From b9c3ab2151652a138aceea9c071dee2521fca683 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 7 Jul 2020 22:05:05 -0400
Subject: [PATCH] INI Request: rusEFI 2020.07.06.mre_f4.2108843221 #54

---
 firmware/config/boards/kinetis/config/gen_config.sh | 2 +-
 firmware/tunerstudio/upload_ini.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/firmware/config/boards/kinetis/config/gen_config.sh b/firmware/config/boards/kinetis/config/gen_config.sh
index e851e4ded5..4b6f15041c 100644
--- a/firmware/config/boards/kinetis/config/gen_config.sh
+++ b/firmware/config/boards/kinetis/config/gen_config.sh
@@ -29,7 +29,7 @@ java \
  -firing_order controllers/algo/firing_order.h \
  -with_c_defines false \
  -initialize_to_zero false \
- -ts_output_name rusefi_kinetis.ini \
+ -ts_output_name generated/rusefi_kinetis.ini \
  -c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h \
  -c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h \
  -signature tunerstudio/generated/signature_kin.txt \
diff --git a/firmware/tunerstudio/upload_ini.sh b/firmware/tunerstudio/upload_ini.sh
index 0668c80f5f..4b54a06405 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-z0-9_]+)\.([0-9]+) ]]; then
       year=${BASH_REMATCH[1]}
       month=${BASH_REMATCH[2]}
       day=${BASH_REMATCH[3]}