mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-01-01 20:38:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from linagee/master

Browse Source 
Ham, not HAM
This commit is contained in:
mkinney
2021-12-28 12:41:53 -08:00
committed by GitHub
parent f8dfa3f0fd 06d37914c3
commit fc88d2bff3
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -122,7 +122,7 @@ Meshtastic is designed to be used without a radio operator license. If you do h
```
meshtastic --port /dev/ttyUSB1 --set-ham KI1345
Connected to radio
Setting HAM ID to KI1345 and turning off encryption
Setting Ham ID to KI1345 and turning off encryption
Writing modified channels to device
```

6
docs/meshtastic/tests/test_main.html
View File

@@ -395,7 +395,7 @@ def test_main_set_ham_to_KI123(capsys, reset_globals):
main()
out, err = capsys.readouterr()
assert re.search(r'Connected to radio', out, re.MULTILINE)
assert re.search(r'Setting HAM ID to KI123', out, re.MULTILINE)
assert re.search(r'Setting Ham ID to KI123', out, re.MULTILINE)
assert re.search(r'inside mocked setOwner', out, re.MULTILINE)
assert re.search(r'inside mocked turnOffEncryptionOnPrimaryChannel', out, re.MULTILINE)
assert err == ''
@@ -2437,7 +2437,7 @@ def test_main_set_ham_to_KI123(capsys, reset_globals):
main()
out, err = capsys.readouterr()
assert re.search(r'Connected to radio', out, re.MULTILINE)
assert re.search(r'Setting HAM ID to KI123', out, re.MULTILINE)
assert re.search(r'Setting Ham ID to KI123', out, re.MULTILINE)
assert re.search(r'inside mocked setOwner', out, re.MULTILINE)
assert re.search(r'inside mocked turnOffEncryptionOnPrimaryChannel', out, re.MULTILINE)
assert err == ''
@@ -3603,4 +3603,4 @@ and propagates this to our listener iff this was a state change.</p></div>
<p>Generated by <a href="https://pdoc3.github.io/pdoc" title="pdoc: Python API documentation generator"><cite>pdoc</cite> 0.10.0</a>.</p>
</footer>
</body>
</html>
</html>

6
docs/meshtastic/tests/test_smoke1.html
View File

@@ -691,7 +691,7 @@ def test_smoke1_set_ham():
Note: Do a factory reset after this setting so it is very short-lived.
&#34;&#34;&#34;
return_value, out = subprocess.getstatusoutput(&#39;meshtastic --set-ham KI1234&#39;)
assert re.search(r&#39;Setting HAM ID&#39;, out, re.MULTILINE)
assert re.search(r&#39;Setting Ham ID&#39;, out, re.MULTILINE)
assert return_value == 0
# pause for the radio
time.sleep(PAUSE_AFTER_REBOOT)
@@ -1510,7 +1510,7 @@ def test_smoke1_set_ham():
Note: Do a factory reset after this setting so it is very short-lived.
&#34;&#34;&#34;
return_value, out = subprocess.getstatusoutput(&#39;meshtastic --set-ham KI1234&#39;)
assert re.search(r&#39;Setting HAM ID&#39;, out, re.MULTILINE)
assert re.search(r&#39;Setting Ham ID&#39;, out, re.MULTILINE)
assert return_value == 0
# pause for the radio
time.sleep(PAUSE_AFTER_REBOOT)
@@ -1819,4 +1819,4 @@ def test_smoke1_test_with_arg_but_no_hardware():
<p>Generated by <a href="https://pdoc3.github.io/pdoc" title="pdoc: Python API documentation generator"><cite>pdoc</cite> 0.10.0</a>.</p>
</footer>
</body>
</html>
</html>

2
docs/python-cmd-guide.md
View File

@@ -196,7 +196,7 @@ meshtastic --dest \!28979058 --set-owner "MeshyJohn"
### --set-ham SET_HAM
Set licensed HAM ID and turn off encryption.
Set licensed Ham ID and turn off encryption.
**Usage**

4
meshtastic/__main__.py
View File

@@ -228,7 +228,7 @@ def onConnected(interface):
if args.set_ham:
closeNow = True
print(f"Setting HAM ID to {args.set_ham} and turning off encryption")
print(f"Setting Ham ID to {args.set_ham} and turning off encryption")
getNode().setOwner(args.set_ham, is_licensed=True)
# Must turn off encryption on primary channel
getNode().turnOffEncryptionOnPrimaryChannel()
@@ -738,7 +738,7 @@ def initParser():
"--set-team", help="Set team affiliation (an invalid team will list valid values)", action="store")
parser.add_argument(
"--set-ham", help="Set licensed HAM ID and turn off encryption", action="store")
"--set-ham", help="Set licensed Ham ID and turn off encryption", action="store")
parser.add_argument(
"--dest", help="The destination node id for any sent commands, if not set '^all' or '^local' is assumed as appropriate", default=None)

2
meshtastic/tests/test_main.py
View File

@@ -370,7 +370,7 @@ def test_main_set_ham_to_KI123(capsys, reset_globals):
main()
out, err = capsys.readouterr()
assert re.search(r'Connected to radio', out, re.MULTILINE)
assert re.search(r'Setting HAM ID to KI123', out, re.MULTILINE)
assert re.search(r'Setting Ham ID to KI123', out, re.MULTILINE)
assert re.search(r'inside mocked setOwner', out, re.MULTILINE)
assert re.search(r'inside mocked turnOffEncryptionOnPrimaryChannel', out, re.MULTILINE)
assert err == ''

2
meshtastic/tests/test_smoke1.py
View File

@@ -662,7 +662,7 @@ def test_smoke1_set_ham():
Note: Do a factory reset after this setting so it is very short-lived.
"""
return_value, out = subprocess.getstatusoutput('meshtastic --set-ham KI1234')
assert re.search(r'Setting HAM ID', out, re.MULTILINE)
assert re.search(r'Setting Ham ID', out, re.MULTILINE)
assert return_value == 0
# pause for the radio
time.sleep(PAUSE_AFTER_REBOOT)