diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index 2cc4d0c375..71bb10c5c6 100644 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -41,12 +41,14 @@ java -DSystemOut.name=gen_config \ if [ -z "${TS_PATH}" ]; then echo "TS_PATH not defined" -else - echo "This would automatically copy latest file to 'dev' TS project at ${TS_PATH}" - cp -v tunerstudio/generated/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini - cp -v tunerstudio/generated/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini + # it's nice to have default location + TS_PATH="${HOMEDRIVE}${HOMEPATH}\Documents\TunerStudioProjects" fi +echo "This would automatically copy latest file to 'dev' TS projects to ${TS_PATH}" +cp -v tunerstudio/generated/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini +cp -v tunerstudio/generated/rusefi_mre_f4.ini $TS_PATH/mre_f4/projectCfg/mainController.ini + 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 BOARD_NAME="${BOARD% *}" BOARD_SHORT_NAME="${BOARD#* }" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7fe757d991..225b527f5d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -664,7 +664,7 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas brain_pin_e canRxPin;set_can_rx_pin X pin_input_mode_e throttlePedalUpPinMode; - uint8_t acIdleExtraOffset;;"Percent", 1, 0, 0, 255, 0 + uint8_t fsio_visible acIdleExtraOffset;+Additional idle PID offset while A/C is active;"Percent", 1, 0, 0, 255, 0 int unusedAt712;;"units", 1, 0, -20, 100, 0 int unusedAt716;;"units", 1, 0, -20, 100, 0 @@ -726,7 +726,7 @@ pin_output_mode_e hip9011IntHoldPinMode; uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0 uint8_t mc33_hvolt;;"v", 1, 0, 0, 100, 0 - uint8_t acIdleExtraMin;;"Percent", 1, 0, 0, 255, 0 + uint8_t fsio_visible acIdleExtraMin;+Additional idle PID minValue while A/C is active;"Percent", 1, 0, 0, 255, 0 uint8_t[2] unusedHere;;"units", 1, 0, -20, 100, 0 diff --git a/java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java index 76511b520e..f06fc819d4 100644 --- a/java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java @@ -5,7 +5,6 @@ import com.rusefi.ReaderState; import com.rusefi.util.LazyFile; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import static com.rusefi.ConfigDefinition.EOL;