diff --git a/mesh_bot.py b/mesh_bot.py index c02c867..553c742 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -170,6 +170,8 @@ def handle_lheard(): bot_response += "Ch Use: " + str(chutil1) + "%" if interface2_enabled: bot_response += " P2:" + str(chutil2) + "%" + #packet count + bot_response += f"\nPackets: {packetCount} Encrypted: {encPacketCount}" return bot_response def handle_whereami(message_from_id, deviceID, channel_number): @@ -350,12 +352,11 @@ def onReceive(packet, interface): elif rxNode == 2: logger.debug(f"Repeating message on Device1 Channel:{channel_number}") send_message(rMsg, channel_number, 0, 1) - msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) - else: - # nothing to do for us - logger.info(f"Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Ignoring Message:" + CustomFormatter.white +\ - f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") - msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) + + # print the message to the log and sdout + logger.info(f"Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Ignoring Message:" + CustomFormatter.white +\ + f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") + msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) except KeyError as e: logger.critical(f"System: Error processing packet: {e} Device:{rxNode}") print(packet) # print the packet for debugging diff --git a/pong_bot.py b/pong_bot.py index ff85a30..7842d45 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -213,10 +213,10 @@ def onReceive(packet, interface): # check if repeater is enabled and the other interface is enabled if repeater_enabled and interface2_enabled: # repeat the message on the other device + # wait a 700ms to avoid message collision from lora-ack. + time.sleep(0.7) rMsg = (f"{message_string} From:{get_name_from_number(message_from_id, 'short', rxNode)}") # if channel found in the repeater list repeat the message - # wait a 700ms to avoid message collision from lora-ack - time.sleep(0.7) if str(channel_number) in repeater_channels: if rxNode == 1: logger.debug(f"Repeating message on Device2 Channel:{channel_number}") @@ -224,11 +224,11 @@ def onReceive(packet, interface): elif rxNode == 2: logger.debug(f"Repeating message on Device1 Channel:{channel_number}") send_message(rMsg, channel_number, 0, 1) - else: - # nothing to do for us - logger.info(f"Ignoring Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Message:" + CustomFormatter.white +\ - f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") - msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}") + + # print the message to the log and sdout + logger.info(f"Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Ignoring Message:" + CustomFormatter.white +\ + f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") + msgLogger.info(f"Device:{rxNode} Channel:{channel_number} | {get_name_from_number(message_from_id, 'long', rxNode)} | " + message_string.replace('\n', '-nl-')) except KeyError as e: logger.critical(f"System: Error processing packet: {e} Device:{rxNode}") print(packet) # print the packet for debugging