firestarter 1.3.0__tar.gz → 1.3.2__tar.gz

{firestarter-1.3.0 → firestarter-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firestarter
-Version: 1.3.0
+Version: 1.3.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.3.2/firestarter/__init__.py

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

{firestarter-1.3.0 → firestarter-1.3.2}/firestarter/firmware.py

@@ -11,12 +11,12 @@ import os
 import requests
 
 try:
-    from .serial_comm import find_programmer, wait_for_response
+    from .serial_comm import find_programmer, wait_for_response, find_comports
     from .config import get_config_value, set_config_value
     from .avr_tool import Avrdude
     from .utils import verbose
 except ImportError:
-    from serial_comm import find_programmer, wait_for_response
+    from serial_comm import find_programmer, wait_for_response, find_comports
     from config import get_config_value, set_config_value
     from avr_tool import Avrdude
     from utils import verbose
@@ -33,7 +33,7 @@ STATE_CONFIG = 14
 HOME_PATH = os.path.join(os.path.expanduser("~"), ".firestarter")
 
 
-def firmware(install, avrdude_path, port):
+def firmware(install, avrdude_path, port, board="uno"):
     """
     Handles firmware-related operations, including version check and installation.
 
@@ -51,7 +51,7 @@ def firmware(install, avrdude_path, port):
 
     if install:
         if not url:
-            version, url = latest_firmware()
+            version, url = latest_firmware(board)
             print(f"Trying to install firmware version: {version}")
         if not selected_port:
             selected_port = port
@@ -80,14 +80,15 @@ def firmware_check(port=None):
     try:
         ser.write("OK".encode("ascii"))
         resp, version = wait_for_response(ser)
-        board = "uno"
-        if ":" in version:
-            version, board = version.split(":")
 
-        if resp != "OK":
+        if not resp == "OK":
             print(f"Failed to read firmware version. {resp}: {version}")
             return False, None, None
 
+        board = "uno"
+        if ":" in version:
+            version, board = version.split(":")
+
         print(f"Current firmware version: {version}, for controller: {board}")
         latest_version, url = latest_firmware(board)
 
@@ -121,9 +122,9 @@ def install_firmware(url, avrdude_path, port=None):
     if port:
         ports = [port]
     else:
-        ports = find_programmer(data={"state": STATE_FW_VERSION})
+        ports = find_comports()
         if not ports:
-            print("No Arduino found.")
+            print("No programmer found.")
             return 1
 
     for port in ports:
@@ -258,7 +259,7 @@ def test_avrdude_connection(avrdude):
         print("Programmer connected successfully.")
         return True
     else:
-        print("Failed to connect to programmer.")
+        print(f"Failed to connect to programmer. {error.decode('ascii')}")
         # if error:
         #     print(error.decode("ascii"))
         return False

{firestarter-1.3.0 → firestarter-1.3.2}/firestarter/main.py

@@ -132,6 +132,13 @@ def main():
         action="store_true",
         help="Try to install the latest firmware.",
     )
+    fw_parser.add_argument(
+        "-b",
+        "--board",
+        type=str,
+        default="uno",
+        help="Microcontroller board (optional), defaults to 'uno'."
+    )
     fw_parser.add_argument(
         "-p",
         "--avrdude-path",
@@ -195,7 +202,7 @@ def main():
     elif args.command == "vpp":
         return read_vpp(args.timeout)
     elif args.command == "fw":
-        return firmware(args.install, args.avrdude_path, args.port)
+        return firmware(args.install, args.avrdude_path, args.port, args.board)
     elif args.command == "hw":
         return hardware()
     elif args.command == "config":

{firestarter-1.3.0 → firestarter-1.3.2}/firestarter/serial_comm.py

@@ -55,14 +55,16 @@ def check_port(port, data, baud_rate=BAUD_RATE):
         while res != "OK":
             if res == "ERROR":
                 raise Exception(msg)
-            print(f"{res} - {msg}")
             if res == "TIMEOUT_ERROR":
                 return None
+            print(f"{res} - {msg}")
 
         if verbose():
             print(f"Programmer: {msg}")
         return ser
     except (OSError, serial.SerialException):
+        if verbose():
+            print(f"Failed to open port: {port}")
         pass
 
     return None
@@ -90,9 +92,13 @@ def find_comports(port=None):
     for port in serial_ports:
         if (
             port.manufacturer
-            and ("Arduino" in port.manufacturer or "FTDI" in port.manufacturer)
-            and port.device not in ports
-        ):
+            and (
+                "Arduino" in port.manufacturer
+                or "FTDI" in port.manufacturer
+                or "CH340" in port.manufacturer
+            )
+            or "USB Serial" in port.description
+        ) and port.device not in ports:
             ports.append(port.device)
 
     if verbose():
@@ -159,30 +165,31 @@ def wait_for_response(ser):
                     if "OK:" in res:
                         msg = res.split("OK:")[-1].strip()
                         type = "OK"
-                        return 
+                        return
                     elif "INFO:" in res:
                         msg = res.split("INFO:")[-1].strip()
-                        write_feedback("INFO",msg)
+                        write_feedback("INFO", msg)
                         # return "INFO", msg
                     elif "ERROR:" in res:
                         msg = res.split("ERROR:")[-1].strip()
-                        type ="ERROR"
-                        return 
+                        type = "ERROR"
+                        return
                     elif "WARN:" in res:
                         msg = res.split("WARN:")[-1].strip()
                         type = "WARN"
-                        return 
+                        return
                     elif "DATA:" in res:
                         msg = res.split("DATA:")[-1].strip()
                         type = "DATA"
-                        return 
+                        return
                     timeout = time.time() + 2  # Reset timeout
             finally:
                 write_feedback(type, msg)
                 if type:
                     return type, msg
-
-    return "TIMEOUT_ERROR", "Timeout waiting for response"
+    msg = f"Timeout, no response on {ser.portstr}"
+    write_feedback("ERROR", msg)
+    return "TIMEOUT_ERROR", msg
 
 
 def write_feedback(type, msg):
@@ -192,11 +199,10 @@ def write_feedback(type, msg):
     Args:
         msg (str): The feedback message.
     """
-    if msg and verbose():
+    if msg and (verbose() or type == "ERROR" or type == "WARN"):
         print(f"{type}: {msg}")
 
 
-
 def read_filtered_bytes(byte_array):
     """
     Filters a byte array to extract readable characters.

{firestarter-1.3.0 → firestarter-1.3.2}/firestarter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firestarter
-Version: 1.3.0
+Version: 1.3.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.3.0/firestarter/__init__.py

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