jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalise and cleanup

Browse Source
This commit is contained in:
jacob.eva 2024-06-06 10:26:25 +01:00
parent e917d89d5b
commit 14d2739994
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
2 changed files with 124 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
RNS/Interfaces/RNodeMultiInterface.py
View File

@ -112,35 +112,6 @@ class KISS():
SX1262 = 0x03 SX1262 = 0x03
SX1280 = 0x04 SX1280 = 0x04
def index_to_selector(index):
match index:
case 0:
return KISS.CMD_SEL_INT0
case 1:
return KISS.CMD_SEL_INT1
case 2:
return KISS.CMD_SEL_INT2
case 3:
return KISS.CMD_SEL_INT3
case 4:
return KISS.CMD_SEL_INT4
case 5:
return KISS.CMD_SEL_INT5
case 6:
return KISS.CMD_SEL_INT6
case 7:
return KISS.CMD_SEL_INT7
case 8:
return KISS.CMD_SEL_INT8
case 9:
return KISS.CMD_SEL_INT9
case 10:
return KISS.CMD_SEL_INT10
case 11:
return KISS.CMD_SEL_INT11
case _:
return KISS.CMD_SEL_INT0
def int_data_cmd_to_index(int_data_cmd): def int_data_cmd_to_index(int_data_cmd):
match int_data_cmd: match int_data_cmd:
case KISS.CMD_INT0_DATA: case KISS.CMD_INT0_DATA:
@ -246,7 +217,6 @@ class RNodeMultiInterface(Interface):
self.reconnect_w = RNodeMultiInterface.RECONNECT_WAIT self.reconnect_w = RNodeMultiInterface.RECONNECT_WAIT
self.subinterfaces = [0] * RNodeMultiInterface.MAX_SUBINTERFACES self.subinterfaces = [0] * RNodeMultiInterface.MAX_SUBINTERFACES
self.subinterface_indexes = []
self.subinterface_types = [] self.subinterface_types = []
self.subint_config = subint_config self.subint_config = subint_config
@ -339,30 +309,27 @@ class RNodeMultiInterface(Interface):
RNS.log("Serial port "+self.port+" is now open") RNS.log("Serial port "+self.port+" is now open")
RNS.log("Creating subinterfaces...", RNS.LOG_VERBOSE) RNS.log("Creating subinterfaces...", RNS.LOG_VERBOSE)
index = None
for subint in self.subint_config: for subint in self.subint_config:
for subint_type in self.subinterface_types: subint_vport = int(subint[2])
if subint[0] == subint_type: # check if index of vport exists in interface types array (the index corresponds to the vport for that interface)
index = self.subinterface_types.index(subint_type) if len(self.subinterface_types) >= (subint_vport+1):
# if the selected vport matches the type of interface chosen
# The interface type configured is not present on the RNode if self.subinterface_types[subint_vport] == subint[1]:
if index is None:
raise ValueError("Interface type \""+subint[0]+"\" is not available on "+self.name)
# interface will add itself to the subinterfaces list automatically # interface will add itself to the subinterfaces list automatically
interface = RNodeSubInterface( interface = RNodeSubInterface(
RNS.Transport, RNS.Transport,
self,
index,
subint[0], subint[0],
frequency = subint[1], self,
bandwidth = subint[2], subint_vport,
txpower = subint[3], subint[1],
sf = subint[4], frequency = subint[3],
cr = subint[5], bandwidth = subint[4],
flow_control=subint[6], txpower = subint[5],
st_alock=subint[7], sf = subint[6],
lt_alock=subint[8] cr = subint[7],
flow_control=subint[8],
st_alock=subint[9],
lt_alock=subint[10]
) )
interface.OUT = True interface.OUT = True
@ -379,7 +346,10 @@ class RNodeMultiInterface(Interface):
RNS.log("Spawned new RNode subinterface: "+str(interface), RNS.LOG_VERBOSE) RNS.log("Spawned new RNode subinterface: "+str(interface), RNS.LOG_VERBOSE)
self.clients += 1 self.clients += 1
else:
raise ValueError("Interface type \""+subint[1]+"\" for subinterface "+subint[0]+" is not available on virtual port "+str(subint_vport)+" on "+self.name)
else:
raise ValueError("Virtual port \""+subint[2]+"\" for subinterface "+subint[0]+" does not exist on "+self.name)
self.online = True self.online = True
def detect(self): def detect(self):
@ -439,90 +409,89 @@ class RNodeMultiInterface(Interface):
raise IOError("An IO error occurred while restarting device") raise IOError("An IO error occurred while restarting device")
sleep(2.25); sleep(2.25);
# todo, change to use sel_cmd variable instead of translating to index by function def setFrequency(self, frequency, interface):
def setFrequency(self, frequency, index):
c1 = frequency >> 24 c1 = frequency >> 24
c2 = frequency >> 16 & 0xFF c2 = frequency >> 16 & 0xFF
c3 = frequency >> 8 & 0xFF c3 = frequency >> 8 & 0xFF
c4 = frequency & 0xFF c4 = frequency & 0xFF
data = KISS.escape(bytes([c1])+bytes([c2])+bytes([c3])+bytes([c4])) data = KISS.escape(bytes([c1])+bytes([c2])+bytes([c3])+bytes([c4]))
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_FREQUENCY])+data+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_FREQUENCY])+data+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring frequency for "+str(self)) raise IOError("An IO error occurred while configuring frequency for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setBandwidth(self, bandwidth, index): def setBandwidth(self, bandwidth, interface):
c1 = bandwidth >> 24 c1 = bandwidth >> 24
c2 = bandwidth >> 16 & 0xFF c2 = bandwidth >> 16 & 0xFF
c3 = bandwidth >> 8 & 0xFF c3 = bandwidth >> 8 & 0xFF
c4 = bandwidth & 0xFF c4 = bandwidth & 0xFF
data = KISS.escape(bytes([c1])+bytes([c2])+bytes([c3])+bytes([c4])) data = KISS.escape(bytes([c1])+bytes([c2])+bytes([c3])+bytes([c4]))
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_BANDWIDTH])+data+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_BANDWIDTH])+data+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring bandwidth for "+str(self)) raise IOError("An IO error occurred while configuring bandwidth for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setTXPower(self, txpower, index): def setTXPower(self, txpower, interface):
txp = bytes([txpower]) txp = bytes([txpower])
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_TXPOWER])+txp+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_TXPOWER])+txp+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring TX power for "+str(self)) raise IOError("An IO error occurred while configuring TX power for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setSpreadingFactor(self, sf, index): def setSpreadingFactor(self, sf, interface):
sf = bytes([sf]) sf = bytes([sf])
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_SF])+sf+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_SF])+sf+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring spreading factor for "+str(self)) raise IOError("An IO error occurred while configuring spreading factor for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setCodingRate(self, cr, index): def setCodingRate(self, cr, interface):
cr = bytes([cr]) cr = bytes([cr])
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_CR])+cr+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_CR])+cr+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring coding rate for "+str(self)) raise IOError("An IO error occurred while configuring coding rate for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setSTALock(self, st_alock, index): def setSTALock(self, st_alock, interface):
if st_alock != None: if st_alock != None:
at = int(st_alock*100) at = int(st_alock*100)
c1 = at >> 8 & 0xFF c1 = at >> 8 & 0xFF
c2 = at & 0xFF c2 = at & 0xFF
data = KISS.escape(bytes([c1])+bytes([c2])) data = KISS.escape(bytes([c1])+bytes([c2]))
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_ST_ALOCK])+data+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_ST_ALOCK])+data+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring short-term airtime limit for "+str(self)) raise IOError("An IO error occurred while configuring short-term airtime limit for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setLTALock(self, lt_alock, index): def setLTALock(self, lt_alock, interface):
if lt_alock != None: if lt_alock != None:
at = int(lt_alock*100) at = int(lt_alock*100)
c1 = at >> 8 & 0xFF c1 = at >> 8 & 0xFF
c2 = at & 0xFF c2 = at & 0xFF
data = KISS.escape(bytes([c1])+bytes([c2])) data = KISS.escape(bytes([c1])+bytes([c2]))
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_LT_ALOCK])+data+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_LT_ALOCK])+data+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring long-term airtime limit for "+str(self)) raise IOError("An IO error occurred while configuring long-term airtime limit for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def setRadioState(self, state, index): def setRadioState(self, state, interface):
#self.state = state #self.state = state
kiss_command = bytes([KISS.FEND])+bytes([KISS.index_to_selector(index)])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_RADIO_STATE])+bytes([state])+bytes([KISS.FEND]) kiss_command = bytes([KISS.FEND])+bytes([interface.sel_cmd])+bytes([KISS.FEND])+bytes([KISS.FEND])+bytes([KISS.CMD_RADIO_STATE])+bytes([state])+bytes([KISS.FEND])
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring radio state for "+str(self)) raise IOError("An IO error occurred while configuring radio state for "+str(self))
self.last_write_index = index self.last_write_index = interface.index
def validate_firmware(self): def validate_firmware(self):
if (self.maj_version >= RNodeMultiInterface.REQUIRED_FW_VER_MAJ): if (self.maj_version >= RNodeMultiInterface.REQUIRED_FW_VER_MAJ):
@ -537,14 +506,13 @@ class RNodeMultiInterface(Interface):
RNS.log("Please update your RNode firmware with rnodeconf from https://github.com/markqvist/rnodeconfigutil/") RNS.log("Please update your RNode firmware with rnodeconf from https://github.com/markqvist/rnodeconfigutil/")
RNS.panic() RNS.panic()
def processOutgoing(self, data, sel_cmd = None): def processOutgoing(self, data, interface = None):
if sel_cmd is None: if interface is None:
# do nothing if RNS tries to transmit on this interface directly # do nothing if RNS tries to transmit on this interface directly
RNS.log("Attempted transmit!", RNS.LOG_DEBUG)
pass pass
else: else:
data = KISS.escape(data) data = KISS.escape(data)
frame = bytes([0xc0])+bytes([sel_cmd])+data+bytes([0xc0]) frame = bytes([0xc0])+bytes([interface.data_cmd])+data+bytes([0xc0])
written = self.serial.write(frame) written = self.serial.write(frame)
self.txb += len(data) self.txb += len(data)
@ -632,7 +600,7 @@ class RNodeMultiInterface(Interface):
command_buffer = command_buffer+bytes([byte]) command_buffer = command_buffer+bytes([byte])
if (len(command_buffer) == 4): if (len(command_buffer) == 4):
self.subinterfaces[self.last_write_index].r_frequency = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3] self.subinterfaces[self.last_write_index].r_frequency = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3]
RNS.log(str(self)+" Radio reporting frequency is "+str(self.subinterfaces[self.last_write_index].r_frequency/1000000.0)+" MHz", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting frequency is "+str(self.subinterfaces[self.last_write_index].r_frequency/1000000.0)+" MHz", RNS.LOG_DEBUG)
self.subinterfaces[self.last_write_index].updateBitrate() self.subinterfaces[self.last_write_index].updateBitrate()
elif (command == KISS.CMD_BANDWIDTH): elif (command == KISS.CMD_BANDWIDTH):
@ -648,19 +616,19 @@ class RNodeMultiInterface(Interface):
command_buffer = command_buffer+bytes([byte]) command_buffer = command_buffer+bytes([byte])
if (len(command_buffer) == 4): if (len(command_buffer) == 4):
self.subinterfaces[self.last_write_index].r_bandwidth = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3] self.subinterfaces[self.last_write_index].r_bandwidth = command_buffer[0] << 24 | command_buffer[1] << 16 | command_buffer[2] << 8 | command_buffer[3]
RNS.log(str(self)+" Radio reporting bandwidth is "+str(self.subinterfaces[self.last_write_index].r_bandwidth/1000.0)+" KHz", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting bandwidth is "+str(self.subinterfaces[self.last_write_index].r_bandwidth/1000.0)+" KHz", RNS.LOG_DEBUG)
self.subinterfaces[self.last_write_index].updateBitrate() self.subinterfaces[self.last_write_index].updateBitrate()
elif (command == KISS.CMD_TXPOWER): elif (command == KISS.CMD_TXPOWER):
self.subinterfaces[self.last_write_index].r_txpower = byte self.subinterfaces[self.last_write_index].r_txpower = byte
RNS.log(str(self)+" Radio reporting TX power is "+str(self.subinterfaces[self.last_write_index].r_txpower)+" dBm", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting TX power is "+str(self.subinterfaces[self.last_write_index].r_txpower)+" dBm", RNS.LOG_DEBUG)
elif (command == KISS.CMD_SF): elif (command == KISS.CMD_SF):
self.subinterfaces[self.last_write_index].r_sf = byte self.subinterfaces[self.last_write_index].r_sf = byte
RNS.log(str(self)+" Radio reporting spreading factor is "+str(self.subinterfaces[self.last_write_index].r_sf), RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting spreading factor is "+str(self.subinterfaces[self.last_write_index].r_sf), RNS.LOG_DEBUG)
self.subinterfaces[self.last_write_index].updateBitrate() self.subinterfaces[self.last_write_index].updateBitrate()
elif (command == KISS.CMD_CR): elif (command == KISS.CMD_CR):
self.subinterfaces[self.last_write_index].r_cr = byte self.subinterfaces[self.last_write_index].r_cr = byte
RNS.log(str(self)+" Radio reporting coding rate is "+str(self.subinterfaces[self.last_write_index].r_cr), RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting coding rate is "+str(self.subinterfaces[self.last_write_index].r_cr), RNS.LOG_DEBUG)
self.subinterfaces[self.last_write_index].updateBitrate() self.subinterfaces[self.last_write_index].updateBitrate()
elif (command == KISS.CMD_RADIO_STATE): elif (command == KISS.CMD_RADIO_STATE):
self.subinterfaces[self.last_write_index].r_state = byte self.subinterfaces[self.last_write_index].r_state = byte
@ -668,7 +636,7 @@ class RNodeMultiInterface(Interface):
pass pass
#RNS.log(str(self)+" Radio reporting state is online", RNS.LOG_DEBUG) #RNS.log(str(self)+" Radio reporting state is online", RNS.LOG_DEBUG)
else: else:
RNS.log(str(self)+" Radio reporting state is offline", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting state is offline", RNS.LOG_DEBUG)
elif (command == KISS.CMD_RADIO_LOCK): elif (command == KISS.CMD_RADIO_LOCK):
self.subinterfaces[self.last_write_index].r_lock = byte self.subinterfaces[self.last_write_index].r_lock = byte
@ -746,7 +714,7 @@ class RNodeMultiInterface(Interface):
if (len(command_buffer) == 2): if (len(command_buffer) == 2):
at = command_buffer[0] << 8 | command_buffer[1] at = command_buffer[0] << 8 | command_buffer[1]
self.subinterfaces[self.last_write_index].r_st_alock = at/100.0 self.subinterfaces[self.last_write_index].r_st_alock = at/100.0
RNS.log(str(self)+" Radio reporting short-term airtime limit is "+str(self.r_st_alock)+"%", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting short-term airtime limit is "+str(self.subinterfaces[self.last_write_index].r_st_alock)+"%", RNS.LOG_DEBUG)
elif (command == KISS.CMD_LT_ALOCK): elif (command == KISS.CMD_LT_ALOCK):
if (byte == KISS.FESC): if (byte == KISS.FESC):
escape = True escape = True
@ -761,7 +729,7 @@ class RNodeMultiInterface(Interface):
if (len(command_buffer) == 2): if (len(command_buffer) == 2):
at = command_buffer[0] << 8 | command_buffer[1] at = command_buffer[0] << 8 | command_buffer[1]
self.subinterfaces[self.last_write_index].r_lt_alock = at/100.0 self.subinterfaces[self.last_write_index].r_lt_alock = at/100.0
RNS.log(str(self)+" Radio reporting long-term airtime limit is "+str(self.r_lt_alock)+"%", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting long-term airtime limit is "+str(self.subinterfaces[self.last_write_index].r_lt_alock)+"%", RNS.LOG_DEBUG)
elif (command == KISS.CMD_STAT_CHTM): elif (command == KISS.CMD_STAT_CHTM):
if (byte == KISS.FESC): if (byte == KISS.FESC):
escape = True escape = True
@ -801,15 +769,15 @@ class RNodeMultiInterface(Interface):
prt = command_buffer[6] << 8 | command_buffer[7] prt = command_buffer[6] << 8 | command_buffer[7]
cst = command_buffer[8] << 8 | command_buffer[9] cst = command_buffer[8] << 8 | command_buffer[9]
if lst != self.r_symbol_time_ms or lsr != self.r_symbol_rate or prs != self.r_preamble_symbols or prt != self.r_premable_time_ms or cst != self.r_csma_slot_time_ms: if lst != self.subinterfaces[self.last_write_index].r_symbol_time_ms or lsr != self.subinterfaces[self.last_write_index].r_symbol_rate or prs != self.subinterfaces[self.last_write_index].r_preamble_symbols or prt != self.subinterfaces[self.last_write_index].r_premable_time_ms or cst != self.subinterfaces[self.last_write_index].r_csma_slot_time_ms:
self.r_symbol_time_ms = lst self.subinterfaces[self.last_write_index].r_symbol_time_ms = lst
self.r_symbol_rate = lsr self.subinterfaces[self.last_write_index].r_symbol_rate = lsr
self.r_preamble_symbols = prs self.subinterfaces[self.last_write_index].r_preamble_symbols = prs
self.r_premable_time_ms = prt self.subinterfaces[self.last_write_index].r_premable_time_ms = prt
self.r_csma_slot_time_ms = cst self.subinterfaces[self.last_write_index].r_csma_slot_time_ms = cst
RNS.log(str(self)+" Radio reporting symbol time is "+str(round(self.r_symbol_time_ms,2))+"ms (at "+str(self.r_symbol_rate)+" baud)", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting symbol time is "+str(round(self.subinterfaces[self.last_write_index].r_symbol_time_ms,2))+"ms (at "+str(self.subinterfaces[self.last_write_index].r_symbol_rate)+" baud)", RNS.LOG_DEBUG)
RNS.log(str(self)+" Radio reporting preamble is "+str(self.r_preamble_symbols)+" symbols ("+str(self.r_premable_time_ms)+"ms)", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting preamble is "+str(self.subinterfaces[self.last_write_index].r_preamble_symbols)+" symbols ("+str(self.subinterfaces[self.last_write_index].r_premable_time_ms)+"ms)", RNS.LOG_DEBUG)
RNS.log(str(self)+" Radio reporting CSMA slot time is "+str(self.r_csma_slot_time_ms)+"ms", RNS.LOG_DEBUG) RNS.log(str(self.subinterfaces[self.last_write_index])+" Radio reporting CSMA slot time is "+str(self.subinterfaces[self.last_write_index].r_csma_slot_time_ms)+"ms", RNS.LOG_DEBUG)
elif (command == KISS.CMD_RANDOM): elif (command == KISS.CMD_RANDOM):
self.r_random = byte self.r_random = byte
elif (command == KISS.CMD_PLATFORM): elif (command == KISS.CMD_PLATFORM):
@ -842,8 +810,7 @@ class RNodeMultiInterface(Interface):
elif (command == KISS.CMD_INTERFACES): elif (command == KISS.CMD_INTERFACES):
command_buffer = command_buffer+bytes([byte]) command_buffer = command_buffer+bytes([byte])
if (len(command_buffer) == 2): if (len(command_buffer) == 2):
# add the interface to the back of the lists # add the interface to the back of the list, they're all given from vport 0 and up in order
self.subinterface_indexes.append(command_buffer[0])
self.subinterface_types.append(KISS.interface_type_to_str(command_buffer[1])) self.subinterface_types.append(KISS.interface_type_to_str(command_buffer[1]))
command_buffer = b"" command_buffer = b""
@ -859,9 +826,10 @@ class RNodeMultiInterface(Interface):
if self.id_interval != None and self.id_callsign != None: if self.id_interval != None and self.id_callsign != None:
if self.first_tx != None: if self.first_tx != None:
if time.time() > self.first_tx + self.id_interval: if time.time() > self.first_tx + self.id_interval:
RNS.log("Interface "+str(self)+" is transmitting beacon data: "+str(self.id_callsign.decode("utf-8")), RNS.LOG_DEBUG) RNS.log("Interface "+str(self)+" is transmitting beacon data on all subinterfaces: "+str(self.id_callsign.decode("utf-8")), RNS.LOG_DEBUG)
# todo, fixme for interface in self.subinterfaces:
self.processOutgoing(self.id_callsign) if interface != 0:
self.subinterfaces[interface.index].processOutgoing(self.id_callsign)
sleep(0.08) sleep(0.08)
@ -869,7 +837,6 @@ class RNodeMultiInterface(Interface):
self.online = False self.online = False
RNS.log("A serial port error occurred, the contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("A serial port error occurred, the contained exception was: "+str(e), RNS.LOG_ERROR)
RNS.log("The interface "+str(self)+" experienced an unrecoverable error and is now offline.", RNS.LOG_ERROR) RNS.log("The interface "+str(self)+" experienced an unrecoverable error and is now offline.", RNS.LOG_ERROR)
RNS.log(traceback.print_exc(), RNS.LOG_DEBUG)
if RNS.Reticulum.panic_on_interface_error: if RNS.Reticulum.panic_on_interface_error:
RNS.panic() RNS.panic()
@ -905,9 +872,9 @@ class RNodeMultiInterface(Interface):
self.detached = True self.detached = True
self.disable_external_framebuffer() self.disable_external_framebuffer()
# todo: make this iterate over all subinterfaces for interface in self.subinterfaces:
self.setRadioState(KISS.RADIO_STATE_OFF, 0) if interface != 0:
self.setRadioState(KISS.RADIO_STATE_OFF, 1) self.setRadioState(KISS.RADIO_STATE_OFF, interface.index)
self.leave() self.leave()
def should_ingress_limit(self): def should_ingress_limit(self):
@ -915,6 +882,7 @@ class RNodeMultiInterface(Interface):
def process_queue(self): def process_queue(self):
for interface in self.subinterfaces: for interface in self.subinterfaces:
if interface != 0:
interface.process_queue() interface.process_queue()
def __str__(self): def __str__(self):
@ -932,7 +900,7 @@ class RNodeSubInterface(Interface):
Q_SNR_MAX = 6 Q_SNR_MAX = 6
Q_SNR_STEP = 2 Q_SNR_STEP = 2
def __init__(self, owner, parent_interface, index, interface_type, frequency = None, bandwidth = None, txpower = None, sf = None, cr = None, flow_control = False, st_alock = None, lt_alock = None,): def __init__(self, owner, name, parent_interface, index, interface_type, frequency = None, bandwidth = None, txpower = None, sf = None, cr = None, flow_control = False, st_alock = None, lt_alock = None,):
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android") raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android")
@ -988,6 +956,7 @@ class RNodeSubInterface(Interface):
data_cmd= KISS.CMD_INT0_DATA data_cmd= KISS.CMD_INT0_DATA
self.owner = owner self.owner = owner
self.name = name
self.index = index self.index = index
self.sel_cmd = sel_cmd self.sel_cmd = sel_cmd
self.data_cmd = data_cmd self.data_cmd = data_cmd
@ -1122,14 +1091,14 @@ class RNodeSubInterface(Interface):
def initRadio(self): def initRadio(self):
self.parent_interface.setFrequency(self.frequency, self.index) self.parent_interface.setFrequency(self.frequency, self)
self.parent_interface.setBandwidth(self.bandwidth, self.index) self.parent_interface.setBandwidth(self.bandwidth, self)
self.parent_interface.setTXPower(self.txpower, self.index) self.parent_interface.setTXPower(self.txpower, self)
self.parent_interface.setSpreadingFactor(self.sf, self.index) self.parent_interface.setSpreadingFactor(self.sf, self)
self.parent_interface.setCodingRate(self.cr, self.index) self.parent_interface.setCodingRate(self.cr, self)
self.parent_interface.setSTALock(self.st_alock, self.index) self.parent_interface.setSTALock(self.st_alock, self)
self.parent_interface.setLTALock(self.lt_alock, self.index) self.parent_interface.setLTALock(self.lt_alock, self)
self.parent_interface.setRadioState(KISS.RADIO_STATE_ON, self.index) self.parent_interface.setRadioState(KISS.RADIO_STATE_ON, self)
self.state = KISS.RADIO_STATE_ON self.state = KISS.RADIO_STATE_ON
def validateRadioState(self): def validateRadioState(self):
@ -1179,13 +1148,13 @@ class RNodeSubInterface(Interface):
if self.flow_control: if self.flow_control:
self.interface_ready = False self.interface_ready = False
#if data == self.id_callsign: if data == self.parent_interface.id_callsign:
# self.first_tx = None self.parent_interface.first_tx = None
#else: else:
if self.first_tx == None: if self.parent_interface.first_tx == None:
self.first_tx = time.time() self.parent_interface.first_tx = time.time()
self.txb += len(data) self.txb += len(data)
self.parent_interface.processOutgoing(data, self.data_cmd) self.parent_interface.processOutgoing(data, self)
else: else:
self.queue(data) self.queue(data)
@ -1202,4 +1171,4 @@ class RNodeSubInterface(Interface):
self.interface_ready = True self.interface_ready = True
def __str__(self): def __str__(self):
return self.parent_interface.name+"["+self.interface_type+":"+str(self.index)+"]" return self.parent_interface.name+"["+self.name+"]"

24
RNS/Reticulum.py
View File

@ -948,7 +948,7 @@ class Reticulum:
enabled_count += 1 enabled_count += 1
# Create an array with a row for each subinterface # Create an array with a row for each subinterface
subint_config = [[0 for x in range(9)] for y in range(enabled_count)] subint_config = [[0 for x in range(11)] for y in range(enabled_count)]
subint_index = 0 subint_index = 0
for subinterface in c: for subinterface in c:
@ -956,27 +956,31 @@ class Reticulum:
if not isinstance(c[subinterface], str): if not isinstance(c[subinterface], str):
subinterface_config = self.config["interfaces"][name][subinterface] subinterface_config = self.config["interfaces"][name][subinterface]
if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True): if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True):
subint_config[subint_index][0] = subinterface
subint_type = subinterface_config["type"] if "type" in subinterface_config else None subint_type = subinterface_config["type"] if "type" in subinterface_config else None
if subint_type is None: if subint_type is None:
raise ValueError("No type defined for "+name+" subinterface!") raise ValueError("No type defined for "+name+" subinterface!")
subint_config[subint_index][1] = subint_type
subint_vport = subinterface_config["vport"] if "vport" in subinterface_config else None
subint_config[subint_index][2] = subint_vport
subint_config[subint_index][0] = subint_type
frequency = int(subinterface_config["frequency"]) if "frequency" in subinterface_config else None frequency = int(subinterface_config["frequency"]) if "frequency" in subinterface_config else None
subint_config[subint_index][1] = frequency subint_config[subint_index][3] = frequency
bandwidth = int(subinterface_config["bandwidth"]) if "bandwidth" in subinterface_config else None bandwidth = int(subinterface_config["bandwidth"]) if "bandwidth" in subinterface_config else None
subint_config[subint_index][2] = bandwidth subint_config[subint_index][4] = bandwidth
txpower = int(subinterface_config["txpower"]) if "txpower" in subinterface_config else None txpower = int(subinterface_config["txpower"]) if "txpower" in subinterface_config else None
subint_config[subint_index][3] = txpower subint_config[subint_index][5] = txpower
spreadingfactor = int(subinterface_config["spreadingfactor"]) if "spreadingfactor" in subinterface_config else None spreadingfactor = int(subinterface_config["spreadingfactor"]) if "spreadingfactor" in subinterface_config else None
subint_config[subint_index][4] = spreadingfactor subint_config[subint_index][6] = spreadingfactor
codingrate = int(subinterface_config["codingrate"]) if "codingrate" in subinterface_config else None codingrate = int(subinterface_config["codingrate"]) if "codingrate" in subinterface_config else None
subint_config[subint_index][5] = codingrate subint_config[subint_index][7] = codingrate
flow_control = subinterface_config.as_bool("flow_control") if "flow_control" in subinterface_config else False flow_control = subinterface_config.as_bool("flow_control") if "flow_control" in subinterface_config else False
subint_config[subint_index][6] = flow_control subint_config[subint_index][8] = flow_control
st_alock = float(subinterface_config["airtime_limit_short"]) if "airtime_limit_short" in subinterface_config else None st_alock = float(subinterface_config["airtime_limit_short"]) if "airtime_limit_short" in subinterface_config else None
subint_config[subint_index][7] = st_alock subint_config[subint_index][9] = st_alock
lt_alock = float(subinterface_config["airtime_limit_long"]) if "airtime_limit_long" in subinterface_config else None lt_alock = float(subinterface_config["airtime_limit_long"]) if "airtime_limit_long" in subinterface_config else None
subint_config[subint_index][8] = lt_alock subint_config[subint_index][10] = lt_alock
subint_index += 1 subint_index += 1
# if no subinterfaces are defined # if no subinterfaces are defined