From c17fa49426e1ca9711f2eed7aa4d9669863fe600 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 29 Sep 2022 20:53:31 -0400 Subject: [PATCH] CAN side of automated testing #4630 more meta --- firmware/config/boards/mre_meta.h | 16 ++++++++++++++++ firmware/config/boards/proteus_meta.h | 19 +++++++++++++++++++ firmware/config/engines/vw_b6.cpp | 4 ++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/firmware/config/boards/mre_meta.h b/firmware/config/boards/mre_meta.h index 388a287cbe..cb37fa0107 100644 --- a/firmware/config/boards/mre_meta.h +++ b/firmware/config/boards/mre_meta.h @@ -7,9 +7,17 @@ #pragma once +#define MRE_INJ_1 Gpio::TLE8888_PIN_1 +#define MRE_INJ_2 Gpio::TLE8888_PIN_2 +#define MRE_INJ_3 Gpio::TLE8888_PIN_3 +#define MRE_INJ_4 Gpio::TLE8888_PIN_4 + // OpenDrain: 4.5A #define MRE_LS_1 Gpio::TLE8888_PIN_6 +// "3 - Lowside 2" +#define MRE_LS_2 Gpio::TLE8888_PIN_5 + // clt = "18 - AN temp 1" // R27 pull-up #define MRE_IN_ANALOG_TEMP_1 EFI_ADC_0 @@ -45,3 +53,11 @@ // 28 - AN volt 10 #define MRE_IN_ANALOG_VOLT_10 EFI_ADC_4 + +static Gpio MRE_OUTPUTS[] = { +MRE_INJ_1, +MRE_INJ_2, +MRE_INJ_3, +MRE_INJ_4, +MRE_LS_1, +}; diff --git a/firmware/config/boards/proteus_meta.h b/firmware/config/boards/proteus_meta.h index 902018e3e3..6fe6d3f498 100644 --- a/firmware/config/boards/proteus_meta.h +++ b/firmware/config/boards/proteus_meta.h @@ -133,3 +133,22 @@ #define PROTEUS_DIGITAL_4 Gpio::E14 #define PROTEUS_DIGITAL_5 Gpio::E13 #define PROTEUS_DIGITAL_6 Gpio::E15 + +static Gpio PROTEUS_OUTPUTS[] = { +PROTEUS_LS_1, +PROTEUS_LS_2, +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, +PROTEUS_LS_13, +PROTEUS_LS_14, +PROTEUS_LS_15, +PROTEUS_LS_16, +}; diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index f949b8729b..edd3ef7898 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -390,12 +390,12 @@ void setMreVwPassatB6() { gppwm_channel *lowPressureFuelPumpControl = &engineConfiguration->gppwm[1]; // "42 - Injector 4", somehow GP4 did not work? not enough current? not happy with diode? - lowPressureFuelPumpControl->pin = Gpio::TLE8888_PIN_4; + lowPressureFuelPumpControl->pin = MRE_INJ_4; gppwm_channel *coolantControl = &engineConfiguration->gppwm[0]; - coolantControl->pin = Gpio::TLE8888_PIN_5; // "3 - Lowside 2" + coolantControl->pin = MRE_LS_2; // "7 - Lowside 1" //engineConfiguration->hpfpValvePin = MRE_LS_1; engineConfiguration->disablePrimaryUart = true;