export board-specific macro for stm32 pins based on board yaml #3298

This commit is contained in:
rusefillc 2021-10-03 00:59:34 -04:00
parent 9b249fe1b3
commit 7302eedf7b
4 changed files with 22 additions and 15 deletions

View File

@ -13,6 +13,7 @@
#include "pch.h"
#include "fsio_impl.h"
#include "custom_engine.h"
#include "../hellen_meta.h"
static void hellenWbo() {
engineConfiguration->enableAemXSeries = true;
@ -24,11 +25,6 @@ static void setInjectorPins() {
engineConfiguration->injectionPins[2] = GPIOD_11; // 97 - INJ_3
engineConfiguration->injectionPins[3] = GPIOD_10;
//engineConfiguration->injectionPins[4] = GPIOD_9;
//engineConfiguration->injectionPins[5] = GPIOF_12;
//engineConfiguration->injectionPins[6] = GPIOF_13;
//engineConfiguration->injectionPins[7] = GPIOF_14;
// Disable remainder
for (int i = 4; i < MAX_CYLINDER_COUNT;i++) {
engineConfiguration->injectionPins[i] = GPIO_UNASSIGNED;

View File

@ -13,13 +13,14 @@
#include "pch.h"
#include "fsio_impl.h"
#include "custom_engine.h"
#include "../hellen_meta.h"
static void hellenWbo() {
engineConfiguration->enableAemXSeries = true;
}
static void setInjectorPins() {
engineConfiguration->injectionPins[0] = GPIOG_7;
engineConfiguration->injectionPins[0] = H176_LS_1;
engineConfiguration->injectionPins[1] = GPIOG_8;
engineConfiguration->injectionPins[2] = GPIOD_11;
engineConfiguration->injectionPins[3] = GPIOD_10;
@ -156,9 +157,9 @@ void setBoardDefaultConfiguration(void) {
engineConfiguration->injectionMode = IM_SEQUENTIAL;//IM_BATCH;// IM_SEQUENTIAL;
//Set default ETB config
engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; // out_pwm2
engineConfiguration->etbIo[0].directionPin2 = GPIOC_7; // out_pwm3
engineConfiguration->etbIo[0].controlPin = GPIOD_13; // ETB_EN out_pwm1
engineConfiguration->etbIo[0].directionPin1 = H176_OUT_PWM2;
engineConfiguration->etbIo[0].directionPin2 = H176_OUT_PWM3;
engineConfiguration->etbIo[0].controlPin = H176_OUT_PWM1; // ETB_EN
CONFIG(etb_use_two_wires) = true;
strcpy(CONFIG(engineMake), ENGINE_MAKE_MERCEDES);

View File

@ -13,18 +13,14 @@
#include "pch.h"
#include "fsio_impl.h"
#include "custom_engine.h"
#include "../hellen_meta.h"
static void setInjectorPins() {
engineConfiguration->injectionPins[0] = GPIOG_7;
engineConfiguration->injectionPins[0] = H176_LS_1;
engineConfiguration->injectionPins[1] = GPIOG_8;
engineConfiguration->injectionPins[2] = GPIOD_11;
engineConfiguration->injectionPins[3] = GPIOD_10;
//engineConfiguration->injectionPins[4] = GPIOD_9;
//engineConfiguration->injectionPins[5] = GPIOF_12;
//engineConfiguration->injectionPins[6] = GPIOF_13;
//engineConfiguration->injectionPins[7] = GPIOF_14;
// Disable remainder
for (int i = 4; i < MAX_CYLINDER_COUNT;i++) {
engineConfiguration->injectionPins[i] = GPIO_UNASSIGNED;

View File

@ -0,0 +1,14 @@
/*
* hellen_meta.h
*
* @date Oct 2, 2021
* @author Andrey Belomutskiy, (c) 2012-2021
*/
#pragma once
#define H176_LS_1 GPIOG_7
#define H176_OUT_PWM1 GPIOD_13
#define H176_OUT_PWM2 GPIOC_6
#define H176_OUT_PWM3 GPIOC_7