diff --git a/README.md b/README.md index c3940fe..5d90e8d 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/docs/meshtastic/tests/test_main.html b/docs/meshtastic/tests/test_main.html index fa4ee62..896c751 100644 --- a/docs/meshtastic/tests/test_main.html +++ b/docs/meshtastic/tests/test_main.html @@ -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.

Generated by pdoc 0.10.0.

- \ No newline at end of file + diff --git a/docs/meshtastic/tests/test_smoke1.html b/docs/meshtastic/tests/test_smoke1.html index 67e3022..f63eb2d 100644 --- a/docs/meshtastic/tests/test_smoke1.html +++ b/docs/meshtastic/tests/test_smoke1.html @@ -691,7 +691,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) @@ -1510,7 +1510,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) @@ -1819,4 +1819,4 @@ def test_smoke1_test_with_arg_but_no_hardware():

Generated by pdoc 0.10.0.

- \ No newline at end of file + diff --git a/docs/python-cmd-guide.md b/docs/python-cmd-guide.md index 9344804..77a881a 100644 --- a/docs/python-cmd-guide.md +++ b/docs/python-cmd-guide.md @@ -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** diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index cbd67c9..23f47b4 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -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) diff --git a/meshtastic/tests/test_main.py b/meshtastic/tests/test_main.py index 28ef303..c4bd2d6 100644 --- a/meshtastic/tests/test_main.py +++ b/meshtastic/tests/test_main.py @@ -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 == '' diff --git a/meshtastic/tests/test_smoke1.py b/meshtastic/tests/test_smoke1.py index 892ab35..d05b765 100644 --- a/meshtastic/tests/test_smoke1.py +++ b/meshtastic/tests/test_smoke1.py @@ -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)