From a1a86b71e07c94356b3a648889b57e53bd37877c Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 23 Apr 2020 23:51:32 -0400 Subject: [PATCH] Fresh generated - auto --- .../algo/engine_configuration_generated_structures.h | 9 +++------ .../kinetis/config/controllers/algo/rusefi_generated.h | 4 ++-- .../engine_configuration_generated_structures.h | 9 +++------ firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 8 ++++---- firmware/tunerstudio/rusefi_frankenso.ini | 8 ++++---- firmware/tunerstudio/rusefi_kinetis.ini | 8 ++++---- firmware/tunerstudio/rusefi_microrusefi.ini | 8 ++++---- firmware/tunerstudio/rusefi_prometheus.ini | 8 ++++---- firmware/tunerstudio/rusefi_proteus.ini | 8 ++++---- .../models/src/com/rusefi/config/generated/Fields.java | 8 ++++---- 11 files changed, 38 insertions(+), 44 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 1d101b001d..6e486983db 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 Thu Apr 23 15:57:04 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 23 23:49:40 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -590,11 +590,8 @@ struct engine_configuration_s { */ injector_s injector; /** - * Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires? - * See also triggerSimulatorPins - * PS: Funny name, right? :) offset 76 bit 0 */ - bool directSelfStimulation : 1; + bool unused76b0 : 1; /** offset 76 bit 1 */ bool activateAuxPid1 : 1; @@ -3355,4 +3352,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 Thu Apr 23 15:57:04 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 23 23:49:40 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 ff3fd1e92f..6d68f441bd 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -527,8 +527,6 @@ #define digitalPotentiometerChipSelect4_offset_hex 29f #define digitalPotentiometerSpiDevice_offset 677 #define digitalPotentiometerSpiDevice_offset_hex 2a5 -#define directSelfStimulation_offset 76 -#define directSelfStimulation_offset_hex 4c #define displacement_offset 396 #define displacement_offset_hex 18c #define displayLogicLevelsInEngineSniffer_offset 76 @@ -2171,6 +2169,8 @@ #define unused1059_offset_hex f7c #define unused2432_offset 2432 #define unused2432_offset_hex 980 +#define unused76b0_offset 76 +#define unused76b0_offset_hex 4c #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_24_offset_hex 5c4 #define unused_1484_bit_25_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index e61b21bc89..cc32e925cb 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 Thu Apr 23 15:56:48 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:34 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -590,11 +590,8 @@ struct engine_configuration_s { */ injector_s injector; /** - * Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires? - * See also triggerSimulatorPins - * PS: Funny name, right? :) offset 76 bit 0 */ - bool directSelfStimulation : 1; + bool unused76b0 : 1; /** offset 76 bit 1 */ bool activateAuxPid1 : 1; @@ -3355,4 +3352,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 Thu Apr 23 15:56:48 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:34 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f6c644753c..48f556a9b0 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -527,8 +527,6 @@ #define digitalPotentiometerChipSelect4_offset_hex 29f #define digitalPotentiometerSpiDevice_offset 677 #define digitalPotentiometerSpiDevice_offset_hex 2a5 -#define directSelfStimulation_offset 76 -#define directSelfStimulation_offset_hex 4c #define displacement_offset 396 #define displacement_offset_hex 18c #define displayLogicLevelsInEngineSniffer_offset 76 @@ -2171,6 +2169,8 @@ #define unused1059_offset_hex f7c #define unused2432_offset 2432 #define unused2432_offset_hex 980 +#define unused76b0_offset 76 +#define unused76b0_offset_hex 4c #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_24_offset_hex 5c4 #define unused_1484_bit_25_offset 1476 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index eb310cfc5e..e0460e5022 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 Thu Apr 23 19:37:17 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:34 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2628,6 +2627,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4001,7 +4001,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 447797a572..3c647f76ae 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 Thu Apr 23 19:37:24 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:47 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2628,6 +2627,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4001,7 +4001,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 5360a75bde..cbab253eed 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 Thu Apr 23 19:37:34 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 23 23:49:40 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2628,6 +2627,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -4002,7 +4002,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 924caaedda..3d47ae2f4f 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 Thu Apr 23 19:37:21 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:44 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2620,6 +2619,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -3961,7 +3961,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 2c57d93ac6..be2c59099b 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 Thu Apr 23 19:37:27 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:49:05 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2624,6 +2623,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -3997,7 +3997,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 46bcb4f2ee..5333efafb2 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 Thu Apr 23 19:37:30 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:49:17 EDT 2020 pageSize = 20000 page = 1 @@ -98,7 +98,7 @@ page = 1 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2 - directSelfStimulation = bits, U32, 76, [0:0], "false", "true" + unused76b0 = bits, U32, 76, [0:0], "false", "true" activateAuxPid1 = bits, U32, 76, [1:1], "false", "true" isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true" activateAuxPid2 = bits, U32, 76, [3:3], "false", "true" @@ -1124,7 +1124,6 @@ page = 1 ; total TS size = 20000 [SettingContextHelp] injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" - directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nSee also triggerSimulatorPins\nPS: Funny name, right? :)" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider?" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." @@ -2620,6 +2619,7 @@ 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_enable_self_stim = "w\x00\x14\x00\x0D" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" @@ -3969,7 +3969,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Board->ECU stimulator dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency - field = "self-stimulation", directSelfStimulation + commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 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 ddc1c6d4dc..4391139cc0 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 Thu Apr 23 15:56:48 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 23 23:48:34 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -346,7 +346,6 @@ public class Fields { public static final int digitalPotentiometerChipSelect3_offset = 670; public static final int digitalPotentiometerChipSelect4_offset = 671; 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; @@ -1441,6 +1440,7 @@ public class Fields { public static final int unused1059_offset = 3964; public static final int unused2432_offset = 2432; public static final int unused2432_offset_hex = 980; + public static final int unused76b0_offset = 76; public static final int unused_1484_bit_24_offset = 1476; public static final int unused_1484_bit_25_offset = 1476; public static final int unused_1484_bit_26_offset = 1476; @@ -1559,7 +1559,7 @@ public class Fields { public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT); public static final Field ENGINESNIFFERRPMTHRESHOLD = Field.create("ENGINESNIFFERRPMTHRESHOLD", 4, FieldType.INT); public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT); - public static final Field DIRECTSELFSTIMULATION = Field.create("DIRECTSELFSTIMULATION", 76, FieldType.BIT, 0); + public static final Field UNUSED76B0 = Field.create("UNUSED76B0", 76, FieldType.BIT, 0); public static final Field ACTIVATEAUXPID1 = Field.create("ACTIVATEAUXPID1", 76, FieldType.BIT, 1); public static final Field ISVERBOSEAUXPID1 = Field.create("ISVERBOSEAUXPID1", 76, FieldType.BIT, 2); public static final Field ACTIVATEAUXPID2 = Field.create("ACTIVATEAUXPID2", 76, FieldType.BIT, 3); @@ -2496,7 +2496,7 @@ public class Fields { ENGINETYPE, ENGINESNIFFERRPMTHRESHOLD, INJECTOR_FLOW, - DIRECTSELFSTIMULATION, + UNUSED76B0, ACTIVATEAUXPID1, ISVERBOSEAUXPID1, ACTIVATEAUXPID2,