From d09bcad3e769df79aaf33f7cfc549ad94aa3b2ef Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 5 May 2019 12:02:42 -0400 Subject: [PATCH] dreams of two ETBs --- .../boards/prometheus/board_configuration.cpp | 2 +- .../subaru-ej20gn/board_configuration.cpp | 2 +- firmware/config/engines/bmw_e34.cpp | 2 +- .../config/engines/chevrolet_camaro_4.cpp | 2 +- .../config/engines/citroenBerlingoTU3JP.cpp | 2 +- firmware/config/engines/custom_engine.cpp | 6 ++--- firmware/config/engines/dodge_neon.cpp | 4 ++-- .../config/engines/ford_1995_inline_6.cpp | 2 +- firmware/config/engines/ford_aspire.cpp | 2 +- firmware/config/engines/ford_festiva.cpp | 2 +- firmware/config/engines/honda_600.cpp | 2 +- firmware/config/engines/honda_accord.cpp | 2 +- firmware/config/engines/mazda_miata.cpp | 6 ++--- firmware/config/engines/mazda_miata_1_6.cpp | 2 +- firmware/config/engines/mazda_miata_nb.cpp | 2 +- firmware/config/engines/me7pnp.cpp | 2 +- firmware/config/engines/rover_v8.cpp | 2 +- firmware/config/engines/sachs.cpp | 2 +- firmware/console/status_loop.cpp | 2 +- .../controllers/actuators/lcd_controller.cpp | 2 +- ...ngine_configuration_generated_structures.h | 17 +++++++------- firmware/controllers/algo/rusefi_generated.h | 8 +++---- firmware/controllers/engine_controller.cpp | 4 ++-- firmware/controllers/sensors/tps.cpp | 8 +++---- firmware/controllers/settings.cpp | 4 ++-- firmware/hw_layer/adc_inputs.cpp | 2 +- firmware/hw_layer/hardware.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 6 ++--- firmware/tunerstudio/rusefi.ini | 23 ++++++++++--------- firmware/tunerstudio/rusefi.input | 17 +++++++------- .../models/src/com/rusefi/config/Fields.java | 14 +++++------ 31 files changed, 80 insertions(+), 77 deletions(-) diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 270836a21c..3346cb2675 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -137,7 +137,7 @@ void setBoardConfigurationOverrides(void) { setSerialConfigurationOverrides(); engineConfiguration->vbattAdcChannel = EFI_ADC_13; - engineConfiguration->tpsAdcChannel = is469 ? EFI_ADC_7 : EFI_ADC_14; + engineConfiguration->tps1_1AdcChannel = is469 ? EFI_ADC_7 : EFI_ADC_14; engineConfiguration->map.sensor.hwChannel = is469 ? EFI_ADC_8 : EFI_ADC_15; engineConfiguration->clt.adcChannel = EFI_ADC_3; engineConfiguration->iat.adcChannel = EFI_ADC_4; diff --git a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp index ac304bd9e8..9a5bc10d6c 100644 --- a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp +++ b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp @@ -89,7 +89,7 @@ void setBoardConfigurationOverrides(void) { setSerialConfigurationOverrides(); engineConfiguration->vbattAdcChannel = EFI_ADC_6; - engineConfiguration->tpsAdcChannel = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; engineConfiguration->map.sensor.hwChannel = EFI_ADC_14; engineConfiguration->clt.adcChannel = EFI_ADC_8; /* not yet */ diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index b9f9b13626..6a9f083338 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -86,7 +86,7 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->vbattDividerCoeff = 5.33; engineConfiguration->vbattAdcChannel = EFI_ADC_15; // PC5 - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; boardConfiguration->triggerInputPins[0] = GPIOA_5; diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index 41feb371e8..fa4d36ab3e 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -40,7 +40,7 @@ void setCamaro4(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->mafAdcChannel = EFI_ADC_NONE; - engineConfiguration->tpsAdcChannel = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // todo: move this into trigger definition // set global_trigger_offset_angle 230 diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 80e71e22be..5a51cb18ad 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -173,7 +173,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * TPS */ - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->tpsMax = 102; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 825; // convert 12to10 bit (ADC/4) /** diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 551edb9be3..6a08af3f31 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -104,7 +104,7 @@ void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * Frankenso analog #11 PC5 ADC15 * Frankenso analog #12 PC4 ADC14 VBatt */ - engineConfiguration->tpsAdcChannel = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; @@ -303,7 +303,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->etb.maxValue = 200; #endif /* EFI_ELECTRONIC_THROTTLE_BODY */ - engineConfiguration->tpsAdcChannel = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_9; // PB1 engineConfiguration->debugMode = DBG_ELECTRONIC_THROTTLE_PID; @@ -387,7 +387,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { boardConfiguration->fuelPumpPin = TLE8888_PIN_20; - engineConfiguration->tpsAdcChannel = EFI_ADC_3; // PA3 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // PA7 engineConfiguration->etb.pFactor = 1.07; diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 1b9272424e..93decc209d 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -398,13 +398,13 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // rev 0.1 green board // engineConfiguration->map.sensor.hwChannel = EFI_ADC_6; // PA6 -// engineConfiguration->tpsAdcChannel = EFI_ADC_15; // PC5 +// engineConfiguration->tps1_1AdcChannel = EFI_ADC_15; // PC5 /** * TPS */ - engineConfiguration->tpsAdcChannel = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4) diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index 80cdeecb2e..cf0b3c4311 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -69,7 +69,7 @@ void setFordInline6(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // input channel 10 is PC3, that's ADC13 // input channel 12 is PC1, that's ADC11 - engineConfiguration->tpsAdcChannel = EFI_ADC_4; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_4; engineConfiguration->iat.adcChannel = EFI_ADC_2; engineConfiguration->clt.adcChannel = EFI_ADC_1; engineConfiguration->afr.hwChannel = EFI_ADC_11; diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index 0f8e658dff..2e00972b3a 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -138,7 +138,7 @@ void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // Frankenstein analog input #12: adc - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->vbattAdcChannel = EFI_ADC_0; engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 3d6efbee50..f51328f613 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -214,7 +214,7 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4) - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->clt.adcChannel = EFI_ADC_12; diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp index d3ed4027d0..6e089c5d29 100644 --- a/firmware/config/engines/honda_600.cpp +++ b/firmware/config/engines/honda_600.cpp @@ -103,7 +103,7 @@ void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * Frankenso analog #11 PC5 ADC15 * Frankenso analog #12 PC4 ADC14 VBatt */ - engineConfiguration->tpsAdcChannel = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index a11b055725..fae6eb3711 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -132,7 +132,7 @@ static void setHondaAccordConfigurationCommon(DECLARE_CONFIG_PARAMETER_SIGNATURE /** * TPS D11/W11 blue wire */ - engineConfiguration->tpsAdcChannel = EFI_ADC_1; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_1; /** diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 7f24cd3b4c..f443f31c20 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -194,7 +194,7 @@ void common079721_2351(engine_configuration_s *engineConfiguration, board_config // Frankenstein analog input #11: adc // Frankenstein analog input #12: adc engineConfiguration->mafAdcChannel = EFI_ADC_1; - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->clt.adcChannel = EFI_ADC_11; } @@ -294,7 +294,7 @@ static void setMiata1994_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) { commonFrankensoAnalogInputs(engineConfiguration); - engineConfiguration->tpsAdcChannel = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->clt.adcChannel = EFI_ADC_12; @@ -381,7 +381,7 @@ void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->clt.adcChannel = EFI_ADC_11; - engineConfiguration->tpsAdcChannel = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3 boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index bfac131e61..1dbadc49d9 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -264,6 +264,6 @@ void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * Stage 0 we only have OEM TPS switch */ - engineConfiguration->tpsAdcChannel = EFI_ADC_NONE; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE; // todo: MAF-based ignition table? } diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp index 88bc2879c5..2f0564729e 100644 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ b/firmware/config/engines/mazda_miata_nb.cpp @@ -38,7 +38,7 @@ void setMazdaMiataNb1EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setThermistorConfiguration(&engineConfiguration->iat, -10, 160310, 60, 7700, 120.00, 1180); engineConfiguration->iat.config.bias_resistor = 2700; - engineConfiguration->tpsAdcChannel = EFI_ADC_3; // 15 is the old value + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // 15 is the old value engineConfiguration->vbattAdcChannel = EFI_ADC_0; // 1 is the old value // engineConfiguration->map.channel = 1; engineConfiguration->mafAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index a0153a8a00..9510218eed 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -51,7 +51,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setCommonNTCSensor(&engineConfiguration->iat); engineConfiguration->iat.config.bias_resistor = 2700; engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; - //engineConfiguration->tpsAdcChannel = PF3; TODO: ADC channel 3 + //engineConfiguration->tps1_1AdcChannel = PF3; TODO: ADC channel 3 engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; engineConfiguration->clt.adcChannel = EFI_ADC_6; //engineConfiguration->iat.adcChannel = PF4; TODO: ADC channel 3 diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index 1fd365293c..cd9daa3798 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -106,7 +106,7 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setCommonNTCSensor(&engineConfiguration->iat); engineConfiguration->iat.config.bias_resistor = 2700; - engineConfiguration->tpsAdcChannel = EFI_ADC_3; //Frankenstein: inp2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; //Frankenstein: inp2 engineConfiguration->vbattAdcChannel = EFI_ADC_0; //Frankenstein: inp5 engineConfiguration->clt.adcChannel = EFI_ADC_11; engineConfiguration->iat.adcChannel = EFI_ADC_13; diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp index fe9b0b44b8..438af42225 100644 --- a/firmware/config/engines/sachs.cpp +++ b/firmware/config/engines/sachs.cpp @@ -49,7 +49,7 @@ void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // Frankenstein analog input #11: PC4 adc14 // Frankenstein analog input #12: PC5 adc15 - engineConfiguration->tpsAdcChannel = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->vbattAdcChannel = EFI_ADC_NONE; /** diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index d23828e405..f0c920fdcb 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -837,7 +837,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ #endif /* EFI_CAN_SUPPORT */ case DBG_ANALOG_INPUTS: tsOutputChannels->debugFloatField1 = (engineConfiguration->vbattAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("vbatt", engineConfiguration->vbattAdcChannel) : 0.0f; - tsOutputChannels->debugFloatField2 = (engineConfiguration->tpsAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tpsAdcChannel) : 0.0f; + tsOutputChannels->debugFloatField2 = (engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tps1_1AdcChannel) : 0.0f; tsOutputChannels->debugFloatField3 = (engineConfiguration->mafAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("maf", engineConfiguration->mafAdcChannel) : 0.0f; tsOutputChannels->debugFloatField4 = (engineConfiguration->map.sensor.hwChannel != EFI_ADC_NONE) ? getVoltageDivided("map", engineConfiguration->map.sensor.hwChannel) : 0.0f; tsOutputChannels->debugFloatField5 = (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) ? getVoltageDivided("clt", engineConfiguration->clt.adcChannel) : 0.0f; diff --git a/firmware/controllers/actuators/lcd_controller.cpp b/firmware/controllers/actuators/lcd_controller.cpp index 381d6b3506..8dfb86b010 100644 --- a/firmware/controllers/actuators/lcd_controller.cpp +++ b/firmware/controllers/actuators/lcd_controller.cpp @@ -246,7 +246,7 @@ static void showLine(lcd_line_e line, int screenY) { lcdPrintf(getIgnition_mode_e(engineConfiguration->ignitionMode)); return; case LL_TPS: - getPinNameByAdcChannel("tps", engineConfiguration->tpsAdcChannel, buffer); + getPinNameByAdcChannel("tps", engineConfiguration->tps1_1AdcChannel, buffer); lcdPrintf("Throttle %s %.2f%%", buffer, getTPS()); return; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 3a346edfb8..8a01051344 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 03 21:08:34 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 05 11:03:35 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1085,14 +1085,14 @@ typedef struct { /** * 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 tpsAdcChannel + * See also tps1_1AdcChannel * set tps_min X * offset 80 */ int16_t tpsMin; /** * Full throtle. tpsMax value as 10 bit ADC value. Not Voltage! - * See also tpsAdcChannel + * See also tps1_1AdcChannel * set tps_max X * offset 82 */ @@ -1314,10 +1314,10 @@ typedef struct { */ int HD44780height; /** - * See aslo pedalPositionAdcChannel + * First TPS, first channel. See aslo pedalPositionAdcChannel * offset 512 */ - adc_channel_e tpsAdcChannel; + adc_channel_e tps1_1AdcChannel; /** * offset 513 */ @@ -1330,7 +1330,7 @@ typedef struct { * Second throttle body position sensor * offset 515 */ - adc_channel_e tps2AdcChannel; + adc_channel_e tps2_1AdcChannel; /** * offset 516 */ @@ -1381,7 +1381,8 @@ typedef struct { afr_sensor_s afr; /** * Electronic throttle pedal position input - * See also tpsAdcChannel + * Single channel so far + * See also tps1_1AdcChannel * offset 580 */ adc_channel_e throttlePedalPositionAdcChannel; @@ -2727,4 +2728,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 03 21:08:34 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 05 11:03:35 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 10f60f38e0..cde3d95175 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1664,8 +1664,10 @@ #define tle8888spiDevice_offset_hex fb8 #define TOTAL_CONFIG_SIZE 20000 #define TOTAL_CONFIG_SIZE_hex 4e20 -#define tps2AdcChannel_offset 515 -#define tps2AdcChannel_offset_hex 203 +#define tps1_1AdcChannel_offset 512 +#define tps1_1AdcChannel_offset_hex 200 +#define tps2_1AdcChannel_offset 515 +#define tps2_1AdcChannel_offset_hex 203 #define TPS_TPS_ACCEL_TABLE 8 #define tpsAccelEnrichmentThreshold_offset 2068 #define tpsAccelEnrichmentThreshold_offset_hex 814 @@ -1675,8 +1677,6 @@ #define tpsAccelFractionPeriod_offset_hex fb2 #define tpsAccelLength_offset 2064 #define tpsAccelLength_offset_hex 810 -#define tpsAdcChannel_offset 512 -#define tpsAdcChannel_offset_hex 200 #define tpsDecelEnleanmentMultiplier_offset 2104 #define tpsDecelEnleanmentMultiplier_offset_hex 838 #define tpsDecelEnleanmentThreshold_offset 2100 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index ec2152d914..0cc0a8cc6b 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -376,7 +376,7 @@ static void printAnalogInfo(void) { printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel); printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor); - printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel); + printAnalogChannelInfo("TPS", engineConfiguration->tps1_1AdcChannel); printAnalogChannelInfo("pPS", engineConfiguration->throttlePedalPositionAdcChannel); if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) { printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel); @@ -579,7 +579,7 @@ void setMockAfrVoltage(float voltage) { } void setMockTpsVoltage(float voltage) { - setMockVoltage(engineConfiguration->tpsAdcChannel, voltage); + setMockVoltage(engineConfiguration->tps1_1AdcChannel, voltage); } void setMockMapVoltage(float voltage) { diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index 63780fe7d2..c5656d094a 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -105,7 +105,7 @@ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) { * Return voltage on TPS AND channel * */ float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - return getVoltageDivided("tps", engineConfiguration->tpsAdcChannel); + return getVoltageDivided("tps", engineConfiguration->tps1_1AdcChannel); } /* @@ -119,11 +119,11 @@ int getTPS12bitAdc(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return mockTps; } #endif - if (engineConfiguration->tpsAdcChannel == EFI_ADC_NONE) + if (engineConfiguration->tps1_1AdcChannel == EFI_ADC_NONE) return -1; #if EFI_PROD_CODE - return getAdcValue("tps10", engineConfiguration->tpsAdcChannel); + return getAdcValue("tps10", engineConfiguration->tps1_1AdcChannel); // return tpsFastAdc / 4; #else return 0; @@ -184,7 +184,7 @@ percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - return engineConfiguration->tpsAdcChannel != EFI_ADC_NONE; + return engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE; } percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) { diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 339f7da0df..2b984e2057 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -417,7 +417,7 @@ void printTPSInfo(void) { static char pinNameBuffer[16]; scheduleMsg(&logger, "tps min (closed) %d/max (full) %d v=%.2f @%s", engineConfiguration->tpsMin, engineConfiguration->tpsMax, - getTPSVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), getPinNameByAdcChannel("tps", engineConfiguration->tpsAdcChannel, pinNameBuffer)); + getTPSVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), getPinNameByAdcChannel("tps", engineConfiguration->tps1_1AdcChannel, pinNameBuffer)); #endif /* EFI_PROD_CODE */ scheduleMsg(&logger, "current 10bit=%d value=%.2f rate=%.2f", getTPS10bitAdc(), getTPS(PASS_ENGINE_PARAMETER_SIGNATURE), getTpsRateOfChange()); @@ -789,7 +789,7 @@ static void setAnalogInputPin(const char *sensorStr, const char *pinName) { engineConfiguration->iat.adcChannel = channel; scheduleMsg(&logger, "setting IAT to %s/%d", pinName, channel); } else if (strEqual("tps", sensorStr)) { - engineConfiguration->tpsAdcChannel = channel; + engineConfiguration->tps1_1AdcChannel = channel; scheduleMsg(&logger, "setting TPS to %s/%d", pinName, channel); } incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 3c462ffd81..a2add924d8 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -482,7 +482,7 @@ static void configureInputs(void) { addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST); addChannel("baro", engineConfiguration->baroSensor.hwChannel, ADC_SLOW); - addChannel("TPS", engineConfiguration->tpsAdcChannel, ADC_FAST); + addChannel("TPS", engineConfiguration->tps1_1AdcChannel, ADC_FAST); addChannel("fuel", engineConfiguration->fuelLevelSensor, ADC_SLOW); addChannel("pPS", engineConfiguration->throttlePedalPositionAdcChannel, ADC_SLOW); addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW); diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 6cbbd56c58..030cf981ce 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -225,8 +225,8 @@ static void calcFastAdcIndexes(void) { hipSampleIndex = engineConfiguration->hipOutputChannel == EFI_ADC_NONE ? -1 : fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->hipOutputChannel]; - if (engineConfiguration->tpsAdcChannel != EFI_ADC_NONE) { - tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tpsAdcChannel]; + if (engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE) { + tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tps1_1AdcChannel]; } else { tpsSampleIndex = TPS_IS_SLOW; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1615db00a9..5162d279f3 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -403,10 +403,10 @@ log_format_e logFormat; int HD44780width;;"index", 1, 0, 0, 300, 0 int HD44780height;;"index", 1, 0, 0, 300, 0 - adc_channel_e tpsAdcChannel;See aslo pedalPositionAdcChannel + adc_channel_e tps1_1AdcChannel;First TPS, single channel so far. See aslo pedalPositionAdcChannel adc_channel_e vbattAdcChannel; adc_channel_e fuelLevelSensor; - adc_channel_e tps2AdcChannel;Second throttle body position sensor + adc_channel_e tps2_1AdcChannel;Second throttle body position sensor, single channel so far int overrideCrankingIgnition; int sensorChartFrequency;;"index", 1, 0, 0, 300, 0 ; size 4 @@ -454,7 +454,7 @@ end_struct afr_sensor_s afr -adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSee also tpsAdcChannel +adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSingle channel so far\nSee also tpsAdcChannel brain_pin_e tle6240_cs; pin_output_mode_e tle6240_csPinMode; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ff64f065fc..7dfafd494f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -68,7 +68,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 05 10:46:52 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 05 11:03:35 EDT 2019 pageSize = 20000 page = 1 @@ -178,10 +178,10 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tpsAdcChannel = bits, U08, 512, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vbattAdcChannel = bits, U08, 513, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" fuelLevelSensor = bits, U08, 514, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - tps2AdcChannel = bits, U08, 515, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + tps2_1AdcChannel = bits, U08, 515, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" ;no TS info - skipping overrideCrankingIgnition offset 516 sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4 trigger_type = bits, U32, 524, [0:5], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID" @@ -1098,8 +1098,8 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - alignmet = scalar, U16, 34, "al", 1, 0.0; + tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; ; total fuel squirt duration (in MS) per engine cycle according to current CLT @@ -1729,7 +1729,7 @@ gaugeCategory = Sensors MAFGauge = MAFValue, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 gaugeCategory = Sensors2 VSSGauge = vehicleSpeedKph, "Speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 @@ -1973,7 +1973,7 @@ gaugeCategory = Fuel Data entry = ind_fan, "radiator fan",int,"%d" -; tpsADC = U16, "ADC", +; tpsADC1 = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -2424,7 +2424,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "AFR ADC input", afr_hwChannel field = "vBatt ADC input", vbattAdcChannel field = "!See Tools>Calibrate TPS" - field = "Throttle position sensor", tpsAdcChannel + field = "Throttle1 position sensor", tpsAdc1_1Channel + field = "Throttle2 position sensor", tpsAdc2_1Channel dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" @@ -2445,8 +2446,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS ADC input", tpsAdcChannel - field = "TPS2 ADC input", tps2AdcChannel + field = "TPS1 ADC input", tps1_1AdcChannel + field = "TPS2 ADC input", tps2_2AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel @@ -3303,7 +3304,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = etbDialogRight field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "TPS", tpsAdcChannel + field = "TPS1", tps1_1AdcChannel field = "Pedal", throttlePedalPositionAdcChannel field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleRange diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5fa38ac537..9a63caccbd 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -169,8 +169,8 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC = scalar, U16, 32, "ADC", 1, 0.0; - alignmet = scalar, U16, 34, "al", 1, 0.0; + tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; ; total fuel squirt duration (in MS) per engine cycle according to current CLT @@ -800,7 +800,7 @@ gaugeCategory = Sensors MAFGauge = MAFValue, "Mass Air Flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery Voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 - tpsADCGauge = tpsADC, "tps ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 gaugeCategory = Sensors2 VSSGauge = vehicleSpeedKph, "Speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 @@ -1044,7 +1044,7 @@ gaugeCategory = Fuel Data entry = ind_fan, "radiator fan",int,"%d" -; tpsADC = U16, "ADC", +; tpsADC1 = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -1495,7 +1495,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "AFR ADC input", afr_hwChannel field = "vBatt ADC input", vbattAdcChannel field = "!See Tools>Calibrate TPS" - field = "Throttle position sensor", tpsAdcChannel + field = "Throttle1 position sensor", tpsAdc1_1Channel + field = "Throttle2 position sensor", tpsAdc2_1Channel dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" @@ -1516,8 +1517,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS ADC input", tpsAdcChannel - field = "TPS2 ADC input", tps2AdcChannel + field = "TPS1 ADC input", tps1_1AdcChannel + field = "TPS2 ADC input", tps2_2AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel @@ -2374,7 +2375,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = etbDialogRight field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode - field = "TPS", tpsAdcChannel + field = "TPS1", tps1_1AdcChannel field = "Pedal", throttlePedalPositionAdcChannel field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleRange diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 7d426b5db0..24b6316b42 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 03 21:08:34 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 05 11:03:35 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -1067,8 +1067,10 @@ public class Fields { public static final int tle8888_csPinMode_offset = 3130; public static final int tle8888spiDevice_offset = 4024; public static final int TOTAL_CONFIG_SIZE = 20000; - public static final int tps2AdcChannel_offset = 515; - public static final int tps2AdcChannel_offset_hex = 203; + public static final int tps1_1AdcChannel_offset = 512; + 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 TPS_TPS_ACCEL_TABLE = 8; public static final int tpsAccelEnrichmentThreshold_offset = 2068; public static final int tpsAccelEnrichmentThreshold_offset_hex = 814; @@ -1076,8 +1078,6 @@ public class Fields { public static final int tpsAccelFractionPeriod_offset = 4018; public static final int tpsAccelLength_offset = 2064; public static final int tpsAccelLength_offset_hex = 810; - public static final int tpsAdcChannel_offset = 512; - public static final int tpsAdcChannel_offset_hex = 200; public static final int tpsDecelEnleanmentMultiplier_offset = 2104; public static final int tpsDecelEnleanmentMultiplier_offset_hex = 838; public static final int tpsDecelEnleanmentThreshold_offset = 2100; @@ -1326,10 +1326,10 @@ public class Fields { public static final Field BYFIRMWAREVERSION = Field.create("BYFIRMWAREVERSION", 500, FieldType.INT); public static final Field HD44780WIDTH = Field.create("HD44780WIDTH", 504, FieldType.INT); public static final Field HD44780HEIGHT = Field.create("HD44780HEIGHT", 508, FieldType.INT); - public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 512, FieldType.INT8, adc_channel_e); + public static final Field TPS1_1ADCCHANNEL = Field.create("TPS1_1ADCCHANNEL", 512, FieldType.INT8, adc_channel_e); public static final Field VBATTADCCHANNEL = Field.create("VBATTADCCHANNEL", 513, FieldType.INT8, adc_channel_e); public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 514, FieldType.INT8, adc_channel_e); - public static final Field TPS2ADCCHANNEL = Field.create("TPS2ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); + public static final Field TPS2_1ADCCHANNEL = Field.create("TPS2_1ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); public static final Field OVERRIDECRANKINGIGNITION = Field.create("OVERRIDECRANKINGIGNITION", 516, FieldType.INT); public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT); public static final String[] trigger_type_e = {"custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"};