From 585b0f8011aa27bb81f4e2557946ef9e45f89d05 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 6 Jul 2020 01:06:27 -0400 Subject: [PATCH] generated --- firmware/gen_config.bat | 4 ++-- firmware/gen_config.sh | 2 +- firmware/gen_config_board.sh | 2 +- firmware/tunerstudio/{ => generated}/rusefi_frankenso.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_frankenso_na6.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_kinetis.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_microrusefi.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_mre_f4.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_mre_f7.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_prometheus.ini | 0 .../tunerstudio/{ => generated}/rusefi_prometheus_405.ini | 0 .../tunerstudio/{ => generated}/rusefi_prometheus_469.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_proteus.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_proteus_f4.ini | 0 firmware/tunerstudio/{ => generated}/rusefi_proteus_f7.ini | 0 misc/jenkins/build_working_folder.sh | 2 +- 16 files changed, 5 insertions(+), 5 deletions(-) rename firmware/tunerstudio/{ => generated}/rusefi_frankenso.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_frankenso_na6.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_kinetis.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_microrusefi.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_mre_f4.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_mre_f7.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_prometheus.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_prometheus_405.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_prometheus_469.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_proteus.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_proteus_f4.ini (100%) rename firmware/tunerstudio/{ => generated}/rusefi_proteus_f7.ini (100%) diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index 64a7df1d9d..63d9abe983 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -4,5 +4,5 @@ sh.exe gen_config.sh rem This would automatically copy latest file to 'dev' TS project set ts_path="%HOMEDRIVE%%HOMEPATH%\Documents\TunerStudioProjects" echo %ts_path% -cp tunerstudio/rusefi.ini %ts_path%\dev\projectCfg\mainController.ini -cp tunerstudio/rusefi_microrusefi.ini %ts_path%\dev_mre\projectCfg\mainController.ini +cp tunerstudio/generated/rusefi.ini %ts_path%\dev\projectCfg\mainController.ini +cp tunerstudio/generated/rusefi_microrusefi.ini %ts_path%\dev_mre\projectCfg\mainController.ini diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index f964774f13..561e793667 100644 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -43,7 +43,7 @@ if [ -z "${TS_PATH}" ]; then else echo "This would automatically copy latest file to 'dev' TS project at ${TS_PATH}" cp -v tunerstudio/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini - cp -v tunerstudio/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini + cp -v tunerstudio/generated/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini fi for BOARD in "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh index 22585d32ed..533433b9a4 100644 --- a/firmware/gen_config_board.sh +++ b/firmware/gen_config_board.sh @@ -67,7 +67,7 @@ if [ -z "${TS_PATH}" ]; then else if [ -d "${TS_PATH}/dev_${BOARDNAME}/" ]; then echo "This would automatically copy latest file to 'dev_${BOARDNAME}' TS project $TS_PATH" - cp -v tunerstudio/rusefi_${BOARDNAME}.ini ${TS_PATH}/dev_${BOARDNAME}/projectCfg/mainController.ini + cp -v tunerstudio/generated/rusefi_${BOARDNAME}.ini ${TS_PATH}/dev_${BOARDNAME}/projectCfg/mainController.ini fi fi diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/generated/rusefi_frankenso.ini similarity index 100% rename from firmware/tunerstudio/rusefi_frankenso.ini rename to firmware/tunerstudio/generated/rusefi_frankenso.ini diff --git a/firmware/tunerstudio/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini similarity index 100% rename from firmware/tunerstudio/rusefi_frankenso_na6.ini rename to firmware/tunerstudio/generated/rusefi_frankenso_na6.ini diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini similarity index 100% rename from firmware/tunerstudio/rusefi_kinetis.ini rename to firmware/tunerstudio/generated/rusefi_kinetis.ini diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/generated/rusefi_microrusefi.ini similarity index 100% rename from firmware/tunerstudio/rusefi_microrusefi.ini rename to firmware/tunerstudio/generated/rusefi_microrusefi.ini diff --git a/firmware/tunerstudio/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini similarity index 100% rename from firmware/tunerstudio/rusefi_mre_f4.ini rename to firmware/tunerstudio/generated/rusefi_mre_f4.ini diff --git a/firmware/tunerstudio/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini similarity index 100% rename from firmware/tunerstudio/rusefi_mre_f7.ini rename to firmware/tunerstudio/generated/rusefi_mre_f7.ini diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/generated/rusefi_prometheus.ini similarity index 100% rename from firmware/tunerstudio/rusefi_prometheus.ini rename to firmware/tunerstudio/generated/rusefi_prometheus.ini diff --git a/firmware/tunerstudio/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini similarity index 100% rename from firmware/tunerstudio/rusefi_prometheus_405.ini rename to firmware/tunerstudio/generated/rusefi_prometheus_405.ini diff --git a/firmware/tunerstudio/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini similarity index 100% rename from firmware/tunerstudio/rusefi_prometheus_469.ini rename to firmware/tunerstudio/generated/rusefi_prometheus_469.ini diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/generated/rusefi_proteus.ini similarity index 100% rename from firmware/tunerstudio/rusefi_proteus.ini rename to firmware/tunerstudio/generated/rusefi_proteus.ini diff --git a/firmware/tunerstudio/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini similarity index 100% rename from firmware/tunerstudio/rusefi_proteus_f4.ini rename to firmware/tunerstudio/generated/rusefi_proteus_f4.ini diff --git a/firmware/tunerstudio/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini similarity index 100% rename from firmware/tunerstudio/rusefi_proteus_f7.ini rename to firmware/tunerstudio/generated/rusefi_proteus_f7.ini diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index a3c67d4a1f..3d054e295e 100644 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -53,7 +53,7 @@ cp java_console/rusefi.xml $CONSOLE_FOLDER cp misc/console_launcher/readme.html $FOLDER -cp firmware/tunerstudio/$INI_FILE_OVERRIDE $FOLDER +cp firmware/tunerstudio/generated/$INI_FILE_OVERRIDE $FOLDER # Unsetting since would not be used anywhere else INI_FILE_OVERRIDE="" RUSEFI_CONSOLE_SETTINGS=""