diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 22b46e3461..a071dca4c0 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 15 03:37:49 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:51 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3262,9 +3262,19 @@ struct engine_configuration_s { */ linear_sensor_s lowPressureFuel; /** + * CLT-based target RPM for hard limit depending on CLT like on Lexus LFA * offset 3328 */ - uint8_t unused3328[536]; + int8_t cltRevLimitRpmBins[CLT_LIMITER_CURVE_SIZE]; + /** + * See idleRpmPid + * offset 3332 + */ + uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; + /** + * offset 3340 + */ + uint8_t unused3328[524]; /** * offset 3864 */ @@ -3854,4 +3864,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 15 03:37:49 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:51 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index fc08a5155c..81fee13cab 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -204,6 +204,7 @@ #define clt_config_offset 252 #define CLT_CRANKING_CURVE_SIZE 8 #define CLT_CURVE_SIZE 16 +#define CLT_LIMITER_CURVE_SIZE 4 #define clt_offset 252 #define clt_resistance_1_offset 264 #define clt_resistance_2_offset 268 @@ -220,6 +221,8 @@ #define cltIdleCorrBins_offset 10656 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 +#define cltRevLimitRpm_offset 3332 +#define cltRevLimitRpmBins_offset 3328 #define cltTimingBins_offset 2352 #define cltTimingExtra_offset 2384 #define clutchDownPin_offset 664 @@ -1238,8 +1241,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.02.15 -#define SIGNATURE_HASH 4272151618 +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 327658260 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1573,7 +1576,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.15.hellen_cypress.4272151618" +#define TS_SIGNATURE "rusEFI 2021.02.17.hellen_cypress.327658260" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1645,7 +1648,7 @@ #define unused244_3_offset 2428 #define unused2508_offset 2508 #define unused2536_offset 2536 -#define unused3328_offset 3328 +#define unused3328_offset 3340 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 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 3bebe80dab..39ce7bc48c 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 Mon Feb 15 03:37:47 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:49 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3257,9 +3257,19 @@ struct engine_configuration_s { */ linear_sensor_s lowPressureFuel; /** + * CLT-based target RPM for hard limit depending on CLT like on Lexus LFA * offset 3300 */ - uint8_t unused3328[536]; + int8_t cltRevLimitRpmBins[CLT_LIMITER_CURVE_SIZE]; + /** + * See idleRpmPid + * offset 3304 + */ + uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; + /** + * offset 3312 + */ + uint8_t unused3328[524]; /** * offset 3836 */ @@ -3849,4 +3859,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 Mon Feb 15 03:37:47 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:49 UTC 2021 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 acf3df1f0d..18e1afaae0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -188,6 +188,7 @@ #define clt_config_offset 252 #define CLT_CRANKING_CURVE_SIZE 8 #define CLT_CURVE_SIZE 16 +#define CLT_LIMITER_CURVE_SIZE 4 #define clt_offset 252 #define clt_resistance_1_offset 264 #define clt_resistance_2_offset 268 @@ -204,6 +205,8 @@ #define cltIdleCorrBins_offset 10628 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 +#define cltRevLimitRpm_offset 3304 +#define cltRevLimitRpmBins_offset 3300 #define cltTimingBins_offset 2344 #define cltTimingExtra_offset 2376 #define clutchDownPin_offset 664 @@ -1222,8 +1225,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.02.15 -#define SIGNATURE_HASH 17174718 +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 3961677800 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1557,7 +1560,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.15.kin.17174718" +#define TS_SIGNATURE "rusEFI 2021.02.17.kin.3961677800" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1629,7 +1632,7 @@ #define unused244_3_offset 2420 #define unused2508_offset 2500 #define unused2536_offset 2528 -#define unused3328_offset 3300 +#define unused3328_offset 3312 #define unused3942_offset 3964 #define unused3988_offset 3960 #define unused4028_offset 4000 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 0414711ffe..8f5458ce43 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 Mon Feb 15 03:37:24 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3262,9 +3262,19 @@ struct engine_configuration_s { */ linear_sensor_s lowPressureFuel; /** + * CLT-based target RPM for hard limit depending on CLT like on Lexus LFA * offset 3328 */ - uint8_t unused3328[536]; + int8_t cltRevLimitRpmBins[CLT_LIMITER_CURVE_SIZE]; + /** + * See idleRpmPid + * offset 3332 + */ + uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; + /** + * offset 3340 + */ + uint8_t unused3328[524]; /** * offset 3864 */ @@ -3854,4 +3864,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 Mon Feb 15 03:37:24 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 00fa534389..939647925c 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 Mon Feb 15 03:37:24 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // 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 09ae4cad39..351efe3e8d 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 Mon Feb 15 03:37:24 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // 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 443493017a..e1f3093c6e 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 Mon Feb 15 03:37:24 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // 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 40ab0dfa21..1a147fb89c 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 Mon Feb 15 03:37:24 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // 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 27a9ceb620..20e06d695d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -202,6 +202,7 @@ #define clt_config_offset 252 #define CLT_CRANKING_CURVE_SIZE 8 #define CLT_CURVE_SIZE 16 +#define CLT_LIMITER_CURVE_SIZE 4 #define clt_offset 252 #define clt_resistance_1_offset 264 #define clt_resistance_2_offset 268 @@ -218,6 +219,8 @@ #define cltIdleCorrBins_offset 10656 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 +#define cltRevLimitRpm_offset 3332 +#define cltRevLimitRpmBins_offset 3328 #define cltTimingBins_offset 2352 #define cltTimingExtra_offset 2384 #define clutchDownPin_offset 664 @@ -1235,8 +1238,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.02.15 -#define SIGNATURE_HASH 3168733074 +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 1375432900 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1570,7 +1573,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.15.all.3168733074" +#define TS_SIGNATURE "rusEFI 2021.02.17.all.1375432900" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1642,7 +1645,7 @@ #define unused244_3_offset 2428 #define unused2508_offset 2508 #define unused2536_offset 2536 -#define unused3328_offset 3328 +#define unused3328_offset 3340 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index db539f184a..4f30bfeafa 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 1841462752 -#define TS_SIGNATURE "rusEFI 2021.02.16.all.1841462752" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 1375432900 +#define TS_SIGNATURE "rusEFI 2021.02.17.all.1375432900" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 44309305c4..9d7901cbe0 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 3921170547 -#define TS_SIGNATURE "rusEFI 2021.02.16.frankenso_na6.3921170547" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 3582025047 +#define TS_SIGNATURE "rusEFI 2021.02.17.frankenso_na6.3582025047" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index eb4b5056cc..3238f004f3 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 395767137 -#define TS_SIGNATURE "rusEFI 2021.02.16.hellen72.395767137" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 732946501 +#define TS_SIGNATURE "rusEFI 2021.02.17.hellen72.732946501" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c7634367b2..4bd5f30425 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 801023536 -#define TS_SIGNATURE "rusEFI 2021.02.16.hellen_cypress.801023536" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 327658260 +#define TS_SIGNATURE "rusEFI 2021.02.17.hellen_cypress.327658260" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 3c8d7bcf7e..4e99249a90 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 3491457740 -#define TS_SIGNATURE "rusEFI 2021.02.16.kin.3491457740" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 3961677800 +#define TS_SIGNATURE "rusEFI 2021.02.17.kin.3961677800" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index abfa22c071..94938b6ba3 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 1124339466 -#define TS_SIGNATURE "rusEFI 2021.02.16.mre_f4.1124339466" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 2134704686 +#define TS_SIGNATURE "rusEFI 2021.02.17.mre_f4.2134704686" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f185b9e2f6..5e4b762c72 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 1124339466 -#define TS_SIGNATURE "rusEFI 2021.02.16.mre_f7.1124339466" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 2134704686 +#define TS_SIGNATURE "rusEFI 2021.02.17.mre_f7.2134704686" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9b464f0db8..6e4f95013c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 2136244182 -#define TS_SIGNATURE "rusEFI 2021.02.16.prometheus_405.2136244182" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 1131246322 +#define TS_SIGNATURE "rusEFI 2021.02.17.prometheus_405.1131246322" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 0be5d76271..39d25fa37a 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 2136244182 -#define TS_SIGNATURE "rusEFI 2021.02.16.prometheus_469.2136244182" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 1131246322 +#define TS_SIGNATURE "rusEFI 2021.02.17.prometheus_469.1131246322" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index fe61ff1776..dbb905e2dd 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 183743951 -#define TS_SIGNATURE "rusEFI 2021.02.16.proteus_f4.183743951" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 919255275 +#define TS_SIGNATURE "rusEFI 2021.02.17.proteus_f4.919255275" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0ff1231e19..09bfb6d510 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 183743951 -#define TS_SIGNATURE "rusEFI 2021.02.16.proteus_f7.183743951" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 919255275 +#define TS_SIGNATURE "rusEFI 2021.02.17.proteus_f7.919255275" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 79016d1f60..a8d96006e7 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.02.16 -#define SIGNATURE_HASH 819661567 -#define TS_SIGNATURE "rusEFI 2021.02.16.subaru_eg33_f7.819661567" +#define SIGNATURE_DATE 2021.02.17 +#define SIGNATURE_HASH 216139739 +#define TS_SIGNATURE "rusEFI 2021.02.17.subaru_eg33_f7.216139739" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d3678587b8..3be756dd90 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 78f10725e6..428f575b37 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 2021.02.16.all.1841462752" + signature = "rusEFI 2021.02.17.all.1375432900" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.all.1841462752" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.all.1375432900" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:00 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 712d734030..bd8be9f27d 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 2021.02.16.frankenso_na6.3921170547" + signature = "rusEFI 2021.02.17.frankenso_na6.3582025047" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.frankenso_na6.3921170547" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.frankenso_na6.3582025047" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:13 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:38 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 0407b2eb82..a1d3abb379 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.16.hellen72.395767137" + signature = "rusEFI 2021.02.17.hellen72.732946501" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.hellen72.395767137" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.hellen72.732946501" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:03 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:33 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 18478e4097..736974e954 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.16.hellen_cypress.801023536" + signature = "rusEFI 2021.02.17.hellen_cypress.327658260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.hellen_cypress.801023536" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.hellen_cypress.327658260" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Feb 16 22:27:23 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:51 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 1f95b1b485..df157a08eb 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 2021.02.16.kin.3491457740" + signature = "rusEFI 2021.02.17.kin.3961677800" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.kin.3491457740" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.kin.3961677800" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:22 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 17 22:45:49 UTC 2021 pageSize = 19972 page = 1 @@ -1041,7 +1041,9 @@ lowPressureFuel_v1 = scalar, F32, 3284, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3288, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3292, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3296, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3300, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3300, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3304, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3312, [524], "units", 1.0, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3836, "Min tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3840, "Max tCharge Coeff.", 1.0, 0, 0.0, 1.0, 4 tChargeAirFlowMax = scalar, F32, 3844, "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 c5bc50c149..7dfebdc065 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 2021.02.16.mre_f4.1124339466" + signature = "rusEFI 2021.02.17.mre_f4.2134704686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.mre_f4.1124339466" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.mre_f4.2134704686" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:12 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:36 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 1cbc51728e..f6b67c8129 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 2021.02.16.mre_f7.1124339466" + signature = "rusEFI 2021.02.17.mre_f7.2134704686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.mre_f7.1124339466" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.mre_f7.2134704686" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:11 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:35 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 f6012498cd..54e6a7f9ec 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 2021.02.16.prometheus_405.2136244182" + signature = "rusEFI 2021.02.17.prometheus_405.1131246322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.prometheus_405.2136244182" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.prometheus_405.1131246322" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:16 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:41 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 613370778d..bf71f63718 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 2021.02.16.prometheus_469.2136244182" + signature = "rusEFI 2021.02.17.prometheus_469.1131246322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.prometheus_469.2136244182" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.prometheus_469.1131246322" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:15 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:40 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 2fd980ace6..b20eae8d7f 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 2021.02.16.proteus_f4.183743951" + signature = "rusEFI 2021.02.17.proteus_f4.919255275" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.proteus_f4.183743951" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.proteus_f4.919255275" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:19 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:45 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 a71f0a3793..3646f140a7 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 2021.02.16.proteus_f7.183743951" + signature = "rusEFI 2021.02.17.proteus_f7.919255275" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.proteus_f7.183743951" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.proteus_f7.919255275" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:18 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:43 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index b145c9b800..b5f6420364 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.16.subaru_eg33_f7.819661567" + signature = "rusEFI 2021.02.17.subaru_eg33_f7.216139739" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.16.subaru_eg33_f7.819661567" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.17.subaru_eg33_f7.216139739" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Tue Feb 16 22:27:21 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:47 UTC 2021 pageSize = 20000 page = 1 @@ -1057,7 +1057,9 @@ lowPressureFuel_v1 = scalar, F32, 3312, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value1 = scalar, F32, 3316, "kPa", 1.0, 0.0, 0, 1000000.0, 2 lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1.0, 0.0, 0, 10.0, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1.0, 0.0, 0, 1000000.0, 2 -unused3328 = array, U08, 3328, [536], "units", 1.0, 0, -20, 100, 0 +cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1.0, 0, -70, 120, 0 +cltRevLimitRpm = array, U16, 3332, [4], "", 1.0, 0, 0, 8000, 0 +unused3328 = array, U08, 3340, [524], "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 46b7a04b7c..e24447f394 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 Mon Feb 15 03:37:24 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 17 22:45:29 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -192,6 +192,7 @@ public class Fields { public static final int clt_config_offset = 252; public static final int CLT_CRANKING_CURVE_SIZE = 8; public static final int CLT_CURVE_SIZE = 16; + public static final int CLT_LIMITER_CURVE_SIZE = 4; public static final int clt_offset = 252; public static final int clt_resistance_1_offset = 264; public static final int clt_resistance_2_offset = 268; @@ -208,6 +209,8 @@ public class Fields { public static final int cltIdleCorrBins_offset = 10656; public static final int cltIdleRpm_offset = 1960; public static final int cltIdleRpmBins_offset = 1896; + public static final int cltRevLimitRpm_offset = 3332; + public static final int cltRevLimitRpmBins_offset = 3328; public static final int cltTimingBins_offset = 2352; public static final int cltTimingExtra_offset = 2384; public static final int clutchDownPin_offset = 664; @@ -1190,6 +1193,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1375432900; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1473,7 +1477,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 2021.02.15.all.3168733074"; + public static final String TS_SIGNATURE = "rusEFI 2021.02.17.all.1375432900"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1542,7 +1546,7 @@ public class Fields { public static final int unused244_3_offset = 2428; public static final int unused2508_offset = 2508; public static final int unused2536_offset = 2536; - public static final int unused3328_offset = 3328; + public static final int unused3328_offset = 3340; public static final int unused3942_offset = 3992; public static final int unused3988_offset = 3988; public static final int unused4028_offset = 4028; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 79e6ac0f13..373f03012c 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +