modemPresetName

refactoring per comments in meshtastic#859

Author: SpudGunMan

meshtastic/node.py

@@ -17,6 +17,7 @@
     stripnl,
     message_to_json,
     generate_channel_hash,
+    format_preset_name,
     to_node_num,
 )
 
@@ -1027,12 +1028,18 @@ def get_channels_with_hash(self):
             for c in self.channels:
                 if c.settings and hasattr(c.settings, "name") and hasattr(c.settings, "psk"):
                     hash_val = generate_channel_hash(c.settings.name, c.settings.psk)
-                else:
-                    hash_val = None
+                    # If name is empty string, use modem preset
+                    if c.settings.name == '':
+                        # Assuming c.settings.modem_preset exists and is the enum name
+                        modem_preset_enum = getattr(getattr(self.localConfig, "lora", None), "modem_preset", None)
+                        modem_preset_string = self.localConfig.lora.DESCRIPTOR.fields_by_name["modem_preset"].enum_type.values_by_number[modem_preset_enum].name
+                        name_val = format_preset_name(modem_preset_string)
+                    else:
+                        name_val = c.settings.name
                 result.append({
                     "index": c.index,
                     "role": channel_pb2.Channel.Role.Name(c.role),
-                    "name": c.settings.name if c.settings and hasattr(c.settings, "name") else "",
+                    "name": name_val,
                     "hash": hash_val,
                 })
         return result

meshtastic/util.py

@@ -392,6 +392,29 @@ def generate_channel_hash(name: Union[str, bytes], key: Union[str, bytes]) -> in
     result: int = h_name ^ h_key
     return result
 
+# Mapping of preset enum names to display names used by get_channels_with_hash(), format_preset_name()
+MODEM_PRESET_DISPLAY_NAMES = {
+    "SHORT_TURBO": ("ShortTurbo", "ShortT"),
+    "SHORT_SLOW": ("ShortSlow", "ShortS"),
+    "SHORT_FAST": ("ShortFast", "ShortF"),
+    "MEDIUM_SLOW": ("MediumSlow", "MedS"),
+    "MEDIUM_FAST": ("MediumFast", "MedF"),
+    "LONG_SLOW": ("LongSlow", "LongS"),
+    "LONG_FAST": ("LongFast", "LongF"),
+    "LONG_MODERATE": ("LongMod", "LongM"),
+}
+
+def format_preset_name(name=None):
+    # Normalize input: extract the preset part from full enum string
+    if isinstance(name, str):
+        parts = name.split('_')
+        for i in range(len(parts)):
+            key = '_'.join(parts[i:])
+            if key in MODEM_PRESET_DISPLAY_NAMES:
+                names = MODEM_PRESET_DISPLAY_NAMES[key]
+                return names[0]  # Return clean name like "LongFast"
+    return "Custom"  # If no match, return "Custom"
+
 def hexstr(barray: bytes) -> str:
     """Print a string of hex digits"""
     return ":".join(f"{x:02x}" for x in barray)