From e2d2d3a347c184cbee59a2d8bd06706ea2d9ad7e Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Fri, 9 Sep 2022 11:02:58 -0500
Subject: [PATCH] Refactor

---
 meshtastic/__main__.py       | 14 +++++++-------
 meshtastic/mesh_interface.py |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py
index 9ecae5c..1598f9e 100644
--- a/meshtastic/__main__.py
+++ b/meshtastic/__main__.py
@@ -471,25 +471,25 @@ def onConnected(interface):
 
         # 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/mesh_interface.py b/meshtastic/mesh_interface.py
index 9bea88f..96d170b 100644
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -550,8 +550,8 @@ class MeshInterface:
                 self.localNode.localConfig.position.CopyFrom(fromRadio.config.position)
             elif fromRadio.config.HasField("power"):
                 self.localNode.localConfig.power.CopyFrom(fromRadio.config.power)
-            elif fromRadio.config.HasField("wifi"):
-                self.localNode.localConfig.wifi.CopyFrom(fromRadio.config.wifi)
+            elif fromRadio.config.HasField("network"):
+                self.localNode.localConfig.network.CopyFrom(fromRadio.config.network)
             elif fromRadio.config.HasField("display"):
                 self.localNode.localConfig.display.CopyFrom(fromRadio.config.display)
             elif fromRadio.config.HasField("lora"):