diff --git a/firmware/config/boards/proteus/connectors/white35.yaml b/firmware/config/boards/proteus/connectors/white35.yaml index 5f9ceee968..51aeddcf9d 100644 --- a/firmware/config/boards/proteus/connectors/white35.yaml +++ b/firmware/config/boards/proteus/connectors/white35.yaml @@ -79,7 +79,7 @@ pins: id: [A4, EFI_ADC_4] class: [switch_inputs, analog_inputs] ts_name: Analog Volt 9 - function: "Analog Voltage Input #9" + function: "Analog Voltage Input #9 (PPS)" type: av - pin: 18 diff --git a/firmware/config/boards/proteus_meta.h b/firmware/config/boards/proteus_meta.h index bb5294d7b6..b7f54d081d 100644 --- a/firmware/config/boards/proteus_meta.h +++ b/firmware/config/boards/proteus_meta.h @@ -112,6 +112,7 @@ // PA4 #define PROTEUS_IN_ANALOG_VOLT_9 EFI_ADC_4 +#define PROTEUS_IN_PPS PROTEUS_IN_ANALOG_VOLT_9 // PA5 #define PROTEUS_IN_ANALOG_VOLT_10 EFI_ADC_5 diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 7926a78d84..ac3089512d 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -252,7 +252,7 @@ void setEngineBMW_M73_Proteus() { // 12 injectors defined in boards/proteus/board_configuration.cpp // set_analog_input_pin pps pa4 - engineConfiguration->throttlePedalPositionAdcChannel = PROTEUS_IN_ANALOG_VOLT_9; + engineConfiguration->throttlePedalPositionAdcChannel = PROTEUS_IN_PPS; strcpy(engineConfiguration->vehicleName, "Using Proteus"); diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index e1e33b50e3..2316bdaa55 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -626,11 +626,11 @@ void proteusBoardTest() { engineConfiguration->ignitionPins[4] = PROTEUS_IGN_6; engineConfiguration->ignitionPins[5] = PROTEUS_IGN_7; - engineConfiguration->ignitionPins[6] = Gpio::D15;// "Highside 3" # pin 13/black35 + engineConfiguration->ignitionPins[6] = PROTEUS_HS_3; engineConfiguration->ignitionPins[7] = PROTEUS_IGN_3; engineConfiguration->ignitionPins[8] = PROTEUS_IGN_9; engineConfiguration->ignitionPins[9] = PROTEUS_IGN_8; - engineConfiguration->ignitionPins[10] = PROTEUS_IGN_1; + engineConfiguration->ignitionPins[10] = PROTEUS_HS_1; engineConfiguration->ignitionPins[11] = PROTEUS_IGN_12;