diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h index e9fd5c2274..4a41903631 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:39 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:25 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1111,10 +1111,9 @@ struct engine_configuration_s { */ uint8_t acrRevolutions; /** - * units: coef * offset 548 */ - float globalFuelCorrection; + float unused4bytesHere; /** * units: volts * offset 552 @@ -5625,4 +5624,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:39 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:25 UTC 2024 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index e75d3d2591..eaae7fcd3e 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -832,7 +832,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4058461404 +#define SIGNATURE_HASH 2808465707 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1159,7 +1159,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.4058461404" +#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.2808465707" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h index 9ed40fbaf3..2b1979b222 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:24 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1111,10 +1111,9 @@ struct engine_configuration_s { */ uint8_t acrRevolutions; /** - * units: coef * offset 548 */ - float globalFuelCorrection; + float unused4bytesHere; /** * units: volts * offset 552 @@ -5625,4 +5624,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 20860); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:38 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:24 UTC 2024 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index bc0f7cc473..c96449c781 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -832,7 +832,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3006722930 +#define SIGNATURE_HASH 3853782661 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1159,7 +1159,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3006722930" +#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3853782661" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h index c7e96fb773..6d72d8fae3 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:26 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1111,10 +1111,9 @@ struct engine_configuration_s { */ uint8_t acrRevolutions; /** - * units: coef * offset 548 */ - float globalFuelCorrection; + float unused4bytesHere; /** * units: volts * offset 552 @@ -5625,4 +5624,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:09:40 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:26 UTC 2024 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index d1cae8ac82..7b298b9b3e 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -1069,7 +1069,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1107370548 +#define SIGNATURE_HASH 344186819 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1396,7 +1396,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" +#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.344186819" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h index f707eb444e..1897fca673 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:11:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:17:02 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1111,10 +1111,9 @@ struct engine_configuration_s { */ uint8_t acrRevolutions; /** - * units: coef * offset 548 */ - float globalFuelCorrection; + float unused4bytesHere; /** * units: volts * offset 552 @@ -5625,4 +5624,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 01:11:17 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:17:02 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 5bddb66931..7a6e1a7324 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 1111983875 +#define SIGNATURE_HASH 348486388 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1485,7 +1485,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.1111983875" +#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.348486388" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index ec44a9f886..1cb1d024bb 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 4058461404 -#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.4058461404" +#define SIGNATURE_HASH 2808465707 +#define TS_SIGNATURE "rusEFI master.2024.02.29.cypress.2808465707" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index bb54b69f48..9744f316da 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1111983875 -#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.1111983875" +#define SIGNATURE_HASH 348486388 +#define TS_SIGNATURE "rusEFI master.2024.02.29.f407-discovery.348486388" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index cdb029a643..6a297d6559 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3006722930 -#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3006722930" +#define SIGNATURE_HASH 3853782661 +#define TS_SIGNATURE "rusEFI master.2024.02.29.kin.3853782661" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index e35e918407..b29a0fff46 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1107370548 -#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" +#define SIGNATURE_HASH 344186819 +#define TS_SIGNATURE "rusEFI master.2024.02.29.subaru_eg33_f7.344186819" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 39a8311a22..b1e313a189 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -310,9 +310,6 @@ float getConfigValueByName(const char *name) { // acrRevolutions case -1373423899: return engineConfiguration->acrRevolutions; -// globalFuelCorrection - case 1371979578: - return engineConfiguration->globalFuelCorrection; // adcVcc case -244496183: return engineConfiguration->adcVcc; @@ -2295,11 +2292,6 @@ bool setConfigValueByName(const char *name, float value) { { engineConfiguration->acrRevolutions = (int)value; return 1; - } - case 1371979578: - { - engineConfiguration->globalFuelCorrection = value; - return 1; } case -244496183: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 77c28ec6fe..626b74f25f 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -304,9 +304,6 @@ Duty cycle to use in case of a sensor failure. This duty cycle should produce th ### acrRevolutions -### globalFuelCorrection - - ### adcVcc diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index f0a537a473..7317d12160 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.29.f407-discovery.1111983875" + signature = "rusEFI master.2024.02.29.f407-discovery.348486388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.29.f407-discovery.1111983875" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.f407-discovery.348486388" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:40:36 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:17:02 UTC 2024 pageSize = 22236 page = 1 @@ -233,7 +233,7 @@ hip9011SpiDevice = bits, U08, 544, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", boostControlSafeDutyCycle = scalar, U08, 545, "%", 1, 0, 0, 100, 0 mafAdcChannel = bits, U08, 546, [0:5], $adc_channel_e_list acrRevolutions = scalar, U08, 547, "", 1, 0, 0, 100, 0 -globalFuelCorrection = scalar, F32, 548, "coef", 1, 0, 0, 1000, 2 +unused4bytesHere = scalar, F32, 548, "", 1, 0, 0, 100, 0 adcVcc = scalar, F32, 552, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 556, "Deg", 1, 0, 0, 360, 0 camInputs1 = bits, U16, 560, [0:7], $brain_input_pin_e_list diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 8962c582e1..fcf21df003 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.29.cypress.4058461404" + signature = "rusEFI master.2024.02.29.cypress.2808465707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.29.cypress.4058461404" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.cypress.2808465707" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:58 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:25 UTC 2024 pageSize = 22236 page = 1 @@ -233,7 +233,7 @@ hip9011SpiDevice = bits, U08, 544, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", boostControlSafeDutyCycle = scalar, U08, 545, "%", 1, 0, 0, 100, 0 mafAdcChannel = bits, U08, 546, [0:5], $adc_channel_e_list acrRevolutions = scalar, U08, 547, "", 1, 0, 0, 100, 0 -globalFuelCorrection = scalar, F32, 548, "coef", 1, 0, 0, 1000, 2 +unused4bytesHere = scalar, F32, 548, "", 1, 0, 0, 100, 0 adcVcc = scalar, F32, 552, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 556, "Deg", 1, 0, 0, 360, 0 camInputs1 = bits, U16, 560, [0:7], $brain_input_pin_e_list diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 9814557fb9..a9d08eb374 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.29.kin.3006722930" + signature = "rusEFI master.2024.02.29.kin.3853782661" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.29.kin.3006722930" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.kin.3853782661" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:57 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:24 UTC 2024 pageSize = 20860 page = 1 @@ -233,7 +233,7 @@ hip9011SpiDevice = bits, U08, 544, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", boostControlSafeDutyCycle = scalar, U08, 545, "%", 1, 0, 0, 100, 0 mafAdcChannel = bits, U08, 546, [0:5], $adc_channel_e_list acrRevolutions = scalar, U08, 547, "", 1, 0, 0, 100, 0 -globalFuelCorrection = scalar, F32, 548, "coef", 1, 0, 0, 1000, 2 +unused4bytesHere = scalar, F32, 548, "", 1, 0, 0, 100, 0 adcVcc = scalar, F32, 552, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 556, "Deg", 1, 0, 0, 360, 0 camInputs1 = bits, U16, 560, [0:7], $brain_input_pin_e_list diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index aafda11ec4..aa882d2f33 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" + signature = "rusEFI master.2024.02.29.subaru_eg33_f7.344186819" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.02.29.subaru_eg33_f7.1107370548" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.02.29.subaru_eg33_f7.344186819" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -98,7 +98,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:39:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:16:26 UTC 2024 pageSize = 22236 page = 1 @@ -233,7 +233,7 @@ hip9011SpiDevice = bits, U08, 544, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", boostControlSafeDutyCycle = scalar, U08, 545, "%", 1, 0, 0, 100, 0 mafAdcChannel = bits, U08, 546, [0:5], $adc_channel_e_list acrRevolutions = scalar, U08, 547, "", 1, 0, 0, 100, 0 -globalFuelCorrection = scalar, F32, 548, "coef", 1, 0, 0, 1000, 2 +unused4bytesHere = scalar, F32, 548, "", 1, 0, 0, 100, 0 adcVcc = scalar, F32, 552, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 556, "Deg", 1, 0, 0, 360, 0 camInputs1 = bits, U16, 560, [0:7], $brain_input_pin_e_list diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index b51eae26ef..3b1f293204 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 00:40:36 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 02:17:02 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1095,7 +1095,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 1111983875; + public static final int SIGNATURE_HASH = 348486388; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1342,7 +1342,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2024.02.29.f407-discovery.1111983875"; + public static final String TS_SIGNATURE = "rusEFI master.2024.02.29.f407-discovery.348486388"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -1556,7 +1556,7 @@ public class Fields { public static final Field BOOSTCONTROLSAFEDUTYCYCLE = Field.create("BOOSTCONTROLSAFEDUTYCYCLE", 545, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 546, FieldType.INT8, adc_channel_e).setScale(1.0).setBaseOffset(0); public static final Field ACRREVOLUTIONS = Field.create("ACRREVOLUTIONS", 547, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 548, FieldType.FLOAT).setBaseOffset(0); + public static final Field UNUSED4BYTESHERE = Field.create("UNUSED4BYTESHERE", 548, FieldType.FLOAT).setBaseOffset(0); public static final Field ADCVCC = Field.create("ADCVCC", 552, FieldType.FLOAT).setBaseOffset(0); public static final Field MAPCAMDETECTIONANGLEPOSITION = Field.create("MAPCAMDETECTIONANGLEPOSITION", 556, FieldType.FLOAT).setBaseOffset(0); public static final String[] brain_input_pin_e = {"NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15"}; @@ -3207,7 +3207,7 @@ public class Fields { BOOSTCONTROLSAFEDUTYCYCLE, MAFADCCHANNEL, ACRREVOLUTIONS, - GLOBALFUELCORRECTION, + UNUSED4BYTESHERE, ADCVCC, MAPCAMDETECTIONANGLEPOSITION, CAMINPUTS1,