diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index dc51d0a9b4..514d5da534 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[] = { - GPIOD_4, - GPIOD_3, - GPIOC_9, - GPIOC_8, - GPIOC_7, - GPIOG_8, - GPIOG_7, - GPIOG_6, - GPIOG_5, - GPIOG_4, - GPIOG_3, - GPIOG_2, + 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, }; static void setInjectorPins() { @@ -108,13 +108,11 @@ static void setupDefaultSensorInputs() { // trigger inputs #if VR_HW_CHECK_MODE // set_trigger_input_pin 0 PE7 - // GPIOE_7: "VR 1" - engineConfiguration->triggerInputPins[0] = GPIOE_7; - // GPIOE_8: "VR 2" - engineConfiguration->camInputs[0] = GPIOE_8; + engineConfiguration->triggerInputPins[0] = PROTEUS_VR_1; + engineConfiguration->camInputs[0] = PROTEUS_VR_2; #else // Digital channel 1 as default - others not set - engineConfiguration->triggerInputPins[0] = GPIOC_6; + engineConfiguration->triggerInputPins[0] = PROTEUS_DIGITAL_1; engineConfiguration->camInputs[0] = GPIO_UNASSIGNED; #endif diff --git a/firmware/config/boards/proteus/proteus_meta.h b/firmware/config/boards/proteus/proteus_meta.h index acf34ea1ed..7ce47e1fcb 100644 --- a/firmware/config/boards/proteus/proteus_meta.h +++ b/firmware/config/boards/proteus/proteus_meta.h @@ -27,3 +27,27 @@ #define PROTEUS_LS_10 GPIOB_6 #define PROTEUS_LS_11 GPIOB_7 #define PROTEUS_LS_12 GPIOB_8 + +// pin 2/black35 +#define PROTEUS_HS_1 GPIOD_4 + +// pin 1/black35 +#define PROTEUS_HS_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_VR_1 GPIOE_7 +#define PROTEUS_VR_2 GPIOE_8 + +#define PROTEUS_DIGITAL_1 GPIOC_6 diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 818942814c..de52e7159d 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -540,19 +540,19 @@ void proteusBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->ignitionPins[0] = GPIOD_4;// "Ign 1" - engineConfiguration->ignitionPins[1] = GPIOD_3;// "Ign 2" - engineConfiguration->ignitionPins[2] = GPIOC_8;// "Ign 4" - engineConfiguration->ignitionPins[3] = GPIOC_7;// "Ign 5" - engineConfiguration->ignitionPins[4] = GPIOG_8;// "Ign 6" - engineConfiguration->ignitionPins[5] = GPIOG_7;// "Ign 7" + 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[6] = GPIOD_15;// "Highside 3" # pin 13/black35 - engineConfiguration->ignitionPins[7] = GPIOC_9;// "Ign 3" - engineConfiguration->ignitionPins[8] = GPIOG_5;// "Ign 9" - engineConfiguration->ignitionPins[9] = GPIOG_6;// "Ign 8" - engineConfiguration->ignitionPins[10] = GPIOA_9;// "Highside 1" # pin 2/black35 - engineConfiguration->ignitionPins[11] = GPIOG_2;// "Ign 12" + 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->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 dd16b3b1fd..e99de2b270 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -754,9 +754,9 @@ void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) engineConfiguration->ignitionMode = IM_WASTED_SPARK; - engineConfiguration->ignitionPins[0] = GPIOD_4; // "Ign 1" # pin 35/black35 + engineConfiguration->ignitionPins[0] = PROTEUS_HS_1; engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[2] = GPIOC_9; // "Ign 3" # pin 22/black35 + engineConfiguration->ignitionPins[2] = PROTEUS_HS_3; engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;