mirror of https://github.com/FOME-Tech/fome-fw.git
export board-specific macro for stm32 pins based on board yaml #3298
This commit is contained in:
parent
8f71e735b5
commit
6a3c4d5d3e
|
@ -11,18 +11,18 @@
|
|||
#include "proteus_meta.h"
|
||||
|
||||
static const brain_pin_e injPins[] = {
|
||||
GPIOD_7,
|
||||
PROTEUS_LS_1,
|
||||
PROTEUS_LS_2,
|
||||
GPIOG_10,
|
||||
GPIOG_11,
|
||||
GPIOG_12,
|
||||
GPIOG_13,
|
||||
GPIOG_14,
|
||||
GPIOB_4,
|
||||
GPIOB_5,
|
||||
GPIOB_6,
|
||||
GPIOB_7,
|
||||
GPIOB_8
|
||||
PROTEUS_LS_3,
|
||||
PROTEUS_LS_4,
|
||||
PROTEUS_LS_5,
|
||||
PROTEUS_LS_6,
|
||||
PROTEUS_LS_7,
|
||||
PROTEUS_LS_8,
|
||||
PROTEUS_LS_9,
|
||||
PROTEUS_LS_10,
|
||||
PROTEUS_LS_11,
|
||||
PROTEUS_LS_12
|
||||
};
|
||||
|
||||
static const brain_pin_e ignPins[] = {
|
||||
|
|
|
@ -8,4 +8,22 @@
|
|||
#pragma once
|
||||
|
||||
#define PROTEUS_LS_1 GPIOD_7
|
||||
// pin 15/black35
|
||||
#define PROTEUS_LS_2 GPIOG_9
|
||||
|
||||
// pin 4/black35
|
||||
#define PROTEUS_LS_3 GPIOG_10
|
||||
|
||||
// pin 16/black35
|
||||
#define PROTEUS_LS_4 GPIOG_11
|
||||
|
||||
#define PROTEUS_LS_5 GPIOG_12
|
||||
#define PROTEUS_LS_6 GPIOG_13
|
||||
#define PROTEUS_LS_7 GPIOG_14
|
||||
#define PROTEUS_LS_8 GPIOB_4
|
||||
#define PROTEUS_LS_9 GPIOB_5
|
||||
|
||||
// pin 20/black35
|
||||
#define PROTEUS_LS_10 GPIOB_6
|
||||
#define PROTEUS_LS_11 GPIOB_7
|
||||
#define PROTEUS_LS_12 GPIOB_8
|
||||
|
|
|
@ -524,16 +524,16 @@ void proteusBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
|
|||
CONFIG(fanPin) = GPIO_UNASSIGNED;
|
||||
CONFIG(fuelPumpPin) = GPIO_UNASSIGNED;
|
||||
|
||||
engineConfiguration->injectionPins[0] = GPIOD_7; // "Lowside 1"
|
||||
engineConfiguration->injectionPins[1] = GPIOG_9;// "Lowside 2"
|
||||
engineConfiguration->injectionPins[2] = GPIOG_10;// "Lowside 3"
|
||||
engineConfiguration->injectionPins[3] = GPIOG_11;// "Lowside 4"
|
||||
engineConfiguration->injectionPins[0] = PROTEUS_LS_1;
|
||||
engineConfiguration->injectionPins[1] = PROTEUS_LS_2;
|
||||
engineConfiguration->injectionPins[2] = PROTEUS_LS_3;
|
||||
engineConfiguration->injectionPins[3] = PROTEUS_LS_4;
|
||||
engineConfiguration->injectionPins[4] = GPIOG_12;// "Lowside 5"
|
||||
engineConfiguration->injectionPins[5] = GPIOG_13;// "Lowside 6"
|
||||
engineConfiguration->injectionPins[6] = GPIOB_5;// "Lowside 9"
|
||||
engineConfiguration->injectionPins[7] = GPIOB_4;// "Lowside 8"
|
||||
engineConfiguration->injectionPins[8] = GPIOB_7;// "Lowside 11"
|
||||
engineConfiguration->injectionPins[9] = GPIOB_6;// "Lowside 10"
|
||||
engineConfiguration->injectionPins[9] = PROTEUS_LS_10;
|
||||
engineConfiguration->injectionPins[10] = GPIOB_8;// "Lowside 12"
|
||||
engineConfiguration->injectionPins[11] = GPIOB_9;// "Lowside 13" # pin 10/black35
|
||||
|
||||
|
|
|
@ -54,6 +54,11 @@
|
|||
#include "mazda_miata_base_maps.h"
|
||||
#include "hip9011_logic.h"
|
||||
|
||||
|
||||
#if HW_PROTEUS
|
||||
#include "proteus_meta.h"
|
||||
#endif
|
||||
|
||||
static const float injectorLagBins[VBAT_INJECTOR_CURVE_SIZE] = {
|
||||
6.0, 8.0, 10.0, 11.0,
|
||||
12.0, 13.0, 14.0, 15.0
|
||||
|
@ -758,16 +763,16 @@ void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE)
|
|||
engineConfiguration->injectionMode = IM_SEQUENTIAL;
|
||||
|
||||
|
||||
engineConfiguration->injectionPins[0] = GPIOD_7; // BLU # pin 3/black35
|
||||
engineConfiguration->injectionPins[1] = GPIOG_9; // BLK # pin 15/black35
|
||||
engineConfiguration->injectionPins[2] = GPIOG_10; // GRN # pin 4/black35
|
||||
engineConfiguration->injectionPins[3] = GPIOG_11; // WHT # pin 16/black35
|
||||
engineConfiguration->injectionPins[0] = PROTEUS_LS_1; // BLU # pin 3/black35
|
||||
engineConfiguration->injectionPins[1] = PROTEUS_LS_2; // BLK
|
||||
engineConfiguration->injectionPins[2] = PROTEUS_LS_3; // GRN
|
||||
engineConfiguration->injectionPins[3] = PROTEUS_LS_4; // WHT
|
||||
engineConfiguration->injectionPinMode = OM_DEFAULT;
|
||||
|
||||
|
||||
CONFIG(enableSoftwareKnock) = true;
|
||||
|
||||
engineConfiguration->malfunctionIndicatorPin = GPIOB_6; // "Lowside 10" # pin 20/black35
|
||||
engineConfiguration->malfunctionIndicatorPin = PROTEUS_LS_10;
|
||||
|
||||
engineConfiguration->map.sensor.hwChannel = EFI_ADC_10;
|
||||
|
||||
|
|
Loading…
Reference in New Issue