From 659ee2959c067bfb35c8a90dc58706521f15ac8f Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 13 Dec 2024 20:10:59 -0800 Subject: [PATCH] cleanup --- mesh_bot.py | 8 ++++---- pong_bot.py | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index f51052c..322dc5b 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -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()}) diff --git a/pong_bot.py b/pong_bot.py index bf07c89..e8835d6 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -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'):