diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 2feb2829b4..32cd953910 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 00:22:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3159,11 +3159,7 @@ struct engine_configuration_s { /** * offset 3288 */ - uint8_t unused3288[512]; - /** - * offset 3800 - */ - float ignitionTpsBins[IGN_TPS_COUNT]; + uint8_t unused3288[576]; /** * offset 3864 */ @@ -3698,4 +3694,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 00:22:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 02068741d4..82662a5a5e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -831,7 +831,6 @@ #define idleVeBins_offset 6608 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 -#define IGN_TPS_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" #define IGNITION_PIN_COUNT 12 #define ignitionDwellForCrankingMs_offset 100 @@ -856,7 +855,6 @@ #define ignitionPins9_offset 644 #define ignitionRpmBins_offset 17376 #define ignitionTable_offset 16288 -#define ignitionTpsBins_offset 3800 #define ignMathCalculateAtIndex_offset 1488 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1169,7 +1167,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 1538310286 +#define SIGNATURE_HASH 1697619300 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1480,7 +1478,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.12.kin.1538310286" +#define TS_SIGNATURE "rusEFI 2020.09.12.kin.1697619300" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 6bb653a9aa..9416b8f3b0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3159,11 +3159,7 @@ struct engine_configuration_s { /** * offset 3288 */ - uint8_t unused3288[512]; - /** - * offset 3800 - */ - float ignitionTpsBins[IGN_TPS_COUNT]; + uint8_t unused3288[576]; /** * offset 3864 */ @@ -3698,4 +3694,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 1480095b94..ac33ca3930 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index a26a0f9a12..da133d4931 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 8cae318173..66b888e362 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index d7870cb9e8..ca54af85f8 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index fc3124fb4e..27bd004348 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -831,7 +831,6 @@ #define idleVeBins_offset 6608 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 -#define IGN_TPS_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" #define IGNITION_PIN_COUNT 12 #define ignitionDwellForCrankingMs_offset 100 @@ -856,7 +855,6 @@ #define ignitionPins9_offset 644 #define ignitionRpmBins_offset 17376 #define ignitionTable_offset 16288 -#define ignitionTpsBins_offset 3800 #define ignMathCalculateAtIndex_offset 1488 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1169,7 +1167,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 2959866634 +#define SIGNATURE_HASH 2398398176 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1480,7 +1478,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.12.all.2959866634" +#define TS_SIGNATURE "rusEFI 2020.09.12.all.2398398176" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 29424ce330..ebd4141a06 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 2959866634 -#define TS_SIGNATURE "rusEFI 2020.09.12.all.2959866634" +#define SIGNATURE_HASH 2398398176 +#define TS_SIGNATURE "rusEFI 2020.09.12.all.2398398176" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index c865cf4a8a..73982e8058 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 401644849 -#define TS_SIGNATURE "rusEFI 2020.09.12.frankenso_na6.401644849" +#define SIGNATURE_HASH 695189723 +#define TS_SIGNATURE "rusEFI 2020.09.12.frankenso_na6.695189723" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 3ab8d13eb6..c907d02e82 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 1538310286 -#define TS_SIGNATURE "rusEFI 2020.09.12.kin.1538310286" +#define SIGNATURE_HASH 1697619300 +#define TS_SIGNATURE "rusEFI 2020.09.12.kin.1697619300" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f49d224571..20194135f9 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 2710462368 -#define TS_SIGNATURE "rusEFI 2020.09.12.mre_f4.2710462368" +#define SIGNATURE_HASH 2668692042 +#define TS_SIGNATURE "rusEFI 2020.09.12.mre_f4.2668692042" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index ebe39fb3a9..23fdd35be8 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 2710462368 -#define TS_SIGNATURE "rusEFI 2020.09.12.mre_f7.2710462368" +#define SIGNATURE_HASH 2668692042 +#define TS_SIGNATURE "rusEFI 2020.09.12.mre_f7.2668692042" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 904a608030..226db9892a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 88347257 -#define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_405.88347257" +#define SIGNATURE_HASH 1004228499 +#define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_405.1004228499" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1bb127f362..677dcf790d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 88347257 -#define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_469.88347257" +#define SIGNATURE_HASH 1004228499 +#define TS_SIGNATURE "rusEFI 2020.09.12.prometheus_469.1004228499" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e3a487ef68..2e44a81069 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 1404706842 -#define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f4.1404706842" +#define SIGNATURE_HASH 1831173616 +#define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f4.1831173616" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 72b07213d5..37467d04eb 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.09.12 -#define SIGNATURE_HASH 1404706842 -#define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f7.1404706842" +#define SIGNATURE_HASH 1831173616 +#define TS_SIGNATURE "rusEFI 2020.09.12.proteus_f7.1831173616" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 5b37b7b12b..cae02be428 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 2d77e2097c..49b10d1fe1 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.all.2959866634" + signature = "rusEFI 2020.09.12.all.2398398176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.all.2959866634" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.all.2398398176" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e0e90a07ae..606db107d6 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.frankenso_na6.401644849" + signature = "rusEFI 2020.09.12.frankenso_na6.695189723" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.frankenso_na6.401644849" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.frankenso_na6.695189723" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:56 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 0002236ef6..c077f48e1d 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.kin.1538310286" + signature = "rusEFI 2020.09.12.kin.1697619300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.kin.1538310286" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.kin.1697619300" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 00:22:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 12 07:37:06 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index afd3500deb..a7e3c19c8b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.mre_f4.2710462368" + signature = "rusEFI 2020.09.12.mre_f4.2668692042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.mre_f4.2710462368" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.mre_f4.2668692042" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:13 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:53 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 95e5826bc3..768b033174 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.mre_f7.2710462368" + signature = "rusEFI 2020.09.12.mre_f7.2668692042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.mre_f7.2710462368" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.mre_f7.2668692042" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:50 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 984ff1759e..3643077eeb 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.prometheus_405.88347257" + signature = "rusEFI 2020.09.12.prometheus_405.1004228499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.prometheus_405.88347257" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.prometheus_405.1004228499" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:18 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:01 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 8056c79835..26ef4c6e78 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.prometheus_469.88347257" + signature = "rusEFI 2020.09.12.prometheus_469.1004228499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.prometheus_469.88347257" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.prometheus_469.1004228499" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:16 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:59 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 991aa3b6f2..183cdbbdb1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.proteus_f4.1404706842" + signature = "rusEFI 2020.09.12.proteus_f4.1831173616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.proteus_f4.1404706842" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.proteus_f4.1831173616" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:21 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:04 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index d3f84363a4..7856b571f7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.12.proteus_f7.1404706842" + signature = "rusEFI 2020.09.12.proteus_f7.1831173616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.12.proteus_f7.1404706842" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.12.proteus_f7.1831173616" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:37:02 UTC 2020 pageSize = 20000 page = 1 @@ -1033,8 +1033,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1.0, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1.0, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1.0, 0, 0.0, 100.0, 2 - unused3288 = array, U08, 3288, [512], "units", 1.0, 0, -20, 100, 0 - ignitionTpsBins = array, F32, 3800, [16], "TPS", 1.0, 0.0, 0, 100.0, 2 + unused3288 = array, U08, 3288, [576], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1.0, 0, 0.0, 1000.0, 1 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 731e9c08f6..9fa8bc7c2e 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 00:22:09 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 12 07:36:48 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -810,7 +810,6 @@ public class Fields { public static final int idleVeBins_offset = 6608; public static final int IGN_LOAD_COUNT = 16; public static final int IGN_RPM_COUNT = 16; - public static final int IGN_TPS_COUNT = 16; public static final int IGNITION_PIN_COUNT = 12; public static final int ignitionDwellForCrankingMs_offset = 100; public static final int ignitionIatCorrLoadBins_offset = 13856; @@ -834,7 +833,6 @@ public class Fields { public static final int ignitionPins9_offset = 644; public static final int ignitionRpmBins_offset = 17376; public static final int ignitionTable_offset = 16288; - public static final int ignitionTpsBins_offset = 3800; public static final int ignMathCalculateAtIndex_offset = 1488; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; @@ -1384,7 +1382,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.09.12.all.2959866634"; + public static final String TS_SIGNATURE = "rusEFI 2020.09.12.all.2398398176"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index be209cfd02..dc4f0d3e79 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +