rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"Calibrate TPS" broken in TS fix #805

This commit is contained in:
rusefi 2019-06-17 22:00:34 -04:00
parent 0b843819eb
commit 96270758c9
29 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -137,7 +137,7 @@ void setBoardConfigurationOverrides(void) {
setSerialConfigurationOverrides();
engineConfiguration->vbattAdcChannel = EFI_ADC_13;
engineConfiguration->tps1_1AdcChannel = is469 ? EFI_ADC_7 : EFI_ADC_14;
engineConfiguration->tpsADC = 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;

2
firmware/config/boards/subaru-ej20gn/board_configuration.cpp
View File

@ -89,7 +89,7 @@ void setBoardConfigurationOverrides(void) {
setSerialConfigurationOverrides();
engineConfiguration->vbattAdcChannel = EFI_ADC_6;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_13;
engineConfiguration->tpsADC = EFI_ADC_13;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_14;
engineConfiguration->clt.adcChannel = EFI_ADC_8;
/* not yet */

2
firmware/config/engines/bmw_e34.cpp
View File

@ -86,7 +86,7 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->vbattDividerCoeff = 5.33;
engineConfiguration->vbattAdcChannel = EFI_ADC_15; // PC5
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
boardConfiguration->triggerInputPins[0] = GPIOA_5;

2
firmware/config/engines/chevrolet_camaro_4.cpp
View File

@ -40,7 +40,7 @@ void setCamaro4(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2;
engineConfiguration->tpsADC = EFI_ADC_2;
// todo: move this into trigger definition
// set global_trigger_offset_angle 230

2
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -177,7 +177,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/**
* TPS <MAGNETI MARELLI>
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
engineConfiguration->tpsMax = 102; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMin = 825; // convert 12to10 bit (ADC/4)
/**

6
firmware/config/engines/custom_engine.cpp
View File

@ -103,7 +103,7 @@ void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 PC4 ADC14 VBatt
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2
engineConfiguration->tpsADC = EFI_ADC_2; // PA2
engineConfiguration->map.sensor.hwChannel = EFI_ADC_0;
@ -302,7 +302,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->etb.maxValue = 200;
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2
engineConfiguration->tpsADC = EFI_ADC_2; // PA2
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_9; // PB1
engineConfiguration->debugMode = DBG_ELECTRONIC_THROTTLE_PID;
@ -393,7 +393,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->fuelPumpPin = TLE8888_PIN_20;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3
engineConfiguration->tpsADC = EFI_ADC_3; // PA3
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // PA7
// engineConfiguration->etb.pFactor = 1.07;

4
firmware/config/engines/dodge_neon.cpp
View File

@ -401,13 +401,13 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// rev 0.1 green board
// engineConfiguration->map.sensor.hwChannel = EFI_ADC_6; // PA6
// engineConfiguration->tps1_1AdcChannel = EFI_ADC_15; // PC5
// engineConfiguration->tpsADC = EFI_ADC_15; // PC5
/**
* TPS
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2;
engineConfiguration->tpsADC = EFI_ADC_2;
engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4)

2
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -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->tps1_1AdcChannel = EFI_ADC_4;
engineConfiguration->tpsADC = EFI_ADC_4;
engineConfiguration->iat.adcChannel = EFI_ADC_2;
engineConfiguration->clt.adcChannel = EFI_ADC_1;
engineConfiguration->afr.hwChannel = EFI_ADC_11;

2
firmware/config/engines/ford_aspire.cpp
View File

@ -147,7 +147,7 @@ void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// Frankenstein analog input #12: adc
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
engineConfiguration->vbattAdcChannel = EFI_ADC_0;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->mafAdcChannel = EFI_ADC_1;

2
firmware/config/engines/ford_festiva.cpp
View File

@ -216,7 +216,7 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4)
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
// engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->clt.adcChannel = EFI_ADC_12;

2
firmware/config/engines/honda_600.cpp
View File

@ -109,7 +109,7 @@ void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
* Frankenso analog #11 PC5 ADC15
* Frankenso analog #12 PC4 ADC14 VBatt
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2;
engineConfiguration->tpsADC = EFI_ADC_2;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_0;

2
firmware/config/engines/honda_accord.cpp
View File

@ -132,7 +132,7 @@ static void setHondaAccordConfigurationCommon(DECLARE_CONFIG_PARAMETER_SIGNATURE
/**
* TPS D11/W11 blue wire
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_1;
engineConfiguration->tpsADC = EFI_ADC_1;
/**

6
firmware/config/engines/mazda_miata.cpp
View File

@ -198,7 +198,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->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
engineConfiguration->clt.adcChannel = EFI_ADC_11;
}
@ -302,7 +302,7 @@ static void setMiata1994_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
commonFrankensoAnalogInputs(engineConfiguration);
engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2
engineConfiguration->tpsADC = EFI_ADC_2; // PA2
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->mafAdcChannel = EFI_ADC_0;
engineConfiguration->clt.adcChannel = EFI_ADC_12;
@ -393,7 +393,7 @@ void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_13;
engineConfiguration->tpsADC = EFI_ADC_13;
boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3
boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;

2
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -272,6 +272,6 @@ void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/**
* Stage 0 we only have OEM TPS switch
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->tpsADC = EFI_ADC_NONE;
// todo: MAF-based ignition table?
}

2
firmware/config/engines/mazda_miata_nb.cpp
View File

@ -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->tps1_1AdcChannel = EFI_ADC_3; // 15 is the old value
engineConfiguration->tpsADC = 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;

2
firmware/config/engines/me7pnp.cpp
View File

@ -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->tps1_1AdcChannel = PF3; TODO: ADC channel 3
//engineConfiguration->tpsADC = 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

2
firmware/config/engines/rover_v8.cpp
View File

@ -106,7 +106,7 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setCommonNTCSensor(&engineConfiguration->iat);
engineConfiguration->iat.config.bias_resistor = 2700;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; //Frankenstein: inp2
engineConfiguration->tpsADC = EFI_ADC_3; //Frankenstein: inp2
engineConfiguration->vbattAdcChannel = EFI_ADC_0; //Frankenstein: inp5
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->iat.adcChannel = EFI_ADC_13;

2
firmware/config/engines/sachs.cpp
View File

@ -49,7 +49,7 @@ void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// Frankenstein analog input #11: PC4 adc14
// Frankenstein analog input #12: PC5 adc15
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsADC = EFI_ADC_3;
engineConfiguration->vbattAdcChannel = EFI_ADC_NONE;
/**

2
firmware/console/status_loop.cpp
View File

@ -841,7 +841,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->tps1_1AdcChannel != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tps1_1AdcChannel) : 0.0f;
tsOutputChannels->debugFloatField2 = (engineConfiguration->tpsADC != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tpsADC) : 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;

2
firmware/controllers/actuators/lcd_controller.cpp
View File

@ -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->tps1_1AdcChannel, buffer);
getPinNameByAdcChannel("tps", engineConfiguration->tpsADC, buffer);
lcdPrintf("Throttle %s %.2f%%", buffer, getTPS());
return;

4
firmware/controllers/engine_controller.cpp
View File

@ -386,7 +386,7 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel);
printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor);
printAnalogChannelInfo("TPS", engineConfiguration->tps1_1AdcChannel);
printAnalogChannelInfo("TPS", engineConfiguration->tpsADC);
printAnalogChannelInfo("pPS", engineConfiguration->throttlePedalPositionAdcChannel);
if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) {
printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);
@ -589,7 +589,7 @@ void setMockAfrVoltage(float voltage) {
}
void setMockTpsVoltage(float voltage) {
setMockVoltage(engineConfiguration->tps1_1AdcChannel, voltage);
setMockVoltage(engineConfiguration->tpsADC, voltage);
}
void setMockMapVoltage(float voltage) {

12
firmware/controllers/sensors/tps.cpp
View File

@ -84,8 +84,8 @@ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if !EFI_UNIT_TEST
engine->engineState.DISPLAY_FIELD(tpsVoltageMCU) = adcToVolts(adc);
#endif
DISPLAY_TEXT(Volts);inte
DISPLAY_TEXT(from_pin) DISPLAY(DISPLAY_CONFIG(tps1_1AdcChannel))
DISPLAY_TEXT(Volts);
DISPLAY_TEXT(from_pin) DISPLAY(DISPLAY_CONFIG(tpsADC))
DISPLAY_TEXT(EOL);
DISPLAY_TEXT(Analog_ECU_reads);
@ -126,7 +126,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->tps1_1AdcChannel);
return getVoltageDivided("tps", engineConfiguration->tpsADC);
}
/*
@ -140,11 +140,11 @@ int getTPS12bitAdc(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return engine->mockTpsAdcValue;
}
#endif
if (engineConfiguration->tps1_1AdcChannel == EFI_ADC_NONE)
if (engineConfiguration->tpsADC == EFI_ADC_NONE)
return -1;
#if EFI_PROD_CODE
return getAdcValue("tps10", engineConfiguration->tps1_1AdcChannel);
return getAdcValue("tps10", engineConfiguration->tpsADC);
// return tpsFastAdc / 4;
#else
return 0;
@ -205,7 +205,7 @@ percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
}
bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE;
return engineConfiguration->tpsADC != EFI_ADC_NONE;
}
percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) {

4
firmware/controllers/settings.cpp
View File

@ -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->tps1_1AdcChannel, pinNameBuffer));
getTPSVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), getPinNameByAdcChannel("tps", engineConfiguration->tpsADC, pinNameBuffer));
#endif /* EFI_PROD_CODE */
scheduleMsg(&logger, "current 10bit=%d value=%.2f rate=%.2f", getTPS10bitAdc(), getTPS(PASS_ENGINE_PARAMETER_SIGNATURE),
getTpsRateOfChange());
@ -791,7 +791,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->tps1_1AdcChannel = channel;
engineConfiguration->tpsADC = channel;
scheduleMsg(&logger, "setting TPS to %s/%d", pinName, channel);
}
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE);

2
firmware/hw_layer/adc_inputs.cpp
View File

@ -487,7 +487,7 @@ static void configureInputs(void) {
addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST);
addChannel("baro", engineConfiguration->baroSensor.hwChannel, ADC_SLOW);
addChannel("TPS", engineConfiguration->tps1_1AdcChannel, ADC_FAST);
addChannel("TPS", engineConfiguration->tpsADC, ADC_FAST);
addChannel("fuel", engineConfiguration->fuelLevelSensor, ADC_SLOW);
addChannel("pPS", engineConfiguration->throttlePedalPositionAdcChannel, ADC_SLOW);
addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW);

4
firmware/hw_layer/hardware.cpp
View File

@ -230,8 +230,8 @@ static void calcFastAdcIndexes(void) {
hipSampleIndex =
engineConfiguration->hipOutputChannel == EFI_ADC_NONE ?
-1 : fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->hipOutputChannel];
if (engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE) {
tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tps1_1AdcChannel];
if (engineConfiguration->tpsADC != EFI_ADC_NONE) {
tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tpsADC];
} else {
tpsSampleIndex = TPS_IS_SLOW;
}

15
firmware/integration/rusefi_config.txt
View File

@ -315,8 +315,8 @@ 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 tpsMax;Full throtle. 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 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 tpsADC\nset tps_min X;"ADC", 1, 0, 0, 1023, 0
int16_t tpsMax;Full throtle. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tpsADC\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
int16_t tpsErrorDetectionTooHigh;+TPS error detection, what TPS % value is unrealistically high;"%", 1, 0, -40, 200, 0
@ -417,8 +417,13 @@ log_format_e logFormat;
int byFirmwareVersion;;"index", 1, 0, 0, 300, 0
int HD44780width;;"index", 1, 0, 0, 300, 0
int HD44780height;;"index", 1, 0, 0, 300, 0
adc_channel_e tps1_1AdcChannel;First TPS, single channel so far. See aslo pedalPositionAdcChannel
!
! TunerStudio has that nice 'Calibrate TPS' standart dialog which users LOVE!
! So, we have to use 'tpsADC' magic field name for first TPS first channel
! https://github.com/rusefi/rusefi/issues/805
!
adc_channel_e tpsADC;First TPS, single channel so far. See aslo pedalPositionAdcChannel
adc_channel_e vbattAdcChannel;
adc_channel_e fuelLevelSensor;
adc_channel_e tps2_1AdcChannel;Second throttle body position sensor, single channel so far
@ -471,7 +476,7 @@ end_struct
afr_sensor_s afr
adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSingle channel so far\nSee also tps1_1AdcChannel
adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSingle channel so far\nSee also tpsADC
brain_pin_e tle6240_cs;
pin_output_mode_e tle6240_csPinMode;

10
firmware/tunerstudio/rusefi.input
View File

@ -1542,10 +1542,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = tpsSensor, "TPS"
field = "!See Tools>Calibrate TPS"
field = "Throttle1 position sensor", tps1_1AdcChannel
field = "Throttle1 position sensor", tpsADC
field = "Throttle2 position sensor", tps2_1AdcChannel
field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16}
field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16}
dialog = pedalSensor, "Accelerator pedal"
field = "Accelerator position sensor", throttlePedalPositionAdcChannel
@ -1572,7 +1572,7 @@ 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 = "TPS1 ADC input", tps1_1AdcChannel
field = "TPS1 ADC input", tpsADC
field = "TPS2 ADC input", tps2_1AdcChannel
field = "MAF ADC input", mafAdcChannel
field = "AFR ADC input", afr_hwChannel
@ -2457,7 +2457,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = etbDialogRight
field = "!https://rusefi.com/s/debugmode"
field = "Debug mode", debugMode
field = "TPS1", tps1_1AdcChannel
field = "TPS1", tpsADC
field = "Pedal", throttlePedalPositionAdcChannel
field = "use ETB for idle", useETBforIdleControl
field = "ETB idle maximum angle", etbIdleRange

10
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -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 Mon Jun 17 21:03:13 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jun 17 21:43:24 EDT 2019
import com.rusefi.config.*;
@ -1092,8 +1092,6 @@ 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 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;
@ -1103,6 +1101,8 @@ 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 tpsADC_offset = 512;
public static final int tpsADC_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;
@ -1352,7 +1352,7 @@ 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 TPS1_1ADCCHANNEL = Field.create("TPS1_1ADCCHANNEL", 512, FieldType.INT8, adc_channel_e);
public static final Field TPSADC = Field.create("TPSADC", 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 TPS2_1ADCCHANNEL = Field.create("TPS2_1ADCCHANNEL", 515, FieldType.INT8, adc_channel_e);
@ -2136,7 +2136,7 @@ public class Fields {
BYFIRMWAREVERSION,
HD44780WIDTH,
HD44780HEIGHT,
TPS1_1ADCCHANNEL,
TPSADC,
VBATTADCCHANNEL,
FUELLEVELSENSOR,
TPS2_1ADCCHANNEL,

2
java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java
View File

@ -8,7 +8,7 @@ public class TpsMeta {
new FieldRequest("tpsVoltageMCU"),
new TextRequest("Volts"),
new TextRequest("from_pin"),
new ConfigRequest("tps1_1AdcChannel"),
new ConfigRequest("tpsADC"),
new TextRequest("EOL"),
new TextRequest("Analog_ECU_reads"),
new FieldRequest("tpsVoltageBoard"),