configuration for secondary (redundant) TPS sensors (#1419)

* add new fields

* add tps 2 secondary

* sensible error detection limits

* UI mods

* grey out as appropriate

* defaults

* either it's unused or its not
This commit is contained in:
Matthew Kennedy 2020-05-10 13:13:15 -07:00 committed by GitHub
parent 3e506a674a
commit c7fadd475f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 11 deletions

View File

@ -960,8 +960,14 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->fanOnTemperature = 95;
engineConfiguration->fanOffTemperature = 91;
engineConfiguration->tpsMin = convertVoltageTo10bitADC(1.250);
engineConfiguration->tpsMax = convertVoltageTo10bitADC(4.538);
engineConfiguration->tpsMin = convertVoltageTo10bitADC(0);
engineConfiguration->tpsMax = convertVoltageTo10bitADC(5);
engineConfiguration->tps1SecondaryMin = convertVoltageTo10bitADC(0);
engineConfiguration->tps1SecondaryMax = convertVoltageTo10bitADC(5);
engineConfiguration->tps2Min = convertVoltageTo10bitADC(0);
engineConfiguration->tps2Max = convertVoltageTo10bitADC(5);
engineConfiguration->tps2SecondaryMin = convertVoltageTo10bitADC(0);
engineConfiguration->tps2SecondaryMax = convertVoltageTo10bitADC(5);
engineConfiguration->tpsErrorDetectionTooLow = -10; // -10% open
engineConfiguration->tpsErrorDetectionTooHigh = 110; // 110% open

View File

@ -1778,16 +1778,31 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
dialog = tpsSensor, "TPS"
dialog = tpsNum1, "Throttle #1"
field = "!See Tools>Calibrate TPS"
field = "Throttle1 position sensor", tps1_1AdcChannel
field = "Throttle1 2nd position sensor", tps1_2AdcChannel
field = "Throttle2 position sensor", tps2_1AdcChannel
field = "Throttle2 2nd position sensor", tps2_2AdcChannel
field = "Throttle2 min value", tps2Min
field = "Throttle2 max value", tps2Max
field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
field = "Primary sensor", tps1_1AdcChannel
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
field = "Secondary sensor", tps1_2AdcChannel
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
dialog = tpsNum2, "Throttle #2"
field = "Primary sensor", tps2_1AdcChannel
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
field = "Secondary sensor", tps2_2AdcChannel
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
dialog = tpsLimits, "TPS Limits"
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
dialog = tpsSensor, "TPS"
panel = tpsLimits
panel = tpsNum1
panel = tpsNum2
dialog = pedalSensorLeft, "Accelerator pedal"
field = "Accelerator position sensor", throttlePedalPositionAdcChannel