rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #2981 (#2983) 

* get yq from GH releases

* submo bump

* little hack

* didn't work, fix properly

* oh roight

* got it backwards

* poke
This commit is contained in:
David Holdeman 2021-07-17 20:41:45 -05:00 committed by GitHub
parent 0d609cb5f5
commit e8ce3738f7
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-firmware.yaml vendored
View File

@ -145,7 +145,7 @@ jobs:
bash config/boards/subaru_eg33/config/gen_config.sh bash config/boards/subaru_eg33/config/gen_config.sh
[ $? -eq 0 ] || { echo "ERROR generating board subaru_eg33 subaru_eg33_f7"; exit 1; } [ $? -eq 0 ] || { echo "ERROR generating board subaru_eg33 subaru_eg33_f7"; exit 1; }
else 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 fi
- name: Generate Enum Strings - name: Generate Enum Strings

11
firmware/gen_config_board.sh
View File

@ -14,6 +14,11 @@ fi
BOARDNAME=$1 BOARDNAME=$1
SHORT_BOARDNAME=$2 SHORT_BOARDNAME=$2
if [ -n "$3" ]; then
INI="$3"
else
INI="rusefi_${SHORT_BOARDNAME}.ini"
fi
echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}" echo "BOARDNAME=${BOARDNAME} SHORT_BOARDNAME=${SHORT_BOARDNAME}"
@ -28,7 +33,7 @@ java -DSystemOut.name=gen_config_board \
-cache ${SHORT_BOARDNAME} \ -cache ${SHORT_BOARDNAME} \
-cache_zip_file tunerstudio/generated/cache.zip \ -cache_zip_file tunerstudio/generated/cache.zip \
-firing_order controllers/algo/firing_order.h \ -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 tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \ -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-enumInputFile controllers/algo/rusefi_enums.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? # 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 # 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.sh ./tunerstudio/generated/${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_compressed.sh ./tunerstudio/generated/${INI} ./hw_layer/mass_storage/ramdisk_image_compressed.h
exit 0 exit 0

1
firmware/tunerstudio/rusefi.input
View File

@ -3719,4 +3719,3 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl
#endif #endif
; poke