From b378bcbaca82586ff72bf3428bbcf269822a366a Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 27 Jun 2020 22:20:38 -0400 Subject: [PATCH] manual while automation is not well --- .../algo/engine_configuration_generated_structures.h | 5 +++-- .../generated/engine_configuration_generated_structures.h | 5 +++-- firmware/tunerstudio/rusefi.ini | 8 ++++++-- firmware/tunerstudio/rusefi_microrusefi.ini | 8 ++++++-- 4 files changed, 18 insertions(+), 8 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 b72031101b..a83d71bea1 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 Fri Jun 19 09:31:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 27 22:18:44 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -688,6 +688,7 @@ struct engine_configuration_s { offset 76 bit 12 */ bool etb_use_two_wires : 1; /** + * Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position. offset 76 bit 13 */ bool isDoubleSolenoidIdle : 1; /** @@ -3521,4 +3522,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 Fri Jun 19 09:31:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 27 22:18:44 EDT 2020 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index d0d82b6689..26b997cdd1 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.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -688,6 +688,7 @@ struct engine_configuration_s { offset 76 bit 12 */ bool etb_use_two_wires : 1; /** + * Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position. offset 76 bit 13 */ bool isDoubleSolenoidIdle : 1; /** @@ -3521,4 +3522,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.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 82b5d14aab..7ae11e40a3 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.sh integration/rusefi_config.txt Fri Jun 26 13:10:17 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020 pageSize = 20000 page = 1 @@ -1195,6 +1195,7 @@ page = 1 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" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." + isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." @@ -1408,7 +1409,6 @@ page = 1 ; recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - ; recordDef = headerLen, footerLen, recordLen recordDef = 0, 0, 5 @@ -3249,6 +3249,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "MIL / Check Engine Pin", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin + field = "A/C Relay", acRelayPin field = "Main Relay Pin", mainRelayPin field = "Starter Relay Pin", starterRelayDisablePin @@ -3633,6 +3634,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Pin mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature +; this one has build-in FSIO logic + field = "A/C Relay", acRelayPin + field = "A/C Relay Mode", acRelayPinMode dialog = fuelPumpConfig, "Fuel Pump" field = "Pin", fuelPumpPin diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 78666fa1d9..7a8bf9ce6e 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.sh integration/rusefi_config.txt Sat Jun 27 18:35:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:32 EDT 2020 pageSize = 20000 page = 1 @@ -1195,6 +1195,7 @@ page = 1 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" cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt" etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." + isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." @@ -1408,7 +1409,6 @@ page = 1 ; recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - ; recordDef = headerLen, footerLen, recordLen recordDef = 0, 0, 5 @@ -3236,6 +3236,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "MIL / Check Engine Pin", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin + field = "A/C Relay", acRelayPin field = "Main Relay Pin", mainRelayPin field = "Starter Relay Pin", starterRelayDisablePin @@ -3616,6 +3617,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Pin mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature +; this one has build-in FSIO logic + field = "A/C Relay", acRelayPin + field = "A/C Relay Mode", acRelayPinMode dialog = fuelPumpConfig, "Fuel Pump" field = "Pin", fuelPumpPin