Merge pull request #125 from CapnBry/backpack-gzip

Mismatch in parameter count for esp8266 upload

python/build_env_setup.py

@@ -16,7 +16,6 @@ def copy_bootfile(source, target, env):
     shutil.copyfile(FRAMEWORK_DIR + "/tools/partitions/boot_app0.bin", env.subst("$BUILD_DIR") + "/boot_app0.bin")
 
 if platform in ['espressif8266']:
-    env.AddPostAction("buildprog", esp_compress.compressFirmware)
     env.AddPreAction("${BUILD_DIR}/spiffs.bin",
                      [esp_compress.compress_files])
     env.AddPreAction("${BUILD_DIR}/${ESP8266_FS_IMAGE_NAME}.bin",
@@ -45,3 +44,5 @@ def copy_bootfile(source, target, env):
 except FileNotFoundError:
     None
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", UnifiedConfiguration.appendConfiguration)
+if platform in ['espressif8266'] and "_WIFI" in target_name:
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp_compress.compressFirmware)

python/upload_via_esp8266_backpack.py

@@ -1,6 +1,6 @@
 import subprocess, os
 
-def do_upload(elrs_bin_target, upload_addr, isstm, env):
+def do_upload(elrs_bin_target, pio_target, upload_addr, isstm, env):
     bootloader_target = None
     app_start = 0 # eka bootloader offset
 
@@ -65,7 +65,9 @@ def on_upload(source, target, env):
     bin_path = os.path.dirname(firmware_path)
     elrs_bin_target = os.path.join(bin_path, 'firmware.elrs')
     if not os.path.exists(elrs_bin_target):
-        elrs_bin_target = os.path.join(bin_path, 'firmware.bin')
+        elrs_bin_target = os.path.join(bin_path, 'firmware.bin.gz')
         if not os.path.exists(elrs_bin_target):
-            raise Exception("No valid binary found!")
+            elrs_bin_target = os.path.join(bin_path, 'firmware.bin')
+            if not os.path.exists(elrs_bin_target):
+                raise Exception("No valid binary found!")
     do_upload(elrs_bin_target, pio_target, upload_addr, isstm, env)