From 3e1b38043c2251aa5fa90a444e6b6d2582666cbe Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 13 Apr 2020 09:23:13 -0400 Subject: [PATCH] fresh --- ...ngine_configuration_generated_structures.h | 80 ++++++++++++++++- .../controllers/algo/rusefi_generated.h | 55 +++++++++++- firmware/controllers/engine_controller.cpp | 2 +- ...ngine_configuration_generated_structures.h | 80 ++++++++++++++++- .../controllers/generated/rusefi_generated.h | 55 +++++++++++- firmware/tunerstudio/rusefi.ini | 32 ++++++- firmware/tunerstudio/rusefi_frankenso.ini | 32 ++++++- firmware/tunerstudio/rusefi_kinetis.ini | 34 +++++++- firmware/tunerstudio/rusefi_microrusefi.ini | 32 ++++++- firmware/tunerstudio/rusefi_prometheus.ini | 32 ++++++- firmware/tunerstudio/rusefi_proteus.ini | 32 ++++++- .../com/rusefi/config/generated/Fields.java | 86 ++++++++++++++++++- 12 files changed, 526 insertions(+), 26 deletions(-) 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 53b688e238..1df8ac6170 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,9 +1,79 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 22:31:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Apr 13 09:22:19 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #define CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #include "rusefi_types.h" +// start of stft_cell_cfg_s +struct stft_cell_cfg_s { + /** + * offset 0 + */ + int8_t maxAdd; + /** + * offset 1 + */ + int8_t maxRemove; + /** + * offset 2 + */ + uint16_t timeConstant; + /** total size 4*/ +}; + +typedef struct stft_cell_cfg_s stft_cell_cfg_s; + +// start of stft_s +struct stft_s { + /** + * Below this RPM, the idle region is active + * offset 0 + */ + uint8_t maxIdleRegionRpm; + /** + * Below this engine load, the overrun region is active + * offset 1 + */ + uint8_t maxOverrunLoad; + /** + * Above this engine load, the power region is active + * offset 2 + */ + uint8_t minPowerLoad; + /** + * When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required. + * offset 3 + */ + uint8_t deadband; + /** + * Below this temperature, correction is disabled. + * offset 4 + */ + int8_t minClt; + /** + * Below this AFR, correction is paused + * offset 5 + */ + uint8_t minAfr; + /** + * Above this AFR, correction is paused + * offset 6 + */ + uint8_t maxAfr; + /** + * Delay after starting the engine before beginning closed loop correction. + * offset 7 + */ + uint8_t startupDelay; + /** + * offset 8 + */ + stft_cell_cfg_s cellCfgs[STFT_CELL_COUNT]; + /** total size 24*/ +}; + +typedef struct stft_s stft_s; + // start of pid_s struct pid_s { /** @@ -1756,7 +1826,11 @@ struct engine_configuration_s { /** * offset 1064 */ - int unusedAtOldBoardConfigurationEnd[100]; + stft_s stft; + /** + * offset 1088 + */ + int unusedAtOldBoardConfigurationEnd[94]; /** offset 1464 bit 0 */ bool vvtDisplayInverted : 1; @@ -3262,4 +3336,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 22:31:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Apr 13 09:22:19 EDT 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 7da6922437..b1d7f113f2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1814,6 +1814,57 @@ #define stepperForceParkingEveryRestart_offset_hex 2e8 #define stepperParkingExtraSteps_offset 818 #define stepperParkingExtraSteps_offset_hex 332 +#define STFT_CELL_COUNT 4 +#define stft_cellCfgs1_maxAdd_offset 1072 +#define stft_cellCfgs1_maxAdd_offset_hex 430 +#define stft_cellCfgs1_maxRemove_offset 1073 +#define stft_cellCfgs1_maxRemove_offset_hex 431 +#define stft_cellCfgs1_offset 1072 +#define stft_cellCfgs1_offset_hex 430 +#define stft_cellCfgs1_timeConstant_offset 1074 +#define stft_cellCfgs1_timeConstant_offset_hex 432 +#define stft_cellCfgs2_maxAdd_offset 1076 +#define stft_cellCfgs2_maxAdd_offset_hex 434 +#define stft_cellCfgs2_maxRemove_offset 1077 +#define stft_cellCfgs2_maxRemove_offset_hex 435 +#define stft_cellCfgs2_offset 1076 +#define stft_cellCfgs2_offset_hex 434 +#define stft_cellCfgs2_timeConstant_offset 1078 +#define stft_cellCfgs2_timeConstant_offset_hex 436 +#define stft_cellCfgs3_maxAdd_offset 1080 +#define stft_cellCfgs3_maxAdd_offset_hex 438 +#define stft_cellCfgs3_maxRemove_offset 1081 +#define stft_cellCfgs3_maxRemove_offset_hex 439 +#define stft_cellCfgs3_offset 1080 +#define stft_cellCfgs3_offset_hex 438 +#define stft_cellCfgs3_timeConstant_offset 1082 +#define stft_cellCfgs3_timeConstant_offset_hex 43a +#define stft_cellCfgs4_maxAdd_offset 1084 +#define stft_cellCfgs4_maxAdd_offset_hex 43c +#define stft_cellCfgs4_maxRemove_offset 1085 +#define stft_cellCfgs4_maxRemove_offset_hex 43d +#define stft_cellCfgs4_offset 1084 +#define stft_cellCfgs4_offset_hex 43c +#define stft_cellCfgs4_timeConstant_offset 1086 +#define stft_cellCfgs4_timeConstant_offset_hex 43e +#define stft_deadband_offset 1067 +#define stft_deadband_offset_hex 42b +#define stft_maxAfr_offset 1070 +#define stft_maxAfr_offset_hex 42e +#define stft_maxIdleRegionRpm_offset 1064 +#define stft_maxIdleRegionRpm_offset_hex 428 +#define stft_maxOverrunLoad_offset 1065 +#define stft_maxOverrunLoad_offset_hex 429 +#define stft_minAfr_offset 1069 +#define stft_minAfr_offset_hex 42d +#define stft_minClt_offset 1068 +#define stft_minClt_offset_hex 42c +#define stft_minPowerLoad_offset 1066 +#define stft_minPowerLoad_offset_hex 42a +#define stft_offset 1064 +#define stft_offset_hex 428 +#define stft_startupDelay_offset 1071 +#define stft_startupDelay_offset_hex 42f #define storageMode_offset 2260 #define storageMode_offset_hex 8d4 #define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" @@ -2114,8 +2165,8 @@ #define unused_former_warmup_target_afr_offset_hex 830 #define unusedAntilagTimeout_offset 820 #define unusedAntilagTimeout_offset_hex 334 -#define unusedAtOldBoardConfigurationEnd_offset 1064 -#define unusedAtOldBoardConfigurationEnd_offset_hex 428 +#define unusedAtOldBoardConfigurationEnd_offset 1088 +#define unusedAtOldBoardConfigurationEnd_offset_hex 440 #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 #define unusedBit_251_10_offset 976 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 1c3caeee84..994d98fca2 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -716,6 +716,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20200412; + return 20200413; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index fc97e267c8..0ea2c3f486 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,9 +1,79 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 22:31:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:02 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #include "rusefi_types.h" +// start of stft_cell_cfg_s +struct stft_cell_cfg_s { + /** + * offset 0 + */ + int8_t maxAdd; + /** + * offset 1 + */ + int8_t maxRemove; + /** + * offset 2 + */ + uint16_t timeConstant; + /** total size 4*/ +}; + +typedef struct stft_cell_cfg_s stft_cell_cfg_s; + +// start of stft_s +struct stft_s { + /** + * Below this RPM, the idle region is active + * offset 0 + */ + uint8_t maxIdleRegionRpm; + /** + * Below this engine load, the overrun region is active + * offset 1 + */ + uint8_t maxOverrunLoad; + /** + * Above this engine load, the power region is active + * offset 2 + */ + uint8_t minPowerLoad; + /** + * When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required. + * offset 3 + */ + uint8_t deadband; + /** + * Below this temperature, correction is disabled. + * offset 4 + */ + int8_t minClt; + /** + * Below this AFR, correction is paused + * offset 5 + */ + uint8_t minAfr; + /** + * Above this AFR, correction is paused + * offset 6 + */ + uint8_t maxAfr; + /** + * Delay after starting the engine before beginning closed loop correction. + * offset 7 + */ + uint8_t startupDelay; + /** + * offset 8 + */ + stft_cell_cfg_s cellCfgs[STFT_CELL_COUNT]; + /** total size 24*/ +}; + +typedef struct stft_s stft_s; + // start of pid_s struct pid_s { /** @@ -1756,7 +1826,11 @@ struct engine_configuration_s { /** * offset 1064 */ - int unusedAtOldBoardConfigurationEnd[100]; + stft_s stft; + /** + * offset 1088 + */ + int unusedAtOldBoardConfigurationEnd[94]; /** offset 1464 bit 0 */ bool vvtDisplayInverted : 1; @@ -3262,4 +3336,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 22:31:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:02 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f4d6475875..8c099f5c34 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1814,6 +1814,57 @@ #define stepperForceParkingEveryRestart_offset_hex 2e8 #define stepperParkingExtraSteps_offset 818 #define stepperParkingExtraSteps_offset_hex 332 +#define STFT_CELL_COUNT 4 +#define stft_cellCfgs1_maxAdd_offset 1072 +#define stft_cellCfgs1_maxAdd_offset_hex 430 +#define stft_cellCfgs1_maxRemove_offset 1073 +#define stft_cellCfgs1_maxRemove_offset_hex 431 +#define stft_cellCfgs1_offset 1072 +#define stft_cellCfgs1_offset_hex 430 +#define stft_cellCfgs1_timeConstant_offset 1074 +#define stft_cellCfgs1_timeConstant_offset_hex 432 +#define stft_cellCfgs2_maxAdd_offset 1076 +#define stft_cellCfgs2_maxAdd_offset_hex 434 +#define stft_cellCfgs2_maxRemove_offset 1077 +#define stft_cellCfgs2_maxRemove_offset_hex 435 +#define stft_cellCfgs2_offset 1076 +#define stft_cellCfgs2_offset_hex 434 +#define stft_cellCfgs2_timeConstant_offset 1078 +#define stft_cellCfgs2_timeConstant_offset_hex 436 +#define stft_cellCfgs3_maxAdd_offset 1080 +#define stft_cellCfgs3_maxAdd_offset_hex 438 +#define stft_cellCfgs3_maxRemove_offset 1081 +#define stft_cellCfgs3_maxRemove_offset_hex 439 +#define stft_cellCfgs3_offset 1080 +#define stft_cellCfgs3_offset_hex 438 +#define stft_cellCfgs3_timeConstant_offset 1082 +#define stft_cellCfgs3_timeConstant_offset_hex 43a +#define stft_cellCfgs4_maxAdd_offset 1084 +#define stft_cellCfgs4_maxAdd_offset_hex 43c +#define stft_cellCfgs4_maxRemove_offset 1085 +#define stft_cellCfgs4_maxRemove_offset_hex 43d +#define stft_cellCfgs4_offset 1084 +#define stft_cellCfgs4_offset_hex 43c +#define stft_cellCfgs4_timeConstant_offset 1086 +#define stft_cellCfgs4_timeConstant_offset_hex 43e +#define stft_deadband_offset 1067 +#define stft_deadband_offset_hex 42b +#define stft_maxAfr_offset 1070 +#define stft_maxAfr_offset_hex 42e +#define stft_maxIdleRegionRpm_offset 1064 +#define stft_maxIdleRegionRpm_offset_hex 428 +#define stft_maxOverrunLoad_offset 1065 +#define stft_maxOverrunLoad_offset_hex 429 +#define stft_minAfr_offset 1069 +#define stft_minAfr_offset_hex 42d +#define stft_minClt_offset 1068 +#define stft_minClt_offset_hex 42c +#define stft_minPowerLoad_offset 1066 +#define stft_minPowerLoad_offset_hex 42a +#define stft_offset 1064 +#define stft_offset_hex 428 +#define stft_startupDelay_offset 1071 +#define stft_startupDelay_offset_hex 42f #define storageMode_offset 2260 #define storageMode_offset_hex 8d4 #define switch_input_pin_e_enum "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","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2114,8 +2165,8 @@ #define unused_former_warmup_target_afr_offset_hex 830 #define unusedAntilagTimeout_offset 820 #define unusedAntilagTimeout_offset_hex 334 -#define unusedAtOldBoardConfigurationEnd_offset 1064 -#define unusedAtOldBoardConfigurationEnd_offset_hex 428 +#define unusedAtOldBoardConfigurationEnd_offset 1088 +#define unusedAtOldBoardConfigurationEnd_offset_hex 440 #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 #define unusedBit_251_10_offset 976 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3fb266e6a4..9a8ad17d89 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -86,7 +86,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.bat integration\rusefi_config.txt Sun Apr 12 23:50:33 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:02 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 32f5e1d703..2c3553548b 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -86,7 +86,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.bat integration\rusefi_config.txt Sun Apr 12 23:50:39 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:09 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index ab1cd0b273..554f95db93 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -86,7 +86,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 kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 12 19:03:57 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Mon Apr 13 09:22:19 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" @@ -1253,6 +1281,8 @@ page = 1 dataReadCommand = "L" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } + ; each packet is 2 and we have 1000 of those + dataLength = 2000 ; recordDef = headerLen, footerLen, recordLen recordDef = 0, 0, 2 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 6bbcd5a8a8..63c5c6f20b 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -86,7 +86,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.bat integration\rusefi_config.txt Sun Apr 12 23:50:36 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:05 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 69b589975f..b4a5346ba7 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -86,7 +86,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.bat integration\rusefi_config.txt Sun Apr 12 23:50:43 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:13 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 9965cca7c9..e33f5332d3 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -86,7 +86,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.bat integration\rusefi_config.txt Sun Apr 12 23:50:46 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:16 EDT 2020 pageSize = 20000 page = 1 @@ -601,7 +601,27 @@ page = 1 ;no TS info - skipping launchAdvanceRpmRange offset 1052 ;no TS info - skipping launchTpsTreshold offset 1056 ;no TS info - skipping launchActivateDelay offset 1060 -;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1064 + stft_maxIdleRegionRpm = scalar, U08, 1064, "RPM", 50, 0, 0.0, 12000.0, 0 + stft_maxOverrunLoad = scalar, U08, 1065, "load", 1, 0, 0.0, 250, 0 + stft_minPowerLoad = scalar, U08, 1066, "load", 1, 0, 0.0, 250, 0 + stft_deadband = scalar, U08, 1067, "%", 0.1, 0, 0, 3, 1 + stft_minClt = scalar, S08, 1068, "C", 1, 0, -20, 100, 0 + stft_minAfr = scalar, U08, 1069, "afr", 0.1, 0, 10, 20, 1 + stft_maxAfr = scalar, U08, 1070, "afr", 0.1, 0, 10, 20, 1 + stft_startupDelay = scalar, U08, 1071, "seconds", 1, 0, 0, 250, 0 + stft_cellCfgs1_maxAdd = scalar, S08, 1072, "%", 1, 0, 0, 25, 0 + stft_cellCfgs1_maxRemove = scalar, S08, 1073, "%", 1, 0, -25, 0, 0 + stft_cellCfgs1_timeConstant = scalar, U16, 1074, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs2_maxAdd = scalar, S08, 1076, "%", 1, 0, 0, 25, 0 + stft_cellCfgs2_maxRemove = scalar, S08, 1077, "%", 1, 0, -25, 0, 0 + stft_cellCfgs2_timeConstant = scalar, U16, 1078, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs3_maxAdd = scalar, S08, 1080, "%", 1, 0, 0, 25, 0 + stft_cellCfgs3_maxRemove = scalar, S08, 1081, "%", 1, 0, -25, 0, 0 + stft_cellCfgs3_timeConstant = scalar, U16, 1082, "sec", 0.1, 0, 0.1, 100, 2 + stft_cellCfgs4_maxAdd = scalar, S08, 1084, "%", 1, 0, 0, 25, 0 + stft_cellCfgs4_maxRemove = scalar, S08, 1085, "%", 1, 0, -25, 0, 0 + stft_cellCfgs4_timeConstant = scalar, U16, 1086, "sec", 0.1, 0, 0.1, 100, 2 +;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1088 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -1157,6 +1177,14 @@ page = 1 launchFuelAdded = "Extra Fuel Added" launchBoostDuty = "Duty Cycle for the Boost Solenoid" hardCutRpmRange = "RPM Range for Hard Cut" + stft_maxIdleRegionRpm = "Below this RPM, the idle region is active" + stft_maxOverrunLoad = "Below this engine load, the overrun region is active" + stft_minPowerLoad = "Above this engine load, the power region is active" + stft_deadband = "When close to correct AFR, pause correction. This can improve stability by not changing the adjustment if the error is extremely small, but is not required." + stft_minClt = "Below this temperature, correction is disabled." + stft_minAfr = "Below this AFR, correction is paused" + stft_maxAfr = "Above this AFR, correction is paused" + stft_startupDelay = "Delay after starting the engine before beginning closed loop correction." fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console" isVerboseETB = "Prints ETB details to rusEFI console" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 22a837d384..c0a9f96ba2 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/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.bat integration\rusefi_config.txt Sun Apr 12 23:47:17 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Apr 13 09:22:02 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1197,6 +1197,46 @@ public class Fields { public static final int stepperForceParkingEveryRestart_offset = 744; public static final int stepperParkingExtraSteps_offset = 818; public static final int stepperParkingExtraSteps_offset_hex = 332; + public static final int STFT_CELL_COUNT = 4; + public static final int stft_cellCfgs1_maxAdd_offset = 1072; + public static final int stft_cellCfgs1_maxAdd_offset_hex = 430; + public static final int stft_cellCfgs1_maxRemove_offset = 1073; + public static final int stft_cellCfgs1_maxRemove_offset_hex = 431; + public static final int stft_cellCfgs1_offset = 1072; + public static final int stft_cellCfgs1_offset_hex = 430; + public static final int stft_cellCfgs1_timeConstant_offset = 1074; + public static final int stft_cellCfgs1_timeConstant_offset_hex = 432; + public static final int stft_cellCfgs2_maxAdd_offset = 1076; + public static final int stft_cellCfgs2_maxAdd_offset_hex = 434; + public static final int stft_cellCfgs2_maxRemove_offset = 1077; + public static final int stft_cellCfgs2_maxRemove_offset_hex = 435; + public static final int stft_cellCfgs2_offset = 1076; + public static final int stft_cellCfgs2_offset_hex = 434; + public static final int stft_cellCfgs2_timeConstant_offset = 1078; + public static final int stft_cellCfgs2_timeConstant_offset_hex = 436; + public static final int stft_cellCfgs3_maxAdd_offset = 1080; + public static final int stft_cellCfgs3_maxAdd_offset_hex = 438; + public static final int stft_cellCfgs3_maxRemove_offset = 1081; + public static final int stft_cellCfgs3_maxRemove_offset_hex = 439; + public static final int stft_cellCfgs3_offset = 1080; + public static final int stft_cellCfgs3_offset_hex = 438; + public static final int stft_cellCfgs3_timeConstant_offset = 1082; + public static final int stft_cellCfgs4_maxAdd_offset = 1084; + public static final int stft_cellCfgs4_maxRemove_offset = 1085; + public static final int stft_cellCfgs4_offset = 1084; + public static final int stft_cellCfgs4_timeConstant_offset = 1086; + public static final int stft_deadband_offset = 1067; + public static final int stft_maxAfr_offset = 1070; + public static final int stft_maxIdleRegionRpm_offset = 1064; + public static final int stft_maxIdleRegionRpm_offset_hex = 428; + public static final int stft_maxOverrunLoad_offset = 1065; + public static final int stft_maxOverrunLoad_offset_hex = 429; + public static final int stft_minAfr_offset = 1069; + public static final int stft_minClt_offset = 1068; + public static final int stft_minPowerLoad_offset = 1066; + public static final int stft_offset = 1064; + public static final int stft_offset_hex = 428; + public static final int stft_startupDelay_offset = 1071; public static final int storageMode_offset = 2260; public static final int tachOutputPin_offset = 704; public static final int tachOutputPinMode_offset = 705; @@ -1395,8 +1435,8 @@ public class Fields { public static final int unused_former_warmup_target_afr_offset_hex = 830; public static final int unusedAntilagTimeout_offset = 820; public static final int unusedAntilagTimeout_offset_hex = 334; - public static final int unusedAtOldBoardConfigurationEnd_offset = 1064; - public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 428; + public static final int unusedAtOldBoardConfigurationEnd_offset = 1088; + public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 440; public static final int unusedBit4_1476_offset = 1476; public static final int unusedBit_251_10_offset = 976; public static final int unusedBit_251_11_offset = 976; @@ -2012,6 +2052,26 @@ public class Fields { public static final Field LAUNCHADVANCERPMRANGE = Field.create("LAUNCHADVANCERPMRANGE", 1052, FieldType.INT); public static final Field LAUNCHTPSTRESHOLD = Field.create("LAUNCHTPSTRESHOLD", 1056, FieldType.INT); public static final Field LAUNCHACTIVATEDELAY = Field.create("LAUNCHACTIVATEDELAY", 1060, FieldType.FLOAT); + public static final Field STFT_MAXIDLEREGIONRPM = Field.create("STFT_MAXIDLEREGIONRPM", 1064, FieldType.INT8); + public static final Field STFT_MAXOVERRUNLOAD = Field.create("STFT_MAXOVERRUNLOAD", 1065, FieldType.INT8); + public static final Field STFT_MINPOWERLOAD = Field.create("STFT_MINPOWERLOAD", 1066, FieldType.INT8); + public static final Field STFT_DEADBAND = Field.create("STFT_DEADBAND", 1067, FieldType.INT8); + public static final Field STFT_MINCLT = Field.create("STFT_MINCLT", 1068, FieldType.INT8); + public static final Field STFT_MINAFR = Field.create("STFT_MINAFR", 1069, FieldType.INT8); + public static final Field STFT_MAXAFR = Field.create("STFT_MAXAFR", 1070, FieldType.INT8); + public static final Field STFT_STARTUPDELAY = Field.create("STFT_STARTUPDELAY", 1071, FieldType.INT8); + public static final Field STFT_CELLCFGS1_MAXADD = Field.create("STFT_CELLCFGS1_MAXADD", 1072, FieldType.INT8); + public static final Field STFT_CELLCFGS1_MAXREMOVE = Field.create("STFT_CELLCFGS1_MAXREMOVE", 1073, FieldType.INT8); + public static final Field STFT_CELLCFGS1_TIMECONSTANT = Field.create("STFT_CELLCFGS1_TIMECONSTANT", 1074, FieldType.INT16); + public static final Field STFT_CELLCFGS2_MAXADD = Field.create("STFT_CELLCFGS2_MAXADD", 1076, FieldType.INT8); + public static final Field STFT_CELLCFGS2_MAXREMOVE = Field.create("STFT_CELLCFGS2_MAXREMOVE", 1077, FieldType.INT8); + public static final Field STFT_CELLCFGS2_TIMECONSTANT = Field.create("STFT_CELLCFGS2_TIMECONSTANT", 1078, FieldType.INT16); + public static final Field STFT_CELLCFGS3_MAXADD = Field.create("STFT_CELLCFGS3_MAXADD", 1080, FieldType.INT8); + public static final Field STFT_CELLCFGS3_MAXREMOVE = Field.create("STFT_CELLCFGS3_MAXREMOVE", 1081, FieldType.INT8); + public static final Field STFT_CELLCFGS3_TIMECONSTANT = Field.create("STFT_CELLCFGS3_TIMECONSTANT", 1082, FieldType.INT16); + public static final Field STFT_CELLCFGS4_MAXADD = Field.create("STFT_CELLCFGS4_MAXADD", 1084, FieldType.INT8); + public static final Field STFT_CELLCFGS4_MAXREMOVE = Field.create("STFT_CELLCFGS4_MAXREMOVE", 1085, FieldType.INT8); + public static final Field STFT_CELLCFGS4_TIMECONSTANT = Field.create("STFT_CELLCFGS4_TIMECONSTANT", 1086, FieldType.INT16); public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); @@ -2914,6 +2974,26 @@ public class Fields { LAUNCHADVANCERPMRANGE, LAUNCHTPSTRESHOLD, LAUNCHACTIVATEDELAY, + STFT_MAXIDLEREGIONRPM, + STFT_MAXOVERRUNLOAD, + STFT_MINPOWERLOAD, + STFT_DEADBAND, + STFT_MINCLT, + STFT_MINAFR, + STFT_MAXAFR, + STFT_STARTUPDELAY, + STFT_CELLCFGS1_MAXADD, + STFT_CELLCFGS1_MAXREMOVE, + STFT_CELLCFGS1_TIMECONSTANT, + STFT_CELLCFGS2_MAXADD, + STFT_CELLCFGS2_MAXREMOVE, + STFT_CELLCFGS2_TIMECONSTANT, + STFT_CELLCFGS3_MAXADD, + STFT_CELLCFGS3_MAXREMOVE, + STFT_CELLCFGS3_TIMECONSTANT, + STFT_CELLCFGS4_MAXADD, + STFT_CELLCFGS4_MAXREMOVE, + STFT_CELLCFGS4_TIMECONSTANT, VVTDISPLAYINVERTED, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC,