diff --git a/mesh_bot.py b/mesh_bot.py index 7af81d4..a012fd6 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -292,7 +292,7 @@ def handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, chann elif "Hops" in hop: # janky, remove the words Gateway or MQTT if present hop = hop.replace("Gateway", "").replace("Direct", "").replace("MQTT", "").strip() - msg += f"\n{hop}🐇 " + msg += f"\n{hop} " if "@" in message: msg = msg + " @" + message.split("@")[1] @@ -2050,7 +2050,13 @@ def onReceive(packet, interface): # Add relay node info if present if packet.get('relayNode') is not None: - hop += f" (Relay:{packet['relayNode']})" + relay_val = packet['relayNode'] + last_byte = relay_val & 0xFF + if last_byte == 0x00: + hex_val = 'OldFW' + else: + hex_val = f"{last_byte:02X}" + hop += f" Relay:{hex_val}" if enableHopLogs: logger.debug(f"System: Packet HopDebugger: hop_away:{hop_away} hop_limit:{hop_limit} hop_start:{hop_start} calculated_hop_count:{hop_count} final_hop_value:{hop} via_mqtt:{via_mqtt} transport_mechanism:{transport_mechanism} Hostname:{rxNodeHostName}") diff --git a/pong_bot.py b/pong_bot.py index 99f6518..55b3c16 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -109,7 +109,7 @@ def handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, chann elif "Hops" in hop: # janky, remove the words Gateway or MQTT if present hop = hop.replace("Gateway", "").replace("Direct", "").replace("MQTT", "").strip() - msg += f"\n{hop}🐇 " + msg += f"\n{hop} " else: msg += "\nflood route" @@ -405,7 +405,13 @@ def onReceive(packet, interface): # Add relay node info if present if packet.get('relayNode') is not None: - hop += f" (Relay:{packet['relayNode']})" + relay_val = packet['relayNode'] + last_byte = relay_val & 0xFF + if last_byte == 0x00: + hex_val = 'FF' + else: + hex_val = f"{last_byte:02X}" + hop += f" (Relay:{hex_val})" if my_settings.enableHopLogs: logger.debug(f"System: Packet HopDebugger: hop_away:{hop_away} hop_limit:{hop_limit} hop_start:{hop_start} calculated_hop_count:{hop_count} final_hop_value:{hop} via_mqtt:{via_mqtt} transport_mechanism:{transport_mechanism} Hostname:{rxNodeHostName}")