adam/meshing-around
1
0
Fork 0
mirror of https://github.com/SpudGunMan/meshing-around.git synced 2026-07-05 09:21:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
SpudGunMan
2025-10-11 11:46:09 -07:00
parent a71e5fa8f3
commit e348854a50
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/system.py
+13 -19
View File
@@ -1122,17 +1122,15 @@ def consumeMetadata(packet, rxNode=0, channel=-1):
uptime = battery = temp = iaq = nodeID = 0
deviceMetrics, envMetrics, localStats = {}, {}, {}
# check type of packet
# update telemetry data for the device
try:
packet_type = ''
if packet.get('decoded'):
packet_type = packet['decoded']['portnum']
nodeID = packet['from']
# if not a bot ID track it
if nodeID != globals().get(f'myNodeNum{rxNode}') or nodeID != 0:
wasItMe = True
else:
if nodeID != globals().get(f'myNodeNum{rxNode}') and nodeID != 0:
# consider Meta for most messages leaderboard
node_message_count = meshLeaderboard.get('nodeMessageCounts', {})
node_message_count[nodeID] = node_message_count.get(nodeID, 0) + 1
@@ -1143,13 +1141,13 @@ def consumeMetadata(packet, rxNode=0, channel=-1):
meshLeaderboard['mostMessages']['nodeID'] = nodeID
meshLeaderboard['mostMessages']['timestamp'] = time.time()
# consider Meta for highest and weakest DBm
if packet.get('rxSnr') is not None and nodeID != 0:
dbm = packet['rxSnr']
if dbm > meshLeaderboard['highestDBm']['value']:
meshLeaderboard['highestDBm'] = {'nodeID': nodeID, 'value': dbm, 'timestamp': time.time()}
if dbm < meshLeaderboard['weakestDBm']['value']:
meshLeaderboard['weakestDBm'] = {'nodeID': nodeID, 'value': dbm, 'timestamp': time.time()}
# consider Meta for highest and weakest DBm
if packet.get('rxSnr') is not None:
dbm = packet['rxSnr']
if dbm > meshLeaderboard['highestDBm']['value']:
meshLeaderboard['highestDBm'] = {'nodeID': nodeID, 'value': dbm, 'timestamp': time.time()}
if dbm < meshLeaderboard['weakestDBm']['value']:
meshLeaderboard['weakestDBm'] = {'nodeID': nodeID, 'value': dbm, 'timestamp': time.time()}
except Exception as e:
logger.debug(f"System: Metadata decode error: Device: {rxNode} Channel: {channel} {e} packet {packet}")
@@ -1176,9 +1174,7 @@ def consumeMetadata(packet, rxNode=0, channel=-1):
# Track longest uptime 🕰️
try:
# if not a bot ID track it
if nodeID != globals().get(f'myNodeNum{rxNode}') or nodeID != 0:
wasItMe = False
else:
if nodeID != globals().get(f'myNodeNum{rxNode}') and nodeID != 0:
if deviceMetrics.get('uptimeSeconds') is not None:
uptime = float(deviceMetrics['uptimeSeconds'])
longest_uptime = float(meshLeaderboard['longestUptime']['value'])
@@ -1380,10 +1376,8 @@ def consumeMetadata(packet, rxNode=0, channel=-1):
try:
if debugMetadata and 'ADMIN_APP' not in metadataFilter:
print(f"DEBUG ADMIN_APP: {packet}\n\n")
# if the packet is from local bot node ignore it
if nodeID != globals().get(f'myNodeNum{rxNode}') or nodeID != 0:
wasItMe = True
else:
# if not a bot ID track it
if nodeID != globals().get(f'myNodeNum{rxNode}') and nodeID != 0:
packet_info = {'nodeID': nodeID, 'timestamp': time.time(), 'device': rxNode, 'channel': channel}
meshLeaderboard['adminPackets'].append(packet_info)
if len(meshLeaderboard['adminPackets']) > 10: