From 0aa2ee0ff4b2b4a7c20f7cc07930eb3514a13120 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 13 Oct 2021 20:56:26 -0400 Subject: [PATCH] NB1 defaults #3299 alternator pin and settings --- .../hellen/hellen-nb1/board_configuration.cpp | 1 + firmware/config/engines/mazda_miata_vvt.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index e4f76b3909..7468b7ed99 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -132,6 +132,7 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->fanPin = GPIOD_12; // OUT_PWM8 engineConfiguration->mainRelayPin = GPIOI_2; // OUT_LOW3 engineConfiguration->tachOutputPin = H144_OUT_PWM1; + engineConfiguration->alternatorControlPin = H144_OUT_PWM7; // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 3b680fbfd1..d191283c58 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -258,6 +258,15 @@ static void setCommonMazdaNB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->idle.solenoidFrequency = 300; + CONFIG(isAlternatorControlEnabled) = true; + // enable altdebug + engineConfiguration->targetVBatt = 13.8; + engineConfiguration->alternatorControl.offset = 40; + engineConfiguration->alternatorControl.pFactor = 14; + engineConfiguration->alternatorControl.iFactor = 0.1; + engineConfiguration->alternatorControl.dFactor = 0; + engineConfiguration->alternatorControl.periodMs = 10; + copyArray(config->veRpmBins, mazda_miata_nb2_RpmBins); copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins); copyTable(config->veTable, mapBased18vvtVeTable_NB_fuel_rail); @@ -343,15 +352,6 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->crankingIACposition = 60; engineConfiguration->afterCrankingIACtaperDuration = 250; - CONFIG(isAlternatorControlEnabled) = true; - // enable altdebug - engineConfiguration->targetVBatt = 13.8; - engineConfiguration->alternatorControl.offset = 40; - engineConfiguration->alternatorControl.pFactor = 14; - engineConfiguration->alternatorControl.iFactor = 0.1; - engineConfiguration->alternatorControl.dFactor = 0; - engineConfiguration->alternatorControl.periodMs = 10; - engineConfiguration->vvtCamSensorUseRise = true; // set vvt_mode 3