adam/meshing-around
1
0
Fork 0
mirror of https://github.com/SpudGunMan/meshing-around.git synced 2026-06-29 22:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
SpudGunMan
2024-12-13 20:10:59 -08:00
parent 1ac9f3b0d6
commit 659ee2959c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mesh_bot.py
+4 -4
View File
@@ -984,10 +984,6 @@ def onReceive(packet, interface):
rxNode = 1
elif interface2_enabled and interface2_type == 'ble':
rxNode = 2
# check if the packet is from us
if packet['from'] == myNodeNum1 or packet['from'] == myNodeNum2:
logger.warning(f"System: Packet from self {packet['from']} loop or traffic replay deteted")
# check if the packet has a channel flag use it
if packet.get('channel'):
@@ -996,6 +992,10 @@ def onReceive(packet, interface):
# set the message_from_id
message_from_id = packet['from']
# check if the packet is from us
if message_from_id == myNodeNum1 or message_from_id == myNodeNum2:
logger.warning(f"System: Packet from self {message_from_id} loop or traffic replay deteted")
# if message_from_id is not in the seenNodes list add it
if not any(node['nodeID'] == message_from_id for node in seenNodes):
seenNodes.append({'nodeID': message_from_id, 'rxInterface': rxNode, 'channel': channel_number, 'welcome': False, 'lastSeen': time.time()})
pong_bot.py
+5 -3
View File
@@ -206,10 +206,13 @@ def onReceive(packet, interface):
rxNode = 1
elif interface2_enabled and interface2_type == 'ble':
rxNode = 2
# set the message_from_id
message_from_id = packet['from']
# check if the packet is from us
if packet['from'] == myNodeNum1 or packet['from'] == myNodeNum2:
logger.warning(f"System: Packet from self {packet['from']} loop or traffic replay deteted")
if message_from_id == myNodeNum1 or message_from_id == myNodeNum2:
logger.warning(f"System: Packet from self {message_from_id} loop or traffic replay deteted")
# check if the packet has a channel flag use it
if packet.get('channel'):
@@ -220,7 +223,6 @@ def onReceive(packet, interface):
if 'decoded' in packet and packet['decoded']['portnum'] == 'TEXT_MESSAGE_APP':
message_bytes = packet['decoded']['payload']
message_string = message_bytes.decode('utf-8')
message_from_id = packet['from']
# get the signal strength and snr if available
if packet.get('rxSnr') or packet.get('rxRssi'):