firestarter 1.2.1__tar.gz → 1.2.2__tar.gz

{firestarter-1.2.1 → firestarter-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firestarter
-Version: 1.2.1
+Version: 1.2.2
 Summary: EPROM burner software for the Relatively Universal ROM Programmer
 Author-email: Henrik Olsson <henols@gmail.com>
 Description-Content-Type: text/markdown

firestarter-1.2.2/firestarter/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

{firestarter-1.2.1 → firestarter-1.2.2}/firestarter/database.py

@@ -128,6 +128,8 @@ def map_data(ic, manufacturer):
     if ic_type == 1:
         if protocol_id == 0x06:
             type = 3
+        elif protocol_id == 0x05:
+            type = 2
         elif flags & 0x08:
             type = 1
     # if pin_count == 24 and variant in [0, 1, 16]:

{firestarter-1.2.1 → firestarter-1.2.2}/firestarter/ic_layout.py

@@ -156,15 +156,17 @@ def print_chip_info(eprom, verbose=False):
             print(f"Chip ID:\t{hex(eprom['chip-id'])}")
     elif eprom["type"] == 4:
         print(f"Type:\t\tSRAM")
+    elif eprom["type"] == 2:
+        print(f"Type:\t\tFlash Memory type 2")
     elif eprom["type"] == 3:
-        print(f"Type:\t\tFlash Memory")
+        print(f"Type:\t\tFlash Memory type 3")
     if eprom["flags"] & 0x00000008:
         print(f"VPP:\t\t{eprom['vpp']}")
     print(f"Pulse delay:\t{eprom['pulse-delay']}µS")
     print_generic_eeprom(eprom)
 
     if verbose:
-        print(protocol_info(eprom['protocol-id']))
+        print(protocol_info(eprom["protocol-id"]))
         print()
 
         # Interpret the flags
@@ -397,7 +399,7 @@ def protocol_info(protocol_id):
             ),
         ),
     ]
-    for  id, type, description in protocol_info:
+    for id, type, description in protocol_info:
         if id == protocol_id:
             return f"Protocol: {type} (0x{id:02X})\nDescription:\n - {description[0]}\n - {description[1]}\n - {description[2]}"
 

{firestarter-1.2.1 → firestarter-1.2.2}/firestarter/main.py

@@ -84,12 +84,14 @@ def check_port(port, data, baud_rate=BAUD_RATE):
         ser.flush()
 
         res, msg = wait_for_response(ser)
-        if res == "OK":
-            if verbose:
-                print(f"Programmer: {msg}")
-            return ser
-        else:
+        while not res == "OK":
+            if res == "ERROR":
+                raise Exception(msg)
             print(f"{res} - {msg}")
+
+        if verbose:
+            print(f"Programmer: {msg}")
+        return ser
     except (OSError, serial.SerialException):
         pass
 
@@ -137,33 +139,36 @@ def find_programmer(data, port=None):
     json_data = json.dumps(data, separators=(",", ":"))
 
     ports = find_comports(port)
-    for port in ports:
-        serial_port = check_port(port, json_data)
+    try:
+        for port in ports:
+            serial_port = check_port(port, json_data)
 
-        if serial_port:
-            config["port"] = port
-            save_config()
-            if verbose:
-                print(f"Found programmer at port: {port}")
-            else:
-                print(f"Connected to programmer")
-            return serial_port
+            if serial_port:
+                config["port"] = port
+                save_config()
+                if verbose:
+                    print(f"Found programmer at port: {port}")
+                else:
+                    print(f"Connected to programmer")
+                return serial_port
 
-    for port in ports:
-        serial_port = check_port(port, json_data, FALLBACK_BAUD_RATE)
+        for port in ports:
+            serial_port = check_port(port, json_data, FALLBACK_BAUD_RATE)
 
-        if serial_port:
-            config["port"] = port
-            save_config()
-            if verbose:
-                print(f"Found programmer at port: {port}")
-            else:
-                print(f"Connected to programmer")
-            print(
-                f"Using fallback baud rate: {FALLBACK_BAUD_RATE} consider updating firmware!"
-            )
-            return serial_port
-    print("No programmer found")
+            if serial_port:
+                config["port"] = port
+                save_config()
+                if verbose:
+                    print(f"Found programmer at port: {port}")
+                else:
+                    print(f"Connected to programmer")
+                print(
+                    f"Using fallback baud rate: {FALLBACK_BAUD_RATE} consider updating firmware!"
+                )
+                return serial_port
+        print("No programmer found")
+    except Exception as e:
+        print("Error:", e)
     return None
 
 
@@ -198,7 +203,7 @@ def wait_for_response(ser):
                 timeout = time.time()
 
         if timeout + 2 < time.time():
-            return "TIMEOUT_ERROR", "Timeout (expecting response)"
+            return "ERROR", "Timeout (expecting response)"
 
 
 def write_feedback(msg):

{firestarter-1.2.1 → firestarter-1.2.2}/firestarter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firestarter
-Version: 1.2.1
+Version: 1.2.2
 Summary: EPROM burner software for the Relatively Universal ROM Programmer
 Author-email: Henrik Olsson <henols@gmail.com>
 Description-Content-Type: text/markdown

firestarter-1.2.1/firestarter/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.2.1"