diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index 0ddf673d6d..995c1dcb48 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -26,18 +26,18 @@ static const brain_pin_e injPins[] = { }; static const brain_pin_e ignPins[] = { - PROTEUS_HS_1, - PROTEUS_HS_2, - PROTEUS_HS_3, - PROTEUS_HS_4, - PROTEUS_HS_5, - PROTEUS_HS_6, - PROTEUS_HS_7, - PROTEUS_HS_8, - PROTEUS_HS_9, - PROTEUS_HS_10, - PROTEUS_HS_11, - PROTEUS_HS_12, + PROTEUS_IGN_1, + PROTEUS_IGN_2, + PROTEUS_IGN_3, + PROTEUS_IGN_4, + PROTEUS_IGN_5, + PROTEUS_IGN_6, + PROTEUS_IGN_7, + PROTEUS_IGN_8, + PROTEUS_IGN_9, + PROTEUS_IGN_10, + PROTEUS_IGN_11, + PROTEUS_IGN_12, }; static void setInjectorPins() { diff --git a/firmware/config/boards/proteus_meta.h b/firmware/config/boards/proteus_meta.h index 881c912e2b..9ab3cabef5 100644 --- a/firmware/config/boards/proteus_meta.h +++ b/firmware/config/boards/proteus_meta.h @@ -41,23 +41,29 @@ // pin 23/black35 #define PROTEUS_LS_16 GPIOE_2 + // pin 2/black35 -#define PROTEUS_HS_1 GPIOD_4 // pin 1/black35 -#define PROTEUS_HS_2 GPIOD_3 + + +// pin 35/black35 +#define PROTEUS_IGN_1 GPIOD_4 + +// pin 34/black35 +#define PROTEUS_IGN_2 GPIOD_3 // pin 22/black35 -#define PROTEUS_HS_3 GPIOC_9 -#define PROTEUS_HS_4 GPIOC_8 -#define PROTEUS_HS_5 GPIOC_7 -#define PROTEUS_HS_6 GPIOG_8 -#define PROTEUS_HS_7 GPIOG_7 -#define PROTEUS_HS_8 GPIOG_6 -#define PROTEUS_HS_9 GPIOG_5 -#define PROTEUS_HS_10 GPIOG_4 -#define PROTEUS_HS_11 GPIOG_3 -#define PROTEUS_HS_12 GPIOG_2 +#define PROTEUS_IGN_3 GPIOC_9 +#define PROTEUS_IGN_4 GPIOC_8 +#define PROTEUS_IGN_5 GPIOC_7 +#define PROTEUS_IGN_6 GPIOG_8 +#define PROTEUS_IGN_7 GPIOG_7 +#define PROTEUS_IGN_8 GPIOG_6 +#define PROTEUS_IGN_9 GPIOG_5 +#define PROTEUS_IGN_10 GPIOG_4 +#define PROTEUS_IGN_11 GPIOG_3 +#define PROTEUS_IGN_12 GPIOG_2 // Analog Temp 1 = PC4 #define PROTEUS_IN_ANALOG_TEMP_1 EFI_ADC_14 diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 92a78023cf..7b7bb65253 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -544,19 +544,19 @@ void proteusBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->ignitionPins[0] = PROTEUS_HS_1; - engineConfiguration->ignitionPins[1] = PROTEUS_HS_2; - engineConfiguration->ignitionPins[2] = PROTEUS_HS_4; - engineConfiguration->ignitionPins[3] = PROTEUS_HS_5; - engineConfiguration->ignitionPins[4] = PROTEUS_HS_6; - engineConfiguration->ignitionPins[5] = PROTEUS_HS_7; + engineConfiguration->ignitionPins[0] = PROTEUS_IGN_1; + engineConfiguration->ignitionPins[1] = PROTEUS_IGN_2; + engineConfiguration->ignitionPins[2] = PROTEUS_IGN_4; + engineConfiguration->ignitionPins[3] = PROTEUS_IGN_5; + engineConfiguration->ignitionPins[4] = PROTEUS_IGN_6; + engineConfiguration->ignitionPins[5] = PROTEUS_IGN_7; engineConfiguration->ignitionPins[6] = GPIOD_15;// "Highside 3" # pin 13/black35 - engineConfiguration->ignitionPins[7] = PROTEUS_HS_3; - engineConfiguration->ignitionPins[8] = PROTEUS_HS_9; - engineConfiguration->ignitionPins[9] = PROTEUS_HS_8; - engineConfiguration->ignitionPins[10] = PROTEUS_HS_1; - engineConfiguration->ignitionPins[11] = PROTEUS_HS_12; + 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[11] = PROTEUS_IGN_12; engineConfiguration->fsioOutputPins[0] = GPIOE_2;// "Lowside 16" # pin 23/black35 engineConfiguration->fsioOutputPins[1] = GPIOG_14;// "Lowside 7" diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index cf4eab3dcc..82c8f678e2 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -759,9 +759,9 @@ void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) engineConfiguration->ignitionMode = IM_WASTED_SPARK; #if EFI_PROD_CODE - engineConfiguration->ignitionPins[0] = PROTEUS_HS_1; + engineConfiguration->ignitionPins[0] = PROTEUS_IGN_1; engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[2] = PROTEUS_HS_3; + engineConfiguration->ignitionPins[2] = PROTEUS_IGN_3; engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;