From 589feb951fcb6b71576379555f91374f75e74f41 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 6 May 2020 08:49:08 -0400 Subject: [PATCH] Fresh generated - auto --- ...ngine_configuration_generated_structures.h | 6 +++--- .../controllers/algo/rusefi_generated.h | 4 ++-- ...ngine_configuration_generated_structures.h | 6 +++--- .../controllers/generated/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 21 ++++++++++++------- firmware/tunerstudio/rusefi_frankenso.ini | 21 ++++++++++++------- firmware/tunerstudio/rusefi_kinetis.ini | 21 ++++++++++++------- firmware/tunerstudio/rusefi_microrusefi.ini | 21 ++++++++++++------- firmware/tunerstudio/rusefi_prometheus.ini | 21 ++++++++++++------- firmware/tunerstudio/rusefi_proteus.ini | 21 ++++++++++++------- .../com/rusefi/config/generated/Fields.java | 4 ++-- 11 files changed, 96 insertions(+), 54 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 14d322aef0..a6954b9eba 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 May 05 15:37:36 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 06 08:47:26 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3170,7 +3170,7 @@ struct persistent_config_s { /** * offset 6312 */ - uint8_t boostMapBins[BOOST_LOAD_COUNT]; + uint8_t unused6312[8]; /** * offset 6320 */ @@ -3435,4 +3435,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 May 05 15:37:36 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 06 08:47:26 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 7a91adffef..615eaa0dfb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -291,8 +291,6 @@ #define boostControlPinMode_offset_hex 3dd #define boostCutPressure_offset 2132 #define boostCutPressure_offset_hex 854 -#define boostMapBins_offset 6312 -#define boostMapBins_offset_hex 18a8 #define boostPid_dFactor_offset 1000 #define boostPid_dFactor_offset_hex 3e8 #define boostPid_iFactor_offset 996 @@ -2265,6 +2263,8 @@ #define unused1476b20_offset_hex 5c4 #define unused2432_offset 2432 #define unused2432_offset_hex 980 +#define unused6312_offset 6312 +#define unused6312_offset_hex 18a8 #define unused711_offset 711 #define unused711_offset_hex 2c7 #define unused76b0_offset 76 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index ebb1195798..9ebb97f957 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 May 05 15:37:25 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:44:47 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3170,7 +3170,7 @@ struct persistent_config_s { /** * offset 6312 */ - uint8_t boostMapBins[BOOST_LOAD_COUNT]; + uint8_t unused6312[8]; /** * offset 6320 */ @@ -3435,4 +3435,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 May 05 15:37:25 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:44:47 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 945fa38bc8..154292e22a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -291,8 +291,6 @@ #define boostControlPinMode_offset_hex 3dd #define boostCutPressure_offset 2132 #define boostCutPressure_offset_hex 854 -#define boostMapBins_offset 6312 -#define boostMapBins_offset_hex 18a8 #define boostPid_dFactor_offset 1000 #define boostPid_dFactor_offset_hex 3e8 #define boostPid_iFactor_offset 996 @@ -2265,6 +2263,8 @@ #define unused1476b20_offset_hex 5c4 #define unused2432_offset 2432 #define unused2432_offset_hex 980 +#define unused6312_offset 6312 +#define unused6312_offset_hex 18a8 #define unused711_offset 711 #define unused711_offset_hex 2c7 #define unused76b0_offset 76 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 0da3657ab8..f121d88f6b 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 May 05 15:37:25 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:44:47 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2736,7 +2740,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2752,6 +2755,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4077,11 +4081,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index a1cc78e25d..2a0c754b08 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 May 05 15:37:30 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:46:32 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2736,7 +2740,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2752,6 +2755,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4077,11 +4081,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index af8081109b..b97f8ce0a2 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 May 05 16:59:18 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 06 08:47:26 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2736,7 +2740,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2752,6 +2755,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4078,11 +4082,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 3bf7b4684e..e0508e09bc 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 May 05 15:37:28 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:45:50 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2727,7 +2731,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2743,6 +2746,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4036,11 +4040,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 64a2bedd49..375913ffc0 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 May 05 15:37:32 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:47:16 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2732,7 +2736,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2748,6 +2751,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4073,11 +4077,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index f755e740c5..a90fdc33a3 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 May 05 15:37:34 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:47:19 EDT 2020 pageSize = 20000 page = 1 @@ -1096,7 +1096,7 @@ page = 1 afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 - boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 +;no TS info - skipping unused6312 offset 6312 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0 boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2 @@ -1662,6 +1662,10 @@ fileVersion = { 20200310 } maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax } maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin } + maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor } + maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor } + maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor } + requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -1990,7 +1994,7 @@ fileVersion = { 20200310 } table = boostTableTbl, boostMapOpen, "", 1 xBins = boostRpmBins, RPMValue - yBins = boostMapBins, MAPValue + yBins = boostTpsBins, TPSValue zBins = boostTableOpenLoop table = boostTable2Tbl, boostMapClosed, "", 1 @@ -2727,7 +2731,6 @@ cmd_test_inj14 = "w\x00\x13\x00\x0e" cmd_test_inj15 = "w\x00\x13\x00\x0f" cmd_test_inj16 = "w\x00\x13\x00\x10" -; cmd_test_fuel_pump = "w\x00\x14\x00\x01" cmd_calibrate_tps_1_closed = "w\x00\x14\x00\x02" cmd_calibrate_tps_1_wot = "w\x00\x14\x00\x03" @@ -2743,6 +2746,7 @@ 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_disable_self_stim = "w\x00\x14\x00\x0F" +cmd_etb_autotune_stop = "w\x00\x14\x00\x10" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4044,11 +4048,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || useStepperIdle && useHbridges } dialog = etbAutotune, "PID Autotune" - field = "!Set debug mode below to 'ETB Autotune' to show results" - field = "Debug mode", debugMode - commandButton = "ETB PID Autotune", cmd_etb_autotune + commandButton = "Start ETB PID Autotune", cmd_etb_autotune + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop + commandButton = "Auto Calibrate TPS", cmb_etb_auto_calibrate + field = "!Set debug mode below to 'ETB Autotune' to show more detail" + field = "Debug mode", debugMode + dialog = etbDialogRight panel = etbIdleDialog panel = etbPidDialog 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 90f992e067..b3b1391ad3 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 Tue May 05 15:37:25 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 08:44:47 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -186,7 +186,6 @@ public class Fields { public static final int boostControlPinMode_offset = 989; public static final int boostCutPressure_offset = 2132; public static final int boostCutPressure_offset_hex = 854; - public static final int boostMapBins_offset = 6312; public static final int boostPid_dFactor_offset = 1000; public static final int boostPid_iFactor_offset = 996; public static final int boostPid_maxValue_offset = 1010; @@ -1525,6 +1524,7 @@ public class Fields { 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 unused6312_offset = 6312; public static final int unused711_offset = 711; public static final int unused76b0_offset = 76; public static final int unused806_offset = 806;