From 0b71ec18a918f4447ae796fe0bcf1c96ac94d4d5 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Tue, 6 Aug 2024 13:38:45 -0700 Subject: [PATCH] uwcolors i know of corruption at uw --- mesh_bot.py | 6 +++--- modules/system.py | 6 +++--- pong_bot.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index d9fc5ee..ce9ed0f 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -257,7 +257,7 @@ def onReceive(packet, interface): # message is DM to us # check if the message contains a trap word, DMs are always responded to if messageTrap(message_string): - logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.yellow +\ + logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") # respond with DM send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode) @@ -270,7 +270,7 @@ def onReceive(packet, interface): # message is on a channel if messageTrap(message_string): # message is for bot to respond to - logger.info(f"Device:{rxNode} Channel {channel_number} " + CustomFormatter.green + "Received: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.yellow +\ + logger.info(f"Device:{rxNode} Channel {channel_number} " + CustomFormatter.green + "Received: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") if useDMForResponse: # respond to channel message via direct message @@ -318,7 +318,7 @@ def onReceive(packet, interface): else: # nothing to do for us logger.info(f"Ignoring incoming Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Message:" + CustomFormatter.white +\ - f" {message_string} " + CustomFormatter.yellow + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") + f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}") except KeyError as e: logger.critical(f"System: Error processing packet: {e} Device:{rxNode}") diff --git a/modules/system.py b/modules/system.py index 05778a0..b2406c2 100644 --- a/modules/system.py +++ b/modules/system.py @@ -284,7 +284,7 @@ def send_message(message, ch, nodeid=0, nodeInt=1): interface2.sendText(text=m, channelIndex=ch) else: # Send to DM - logger.info(f"Device:{nodeInt} " + CustomFormatter.red + "Sending Multi-Chunk Message: " + CustomFormatter.white + f"{m}" + CustomFormatter.yellow +\ + logger.info(f"Device:{nodeInt} " + CustomFormatter.red + "Sending Multi-Chunk Message: " + CustomFormatter.white + f"{m}" + CustomFormatter.purple +\ " To: " + CustomFormatter.white + f"{get_name_from_number(nodeid, 'long', nodeInt)}") if nodeInt == 1: interface1.sendText(text=m, channelIndex=ch, destinationId=nodeid) @@ -300,7 +300,7 @@ def send_message(message, ch, nodeid=0, nodeInt=1): interface2.sendText(text=message, channelIndex=ch) else: # Send to DM - logger.info(f"Device:{nodeInt} " + CustomFormatter.red + "Sending: " + CustomFormatter.white + f"{message}" + CustomFormatter.yellow +\ + logger.info(f"Device:{nodeInt} " + CustomFormatter.red + "Sending: " + CustomFormatter.white + f"{message}" + CustomFormatter.purple +\ " To: " + CustomFormatter.white + f"{get_name_from_number(nodeid, 'long', nodeInt)}") if nodeInt == 1: interface1.sendText(text=message, channelIndex=ch, destinationId=nodeid) @@ -468,7 +468,7 @@ async def watchdog(): # watchdog for connection to the interface while True: await asyncio.sleep(20) - #print(f"System: watchdog running\r", end="") + #print(f"MeshBot System: watchdog running\r", end="") if interface1 is not None and not retry_int1: try: with suppress_stdout(): diff --git a/pong_bot.py b/pong_bot.py index 9b9adc4..6ce1dba 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -143,7 +143,7 @@ def onReceive(packet, interface): # check if the message contains a trap word, DMs are always responded to if messageTrap(message_string): - logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.yellow +\ + logger.info(f"Device:{rxNode} Channel: {channel_number} " + CustomFormatter.green + f"Received DM: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") # respond with DM send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode) @@ -156,7 +156,7 @@ def onReceive(packet, interface): # message is on a channel if messageTrap(message_string): # message is for bot to respond to - logger.info(f"Device:{rxNode} Channel {channel_number} " + CustomFormatter.green + "Received: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.yellow +\ + logger.info(f"Device:{rxNode} Channel {channel_number} " + CustomFormatter.green + "Received: " + CustomFormatter.white + f"{message_string} " + CustomFormatter.purple +\ "From: " + CustomFormatter.white + f"{get_name_from_number(message_from_id, 'long', rxNode)}") if useDMForResponse: # respond to channel message via direct message @@ -203,7 +203,7 @@ def onReceive(packet, interface): else: # nothing to do for us logger.info(f"Ignoring incoming Device:{rxNode} Channel:{channel_number} " + CustomFormatter.green + "Message:" + CustomFormatter.white +\ - f" {message_string} " + CustomFormatter.yellow + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") + f" {message_string} " + CustomFormatter.purple + "From:" + CustomFormatter.white + f" {get_name_from_number(message_from_id)}") msgLogger.info(f"{get_name_from_number(message_from_id, 'long', rxNode)} | {message_string}") except KeyError as e: logger.critical(f"System: Error processing packet: {e} Device:{rxNode}")