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

RNode interface updates

Browse Source
This commit is contained in:
Mark Qvist 2018-06-27 10:15:39 +02:00
parent 2c12deb429
commit deffcae419
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
RNS/Interfaces/RNodeInterface.py
View File

@ -20,14 +20,21 @@ class KISS():
CMD_BANDWIDTH = chr(0x02) CMD_BANDWIDTH = chr(0x02)
CMD_TXPOWER = chr(0x03) CMD_TXPOWER = chr(0x03)
CMD_SF = chr(0x04) CMD_SF = chr(0x04)
CMD_RADIO_STATE = chr(0x05) CMD_CR = chr(0x05)
CMD_RADIO_LOCK = chr(0x06) CMD_RADIO_STATE = chr(0x06)
CMD_RADIO_LOCK = chr(0x07)
CMD_DETECT = chr(0x08)
CMD_READY = chr(0x0F) CMD_READY = chr(0x0F)
CMD_STAT_RX = chr(0x21) CMD_STAT_RX = chr(0x21)
CMD_STAT_TX = chr(0x22) CMD_STAT_TX = chr(0x22)
CMD_STAT_RSSI = chr(0x23) CMD_STAT_RSSI = chr(0x23)
CMD_BLINK = chr(0x30) CMD_BLINK = chr(0x30)
CMD_RANDOM = chr(0x40) CMD_RANDOM = chr(0x40)
CMD_FW_VERSION = chr(0x50)
CMD_ROM_READ = chr(0x51)
DETECT_REQ = chr(0x73)
DETECT_RESP = chr(0x46)
RADIO_STATE_OFF = chr(0x00) RADIO_STATE_OFF = chr(0x00)
RADIO_STATE_ON = chr(0x01) RADIO_STATE_ON = chr(0x01)
@ -36,6 +43,7 @@ class KISS():
CMD_ERROR = chr(0x90) CMD_ERROR = chr(0x90)
ERROR_INITRADIO = chr(0x01) ERROR_INITRADIO = chr(0x01)
ERROR_TXFAILED = chr(0x02) ERROR_TXFAILED = chr(0x02)
ERROR_EEPROM_LOCKED = chr(0x03)
@staticmethod @staticmethod
def escape(data): def escape(data):
@ -74,7 +82,7 @@ class RNodeInterface(Interface):
self.bandwidth = bandwidth self.bandwidth = bandwidth
self.txpower = txpower self.txpower = txpower
self.sf = sf self.sf = sf
self.cr = 5 # Coding rate is hard-coded in firmware for now self.cr = 5
self.state = KISS.RADIO_STATE_OFF self.state = KISS.RADIO_STATE_OFF
self.bitrate = 0 self.bitrate = 0
@ -82,6 +90,7 @@ class RNodeInterface(Interface):
self.r_bandwidth = None self.r_bandwidth = None
self.r_txpower = None self.r_txpower = None
self.r_sf = None self.r_sf = None
self.r_cr = None
self.r_state = None self.r_state = None
self.r_lock = None self.r_lock = None
self.r_stat_rx = None self.r_stat_rx = None
@ -200,6 +209,13 @@ class RNodeInterface(Interface):
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while configuring spreading factor for "+self(str)) raise IOError("An IO error occurred while configuring spreading factor for "+self(str))
def setCodingRate(self):
cr = chr(self.cr)
kiss_command = KISS.FEND+KISS.CMD_CR+cr+KISS.FEND
written = self.serial.write(kiss_command)
if written != len(kiss_command):
raise IOError("An IO error occurred while configuring coding rate for "+self(str))
def setRadioState(self, state): def setRadioState(self, state):
kiss_command = KISS.FEND+KISS.CMD_RADIO_STATE+state+KISS.FEND kiss_command = KISS.FEND+KISS.CMD_RADIO_STATE+state+KISS.FEND
written = self.serial.write(kiss_command) written = self.serial.write(kiss_command)
@ -342,6 +358,10 @@ class RNodeInterface(Interface):
self.r_sf = ord(byte) self.r_sf = ord(byte)
RNS.log(str(self)+" Radio reporting spreading factor is "+str(self.r_sf), RNS.LOG_DEBUG) RNS.log(str(self)+" Radio reporting spreading factor is "+str(self.r_sf), RNS.LOG_DEBUG)
self.updateBitrate() self.updateBitrate()
elif (command == KISS.CMD_CR):
self.r_cr = ord(byte)
RNS.log(str(self)+" Radio reporting coding rate is "+str(self.r_cr), RNS.LOG_DEBUG)
self.updateBitrate()
elif (command == KISS.CMD_RADIO_STATE): elif (command == KISS.CMD_RADIO_STATE):
self.r_state = ord(byte) self.r_state = ord(byte)
elif (command == KISS.CMD_RADIO_LOCK): elif (command == KISS.CMD_RADIO_LOCK):

3
RNS/Link.py
View File

@ -191,8 +191,6 @@ class Link:
RNS.log("Link "+str(self)+" established with "+str(self.destination)+", RTT is "+str(self.rtt), RNS.LOG_VERBOSE) RNS.log("Link "+str(self)+" established with "+str(self.destination)+", RTT is "+str(self.rtt), RNS.LOG_VERBOSE)
rtt_data = umsgpack.packb(self.rtt) rtt_data = umsgpack.packb(self.rtt)
rtt_packet = RNS.Packet(self, rtt_data, context=RNS.Packet.LRRTT) rtt_packet = RNS.Packet(self, rtt_data, context=RNS.Packet.LRRTT)
# TODO: remove
RNS.log("Sending RTT packet", RNS.LOG_EXTREME)
rtt_packet.send() rtt_packet.send()
self.status = Link.ACTIVE self.status = Link.ACTIVE
@ -437,6 +435,7 @@ class Link:
return plaintext return plaintext
except Exception as e: except Exception as e:
RNS.log("Decryption failed on link "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Decryption failed on link "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR)
traceback.print_exc()
def sign(self, message): def sign(self, message):
return self.prv.sign(message, ec.ECDSA(hashes.SHA256())) return self.prv.sign(message, ec.ECDSA(hashes.SHA256()))