Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-12-16 00:44:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added interference detection status and history to rnstatus output for RNode interfaces

Browse source
This commit is contained in:
Mark Qvist 2025-11-21 15:56:17 +01:00
parent a63dd67a07
commit bf2fcbba37
4 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
RNS/Interfaces/Android/RNodeInterface.py
View file

@ -500,6 +500,8 @@ class RNodeInterface(Interface):
self.r_csma_cw_max = None self.r_csma_cw_max = None
self.r_current_rssi = None self.r_current_rssi = None
self.r_noise_floor = None self.r_noise_floor = None
self.r_interference = None
self.r_interference_l = None
self.r_temperature = None self.r_temperature = None
self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN
@ -1314,6 +1316,7 @@ class RNodeInterface(Interface):
self.r_interference = None self.r_interference = None
else: else:
self.r_interference = ntf-RNodeInterface.RSSI_OFFSET self.r_interference = ntf-RNodeInterface.RSSI_OFFSET
self.r_interference_l = [time.time(), self.r_interference]
if self.r_interference != None: if self.r_interference != None:
RNS.log(f"{self} Radio detected interference at {self.r_interference} dBm", RNS.LOG_DEBUG) RNS.log(f"{self} Radio detected interference at {self.r_interference} dBm", RNS.LOG_DEBUG)

5
RNS/Interfaces/RNodeInterface.py
View file

@ -276,6 +276,8 @@ class RNodeInterface(Interface):
self.r_csma_cw_max = None self.r_csma_cw_max = None
self.r_current_rssi = None self.r_current_rssi = None
self.r_noise_floor = None self.r_noise_floor = None
self.r_interference = None
self.r_interference_l = None
self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN
self.r_battery_percent = 0 self.r_battery_percent = 0
@ -947,12 +949,13 @@ class RNodeInterface(Interface):
self.r_interference = None self.r_interference = None
else: else:
self.r_interference = ntf-RNodeInterface.RSSI_OFFSET self.r_interference = ntf-RNodeInterface.RSSI_OFFSET
self.r_interference_l = [time.time(), self.r_interference]
if self.r_interference != None: if self.r_interference != None:
RNS.log(f"{self} Radio detected interference at {self.r_interference} dBm", RNS.LOG_DEBUG) RNS.log(f"{self} Radio detected interference at {self.r_interference} dBm", RNS.LOG_DEBUG)
# TODO: Remove debug # TODO: Remove debug
# RNS.log(f"RSSI: {self.r_current_rssi}, Noise floor: {self.r_noise_floor}, Interference: {self.r_interference}", RNS.LOG_EXTREME) # RNS.log(f"RSSI: {self.r_current_rssi}, Noise floor: {self.r_noise_floor}, Interference: {self.r_interference}", RNS.LOG_DEBUG)
elif (command == KISS.CMD_STAT_PHYPRM): elif (command == KISS.CMD_STAT_PHYPRM):
if (byte == KISS.FESC): if (byte == KISS.FESC):
escape = True escape = True

7
RNS/Reticulum.py
View file

@ -1028,6 +1028,13 @@ class Reticulum:
if hasattr(interface, "r_noise_floor"): if hasattr(interface, "r_noise_floor"):
ifstats["noise_floor"] = interface.r_noise_floor ifstats["noise_floor"] = interface.r_noise_floor
if hasattr(interface, "r_interference"):
ifstats["interference"] = interface.r_interference
if hasattr(interface, "r_interference_l") and type(interface.r_interference_l) == list:
ifstats["interference_last_ts"] = interface.r_interference_l[0]
ifstats["interference_last_dbm"] = interface.r_interference_l[1]
if hasattr(interface, "cpu_temp"): if hasattr(interface, "cpu_temp"):
ifstats["cpu_temp"] = interface.cpu_temp ifstats["cpu_temp"] = interface.cpu_temp

16
RNS/Utilities/rnstatus.py
View file

@ -327,10 +327,20 @@ def program_setup(configdir, dispall=False, verbosity=0, name_filter=None, json=
print(" Rate : {ss}".format(ss=speed_str(ifstat["bitrate"]))) print(" Rate : {ss}".format(ss=speed_str(ifstat["bitrate"])))
if "noise_floor" in ifstat: if "noise_floor" in ifstat:
if ifstat["noise_floor"] != None: if not "interference" in ifstat: nstr = ""
print(" Noise Fl. : {nfl} dBm".format(nfl=str(ifstat["noise_floor"])))
else: else:
print(" Noise Fl. : Unknown") nf = ifstat["interference"]
lstr = ", no interference"
if "interference_last_ts" in ifstat and "interference_last_dbm" in ifstat:
lago = time.time()-ifstat["interference_last_ts"]
ldbm = ifstat["interference_last_dbm"]
lstr = f"\n Intrfrnc. : {ldbm} dBm {RNS.prettytime(lago, compact=True)} ago"
nstr = f"\n Intrfrnc. : {nf} dBm" if nf else lstr
if ifstat["noise_floor"] != None: print(" Noise Fl. : {nfl} dBm{ntr}".format(nfl=str(ifstat["noise_floor"]), ntr=nstr))
else: print(" Noise Fl. : Unknown")
if "cpu_load" in ifstat: if "cpu_load" in ifstat:
if ifstat["cpu_load"] != None: print(" CPU load : {v} %".format(v=str(ifstat["cpu_load"]))) if ifstat["cpu_load"] != None: print(" CPU load : {v} %".format(v=str(ifstat["cpu_load"])))