From eee51a575f43625f8df9ab3138175174da960b3c Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Mon, 6 Jul 2020 01:17:50 -0400
Subject: [PATCH] progress - consuming new .ini file names

---
 firmware/gen_config_board.sh                | 14 --------------
 misc/jenkins/compile_other_versions/run.bat | 12 ++++++------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index 4ebfe496e1..59f9408ddb 100644
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -46,20 +46,6 @@ java -DSystemOut.name=gen_config_board \
 	-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
 	-prepend config/boards/${BOARDNAME}/prepend.txt
 
-java -DSystemOut.name=gen_config_board \
-	-jar ../java_tools/ConfigDefinition.jar \
-	-definition integration/rusefi_config.txt \
-	-tool gen_config.sh \
-	-ts_destination tunerstudio \
-	-cache ${BOARDNAME} \
-	-cache_zip_file tunerstudio/generated/cache.zip \
-	-firing_order controllers/algo/firing_order.h \
-	-ts_output_name rusefi_${BOARDNAME}.ini \
-	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-	-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
-	-prepend config/boards/${BOARDNAME}/prepend.txt
-
 [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
 
 if [ -z "${TS_PATH}" ]; then
diff --git a/misc/jenkins/compile_other_versions/run.bat b/misc/jenkins/compile_other_versions/run.bat
index a77733d793..03530b2fac 100644
--- a/misc/jenkins/compile_other_versions/run.bat
+++ b/misc/jenkins/compile_other_versions/run.bat
@@ -14,7 +14,7 @@ rem #
 rem # see gen_config.sh where short<>long name dictionary is hard-coded
 rem #
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f4 rusefi_microrusefi.ini
+call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f4 rusefi_mre_f4.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd
@@ -42,17 +42,17 @@ set f7_console_setting=firmware\config\boards\nucleo_f767\rusefi_console_propert
 
 rem                     folter_name configuration_name [optional .ini file name]
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus     proteus_f4 rusefi_proteus.ini
+call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus     proteus_f4 rusefi_proteus_f4.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus     proteus_f7 rusefi_proteus.ini
+call misc\jenkins\compile_other_versions\compile_and_upload.bat proteus     proteus_f7 rusefi_proteus_f7.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f7 rusefi_microrusefi.ini %f7_console_setting%
+call misc\jenkins\compile_other_versions\compile_and_upload.bat microrusefi mre_f7 rusefi_mre_f7.ini %f7_console_setting%
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd
@@ -80,13 +80,13 @@ rem IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 rem pwd
 
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_405
+call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_405 rusefi_prometheus_405.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd
 
 
-call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_469
+call misc\jenkins\compile_other_versions\compile_and_upload.bat prometheus prometheus_469 rusefi_prometheus_469.ini
 IF %ERRORLEVEL% NEQ 0 echo ERROR invoking compile_and_upload.bat
 IF %ERRORLEVEL% NEQ 0 EXIT /B 1
 pwd