From a1788c154532b2246f340cf8015896a5239a71ba Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 15 Apr 2020 18:24:26 -0400 Subject: [PATCH] fresh for ETB and engine sniffer usability idea --- .../engine_configuration_generated_structures.h | 6 +++--- .../config/controllers/algo/rusefi_generated.h | 4 ++-- .../engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 7 +++++-- firmware/tunerstudio/rusefi.input | 1 + firmware/tunerstudio/rusefi_frankenso.ini | 7 +++++-- firmware/tunerstudio/rusefi_kinetis.ini | 14 +++++++++----- firmware/tunerstudio/rusefi_microrusefi.ini | 7 +++++-- firmware/tunerstudio/rusefi_prometheus.ini | 7 +++++-- firmware/tunerstudio/rusefi_proteus.ini | 7 +++++-- .../src/com/rusefi/config/generated/Fields.java | 8 ++++---- 13 files changed, 50 insertions(+), 30 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 593c65bdd3..6b46b30d4c 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 Mon Apr 13 18:54:34 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 18:17:28 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -672,7 +672,7 @@ struct engine_configuration_s { bool useRunningMathForCranking : 1; /** offset 76 bit 24 */ - bool issue_294_25 : 1; + bool displayLogicLevelsInEngineSniffer : 1; /** offset 76 bit 25 */ bool issue_294_26 : 1; @@ -3336,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 kineris_gen_config.bat integration/rusefi_config.txt Mon Apr 13 18:54:34 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 18:17:28 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 c49c0f2081..ac6dfac471 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -525,6 +525,8 @@ #define directSelfStimulation_offset_hex 4c #define displacement_offset 396 #define displacement_offset_hex 18c +#define displayLogicLevelsInEngineSniffer_offset 76 +#define displayLogicLevelsInEngineSniffer_offset_hex 4c #define displayMode_offset 492 #define displayMode_offset_hex 1ec #define dizzySparkOutputPin_offset 2226 @@ -1375,8 +1377,6 @@ #define isMapAveragingEnabled_offset_hex 5c4 #define isSdCardEnabled_offset 744 #define isSdCardEnabled_offset_hex 2e8 -#define issue_294_25_offset 76 -#define issue_294_25_offset_hex 4c #define issue_294_26_offset 76 #define issue_294_26_offset_hex 4c #define issue_294_27_offset 76 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index e48567c514..d4e6ee9338 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 Mon Apr 13 18:54:18 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:17:04 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -672,7 +672,7 @@ struct engine_configuration_s { bool useRunningMathForCranking : 1; /** offset 76 bit 24 */ - bool issue_294_25 : 1; + bool displayLogicLevelsInEngineSniffer : 1; /** offset 76 bit 25 */ bool issue_294_26 : 1; @@ -3336,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 gen_config.bat integration\rusefi_config.txt Mon Apr 13 18:54:18 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:17:04 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0eb4ae5496..6109d77294 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -525,6 +525,8 @@ #define directSelfStimulation_offset_hex 4c #define displacement_offset 396 #define displacement_offset_hex 18c +#define displayLogicLevelsInEngineSniffer_offset 76 +#define displayLogicLevelsInEngineSniffer_offset_hex 4c #define displayMode_offset 492 #define displayMode_offset_hex 1ec #define dizzySparkOutputPin_offset 2226 @@ -1375,8 +1377,6 @@ #define isMapAveragingEnabled_offset_hex 5c4 #define isSdCardEnabled_offset 744 #define isSdCardEnabled_offset_hex 2e8 -#define issue_294_25_offset 76 -#define issue_294_25_offset_hex 4c #define issue_294_26_offset 76 #define issue_294_26_offset_hex 4c #define issue_294_27_offset 76 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f9c58ef7ce..185035d2c1 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -373,7 +373,7 @@ bit launchControlEnabled; bit rollingLaunchEnabled; bit antiLagEnabled; bit useRunningMathForCranking,Fuel Map,Fixed; -bit issue_294_25; +bit displayLogicLevelsInEngineSniffer; bit issue_294_26; bit issue_294_27; bit issue_294_28; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index d4cbdad003..c099704909 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 Tue Apr 14 19:06:04 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:23:16 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2606,6 +2606,7 @@ cmd_tle8888_init = "w\x00\x14\x00\x08" cmd_test_ac_relay = "w\x00\x14\x00\x09" 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_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -2743,6 +2744,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -3893,6 +3895,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "TPS#2 wide open position", cmd_calibrate_tps_2_wot commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down + commandButton = "ETB PID Autotune", cmd_etb_autotune dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index b3b8a6b652..d5b2cea988 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1578,6 +1578,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 1d94e59018..e299b9d79e 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 Tue Apr 14 19:06:11 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:23:26 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2606,6 +2606,7 @@ cmd_tle8888_init = "w\x00\x14\x00\x08" cmd_test_ac_relay = "w\x00\x14\x00\x09" 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_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -2743,6 +2744,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -3893,6 +3895,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "TPS#2 wide open position", cmd_calibrate_tps_2_wot commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down + commandButton = "ETB PID Autotune", cmd_etb_autotune dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 625f42d889..2f79e9785f 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 Mon Apr 13 20:23:18 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 18:17:28 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2374,14 +2374,14 @@ menuDialog = main subMenu = std_separator # Targets & closed loop - subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = afrTableTbl, "Target AFR", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)} subMenu = fuelClosedLoopDialog, "Closed loop correction", 0, {isInjectionEnabled == 1} subMenu = coastingFuelCutControl, "Deceleration fuel cutoff (DFCO)", 0, {isInjectionEnabled == 1} subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} - subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} + subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && (fuelAlgorithm == LM_SPEED_DENSITY || fuelAlgorithm == LM_REAL_MAF)} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2743,6 +2743,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -2937,6 +2938,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = mc33816_cs, mc33816_cs field = mc33816_rstb, mc33816_rstb field = mc33816_flag0, mc33816_flag0 + field = "trigger stimulator pin #1", triggerSimulatorPins1 + field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator pin #2", triggerSimulatorPins3 field = high_fuel_pressure_sensor_1, high_fuel_pressure_sensor_1 field = high_fuel_pressure_sensor_2, high_fuel_pressure_sensor_2 field = mc33816_driven, mc33816_driven diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 1415b0fb6f..b07f68f04f 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 Tue Apr 14 19:06:08 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:23:21 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2598,6 +2598,7 @@ cmd_tle8888_init = "w\x00\x14\x00\x08" cmd_test_ac_relay = "w\x00\x14\x00\x09" 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_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -2735,6 +2736,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -3853,6 +3855,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "TPS#2 wide open position", cmd_calibrate_tps_2_wot commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down + commandButton = "ETB PID Autotune", cmd_etb_autotune dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index a79d341f23..3296b86df0 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 Tue Apr 14 19:06:14 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:23:31 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2602,6 +2602,7 @@ cmd_tle8888_init = "w\x00\x14\x00\x08" cmd_test_ac_relay = "w\x00\x14\x00\x09" 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_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -2739,6 +2740,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -3889,6 +3891,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "TPS#2 wide open position", cmd_calibrate_tps_2_wot commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down + commandButton = "ETB PID Autotune", cmd_etb_autotune dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 384221faa0..e010104ded 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 Tue Apr 14 19:06:17 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:23:35 EDT 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 rollingLaunchEnabled = bits, U32, 76, [21:21], "false", "true" antiLagEnabled = bits, U32, 76, [22:22], "false", "true" useRunningMathForCranking= bits, U32, 76, [23:23], "Fixed", "Fuel Map" - issue_294_25 = bits, U32, 76, [24:24], "false", "true" + displayLogicLevelsInEngineSniffer= bits, U32, 76, [24:24], "false", "true" issue_294_26 = bits, U32, 76, [25:25], "false", "true" issue_294_27 = bits, U32, 76, [26:26], "false", "true" issue_294_28 = bits, U32, 76, [27:27], "false", "true" @@ -2598,6 +2598,7 @@ cmd_tle8888_init = "w\x00\x14\x00\x08" cmd_test_ac_relay = "w\x00\x14\x00\x09" 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_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -2735,6 +2736,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset + field = "Display only interesting", displayLogicLevelsInEngineSniffer field = "#Custom Trigger" field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} @@ -3861,6 +3863,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "TPS#2 wide open position", cmd_calibrate_tps_2_wot commandButton = "Pedal Up", cmd_calibrate_pedal_up commandButton = "Pedal Down", cmd_calibrate_pedal_down + commandButton = "ETB PID Autotune", cmd_etb_autotune dialog = etbDialog, "Electronic Throttle Body (beta)", border topicHelp = "etbHelp" 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 1dcb36c1cd..40f8472956 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 Mon Apr 13 20:23:02 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 18:17:04 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -345,6 +345,7 @@ public class Fields { public static final int digitalPotentiometerSpiDevice_offset = 677; public static final int directSelfStimulation_offset = 76; public static final int displacement_offset = 396; + public static final int displayLogicLevelsInEngineSniffer_offset = 76; public static final int displayMode_offset = 492; public static final int dizzySparkOutputPin_offset = 2226; public static final int dizzySparkOutputPinMode_offset = 2227; @@ -914,7 +915,6 @@ public class Fields { public static final int isManualSpinningMode_offset = 1476; public static final int isMapAveragingEnabled_offset = 1476; public static final int isSdCardEnabled_offset = 744; - public static final int issue_294_25_offset = 76; public static final int issue_294_26_offset = 76; public static final int issue_294_27_offset = 76; public static final int issue_294_28_offset = 76; @@ -1572,7 +1572,7 @@ public class Fields { public static final Field ROLLINGLAUNCHENABLED = Field.create("ROLLINGLAUNCHENABLED", 76, FieldType.BIT, 21); public static final Field ANTILAGENABLED = Field.create("ANTILAGENABLED", 76, FieldType.BIT, 22); public static final Field USERUNNINGMATHFORCRANKING = Field.create("USERUNNINGMATHFORCRANKING", 76, FieldType.BIT, 23); - public static final Field ISSUE_294_25 = Field.create("ISSUE_294_25", 76, FieldType.BIT, 24); + public static final Field DISPLAYLOGICLEVELSINENGINESNIFFER = Field.create("DISPLAYLOGICLEVELSINENGINESNIFFER", 76, FieldType.BIT, 24); public static final Field ISSUE_294_26 = Field.create("ISSUE_294_26", 76, FieldType.BIT, 25); public static final Field ISSUE_294_27 = Field.create("ISSUE_294_27", 76, FieldType.BIT, 26); public static final Field ISSUE_294_28 = Field.create("ISSUE_294_28", 76, FieldType.BIT, 27); @@ -2507,7 +2507,7 @@ public class Fields { ROLLINGLAUNCHENABLED, ANTILAGENABLED, USERUNNINGMATHFORCRANKING, - ISSUE_294_25, + DISPLAYLOGICLEVELSINENGINESNIFFER, ISSUE_294_26, ISSUE_294_27, ISSUE_294_28,