iarv/meshing-around
1
0
Fork 1
mirror of https://github.com/SpudGunMan/meshing-around.git synced 2026-05-03 12:02:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from SpudGunMan/test

Browse Source 
fix the enhancement
This commit is contained in:
Kelly
2024-06-19 13:21:14 -07:00
committed by GitHub
parent ee16b00452 75ca8a04dc
commit e58973bd08
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mesh-bot.py
View File

@@ -19,7 +19,7 @@ interface = meshtastic.serial_interface.SerialInterface() #serial interface
trap_list = ("ping","ack","testing","pong","motd","help","sun","solar","hfcond","lheard") #A list of strings to trap and respond to
welcome_message = "MeshBot, here for you like a friend who is not. Try sending: ping @foo or, help"
help_message = "Commands are: ping, ack, motd, sun, solar, hfcond, lheard. Use 'motd $foo' to set MOTD."
help_message = "Commands are: ping, ack, motd, sun, solar, hfcond, Lheard. Use 'motd $foo' to set MOTD."
RESPOND_BY_DM_ONLY = True # Set to True to respond messages via DM only (keeps the channel clean)
MOTD = "Thanks for using PongBOT! Have a good day!" # Message of the Day
@@ -97,33 +97,34 @@ def onReceive(packet, interface):
channel_number = packet['channel']
else:
channel_number = 0
if packet.get('hopLimit'):
hop_limit = packet['hopLimit']
else:
hop_limit = 0
if packet.get('hopStart'):
hop_start = packet['hopStart']
else:
hop_start = 0
# check if the packet has a hop count flag use it
if packet.get('hopsAway'):
hop_away = packet['hopsAway']
else:
# if the packet does not have a hop count try other methods
hop_away = 0
if packet.get('hopLimit'):
hop_limit = packet['hopLimit']
else:
hop_limit = 0
# set hop to Direct if the message was sent directly otherwise set the hop count
if packet.get('hopStart'):
hop_start = packet['hopStart']
else:
hop_start = 0
if hop_start == hop_limit:
hop = "Direct"
else:
# set hop to Direct if the message was sent directly otherwise set the hop count
if hop_away > 0:
hop_count = hop_away
print (f"Using hopsAway: {hop_count}")
else:
hop_count = hop_start - hop_limit
print (f"calculated hop count: {hop_start} - {hop_limit} = {hop_count}")
hop = f"{hop_count} hops"
# If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us

25
pong-bot.py
View File

@@ -18,7 +18,7 @@ interface = meshtastic.serial_interface.SerialInterface() #serial interface
trap_list = ("ping","ack","testing","pong","motd","help","lheard") #A list of strings to trap and respond to
welcome_message = "PongBot, here for you like a friend who is not. Try sending: ping @foo or, help"
help_message = "Commands are: ping, ack, motd, lheard. Use 'motd $foo' to set MOTD."
help_message = "Commands are: ping, ack, motd, Lheard. Use 'motd $foo' to set MOTD."
RESPOND_BY_DM_ONLY = True # Set to True to respond messages via DM only (keeps the channel clean)
MOTD = "Thanks for using PongBOT! Have a good day!" # Message of the Day
@@ -90,32 +90,33 @@ def onReceive(packet, interface):
else:
channel_number = 0
if packet.get('hopLimit'):
hop_limit = packet['hopLimit']
else:
hop_limit = 0
if packet.get('hopStart'):
hop_start = packet['hopStart']
else:
hop_start = 0
# check if the packet has a hop count flag use it
if packet.get('hopsAway'):
hop_away = packet['hopsAway']
else:
# if the packet does not have a hop count try other methods
hop_away = 0
if packet.get('hopLimit'):
hop_limit = packet['hopLimit']
else:
hop_limit = 0
# set hop to Direct if the message was sent directly otherwise set the hop count
if packet.get('hopStart'):
hop_start = packet['hopStart']
else:
hop_start = 0
if hop_start == hop_limit:
hop = "Direct"
else:
# set hop to Direct if the message was sent directly otherwise set the hop count
if hop_away > 0:
hop_count = hop_away
print (f"Using hopsAway: {hop_count}")
else:
hop_count = hop_start - hop_limit
print (f"calculated hop count: {hop_start} - {hop_limit} = {hop_count}")
hop = f"{hop_count} hops"
# If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us