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

Fix for RX not working on non-default interface

Browse Source
This commit is contained in:
jacob.eva 2024-06-04 15:29:55 +01:00
parent e1ac0bd9ea
commit f65b858564
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
RNS/Interfaces/RNodeMultiInterface.py
View File

@ -35,7 +35,6 @@ class KISS():
TFESC = 0xDD TFESC = 0xDD
CMD_UNKNOWN = 0xFE CMD_UNKNOWN = 0xFE
CMD_DATA = 0x00
CMD_FREQUENCY = 0x01 CMD_FREQUENCY = 0x01
CMD_BANDWIDTH = 0x02 CMD_BANDWIDTH = 0x02
CMD_TXPOWER = 0x03 CMD_TXPOWER = 0x03
@ -574,7 +573,7 @@ class RNodeMultiInterface(Interface):
last_read_ms = int(time.time()*1000) last_read_ms = int(time.time()*1000)
if (in_frame and byte == KISS.FEND and if (in_frame and byte == KISS.FEND and
command == KISS.CMD_INT0_DATA or (command == KISS.CMD_INT0_DATA or
command == KISS.CMD_INT1_DATA or command == KISS.CMD_INT1_DATA or
command == KISS.CMD_INT2_DATA or command == KISS.CMD_INT2_DATA or
command == KISS.CMD_INT3_DATA or command == KISS.CMD_INT3_DATA or
@ -585,8 +584,7 @@ class RNodeMultiInterface(Interface):
command == KISS.CMD_INT8_DATA or command == KISS.CMD_INT8_DATA or
command == KISS.CMD_INT9_DATA or command == KISS.CMD_INT9_DATA or
command == KISS.CMD_INT10_DATA or command == KISS.CMD_INT10_DATA or
command == KISS.CMD_INT11_DATA command == KISS.CMD_INT11_DATA)):
):
in_frame = False in_frame = False
self.subinterfaces[KISS.int_data_cmd_to_index(command)].processIncoming(data_buffer) self.subinterfaces[KISS.int_data_cmd_to_index(command)].processIncoming(data_buffer)
data_buffer = b"" data_buffer = b""
@ -599,7 +597,18 @@ class RNodeMultiInterface(Interface):
elif (in_frame and len(data_buffer) < self.HW_MTU): elif (in_frame and len(data_buffer) < self.HW_MTU):
if (len(data_buffer) == 0 and command == KISS.CMD_UNKNOWN): if (len(data_buffer) == 0 and command == KISS.CMD_UNKNOWN):
command = byte command = byte
elif (command == KISS.CMD_DATA): elif (command == KISS.CMD_INT0_DATA or
command == KISS.CMD_INT1_DATA or
command == KISS.CMD_INT2_DATA or
command == KISS.CMD_INT3_DATA or
command == KISS.CMD_INT4_DATA or
command == KISS.CMD_INT5_DATA or
command == KISS.CMD_INT6_DATA or
command == KISS.CMD_INT7_DATA or
command == KISS.CMD_INT8_DATA or
command == KISS.CMD_INT9_DATA or
command == KISS.CMD_INT10_DATA or
command == KISS.CMD_INT11_DATA):
if (byte == KISS.FESC): if (byte == KISS.FESC):
escape = True escape = True
else: else: