diff --git a/mesh_bot.py b/mesh_bot.py index c68319b..530e11a 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -242,7 +242,7 @@ def onReceive(packet, interface): return # If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us on the channel - if packet['to'] == myNodeNum or packet['to'] == myNodeNum2: + if packet['to'] == myNodeNum1 or packet['to'] == myNodeNum2: # message is DM to us # check if the message contains a trap word, DMs are always responded to @@ -329,8 +329,8 @@ async def start_rx(): # Start the receive subscriber using pubsub via meshtastic library pub.subscribe(onReceive, 'meshtastic.receive') - msg = (f"{log_timestamp()} System: Autoresponder Started for Device1 {get_name_from_number(myNodeNum, 'long', 1)}," - f"{get_name_from_number(myNodeNum, 'short', 1)}. NodeID: {myNodeNum}, {decimal_to_hex(myNodeNum)}") + msg = (f"{log_timestamp()} System: Autoresponder Started for Device1 {get_name_from_number(myNodeNum1, 'long', 1)}," + f"{get_name_from_number(myNodeNum1, 'short', 1)}. NodeID: {myNodeNum1}, {decimal_to_hex(myNodeNum1)}") print (msg) if interface2_enabled: msg = (f"{log_timestamp()} System: Autoresponder Started for Device2 {get_name_from_number(myNodeNum2, 'long', 2)}," diff --git a/modules/system.py b/modules/system.py index 17b133b..d8d51f1 100644 --- a/modules/system.py +++ b/modules/system.py @@ -93,7 +93,7 @@ if interface2_enabled: #Get the node number of the device, check if the device is connected try: myinfo = interface1.getMyNodeInfo() - myNodeNum = myinfo['num'] + myNodeNum1 = myinfo['num'] except Exception as e: print(f"System: Critical Error script abort. {e}") exit() @@ -160,7 +160,7 @@ def get_node_list(nodeInt=1): if interface1.nodes: for node in interface1.nodes.values(): # ignore own - if node['num'] != myNodeNum2 and node['num'] != myNodeNum: + if node['num'] != myNodeNum2 and node['num'] != myNodeNum1: node_name = get_name_from_number(node['num'], 'long', nodeInt) snr = node.get('snr', 0) @@ -178,7 +178,7 @@ def get_node_list(nodeInt=1): if interface2.nodes: for node in interface2.nodes.values(): # ignore own - if node['num'] != myNodeNum2 and node['num'] != myNodeNum: + if node['num'] != myNodeNum2 and node['num'] != myNodeNum1: node_name = get_name_from_number(node['num'], 'long', nodeInt) snr = node.get('snr', 0) diff --git a/pong_bot.py b/pong_bot.py index 9856627..5b31d89 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -131,7 +131,7 @@ def onReceive(packet, interface): return # If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us on the channel - if packet['to'] == myNodeNum or packet['to'] == myNodeNum2: + if packet['to'] == myNodeNum1 or packet['to'] == myNodeNum2: # message is DM to us # check if the message contains a trap word, DMs are always responded to @@ -201,8 +201,8 @@ async def start_rx(): # Start the receive subscriber using pubsub via meshtastic library pub.subscribe(onReceive, 'meshtastic.receive') - msg = (f"{log_timestamp()} System: Autoresponder Started for Device1 {get_name_from_number(myNodeNum, 'long', 1)}," - f"{get_name_from_number(myNodeNum, 'short', 1)}. NodeID: {myNodeNum}, {decimal_to_hex(myNodeNum)}") + msg = (f"{log_timestamp()} System: Autoresponder Started for Device1 {get_name_from_number(myNodeNum1, 'long', 1)}," + f"{get_name_from_number(myNodeNum1, 'short', 1)}. NodeID: {myNodeNum1}, {decimal_to_hex(myNodeNum1)}") print (msg) if interface2_enabled: msg = (f"{log_timestamp()} System: Autoresponder Started for Device2 {get_name_from_number(myNodeNum2, 'long', 2)},"