Fix STM32 flashing options (ExpressLRS#2997)

pkendall64 · web-flow · commit 78599ddbad38 · 2024-10-20T14:10:15.000+13:00
* We missed updating the options version and configurator... twice!

* Pin shiv as they f'd it up!
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
       - name: Build flasher "binary" with shiv
         run: |
           cd src/python
-          pip install shiv
+          pip install shiv==1.0.6
           shiv -c flash -o ../../dist/firmware/flasher.pyz pyserial .
 
       - name: Update firmware artifact
diff --git a/src/lib/OPTIONS/options.cpp b/src/lib/OPTIONS/options.cpp
@@ -36,7 +36,7 @@ const char *product_name = (const char *)(target_name+4);
 
 __attribute__ ((used)) static firmware_options_t flashedOptions = {
     ._magic_ = {0xBE, 0xEF, 0xBA, 0xBE, 0xCA, 0xFE, 0xF0, 0x0D},
-    ._version_ = 1,
+    ._version_ = 3,
 #if defined(Regulatory_Domain_ISM_2400)
     .domain = 0,
 #else
diff --git a/src/python/binary_configurator.py b/src/python/binary_configurator.py
@@ -119,7 +119,6 @@ def patch_rx_params(mm, pos, args):
 
 def patch_tx_params(mm, pos, args, options):
     pos = write32(mm, pos, args.tlm_report)
-    pos = write32(mm, pos, args.fan_min_runtime)
     val = mm[pos]
     val &= ~1   # unused1 - ex uart_inverted
     if args.unlock_higher_power != None:
@@ -212,6 +211,7 @@ def patch_firmware(options, mm, pos, args):
         pos += 1
         pos = patch_uid(mm, pos, args)
         pos = patch_flash_discriminator(mm, pos, args)
+        pos = write32(mm, pos, args.fan_min_runtime)
         if options.deviceType is DeviceType.TX:
             pos = patch_tx_params(mm, pos, args, options)
         elif options.deviceType is DeviceType.RX:
