From 99c404f479ee800204108b1e9d620ce06b48fe16 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Fri, 13 Dec 2024 20:12:40 -0800 Subject: [PATCH] moveThisShakeThat --- mesh_bot.py | 8 ++++---- pong_bot.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index 322dc5b..1808408 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -992,10 +992,6 @@ 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()}) @@ -1018,6 +1014,10 @@ def onReceive(packet, interface): message_bytes = packet['decoded']['payload'] message_string = message_bytes.decode('utf-8') + # 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") + # get the signal strength and snr if available if packet.get('rxSnr') or packet.get('rxRssi'): snr = packet.get('rxSnr', 0) diff --git a/pong_bot.py b/pong_bot.py index e8835d6..03b705d 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -209,10 +209,6 @@ 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") # check if the packet has a channel flag use it if packet.get('channel'): @@ -224,6 +220,10 @@ def onReceive(packet, interface): message_bytes = packet['decoded']['payload'] message_string = message_bytes.decode('utf-8') + # 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") + # get the signal strength and snr if available if packet.get('rxSnr') or packet.get('rxRssi'): snr = packet.get('rxSnr', 0)