mirror of
https://github.com/markqvist/Reticulum.git
synced 2025-02-22 00:41:15 +00:00
Compare commits
No commits in common. "0abb3bd4c39e12f8f252c1fa41dde2341bb2b66a" and "e699eb6d25a3e5ab652a1a35a37ae86b176edafb" have entirely different histories.
0abb3bd4c3
...
e699eb6d25
@ -11,7 +11,6 @@ This release brings major efficiency improvements to `Channel` and `Buffer` clas
|
|||||||
- Added allowed_identities file support to `rncp`
|
- Added allowed_identities file support to `rncp`
|
||||||
- Added Transport Instance uptime to `rnstatus` output
|
- Added Transport Instance uptime to `rnstatus` output
|
||||||
- Added channel CSMA parameter stats to RNode Interface `rnstatus` output
|
- Added channel CSMA parameter stats to RNode Interface `rnstatus` output
|
||||||
- Added ability to set custom RNode OLED display address with rnodeconf
|
|
||||||
|
|
||||||
**Bugfixes**
|
**Bugfixes**
|
||||||
- Fixed inadverdent AutoInterface multi-IF deque hit for resource transfer retries
|
- Fixed inadverdent AutoInterface multi-IF deque hit for resource transfer retries
|
||||||
@ -21,8 +20,8 @@ This release brings major efficiency improvements to `Channel` and `Buffer` clas
|
|||||||
|
|
||||||
**Release Hashes**
|
**Release Hashes**
|
||||||
```
|
```
|
||||||
207ab20bd68bab16b417fbd41a4ecdbcf1e2f6fa553d48df6c8fc181b6e84dac rns-0.5.9-py3-none-any.whl
|
670bf8aec55a424001aa9ffc97648edf3db80c85b545aa372ab221fc3db26f1f rns-0.5.9-py3-none-any.whl
|
||||||
93f0965567dfc2c43f3d703481fe1a7d7b1b8d0b3837ad41c37f28a8af5c1acc rnspure-0.5.9-py3-none-any.whl
|
7a9ef70b3843dff886bd8d8dcbc7ba4a34f4278d789ceef0b704397d6b6af1f6 rnspure-0.5.9-py3-none-any.whl
|
||||||
```
|
```
|
||||||
|
|
||||||
### 2023-09-14: RNS β 0.5.8
|
### 2023-09-14: RNS β 0.5.8
|
||||||
|
@ -41,7 +41,7 @@ import RNS
|
|||||||
RNS.logtimefmt = "%H:%M:%S"
|
RNS.logtimefmt = "%H:%M:%S"
|
||||||
RNS.compact_log_fmt = True
|
RNS.compact_log_fmt = True
|
||||||
|
|
||||||
program_version = "2.1.3"
|
program_version = "2.1.2"
|
||||||
eth_addr = "0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a"
|
eth_addr = "0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a"
|
||||||
btc_addr = "3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq"
|
btc_addr = "3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq"
|
||||||
xmr_addr = "87HcDx6jRSkMQ9nPRd5K9hGGpZLn2s7vWETjMaVM5KfV4TD36NcYa8J8WSxhTSvBzzFpqDwp2fg5GX2moZ7VAP9QMZCZGET"
|
xmr_addr = "87HcDx6jRSkMQ9nPRd5K9hGGpZLn2s7vWETjMaVM5KfV4TD36NcYa8J8WSxhTSvBzzFpqDwp2fg5GX2moZ7VAP9QMZCZGET"
|
||||||
@ -80,7 +80,6 @@ class KISS():
|
|||||||
CMD_BLINK = 0x30
|
CMD_BLINK = 0x30
|
||||||
CMD_RANDOM = 0x40
|
CMD_RANDOM = 0x40
|
||||||
CMD_DISP_INT = 0x45
|
CMD_DISP_INT = 0x45
|
||||||
CMD_DISP_ADR = 0x63
|
|
||||||
CMD_BT_CTRL = 0x46
|
CMD_BT_CTRL = 0x46
|
||||||
CMD_BT_PIN = 0x62
|
CMD_BT_PIN = 0x62
|
||||||
CMD_BOARD = 0x47
|
CMD_BOARD = 0x47
|
||||||
@ -578,14 +577,7 @@ class RNode():
|
|||||||
kiss_command = bytes([KISS.FEND])+bytes([KISS.CMD_DISP_INT])+data+bytes([KISS.FEND])
|
kiss_command = bytes([KISS.FEND])+bytes([KISS.CMD_DISP_INT])+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 sending display intensity command to device")
|
raise IOError("An IO error occurred while sending bluetooth enable command to device")
|
||||||
|
|
||||||
def set_display_address(self, address):
|
|
||||||
data = bytes([address & 0xFF])
|
|
||||||
kiss_command = bytes([KISS.FEND])+bytes([KISS.CMD_DISP_ADR])+data+bytes([KISS.FEND])
|
|
||||||
written = self.serial.write(kiss_command)
|
|
||||||
if written != len(kiss_command):
|
|
||||||
raise IOError("An IO error occurred while sending display address command to device")
|
|
||||||
|
|
||||||
def enable_bluetooth(self):
|
def enable_bluetooth(self):
|
||||||
kiss_command = bytes([KISS.FEND, KISS.CMD_BT_CTRL, 0x01, KISS.FEND])
|
kiss_command = bytes([KISS.FEND, KISS.CMD_BT_CTRL, 0x01, KISS.FEND])
|
||||||
@ -1152,7 +1144,6 @@ def main():
|
|||||||
parser.add_argument("-p", "--bluetooth-pair", action="store_true", help="Put device into bluetooth pairing mode")
|
parser.add_argument("-p", "--bluetooth-pair", action="store_true", help="Put device into bluetooth pairing mode")
|
||||||
|
|
||||||
parser.add_argument("-D", "--display", action="store", metavar="i", type=int, default=None, help="Set display intensity (0-255)")
|
parser.add_argument("-D", "--display", action="store", metavar="i", type=int, default=None, help="Set display intensity (0-255)")
|
||||||
parser.add_argument("--display-addr", action="store", metavar="byte", type=str, default=None, help="Set display address as hex byte (00 - FF)")
|
|
||||||
|
|
||||||
parser.add_argument("--freq", action="store", metavar="Hz", type=int, default=None, help="Frequency in Hz for TNC mode")
|
parser.add_argument("--freq", action="store", metavar="Hz", type=int, default=None, help="Frequency in Hz for TNC mode")
|
||||||
parser.add_argument("--bw", action="store", metavar="Hz", type=int, default=None, help="Bandwidth in Hz for TNC mode")
|
parser.add_argument("--bw", action="store", metavar="Hz", type=int, default=None, help="Bandwidth in Hz for TNC mode")
|
||||||
@ -2713,24 +2704,6 @@ def main():
|
|||||||
RNS.log("Setting display intensity to "+str(di))
|
RNS.log("Setting display intensity to "+str(di))
|
||||||
rnode.set_display_intensity(di)
|
rnode.set_display_intensity(di)
|
||||||
|
|
||||||
if isinstance(args.display_addr, str):
|
|
||||||
set_addr = False
|
|
||||||
try:
|
|
||||||
if args.display_addr.startswith("0x"):
|
|
||||||
args.display_addr = args.display_addr[2:]
|
|
||||||
da = bytes.fromhex(args.display_addr)
|
|
||||||
set_addr = True
|
|
||||||
except Exception as e:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if set_addr and len(da) == 1:
|
|
||||||
RNS.log("Setting display address to "+RNS.hexrep(da, delimit=False))
|
|
||||||
rnode.set_display_address(ord(da))
|
|
||||||
rnode.hard_reset()
|
|
||||||
exit()
|
|
||||||
else:
|
|
||||||
RNS.log("Invalid display address specified")
|
|
||||||
|
|
||||||
if args.bluetooth_on:
|
if args.bluetooth_on:
|
||||||
RNS.log("Enabling Bluetooth...")
|
RNS.log("Enabling Bluetooth...")
|
||||||
rnode.enable_bluetooth()
|
rnode.enable_bluetooth()
|
||||||
|
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user