iarv/meshing-around
1
0
Fork 1
mirror of https://github.com/SpudGunMan/meshing-around.git synced 2026-03-28 17:32:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update system.py

Browse Source
This commit is contained in:
SpudGunMan
2024-10-07 21:34:56 -07:00
parent dc561a8d17
commit 8c32714dfb
1 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modules/system.py
View File

@@ -857,73 +857,11 @@ async def watchdog():
# multiPing handler
handleMultiPing(0,1)
if rxType == 'TCPInterface':
rxHost = interface.__dict__.get('hostname', 'unknown')
if hostname1 in rxHost and interface1_type == 'tcp':
rxNode = 1
elif interface2_enabled and hostname2 in rxHost and interface2_type == 'tcp':
rxNode = 2
if rxType == 'BLEInterface':
if interface1_type == 'ble':
rxNode = 1
elif interface2_enabled and interface2_type == 'ble':
rxNode = 2
# TELEMETRY packets
global numPacketsRx, numPacketsTx, numPacketsRxErr, numPacketsTxErr, numOnlineNodes, numTotalNodes
if packet.get('decoded') and packet['decoded']['portnum'] == 'TELEMETRY_APP':
# get the telemetry data
telemetry_packet = packet['decoded']['telemetry']
if telemetry_packet.get('localStats'):
localStats = telemetry_packet['localStats']
# Check if 'numPacketsTx' and 'numPacketsRx' exist and are not zero
if localStats.get('numPacketsTx') is not None and localStats.get('numPacketsRx') is not None and localStats['numPacketsTx'] != -1:
# Assign the values and include rxNode
numPacketsTx = (localStats['numPacketsTx'], rxNode)
numPacketsRx = (localStats['numPacketsRx'], rxNode)
try:
numOnlineNodes = (localStats['numOnlineNodes'], rxNode)
except KeyError:
numOnlineNodes = (-1, rxNode)
try:
numPacketsTxErr = (localStats['numPacketsTxErr'], rxNode)
except KeyError:
numPacketsTxErr = (-1, rxNode)
try:
numPacketsRxErr = (localStats['numPacketsRxErr'], rxNode)
except KeyError:
numPacketsRxErr = (-1, rxNode)
try:
numTotalNodes = (localStats['numTotalNodes'], rxNode)
except KeyError:
numTotalNodes = (-1, rxNode)
print(f"----onReceive() numPacketsTx: {numPacketsTx} numPacketsRx: {numPacketsRx} numOnlineNodes: {numOnlineNodes} numPacketsTxErr: {numPacketsTxErr} numPacketsRxErr: {numPacketsRxErr} numTotalNodes: {numTotalNodes}")
else:
print("DEBUG: localStats does not contain valid numPacketsTx or numPacketsRx")
else:
print("DEBUG: telemetry_packet does not contain localStats")
else:
print("DEBUG: packet does not contain decoded data or portnum is not TELEMETRY_APP")
# Example usage
packet = {
'decoded': {
'portnum': 'TELEMETRY_APP',
'telemetry': {
'localStats': {
'numPacketsTx': 79,
'numPacketsRx': 113,
'numOnlineNodes': 2,
'numPacketsTxErr': -1,
'numPacketsRxErr': -1,
'numTotalNodes': 2
}
}
}
}
rxNode = 1
onReceive(packet, rxNode)
# Telemetry data
int1Data = getNodeTelemetry(0, 1)
if int1Data != -1 and lastTelemetryRequest[0]['lastAlert1'] != int1Data:
logger.debug(int1Data + f" Firmware:{firmware}")
lastTelemetryRequest[0]['lastAlert1'] = int1Data
if retry_int1:
try: