Remove alpha

Fixes #367 MedFast Enum Not Defined

meshtastic/__main__.py

@@ -194,21 +194,21 @@ def onConnected(interface):
             localConfig = interface.localNode.localConfig
             if args.setalt:
                 alt = int(args.setalt)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                 print(f"Fixing altitude at {alt} meters")
             if args.setlat:
                 lat = float(args.setlat)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                 print(f"Fixing latitude at {lat} degrees")
             if args.setlon:
                 lon = float(args.setlon)
-                localConfig.fixed_position = True
+                localConfig.position.fixed_position = True
                 print(f"Fixing longitude at {lon} degrees")
 
             print("Setting device position")
             # can include lat/long/alt etc: latitude = 37.5, longitude = -122.1
             interface.sendPosition(lat, lon, alt)
-            interface.localNode.writeConfig()
+            interface.localNode.writeConfig('position')
         elif not args.no_time:
             # We normally provide a current time to the mesh when we connect
             interface.sendPosition()
@@ -389,19 +389,19 @@ def onConnected(interface):
 
                     if 'alt' in configuration['location']:
                         alt = int(configuration['location']['alt'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                         print(f"Fixing altitude at {alt} meters")
                     if 'lat' in configuration['location']:
                         lat = float(configuration['location']['lat'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                         print(f"Fixing latitude at {lat} degrees")
                     if 'lon' in configuration['location']:
                         lon = float(configuration['location']['lon'])
-                        localConfig.fixed_position = True
+                        localConfig.position.fixed_position = True
                         print(f"Fixing longitude at {lon} degrees")
                     print("Setting device position")
                     interface.sendPosition(lat, lon, alt)
-                    interface.localNode.writeConfig()
+                    interface.localNode.writeConfig('position')
 
                 if 'user_prefs' in configuration:
                     localConfig = interface.getNode(args.dest).localConfig
@@ -479,11 +479,11 @@ def onConnected(interface):
         if args.ch_longfast:
             setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongFast)
 
-        if args.ch_midslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidSlow)
+        if args.ch_medslow:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MedSlow)
 
-        if args.ch_midfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MidFast)
+        if args.ch_medfast:
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MedFast)
 
         if args.ch_shortslow:
             setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortSlow)
@@ -829,10 +829,10 @@ def initParser():
         "--ch-longfast", help="Change to the long-range and fast channel", action='store_true')
 
     parser.add_argument(
-        "--ch-midslow", help="Change to the mid-range and slow channel", action='store_true')
+        "--ch-medslow", help="Change to the med-range and slow channel", action='store_true')
 
     parser.add_argument(
-        "--ch-midfast", help="Change to the mid-range and fast channel", action='store_true')
+        "--ch-medfast", help="Change to the med-range and fast channel", action='store_true')
 
     parser.add_argument(
         "--ch-shortslow", help="Change to the short-range and slow channel", action='store_true')

meshtastic/tests/test_smoke1.py

@@ -217,24 +217,24 @@ def test_smoke1_set_owner():
 @pytest.mark.smoke1
 def test_smoke1_ch_set_modem_config():
     """Test --ch-set modem_config"""
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast')
     assert re.search(r'Warning: Need to specify', out, re.MULTILINE)
     assert return_value == 1
     # pause for the radio
     time.sleep(PAUSE_AFTER_COMMAND)
     return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert not re.search(r'MidFast', out, re.MULTILINE)
+    assert not re.search(r'MedFast', out, re.MULTILINE)
     assert return_value == 0
     # pause for the radio
     time.sleep(PAUSE_AFTER_COMMAND)
-    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MidFast --ch-index 0')
+    return_value, out = subprocess.getstatusoutput('meshtastic --ch-set modem_config MedFast --ch-index 0')
     assert re.match(r'Connected to radio', out)
-    assert re.search(r'^Set modem_config to MidFast', out, re.MULTILINE)
+    assert re.search(r'^Set modem_config to MedFast', out, re.MULTILINE)
     assert return_value == 0
     # pause for the radio
     time.sleep(PAUSE_AFTER_REBOOT)
     return_value, out = subprocess.getstatusoutput('meshtastic --info')
-    assert re.search(r'MidFast', out, re.MULTILINE)
+    assert re.search(r'MedFast', out, re.MULTILINE)
     assert return_value == 0
 
 
@@ -247,8 +247,8 @@ def test_smoke1_ch_values():
             '--ch-vlongslow': '{ "psk": "AQ==" }',
             '--ch-longslow': 'LongSlow',
             '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
             '--ch-shortslow': 'ShortSlow',
             '--ch-shortfast': 'ShortFast'
           }

meshtastic/tests/test_smokevirt.py

@@ -227,8 +227,8 @@ def test_smokevirt_ch_values():
     exp = {
             '--ch-longslow': 'LongSlow',
             '--ch-longfast': 'LongFast',
-            '--ch-midslow': 'MidSlow',
-            '--ch-midfast': 'MidFast',
+            '--ch-medslow': 'MedSlow',
+            '--ch-medfast': 'MedFast',
             '--ch-shortslow': 'ShortSlow',
             '--ch-shortfast': 'ShortFast'
           }

setup.py

@@ -12,7 +12,7 @@ with open("README.md", "r") as fh:
 # This call to setup() does all the work
 setup(
     name="meshtastic",
-    version="1.3alpha.26",
+    version="1.3.28",
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",