RNS/Interfaces/LocalInterface.py

@@ -41,13 +41,7 @@ class HDLC():
         return data
 
 class ThreadingTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
-    def server_bind(self):
+    pass
-        if RNS.vendor.platformutils.is_windows():
-            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
-        else:
-            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.socket.bind(self.server_address)
-        self.server_address = self.socket.getsockname()
 
 class LocalClientInterface(Interface):
     RECONNECT_WAIT = 3
@@ -305,6 +299,7 @@ class LocalServerInterface(Interface):
 
             address = (self.bind_ip, self.bind_port)
 
+            ThreadingTCPServer.allow_reuse_address = True
             self.server = ThreadingTCPServer(address, handlerFactory(self.incoming_connection))
 
             thread = threading.Thread(target=self.server.serve_forever)

RNS/Utilities/rnodeconf.py

@@ -25,7 +25,6 @@
 from time import sleep
 import argparse
 import threading
-import sys
 import os
 import os.path
 import struct
@@ -33,7 +32,6 @@ import datetime
 import time
 import math
 import hashlib
-import zipfile
 from urllib.request import urlretrieve
 from importlib import util
 import RNS
@@ -41,7 +39,7 @@ import RNS
 RNS.logtimefmt      = "%H:%M:%S"
 RNS.compact_log_fmt = True
 
-program_version = "2.1.2"
+program_version = "2.1.1"
 eth_addr = "0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a"
 btc_addr = "3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq"
 xmr_addr = "87HcDx6jRSkMQ9nPRd5K9hGGpZLn2s7vWETjMaVM5KfV4TD36NcYa8J8WSxhTSvBzzFpqDwp2fg5GX2moZ7VAP9QMZCZGET"
@@ -79,7 +77,6 @@ class KISS():
     CMD_STAT_SNR    = 0x24
     CMD_BLINK       = 0x30
     CMD_RANDOM      = 0x40
-    CMD_DISP_INT    = 0x45
     CMD_BT_CTRL     = 0x46
     CMD_BT_PIN      = 0x62
     CMD_BOARD       = 0x47
@@ -132,10 +129,6 @@ class ROM():
     MODEL_A2       = 0xA2
     MODEL_A7       = 0xA7
 
-    PRODUCT_T32_10 = 0xB2
-    MODEL_BA       = 0xBA
-    MODEL_BB       = 0xBB
-
     PRODUCT_T32_20 = 0xB0
     MODEL_B3       = 0xB3
     MODEL_B8       = 0xB8
@@ -187,7 +180,6 @@ products = {
     ROM.PRODUCT_RNODE:  "RNode",
     ROM.PRODUCT_HMBRW:  "Hombrew RNode",
     ROM.PRODUCT_TBEAM:  "LilyGO T-Beam",
-    ROM.PRODUCT_T32_10: "LilyGO LoRa32 v1.0",
     ROM.PRODUCT_T32_20: "LilyGO LoRa32 v2.0",
     ROM.PRODUCT_T32_21: "LilyGO LoRa32 v2.1",
     ROM.PRODUCT_H32_V2: "Heltec LoRa32 v2",
@@ -215,8 +207,6 @@ models = {
     0xB8: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_lora32v20.zip"],
     0xB4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_lora32v21.zip"],
     0xB9: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_lora32v21.zip"],
-    0xBA: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_lora32v10.zip"],
-    0xBB: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_lora32v10.zip"],
     0xC4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_heltec32v2.zip"],
     0xC9: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_heltec32v2.zip"],
     0xE4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_tbeam.zip"],
@@ -566,13 +556,6 @@ class RNode():
         if written != len(kiss_command):
             raise IOError("An IO error occurred while sending host left command to device")
 
-    def set_display_intensity(self, intensity):
-        data = bytes([intensity & 0xFF])
-        kiss_command = bytes([KISS.FEND])+bytes([KISS.CMD_DISP_INT])+data+bytes([KISS.FEND])
-        written = self.serial.write(kiss_command)
-        if written != len(kiss_command):
-            raise IOError("An IO error occurred while sending bluetooth enable command to device")
-
     def enable_bluetooth(self):
         kiss_command = bytes([KISS.FEND, KISS.CMD_BT_CTRL, 0x01, KISS.FEND])
         written = self.serial.write(kiss_command)
@@ -1107,8 +1090,6 @@ def main():
         parser.add_argument("-B", "--bluetooth-off", action="store_true", help="Turn device bluetooth off")
         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("--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("--txp", action="store", metavar="dBm", type=int, default=None, help="TX power in dBm for TNC mode")
@@ -1428,9 +1409,8 @@ def main():
             print("")
             print("[3] LilyGO LoRa32 v2.1 (aka T3 v1.6 / T3 v1.6.1)")
             print("[4] LilyGO LoRa32 v2.0")
-            print("[5] LilyGO LoRa32 v1.0")
+            print("[5] LilyGO T-Beam")
-            print("[6] LilyGO T-Beam")
+            print("[6] Heltec LoRa32 v2")
-            print("[7] Heltec LoRa32 v2")
             print("       .")
             print("      / \\   Select one of these options if you want to easily turn")
             print("       |    a supported development board into an RNode.")
@@ -1462,7 +1442,7 @@ def main():
                     print("who would like to experiment with it. Hit enter to continue.")
                     print("---------------------------------------------------------------------------")
                     input()
-                elif c_dev == 6:
+                elif c_dev == 5:
                     selected_product = ROM.PRODUCT_TBEAM
                     clear()
                     print("")
@@ -1492,25 +1472,6 @@ def main():
                     print("who would like to experiment with it. Hit enter to continue.")
                     print("---------------------------------------------------------------------------")
                     input()
-                elif c_dev == 5:
-                    selected_product = ROM.PRODUCT_T32_10
-                    clear()
-                    print("")
-                    print("---------------------------------------------------------------------------")
-                    print("                     LilyGO LoRa32 v1.0 RNode Installer")
-                    print("")
-                    print("Important! Using RNode firmware on LoRa32 devices should currently be")
-                    print("considered experimental. It is not intended for production or critical use.")
-                    print("The currently supplied firmware is provided AS-IS as a courtesey to those")
-                    print("who would like to experiment with it.")
-                    print("")
-                    print("Please Note! This device is known to have a faulty battery charging circuit,")
-                    print("which can result in overcharging and damaging batteries. If at all possible,")
-                    print("it is recommended to avoid this device.")
-                    print("")
-                    print("Hit enter if you're sure you wish to continue.")
-                    print("---------------------------------------------------------------------------")
-                    input()
                 elif c_dev == 3:
                     selected_product = ROM.PRODUCT_T32_21
                     clear()
@@ -1524,7 +1485,7 @@ def main():
                     print("who would like to experiment with it. Hit enter to continue.")
                     print("---------------------------------------------------------------------------")
                     input()
-                elif c_dev == 7:
+                elif c_dev == 6:
                     selected_product = ROM.PRODUCT_H32_V2
                     clear()
                     print("")
@@ -1656,28 +1617,6 @@ def main():
                     print("That band does not exist, exiting now.")
                     exit()
 
-            elif selected_product == ROM.PRODUCT_T32_10:
-                selected_mcu = ROM.MCU_ESP32
-                print("\nWhat band is this LoRa32 for?\n")
-                print("[1] 433 MHz")
-                print("[2] 868 MHz")
-                print("[3] 915 MHz")
-                print("[4] 923 MHz")
-                print("\n? ", end="")
-                try:
-                    c_model = int(input())
-                    if c_model < 1 or c_model > 4:
-                        raise ValueError()
-                    elif c_model == 1:
-                        selected_model = ROM.MODEL_BA
-                        selected_platform = ROM.PLATFORM_ESP32
-                    elif c_model > 1:
-                        selected_model = ROM.MODEL_BB
-                        selected_platform = ROM.PLATFORM_ESP32
-                except Exception as e:
-                    print("That band does not exist, exiting now.")
-                    exit()
-
             elif selected_product == ROM.PRODUCT_T32_20:
                 selected_mcu = ROM.MCU_ESP32
                 print("\nWhat band is this LoRa32 for?\n")
@@ -1999,7 +1938,7 @@ def main():
                     if fw_filename == "rnode_firmware_tbeam.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2017,7 +1956,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2032,46 +1971,10 @@ def main():
                                 "0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.bin",
                                 "0x8000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.partitions",
                             ]
-                    elif fw_filename == "rnode_firmware_lora32v10.zip":
-                        if numeric_version >= 1.59:
-                            return [
-                                sys.executable, flasher,
-                                "--chip", "esp32",
-                                "--port", args.port,
-                                "--baud", "921600",
-                                "--before", "default_reset",
-                                "--after", "hard_reset",
-                                "write_flash", "-z",
-                                "--flash_mode", "dio",
-                                "--flash_freq", "80m",
-                                "--flash_size", "4MB",
-                                "0xe000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v10.boot_app0",
-                                "0x1000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v10.bootloader",
-                                "0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v10.bin",
-                                "0x210000",UPD_DIR+"/"+selected_version+"/console_image.bin",
-                                "0x8000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v10.partitions",
-                            ]
-                        else:
-                            return [
-                                sys.executable, flasher,
-                                "--chip", "esp32",
-                                "--port", args.port,
-                                "--baud", "921600",
-                                "--before", "default_reset",
-                                "--after", "hard_reset",
-                                "write_flash", "-z",
-                                "--flash_mode", "dio",
-                                "--flash_freq", "80m",
-                                "--flash_size", "4MB",
-                                "0xe000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v20.boot_app0",
-                                "0x1000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v20.bootloader",
-                                "0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v20.bin",
-                                "0x8000",  UPD_DIR+"/"+selected_version+"/rnode_firmware_lora32v20.partitions",
-                            ]
                     elif fw_filename == "rnode_firmware_lora32v20.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2089,7 +1992,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2107,7 +2010,7 @@ def main():
                     elif fw_filename == "rnode_firmware_lora32v21.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2125,7 +2028,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2143,7 +2046,7 @@ def main():
                     elif fw_filename == "rnode_firmware_heltec32v2.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2161,7 +2064,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2179,7 +2082,7 @@ def main():
                     elif fw_filename == "rnode_firmware_featheresp32.zip":
                         if numeric_version >= 1.55:
                             return [
-                               sys.executable,  flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2197,7 +2100,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2215,7 +2118,7 @@ def main():
                     elif fw_filename == "rnode_firmware_esp32_generic.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2233,7 +2136,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2251,7 +2154,7 @@ def main():
                     elif fw_filename == "rnode_firmware_ng20.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2269,7 +2172,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2287,7 +2190,7 @@ def main():
                     elif fw_filename == "rnode_firmware_ng21.zip":
                         if numeric_version >= 1.55:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2305,7 +2208,7 @@ def main():
                             ]
                         else:
                             return [
-                                sys.executable, flasher,
+                                flasher,
                                 "--chip", "esp32",
                                 "--port", args.port,
                                 "--baud", "921600",
@@ -2322,7 +2225,7 @@ def main():
                             ]
                     elif fw_filename == "extracted_rnode_firmware.zip":
                         return [
-                            sys.executable, flasher,
+                            flasher,
                             "--chip", "esp32",
                             "--port", args.port,
                             "--baud", "921600",
@@ -2393,13 +2296,12 @@ def main():
                         try:
                             if fw_filename.endswith(".zip"):
                                 RNS.log("Decompressing firmware...")
-                                try:
+                                unzip_status = call(get_flasher_call("unzip", fw_filename))
-                                    with zipfile.ZipFile(fw_src+fw_filename) as zip:
+                                if unzip_status == 0:
-                                        zip.extractall(fw_src)
-                                except Exception as e:
-                                    RNS.log("Could not decompress firmware from downloaded zip file")
-                                    exit()
                                     RNS.log("Firmware decompressed")
+                                else:
+                                    RNS.log("Could not extract firmware from downloaded zip file")
+                                    exit()
 
                             RNS.log("Flashing RNode firmware to device on "+args.port)
                             from subprocess import call
@@ -2521,15 +2423,13 @@ def main():
                         ensure_firmware_file(fw_filename)
 
                     if fw_filename.endswith(".zip") and not fw_filename == "extracted_rnode_firmware.zip":
-                        RNS.log("Decompressing firmware...")
+                        RNS.log("Extracting firmware...")
-                        fw_src = UPD_DIR+"/"+selected_version+"/"
+                        unzip_status = call(get_flasher_call("unzip", fw_filename))
-                        try:
+                        if unzip_status == 0:
-                            with zipfile.ZipFile(fw_src+fw_filename) as zip:
+                            RNS.log("Firmware extracted")
-                                zip.extractall(fw_src)
+                        else:
-                        except Exception as e:
+                            RNS.log("Could not extract firmware from downloaded zip file")
-                            RNS.log("Could not decompress firmware from downloaded zip file")
                             exit()
-                        RNS.log("Firmware decompressed")
 
                 except Exception as e:
                     RNS.log("Could not obtain firmware package for your board")
@@ -2630,15 +2530,6 @@ def main():
                     RNS.log("but file could not be written to disk.")
                 exit()
 
-            if isinstance(args.display, int):
-                di = args.display
-                if di < 0:
-                    di = 0
-                if di > 255:
-                    di = 255
-                RNS.log("Setting display intensity to "+str(di))
-                rnode.set_display_intensity(di)
-
             if args.bluetooth_on:
                 RNS.log("Enabling Bluetooth...")
                 rnode.enable_bluetooth()

RNS/_version.py

@@ -1 +1 @@
-__version__ = "0.5.1"
+__version__ = "0.5.0"