first working version

Jason2866 · Nov 2, 2023 · 5a7470d · 5a7470d
1 parent a33be94
commit 5a7470d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/esp_flasher/__main__.py b/esp_flasher/__main__.py
@@ -166,7 +166,7 @@ def run_esp_flasher(argv):
     print(f" - Flash Size: {flash_size}")
 
     mock_args = configure_write_flash_args(
-        info, factory_firm, firmware, flash_size, args.bootloader, args.partitions, args.otadata
+        info, firmware, flash_size, args.bootloader, args.partitions, args.otadata
     )
 
     print(f" - Flash Mode: {mock_args.flash_mode}")

diff --git a/esp_flasher/common.py b/esp_flasher/common.py
@@ -195,7 +195,7 @@ def format_partitions_path(path, model):
 
 
 def configure_write_flash_args(
-    info, factory_firm_path, firmware_path, flash_size, bootloader_path, partitions_path, otadata_path
+    info, firmware_path, flash_size, bootloader_path, partitions_path, otadata_path
 ):
     addr_filename = []
     firmware = open_downloadable_binary(firmware_path)
@@ -229,9 +229,8 @@ def configure_write_flash_args(
 
         if not partitions_path:
             partitions_path = format_partitions_path(ESP32_DEFAULT_PARTITIONS, model)
-        if not factory_firm_path:
-            factory_firm_path = format_partitions_path(ESP32_DEFAULT_SAFEBOOT, model)
 
+        factory_firm_path = format_partitions_path(ESP32_DEFAULT_SAFEBOOT, model)
         partitions = open_downloadable_binary(partitions_path)
         factory_firm = open_downloadable_binary(factory_firm_path)
         otadata = open_downloadable_binary(otadata_path)