From 972523c46652366b8516bfc116cc76e9d7af43fa Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 28 Apr 2020 20:12:34 -0400 Subject: [PATCH] Fresh generated - auto --- .../algo/engine_configuration_generated_structures.h | 6 +++--- .../kinetis/config/controllers/algo/rusefi_generated.h | 4 ++-- .../engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 9 ++++++--- firmware/tunerstudio/rusefi_frankenso.ini | 9 ++++++--- firmware/tunerstudio/rusefi_kinetis.ini | 9 ++++++--- firmware/tunerstudio/rusefi_microrusefi.ini | 9 ++++++--- firmware/tunerstudio/rusefi_prometheus.ini | 9 ++++++--- firmware/tunerstudio/rusefi_proteus.ini | 9 ++++++--- .../models/src/com/rusefi/config/generated/Fields.java | 8 ++++---- 11 files changed, 50 insertions(+), 32 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 c15da14a31..54e6fd9df3 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 kineris_gen_config.bat integration/rusefi_config.txt Tue Apr 28 17:06:23 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue Apr 28 20:11:11 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2103,7 +2103,7 @@ struct engine_configuration_s { bool useTPSAdvanceTable : 1; /** offset 1476 bit 20 */ - bool etbCalibrationOnStart : 1; + bool unused1476b20 : 1; /** * This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller offset 1476 bit 21 */ @@ -3415,4 +3415,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue Apr 28 17:06:23 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue Apr 28 20:11:11 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 e9d460da5a..79d09fd05c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -603,8 +603,6 @@ #define etbBiasBins_offset_hex f30 #define etbBiasValues_offset 3920 #define etbBiasValues_offset_hex f50 -#define etbCalibrationOnStart_offset 1476 -#define etbCalibrationOnStart_offset_hex 5c4 #define etbDeadband_offset 3960 #define etbDeadband_offset_hex f78 #define etbFreq_offset 2514 @@ -2254,6 +2252,8 @@ #define uartConsoleSerialSpeed_offset_hex 81c #define unused1059_offset 3964 #define unused1059_offset_hex f7c +#define unused1476b20_offset 1476 +#define unused1476b20_offset_hex 5c4 #define unused2432_offset 2432 #define unused2432_offset_hex 980 #define unused711_offset 711 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 27569c5d0a..9ba255f215 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.bat integration\rusefi_config.txt Tue Apr 28 17:06:01 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:00 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2103,7 +2103,7 @@ struct engine_configuration_s { bool useTPSAdvanceTable : 1; /** offset 1476 bit 20 */ - bool etbCalibrationOnStart : 1; + bool unused1476b20 : 1; /** * This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller offset 1476 bit 21 */ @@ -3415,4 +3415,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 17:06:01 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:00 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a126f01fe7..4567df124a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -603,8 +603,6 @@ #define etbBiasBins_offset_hex f30 #define etbBiasValues_offset 3920 #define etbBiasValues_offset_hex f50 -#define etbCalibrationOnStart_offset 1476 -#define etbCalibrationOnStart_offset_hex 5c4 #define etbDeadband_offset 3960 #define etbDeadband_offset_hex f78 #define etbFreq_offset 2514 @@ -2254,6 +2252,8 @@ #define uartConsoleSerialSpeed_offset_hex 81c #define unused1059_offset 3964 #define unused1059_offset_hex f7c +#define unused1476b20_offset 1476 +#define unused1476b20_offset_hex 5c4 #define unused2432_offset 2432 #define unused2432_offset_hex 980 #define unused711_offset 711 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 7b68bd41fb..825bc57835 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -89,7 +89,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 Tue Apr 28 17:06:01 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:00 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2734,6 +2736,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4027,7 +4030,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -4036,6 +4038,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index dd9b51d8a0..3194a9297a 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -89,7 +89,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 Tue Apr 28 17:06:18 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:05 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2734,6 +2736,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4027,7 +4030,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -4036,6 +4038,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 1dc73619cd..3068f7b140 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -89,7 +89,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 Tue Apr 28 17:06:23 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue Apr 28 20:11:11 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2734,6 +2736,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4028,7 +4031,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -4037,6 +4039,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index f5fb0ab068..f8fe7627c8 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -89,7 +89,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 Tue Apr 28 17:06:16 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:03 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2726,6 +2728,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -3987,7 +3990,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -3996,6 +3998,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 721cdc990f..b866aeb760 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -89,7 +89,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 Tue Apr 28 17:06:20 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:29 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2730,6 +2732,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4023,7 +4026,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -4032,6 +4034,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 8a187f2e26..ea0e0a1690 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -89,7 +89,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 Tue Apr 28 17:06:21 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:49 EDT 2020 pageSize = 20000 page = 1 @@ -683,7 +683,7 @@ page = 1 useSeparateAdvanceForCranking= bits, U32, 1476, [17:17], "false", "true" useAdvanceCorrectionsForCranking= bits, U32, 1476, [18:18], "false", "true" useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true" - etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true" + unused1476b20 = bits, U32, 1476, [20:20], "false", "true" useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true" isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true" launchSmoothRetard = bits, U32, 1476, [23:23], "false", "true" @@ -1646,6 +1646,8 @@ fileVersion = { 20200310 } ; defaultValue = constantName, value; defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 + maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } + maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin @@ -2726,6 +2728,7 @@ cmd_write_config = "w\x00\x14\x00\x0A" cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" +cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -3995,7 +3998,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "https://rusefi.com/s/etb" field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl - field = etbCalibrationOnStart, etbCalibrationOnStart ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } @@ -4004,6 +4006,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Set debug mode below to 'ETB Autotune' to show results" field = "Debug mode", debugMode commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate dialog = etbDialogRight panel = etbIdleDialog 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 8e48f99da6..6d14357adb 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 26 14:16:11 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:00 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -392,7 +392,6 @@ public class Fields { public static final int etb_use_two_wires_offset = 76; public static final int etbBiasBins_offset = 3888; public static final int etbBiasValues_offset = 3920; - public static final int etbCalibrationOnStart_offset = 1476; public static final int etbDeadband_offset = 3960; public static final int etbFreq_offset = 2514; public static final int etbIdleThrottleRange_offset = 4012; @@ -1503,6 +1502,7 @@ public class Fields { public static final int twoWireBatchInjection_offset = 1476; public static final int uartConsoleSerialSpeed_offset = 2076; public static final int unused1059_offset = 3964; + public static final int unused1476b20_offset = 1476; public static final int unused2432_offset = 2432; public static final int unused2432_offset_hex = 980; public static final int unused711_offset = 711; @@ -2211,7 +2211,7 @@ public class Fields { public static final Field USESEPARATEADVANCEFORCRANKING = Field.create("USESEPARATEADVANCEFORCRANKING", 1476, FieldType.BIT, 17); public static final Field USEADVANCECORRECTIONSFORCRANKING = Field.create("USEADVANCECORRECTIONSFORCRANKING", 1476, FieldType.BIT, 18); public static final Field USETPSADVANCETABLE = Field.create("USETPSADVANCETABLE", 1476, FieldType.BIT, 19); - public static final Field ETBCALIBRATIONONSTART = Field.create("ETBCALIBRATIONONSTART", 1476, FieldType.BIT, 20); + public static final Field UNUSED1476B20 = Field.create("UNUSED1476B20", 1476, FieldType.BIT, 20); public static final Field USEIACPIDMULTTABLE = Field.create("USEIACPIDMULTTABLE", 1476, FieldType.BIT, 21); public static final Field ISBOOSTCONTROLENABLED = Field.create("ISBOOSTCONTROLENABLED", 1476, FieldType.BIT, 22); public static final Field LAUNCHSMOOTHRETARD = Field.create("LAUNCHSMOOTHRETARD", 1476, FieldType.BIT, 23); @@ -3168,7 +3168,7 @@ public class Fields { USESEPARATEADVANCEFORCRANKING, USEADVANCECORRECTIONSFORCRANKING, USETPSADVANCETABLE, - ETBCALIBRATIONONSTART, + UNUSED1476B20, USEIACPIDMULTTABLE, ISBOOSTCONTROLENABLED, LAUNCHSMOOTHRETARD,