From 665900d76adcb1652d5fec22e9e619cc1a1e8c62 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 17 Oct 2020 14:53:56 -0400 Subject: [PATCH] GDI Epic #1448 --- firmware/config/boards/microrusefi/mapping.yaml | 2 +- firmware/config/engines/vw_b6.cpp | 6 ++++++ firmware/controllers/engine_controller.cpp | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/firmware/config/boards/microrusefi/mapping.yaml b/firmware/config/boards/microrusefi/mapping.yaml index b0582b0bae..368e858920 100644 --- a/firmware/config/boards/microrusefi/mapping.yaml +++ b/firmware/config/boards/microrusefi/mapping.yaml @@ -78,7 +78,7 @@ analog_inputs: # PA6 pull-down R31 EFI_ADC_6: "26 - AN volt 2" - # PA7 + # PA7 - usually PPS Pedal Position Sensor EFI_ADC_7: "31 - AN volt 3" # PB0 - also AUX REUSE EFI_ADC_8: "36 - AN volt 8" diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index ec9f4e60e4..cd57fd0ea1 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -29,7 +29,13 @@ void setVwPassatB6(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->invertCamVVTSignal = true; engineConfiguration->vvtCamSensorUseRise = true; + // EFI_ADC_7: "31 - AN volt 3" - PA7 + engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; + // "26 - AN volt 2" + engineConfiguration->high_fuel_pressure_sensor_1 = EFI_ADC_6; + // "19 - AN volt 4" + engineConfiguration->low_fuel_pressure_sensor = EFI_ADC_12; CONFIG(isSdCardEnabled) = false; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index d790c9acff..cf00f86f63 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -325,6 +325,9 @@ static void printAnalogInfo(void) { printAnalogChannelInfo("TPS1 Secondary", engineConfiguration->tps1_2AdcChannel); printAnalogChannelInfo("TPS2 Primary", engineConfiguration->tps2_1AdcChannel); printAnalogChannelInfo("TPS2 Secondary", engineConfiguration->tps2_2AdcChannel); + printAnalogChannelInfo("LPF", engineConfiguration->low_fuel_pressure_sensor); + printAnalogChannelInfo("HPF1", engineConfiguration->high_fuel_pressure_sensor_1); + printAnalogChannelInfo("HPF2", engineConfiguration->high_fuel_pressure_sensor_2); printAnalogChannelInfo("pPS1", engineConfiguration->throttlePedalPositionAdcChannel); printAnalogChannelInfo("pPS2", engineConfiguration->throttlePedalPositionSecondAdcChannel); printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);