andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Proteus meta - fixing confusion

This commit is contained in:
Andrey 2021-10-28 22:11:26 -04:00
parent 05c13b0ebb
commit bfe6a5b2a8
4 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -26,18 +26,18 @@ static const brain_pin_e injPins[] = {
}; };
static const brain_pin_e ignPins[] = { static const brain_pin_e ignPins[] = {
PROTEUS_HS_1, PROTEUS_IGN_1,
PROTEUS_HS_2, PROTEUS_IGN_2,
PROTEUS_HS_3, PROTEUS_IGN_3,
PROTEUS_HS_4, PROTEUS_IGN_4,
PROTEUS_HS_5, PROTEUS_IGN_5,
PROTEUS_HS_6, PROTEUS_IGN_6,
PROTEUS_HS_7, PROTEUS_IGN_7,
PROTEUS_HS_8, PROTEUS_IGN_8,
PROTEUS_HS_9, PROTEUS_IGN_9,
PROTEUS_HS_10, PROTEUS_IGN_10,
PROTEUS_HS_11, PROTEUS_IGN_11,
PROTEUS_HS_12, PROTEUS_IGN_12,
}; };
static void setInjectorPins() { static void setInjectorPins() {

30
firmware/config/boards/proteus_meta.h
View File

@ -41,23 +41,29 @@
// pin 23/black35 // pin 23/black35
#define PROTEUS_LS_16 GPIOE_2 #define PROTEUS_LS_16 GPIOE_2
// pin 2/black35 // pin 2/black35
#define PROTEUS_HS_1 GPIOD_4
// pin 1/black35 // 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 // pin 22/black35
#define PROTEUS_HS_3 GPIOC_9 #define PROTEUS_IGN_3 GPIOC_9
#define PROTEUS_HS_4 GPIOC_8 #define PROTEUS_IGN_4 GPIOC_8
#define PROTEUS_HS_5 GPIOC_7 #define PROTEUS_IGN_5 GPIOC_7
#define PROTEUS_HS_6 GPIOG_8 #define PROTEUS_IGN_6 GPIOG_8
#define PROTEUS_HS_7 GPIOG_7 #define PROTEUS_IGN_7 GPIOG_7
#define PROTEUS_HS_8 GPIOG_6 #define PROTEUS_IGN_8 GPIOG_6
#define PROTEUS_HS_9 GPIOG_5 #define PROTEUS_IGN_9 GPIOG_5
#define PROTEUS_HS_10 GPIOG_4 #define PROTEUS_IGN_10 GPIOG_4
#define PROTEUS_HS_11 GPIOG_3 #define PROTEUS_IGN_11 GPIOG_3
#define PROTEUS_HS_12 GPIOG_2 #define PROTEUS_IGN_12 GPIOG_2
// Analog Temp 1 = PC4 // Analog Temp 1 = PC4
#define PROTEUS_IN_ANALOG_TEMP_1 EFI_ADC_14 #define PROTEUS_IN_ANALOG_TEMP_1 EFI_ADC_14

22
firmware/config/engines/custom_engine.cpp
View File

@ -544,19 +544,19 @@ void proteusBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->ignitionPins[0] = PROTEUS_HS_1; engineConfiguration->ignitionPins[0] = PROTEUS_IGN_1;
engineConfiguration->ignitionPins[1] = PROTEUS_HS_2; engineConfiguration->ignitionPins[1] = PROTEUS_IGN_2;
engineConfiguration->ignitionPins[2] = PROTEUS_HS_4; engineConfiguration->ignitionPins[2] = PROTEUS_IGN_4;
engineConfiguration->ignitionPins[3] = PROTEUS_HS_5; engineConfiguration->ignitionPins[3] = PROTEUS_IGN_5;
engineConfiguration->ignitionPins[4] = PROTEUS_HS_6; engineConfiguration->ignitionPins[4] = PROTEUS_IGN_6;
engineConfiguration->ignitionPins[5] = PROTEUS_HS_7; engineConfiguration->ignitionPins[5] = PROTEUS_IGN_7;
engineConfiguration->ignitionPins[6] = GPIOD_15;// "Highside 3" # pin 13/black35 engineConfiguration->ignitionPins[6] = GPIOD_15;// "Highside 3" # pin 13/black35
engineConfiguration->ignitionPins[7] = PROTEUS_HS_3; engineConfiguration->ignitionPins[7] = PROTEUS_IGN_3;
engineConfiguration->ignitionPins[8] = PROTEUS_HS_9; engineConfiguration->ignitionPins[8] = PROTEUS_IGN_9;
engineConfiguration->ignitionPins[9] = PROTEUS_HS_8; engineConfiguration->ignitionPins[9] = PROTEUS_IGN_8;
engineConfiguration->ignitionPins[10] = PROTEUS_HS_1; engineConfiguration->ignitionPins[10] = PROTEUS_IGN_1;
engineConfiguration->ignitionPins[11] = PROTEUS_HS_12; engineConfiguration->ignitionPins[11] = PROTEUS_IGN_12;
engineConfiguration->fsioOutputPins[0] = GPIOE_2;// "Lowside 16" # pin 23/black35 engineConfiguration->fsioOutputPins[0] = GPIOE_2;// "Lowside 16" # pin 23/black35
engineConfiguration->fsioOutputPins[1] = GPIOG_14;// "Lowside 7" engineConfiguration->fsioOutputPins[1] = GPIOG_14;// "Lowside 7"

4
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -759,9 +759,9 @@ void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE)
engineConfiguration->ignitionMode = IM_WASTED_SPARK; engineConfiguration->ignitionMode = IM_WASTED_SPARK;
#if EFI_PROD_CODE #if EFI_PROD_CODE
engineConfiguration->ignitionPins[0] = PROTEUS_HS_1; engineConfiguration->ignitionPins[0] = PROTEUS_IGN_1;
engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
engineConfiguration->ignitionPins[2] = PROTEUS_HS_3; engineConfiguration->ignitionPins[2] = PROTEUS_IGN_3;
engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;