Save last UnifiedConfiguration as default for target

Author: CapnBry

src/python/UnifiedConfiguration.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import argparse
+import re
 import json
 import struct
 import sys
@@ -74,7 +75,40 @@ def appendToFirmware(firmware_file, product_name, lua_name, defines, config, lay
         firmware_file.write(config['prior_target_name'].upper().encode())
         firmware_file.write(b'\0')
 
-def doConfiguration(file, defines, config, moduletype, frequency, platform, device_name, rx_as_tx):
+def getDefaultProductForTarget(target_name: str) -> str:
+    if target_name is None or target_name == '':
+        return ''
+
+    # remove the "_via_WIFI" etc method
+    target_wo_method = re.sub('_VIA_.*', '', target_name.upper())
+    try:
+        with open('.pio/default_target_config.json', 'r') as f:
+            data = json.load(f)
+            product_name = data.get(target_wo_method)
+            return product_name
+    except:
+        # No file or json.JSONDecodeError
+        return ''
+
+def setDefaultProductForTarget(target_name: str, product_name: str) -> None:
+    if target_name is None or target_name == '':
+        return
+
+    # remove the "_via_WIFI" etc method
+    target_wo_method = re.sub('_VIA_.*', '', target_name.upper())
+    data = {}
+    try:
+        with open('.pio/default_target_config.json', 'r') as f:
+            data = json.load(f)
+    except:
+        # No file or json.JSONDecodeError
+        pass
+
+    data[target_wo_method] = product_name
+    with open('.pio/default_target_config.json', 'w') as f:
+        json.dump(data, f, indent=4)
+
+def doConfiguration(file, defines, config, target_name, moduletype, frequency, platform, device_name, rx_as_tx):
     product_name = "Unified"
     lua_name = "Unified"
     layout = None
@@ -103,15 +137,27 @@ def doConfiguration(file, defines, config, moduletype, frequency, platform, devi
                     products.append(k)
         # Sort the list by product name, case insensitive, and print the list
         products = sorted(products, key=lambda p: p['product_name'].casefold())
+        print(f'0) Leave bare (no configuration)')
         for i, p in enumerate(products):
             print(f"{i+1}) {p['product_name']}")
-        print('Choose a configuration to load into the firmware file (press enter to leave bare)')
+        default_prod = getDefaultProductForTarget(target_name)
+        # Make sure default_conf is a valid product name, set to '0' if not or default_prod is blank
+        default_prod = default_prod if any(p['product_name'] == default_prod for p in products) else '0'
+        print(f'default) {default_prod}')
+        print('Choose a configuration to load into the firmware file')
+
         choice = input()
-        if choice != "":
-            config = products[int(choice)-1]
+        if choice == '':
+            choice = default_prod
+        if choice != '0':
+            # First see if choice is a valid product name from the list
+            config = next((p for p in products if p['product_name'] == choice), None)
+            # else choice is an integer
+            config = config if config else products[int(choice)-1]
 
     if config is not None:
         product_name = config['product_name']
+        setDefaultProductForTarget(target_name, product_name)
         lua_name = config['lua_name']
         dir = 'TX' if moduletype == 'tx' else 'RX'
         layout = f"hardware/{dir}/{config['layout_file']}"
@@ -147,7 +193,7 @@ def appendConfiguration(source, target, env):
     defines = json.JSONEncoder().encode(env['OPTIONS_JSON'])
 
     with open(str(target[0]), "r+b") as firmware_file:
-        doConfiguration(firmware_file, defines, config, moduletype, frequency, platform, device_name, None)
+        doConfiguration(firmware_file, defines, config, target_name, moduletype, frequency, platform, device_name, None)
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Configure Unified Firmware")

src/python/binary_configurator.py

@@ -104,6 +104,7 @@ def patch_unified(args, options):
         args.file,
         JSONEncoder().encode(json_flags),
         args.target,
+        None,
         'tx' if options.deviceType is DeviceType.TX else 'rx',
         '2400' if options.radioChip is RadioType.SX1280 else '900' if options.radioChip is RadioType.SX127X else 'dual',
         '32' if options.mcuType is MCUType.ESP32 and options.deviceType is DeviceType.RX else '',