Merge 11baace08d into b977f33df6

RNS/Utilities/rnodeconf.py

@@ -774,18 +774,13 @@ class RNode():
                 self.made = bytes([self.eeprom[ROM.ADDR_MADE], self.eeprom[ROM.ADDR_MADE+1], self.eeprom[ROM.ADDR_MADE+2], self.eeprom[ROM.ADDR_MADE+3]])
                 self.checksum = b""
 
-
-                self.min_freq = models[self.model][0]
-                self.max_freq = models[self.model][1]
-                self.max_output = models[self.model][2]
-
                 try:
                     self.min_freq = models[self.model][0]
                     self.max_freq = models[self.model][1]
                     self.max_output = models[self.model][2]
                 except Exception as e:
-                    RNS.log("Exception")
-                    RNS.log(str(e))
+                    RNS.log("Error: Model band and output power capabilities are unknown!")
+                    RNS.log("The contained exception was: "+str(e))
                     self.min_freq = 0
                     self.max_freq = 0
                     self.max_output = 0
@@ -3041,10 +3036,13 @@ def main():
                     if args.product != None:
                         if args.product == "03":
                             mapped_product = ROM.PRODUCT_RNODE
-                        if args.product == "f0":
+                        elif args.product == "f0":
                             mapped_product = ROM.PRODUCT_HMBRW
-                        if args.product == "e0":
+                        elif args.product == "e0":
                             mapped_product = ROM.PRODUCT_TBEAM
+                        else:
+                            if len(args.product) == 2:
+                                mapped_product = ord(bytes.fromhex(args.product))
 
                     if mapped_model != None:
                         if mapped_model == ROM.MODEL_B4_TCXO:
@@ -3068,6 +3066,9 @@ def main():
                             model = ROM.MODEL_E9
                         elif args.model == "ff":
                             model = ROM.MODEL_FF
+                        else:
+                            if len(args.model) == 2:
+                                model = ord(bytes.fromhex(args.model))
 
 
                     if args.hwrev != None and (args.hwrev > 0 and args.hwrev < 256):