From 0555d2170d257440d270bbf8fff0bb795d4794e8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 8 Dec 2019 00:37:33 -0500 Subject: [PATCH] TPS#2 calibration & fixing ETB in TS --- ...ngine_configuration_generated_structures.h | 21 +++++++++++++++---- .../controllers/algo/rusefi_generated.h | 8 +++++-- ...ngine_configuration_generated_structures.h | 21 +++++++++++++++---- .../controllers/generated/rusefi_generated.h | 8 +++++-- firmware/integration/rusefi_config.txt | 6 ++++-- firmware/tunerstudio/rusefi.ini | 18 +++++++++------- firmware/tunerstudio/rusefi.input | 12 ++++++----- firmware/tunerstudio/rusefi_frankenso.ini | 18 +++++++++------- firmware/tunerstudio/rusefi_kinetis.ini | 18 +++++++++------- firmware/tunerstudio/rusefi_microrusefi.ini | 18 +++++++++------- firmware/tunerstudio/rusefi_prometheus.ini | 18 +++++++++------- .../com/rusefi/config/generated/Fields.java | 10 +++++++-- 12 files changed, 120 insertions(+), 56 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 09183ffbb6..845efa0091 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 integration/rusefi_config.txt Wed Dec 04 20:15:00 EET 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Dec 08 00:34:54 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1117,7 +1117,6 @@ struct engine_configuration_s { bool issue_294_31 : 1; /** * Closed throttle. todo: extract these two fields into a structure - * todo: we need two sets of TPS parameters - modern ETBs have two sensors * See also tps1_1AdcChannel * set tps_min X * offset 80 @@ -1868,9 +1867,23 @@ struct engine_configuration_s { */ float alternator_antiwindupFreq; /** + * Closed throttle#2. todo: extract these two fields into a structure + * See also tps2_1AdcChannel + * set tps2_min X * offset 1768 */ - uint8_t unusedFormerWarmupAfrPid[8]; + int16_t tps2Min; + /** + * Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage! + * See also tps1_1AdcChannel + * set tps2_max X + * offset 1770 + */ + int16_t tps2Max; + /** + * offset 1772 + */ + uint8_t unusedFormerWarmupAfrPid[4]; /** * kPa value which is too low to be true * offset 1776 @@ -2926,4 +2939,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Dec 04 20:15:00 EET 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Dec 08 00:34:54 EST 2019 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 838dfe674f..76440ba83a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1809,6 +1809,10 @@ #define tps1_1AdcChannel_offset_hex 200 #define tps2_1AdcChannel_offset 515 #define tps2_1AdcChannel_offset_hex 203 +#define tps2Max_offset 1770 +#define tps2Max_offset_hex 6ea +#define tps2Min_offset 1768 +#define tps2Min_offset_hex 6e8 #define TPS_TPS_ACCEL_TABLE 8 #define tpsAccelEnrichmentThreshold_offset 2048 #define tpsAccelEnrichmentThreshold_offset_hex 800 @@ -1947,8 +1951,8 @@ #define unusedErrorPin_offset_hex 7f8 #define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset_hex c1c -#define unusedFormerWarmupAfrPid_offset 1768 -#define unusedFormerWarmupAfrPid_offset_hex 6e8 +#define unusedFormerWarmupAfrPid_offset 1772 +#define unusedFormerWarmupAfrPid_offset_hex 6ec #define unusedHereo_wires_offset 76 #define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 5563691f49..9cb32cec57 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 integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:34:44 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1117,7 +1117,6 @@ struct engine_configuration_s { bool issue_294_31 : 1; /** * Closed throttle. todo: extract these two fields into a structure - * todo: we need two sets of TPS parameters - modern ETBs have two sensors * See also tps1_1AdcChannel * set tps_min X * offset 80 @@ -1868,9 +1867,23 @@ struct engine_configuration_s { */ float alternator_antiwindupFreq; /** + * Closed throttle#2. todo: extract these two fields into a structure + * See also tps2_1AdcChannel + * set tps2_min X * offset 1768 */ - uint8_t unusedFormerWarmupAfrPid[8]; + int16_t tps2Min; + /** + * Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage! + * See also tps1_1AdcChannel + * set tps2_max X + * offset 1770 + */ + int16_t tps2Max; + /** + * offset 1772 + */ + uint8_t unusedFormerWarmupAfrPid[4]; /** * kPa value which is too low to be true * offset 1776 @@ -2926,4 +2939,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:34:44 EST 2019 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 725049152d..39e6501f06 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1809,6 +1809,10 @@ #define tps1_1AdcChannel_offset_hex 200 #define tps2_1AdcChannel_offset 515 #define tps2_1AdcChannel_offset_hex 203 +#define tps2Max_offset 1770 +#define tps2Max_offset_hex 6ea +#define tps2Min_offset 1768 +#define tps2Min_offset_hex 6e8 #define TPS_TPS_ACCEL_TABLE 8 #define tpsAccelEnrichmentThreshold_offset 2048 #define tpsAccelEnrichmentThreshold_offset_hex 800 @@ -1947,8 +1951,8 @@ #define unusedErrorPin_offset_hex 7f8 #define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset_hex c1c -#define unusedFormerWarmupAfrPid_offset 1768 -#define unusedFormerWarmupAfrPid_offset_hex 6e8 +#define unusedFormerWarmupAfrPid_offset 1772 +#define unusedFormerWarmupAfrPid_offset_hex 6ec #define unusedHereo_wires_offset 76 #define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 13bf8da434..f94af55680 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -328,7 +328,7 @@ bit issue_294_30; bit issue_294_31; -int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors\nSee also tps1_1AdcChannel\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 +int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\nSee also tps1_1AdcChannel\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 int16_t tpsMax;Full throttle. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps_max X;"ADC", 1, 0, 0, 1023, 0 int16_t tpsErrorDetectionTooLow;+TPS error detection, what TPS % value is unrealistically low;"%", 1, 0, -40, 200, 0 @@ -859,7 +859,9 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:7], @@pin_mode_e_enum@@ float fuelRailPressure;; "kPa", 1, 0.0, 0, 1000.0, 2 float alternator_derivativeFilterLoss;; "x", 1, 0.0, -1000000, 1000000, 4 float alternator_antiwindupFreq;; "x", 1, 0.0, -1000000, 1000000, 4 - uint8_t[8] unusedFormerWarmupAfrPid; +int16_t tps2Min;Closed throttle#2. todo: extract these two fields into a structure\nSee also tps2_1AdcChannel\nset tps2_min X;"ADC", 1, 0, 0, 1023, 0 +int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps2_max X;"ADC", 1, 0, 0, 1023, 0 + uint8_t[4] unusedFormerWarmupAfrPid; ! todo: mapErrorDetectionIdleTooLow? 30kPa is usually lowest on idle float mapErrorDetectionTooLow;kPa value which is too low to be true;"kPa", 1, 0, -100.0, 100.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 9e36b5d9f3..85d6ffc978 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,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 integration\rusefi_config.txt Sat Dec 07 21:20:32 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:32:28 EST 2019 pageSize = 20000 page = 1 @@ -636,7 +636,9 @@ page = 1 fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 alternator_derivativeFilterLoss = scalar, F32, 1760, "x", 1, 0.0, -1000000, 1000000, 4 alternator_antiwindupFreq = scalar, F32, 1764, "x", 1, 0.0, -1000000, 1000000, 4 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1768 + tps2Min = scalar, S16, 1768, "ADC", 1, 0, 0, 1023, 0 + tps2Max = scalar, S16, 1770, "ADC", 1, 0, 0, 1023, 0 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1772 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 @@ -3524,12 +3526,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 2d4638cf79..db5f327758 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2500,12 +2500,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 556e749acf..f5ab316d62 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,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 integration\rusefi_config.txt Sat Dec 07 21:20:38 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:32:34 EST 2019 pageSize = 20000 page = 1 @@ -636,7 +636,9 @@ page = 1 fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 alternator_derivativeFilterLoss = scalar, F32, 1760, "x", 1, 0.0, -1000000, 1000000, 4 alternator_antiwindupFreq = scalar, F32, 1764, "x", 1, 0.0, -1000000, 1000000, 4 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1768 + tps2Min = scalar, S16, 1768, "ADC", 1, 0, 0, 1023, 0 + tps2Max = scalar, S16, 1770, "ADC", 1, 0, 0, 1023, 0 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1772 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 @@ -3524,12 +3526,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index f9568cac7a..de38ec4432 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -85,7 +85,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 integration/rusefi_config.txt Sat Dec 07 23:18:51 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Dec 08 00:34:54 EST 2019 pageSize = 20000 page = 1 @@ -636,7 +636,9 @@ page = 1 fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 alternator_derivativeFilterLoss = scalar, F32, 1760, "x", 1, 0.0, -1000000, 1000000, 4 alternator_antiwindupFreq = scalar, F32, 1764, "x", 1, 0.0, -1000000, 1000000, 4 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1768 + tps2Min = scalar, S16, 1768, "ADC", 1, 0, 0, 1023, 0 + tps2Max = scalar, S16, 1770, "ADC", 1, 0, 0, 1023, 0 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1772 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 @@ -3524,12 +3526,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index ab3a14bbc2..fe06e7febc 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,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 integration\rusefi_config.txt Sat Dec 07 21:20:35 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:32:31 EST 2019 pageSize = 20000 page = 1 @@ -636,7 +636,9 @@ page = 1 fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 alternator_derivativeFilterLoss = scalar, F32, 1760, "x", 1, 0.0, -1000000, 1000000, 4 alternator_antiwindupFreq = scalar, F32, 1764, "x", 1, 0.0, -1000000, 1000000, 4 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1768 + tps2Min = scalar, S16, 1768, "ADC", 1, 0, 0, 1023, 0 + tps2Max = scalar, S16, 1770, "ADC", 1, 0, 0, 1023, 0 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1772 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 @@ -3507,12 +3509,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 5d464da3e2..51a4fdd8c1 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,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 integration\rusefi_config.txt Sat Dec 07 21:20:41 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:32:37 EST 2019 pageSize = 20000 page = 1 @@ -636,7 +636,9 @@ page = 1 fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 alternator_derivativeFilterLoss = scalar, F32, 1760, "x", 1, 0.0, -1000000, 1000000, 4 alternator_antiwindupFreq = scalar, F32, 1764, "x", 1, 0.0, -1000000, 1000000, 4 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1768 + tps2Min = scalar, S16, 1768, "ADC", 1, 0, 0, 1023, 0 + tps2Max = scalar, S16, 1770, "ADC", 1, 0, 0, 1023, 0 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1772 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 @@ -3520,12 +3522,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16} field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16} field = etbCalibrationOnStart, etbCalibrationOnStart - field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16} - field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} - field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16} - field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #1", etbIo1_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No1 Direction #2", etbIo1_directionPin2, {throttlePedalPositionAdcChannel != 16} + field = "No1 Control #1", etbIo1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "No2 Direction #1", etbIo2_directionPin1, {throttlePedalPositionAdcChannel != 16} + field = "No2 Direction #2", etbIo2_directionPin2, {throttlePedalPositionAdcChannel != 16} field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0} + field = "TPS#2 min", tps2Min, {etbIo2_directionPin1 != 0} + field = "TPS#2 max", tps2Max, {etbIo2_directionPin1 != 0} panel = etbPidDialog dialog = etbDialogRight 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 38a42d7a6a..793263ad05 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 integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 08 00:20:37 EST 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1187,6 +1187,8 @@ public class Fields { public static final int tps1_1AdcChannel_offset_hex = 200; public static final int tps2_1AdcChannel_offset = 515; public static final int tps2_1AdcChannel_offset_hex = 203; + public static final int tps2Max_offset = 1770; + public static final int tps2Min_offset = 1768; public static final int TPS_TPS_ACCEL_TABLE = 8; public static final int tpsAccelEnrichmentThreshold_offset = 2048; public static final int tpsAccelEnrichmentThreshold_offset_hex = 800; @@ -1267,7 +1269,7 @@ public class Fields { public static final int unusedAtOldBoardConfigurationEnd_offset = 988; public static final int unusedErrorPin_offset = 2040; public static final int unusedFlexFuelSensor_offset = 3100; - public static final int unusedFormerWarmupAfrPid_offset = 1768; + public static final int unusedFormerWarmupAfrPid_offset = 1772; public static final int unusedHereo_wires_offset = 76; public static final int unusedOldWarmupAfr_offset = 744; public static final int unusedSpiPadding4_offset = 2593; @@ -1876,6 +1878,8 @@ public class Fields { public static final Field FUELRAILPRESSURE = Field.create("FUELRAILPRESSURE", 1756, FieldType.FLOAT); public static final Field ALTERNATOR_DERIVATIVEFILTERLOSS = Field.create("ALTERNATOR_DERIVATIVEFILTERLOSS", 1760, FieldType.FLOAT); public static final Field ALTERNATOR_ANTIWINDUPFREQ = Field.create("ALTERNATOR_ANTIWINDUPFREQ", 1764, FieldType.FLOAT); + public static final Field TPS2MIN = Field.create("TPS2MIN", 1768, FieldType.INT16); + public static final Field TPS2MAX = Field.create("TPS2MAX", 1770, FieldType.INT16); public static final Field MAPERRORDETECTIONTOOLOW = Field.create("MAPERRORDETECTIONTOOLOW", 1776, FieldType.FLOAT); public static final Field MAPERRORDETECTIONTOOHIGH = Field.create("MAPERRORDETECTIONTOOHIGH", 1780, FieldType.FLOAT); public static final Field STEP1RPMWINDOW = Field.create("STEP1RPMWINDOW", 1784, FieldType.INT); @@ -2680,6 +2684,8 @@ public class Fields { FUELRAILPRESSURE, ALTERNATOR_DERIVATIVEFILTERLOSS, ALTERNATOR_ANTIWINDUPFREQ, + TPS2MIN, + TPS2MAX, MAPERRORDETECTIONTOOLOW, MAPERRORDETECTIONTOOHIGH, STEP1RPMWINDOW,