From 20e57974b7ea14ca6aea0bb7488b8f00bfdc2583 Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Wed, 21 Jul 2021 18:23:17 -0500 Subject: [PATCH] Fix ini name (hellen128mercedes drama) (#3020) * fix * redo yaml pram * git add * poke --- .github/workflows/build-firmware.yaml | 2 +- .github/workflows/gen-configs.yaml | 1 + firmware/gen_config.sh | 2 +- firmware/gen_config_board.sh | 4 +++- firmware/tunerstudio/rusefi.input | 2 -- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 3228e0f85c..fd5a7311fe 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -29,7 +29,7 @@ jobs: - build-target: hellen128 folder: hellen/hellen128 - ini-file: rusefi_hellen128.ini + ini-file: rusefi_hellen128mercedes.ini - build-target: hellen121vag folder: hellen/hellen121vag diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index 430ea96fa3..5f72bc4260 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -41,6 +41,7 @@ jobs: run: | git config --local user.email "action@github.com" git config --local user.name "GitHub build-firmware Action" + git add firmware/tunerstudio/generated # get the original ramdisk images back in order to not overwrite the default placeholder git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h git status diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index 6af473ed2e..ada56f295e 100755 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -16,7 +16,7 @@ bash gen_config_default.sh # firmware\tunerstudio\generated and firmware\controllers\generated folders # maybe one day we will automate but not yet # -for BOARD in "f429-discovery f429-discovery" "hellen/hellen128 hellen128" "hellen/hellen121vag hellen121vag" "hellen/hellen121nissan hellen121nissan" "hellen/hellen72 hellen72" "hellen/hellen64_miataNA6_94 hellenNA6" "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do +for BOARD in "f429-discovery f429-discovery" "hellen/hellen128 hellen128 rusefi_hellen128mercedes.ini" "hellen/hellen121vag hellen121vag" "hellen/hellen121nissan hellen121nissan" "hellen/hellen72 hellen72" "hellen/hellen64_miataNA6_94 hellenNA6" "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do BOARD_NAME=$(echo "$BOARD" | cut -d " " -f 1) BOARD_SHORT_NAME=$(echo "$BOARD" | cut -d " " -f 2) INI=$(echo "$BOARD" | cut -d " " -f 3) diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index 9cde369491..768724af45 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -1,7 +1,9 @@ #!/bin/bash # file gen_config_board.sh -# for example ./gen_config_board.sh hellen/hellen128 hellen128 +# for example ./gen_config_board.sh hellen/hellen128 hellen128 rusefi_hellen128mercedes.ini +# or ./gen_config_board.sh hellen/hellen128 hellen128 +# which is short for ./gen_config_board.sh hellen/hellen128 hellen128 rusefi_hellen128.ini set -e diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 2d986d6d14..c5d20f8b16 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3737,5 +3737,3 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" #else addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl #endif - -; poke3