adam/meshing-around
1
0
Fork 0
mirror of https://github.com/SpudGunMan/meshing-around.git synced 2026-08-08 09:53:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268 from SpudGunMan/lab

Browse Source 
Lab
This commit is contained in:
Kelly
2025-11-12 21:58:31 -08:00
committed by GitHub
parent af7dfe8a51 05df1e1a3c
commit 2a6f76ab5b
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mesh_bot.py
+8 -2
View File
@@ -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}")
pong_bot.py
+8 -2
View File
@@ -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}")