Merge pull request #371 from meshtastic/big-proto-refactor

Update python to use reworked protos
meshtastic · Sep 9, 2022 · e083cda · e083cda
2 parents 4b0e3ae + c0006f8
commit e083cda
Show file tree

Hide file tree

Showing 14 changed files with 163 additions and 165 deletions.
diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py
@@ -471,25 +471,25 @@ def setSimpleConfig(modem_preset):
 
         # handle the simple radio set commands
         if args.ch_vlongslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.VLongSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.VERY_LONG_SLOW)
 
         if args.ch_longslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LONG_SLOW)
 
         if args.ch_longfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LongFast)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.LONG_FAST)
 
         if args.ch_medslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MedSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MEDIUM_SLOW)
 
         if args.ch_medfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MedFast)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.MEDIUM_FAST)
 
         if args.ch_shortslow:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortSlow)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.SHORT_SLOW)
 
         if args.ch_shortfast:
-            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.ShortFast)
+            setSimpleConfig(config_pb2.Config.LoRaConfig.ModemPreset.SHORT_FAST)
 
         if args.ch_set or args.ch_enable or args.ch_disable:
             closeNow = True

diff --git a/meshtastic/admin_pb2.py b/meshtastic/admin_pb2.py
diff --git a/meshtastic/channel_pb2.py b/meshtastic/channel_pb2.py