From cbe97b93aaa7701e05cf99bc0ee1b49ff42881e9 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 7 May 2021 19:18:43 -0400 Subject: [PATCH] NA6 ini is not uploaded fix #2649 --- .github/workflows/readme.md | 2 ++ firmware/gen_config_board.sh | 2 +- firmware/tunerstudio/upload_ini.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/readme.md b/.github/workflows/readme.md index 84a34cf2da..fdb452e0bf 100644 --- a/.github/workflows/readme.md +++ b/.github/workflows/readme.md @@ -25,3 +25,5 @@ This is not a complete diagram of all workflows, nor does it show everything tha + + + + Firmware Push Gen Config Unit Tests Firmware PR ``` + +https://github.com/rusefi/rusefi/wiki/Build-Server-and-Automation \ No newline at end of file diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index a37a95b83b..315933d390 100755 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -41,7 +41,7 @@ java -DSystemOut.name=gen_config_board \ # todo: make things consistent by # 0) having generated content not in the same folder with the tool generating content? # 1) using unique file name for each configuration? -# 2) leverage consistent caching mechanism so that image is generted 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_compressed.sh ./tunerstudio/generated/rusefi_${SHORT_BOARDNAME}.ini ./hw_layer/mass_storage/ramdisk_image_compressed.h diff --git a/firmware/tunerstudio/upload_ini.sh b/firmware/tunerstudio/upload_ini.sh index 4b54a06405..e006ef94c7 100755 --- a/firmware/tunerstudio/upload_ini.sh +++ b/firmware/tunerstudio/upload_ini.sh @@ -15,7 +15,7 @@ for f in *.ini; do if [[ -f "$f" ]]; then sig=$(grep "^ *signature *=" $f | cut -f2 -d "=") if [ ! -z "$sig" -a "$sig" != " " ]; then echo "* found signature: $sig" - if [[ "$sig" =~ rusEFI.*([0-9]{4})\.([0-9]{2})\.([0-9]{2})\.([a-z0-9_]+)\.([0-9]+) ]]; then + if [[ "$sig" =~ rusEFI.*([0-9]{4})\.([0-9]{2})\.([0-9]{2})\.([a-zA-Z0-9_]+)\.([0-9]+) ]]; then year=${BASH_REMATCH[1]} month=${BASH_REMATCH[2]} day=${BASH_REMATCH[3]}