From 45c32638e03b67bbe275dff0b319d391066e832f Mon Sep 17 00:00:00 2001
From: David Holdeman <david@chuckwagoncomputing.com>
Date: Sat, 17 Jul 2021 20:41:45 -0500
Subject: [PATCH] Fix #2981 (#2983)

* get yq from GH releases

* submo bump

* little hack

* didn't work, fix properly

* oh roight

* got it backwards

* poke
---
 .github/workflows/build-firmware.yaml |  2 +-
 firmware/gen_config_board.sh          | 11 ++++++++---
 firmware/tunerstudio/rusefi.input     |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 9b4567801b..fd5a7311fe 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -145,7 +145,7 @@ jobs:
           bash config/boards/subaru_eg33/config/gen_config.sh
           [ $? -eq 0 ] || { echo "ERROR generating board subaru_eg33 subaru_eg33_f7"; exit 1; }
         else
-          bash gen_config_board.sh ${{matrix.folder}} ${{matrix.build-target}}
+          bash gen_config_board.sh ${{matrix.folder}} ${{matrix.build-target}} ${{matrix.ini-file}}
         fi
 
     - name: Generate Enum Strings
diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index d64f909bd3..ba71114a7a 100755
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -14,6 +14,11 @@ fi
 
 BOARDNAME=$1
 SHORT_BOARDNAME=$2
+if [ -n "$3" ]; then
+  INI="$3"
+else
+  INI="rusefi_${SHORT_BOARDNAME}.ini"
+fi
 
 echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}"
 
@@ -28,7 +33,7 @@ java -DSystemOut.name=gen_config_board \
 	-cache ${SHORT_BOARDNAME} \
 	-cache_zip_file tunerstudio/generated/cache.zip \
 	-firing_order controllers/algo/firing_order.h \
-	-ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \
+	-ts_output_name generated/${INI} \
 	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
 	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
 	-enumInputFile controllers/algo/rusefi_enums.h \
@@ -43,7 +48,7 @@ java -DSystemOut.name=gen_config_board \
 # 1) using unique file name for each configuration?
 # 2) leverage consistent caching mechanism so that image is generated only in case of fresh .ini. Laziest approach would be to return exit code from java process above
 #
-hw_layer/mass_storage/create_ini_image.sh ./tunerstudio/generated/rusefi_${SHORT_BOARDNAME}.ini ./hw_layer/mass_storage/ramdisk_image.h
-hw_layer/mass_storage/create_ini_image_compressed.sh ./tunerstudio/generated/rusefi_${SHORT_BOARDNAME}.ini ./hw_layer/mass_storage/ramdisk_image_compressed.h
+hw_layer/mass_storage/create_ini_image.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image.h
+hw_layer/mass_storage/create_ini_image_compressed.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h
 
 exit 0
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index e4d19166a9..ee024af25a 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -3719,4 +3719,3 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
  addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
 #endif
 
-; poke