From 067a94414b0b758880fdb0dbda3d77c802e4abc4 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 17 Jan 2023 11:50:10 -0500 Subject: [PATCH] h-bridge wastegate not alive on bench #4965 in my dreams that would be part of CI --- .../hellen/alphax-8chan/board_configuration.cpp | 2 +- firmware/config/engines/test_engine.cpp | 10 ++++++++++ firmware/controllers/algo/engine_configuration.cpp | 12 ++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp index ec6c4994d8..d32706e773 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp @@ -62,7 +62,7 @@ static void setupEtb() { // Disable pin engineConfiguration->etbIo[1].disablePin = Gpio::Unassigned; // Unused - engineConfiguration->etbIo[0].directionPin2 = Gpio::Unassigned; + engineConfiguration->etbIo[1].directionPin2 = Gpio::Unassigned; // we only have pwm/dir, no dira/dirb engineConfiguration->etb_use_two_wires = false; } diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index 4e97ed7b40..d92ff5fe6b 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -61,6 +61,16 @@ void setTestDcWastegateConfiguration() { engineConfiguration->isBoostControlEnabled = 1; engineConfiguration->etbFunctions[0] = ETB_Wastegate; setTable(config->boostTableOpenLoop, 50); + engineConfiguration->tps1_1AdcChannel = EFI_ADC_1; // PA1 + + // PWM pin + engineConfiguration->etbIo[0].controlPin = Gpio::C0; + // DIR pin + engineConfiguration->etbIo[0].directionPin1 = Gpio::C1; + // Disable pin + engineConfiguration->etbIo[0].disablePin = Gpio::C2; + // we only have pwm/dir, no dira/dirb + engineConfiguration->etb_use_two_wires = false; } void setTestVVTEngineConfiguration() { diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 384b88c7ee..94244d82b1 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -711,12 +711,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here // nothing to do - we do it all in setBoardDefaultConfiguration break; - case TEST_ENGINE: - setTestCamEngineConfiguration(); - break; - case TEST_CRANK_ENGINE: - setTestCrankEngineConfiguration(); - break; #if EFI_UNIT_TEST case TEST_ISSUE_366_BOTH: setTestEngineIssue366both(); @@ -872,6 +866,12 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case DEFAULT_FRANKENSO: setFrankensoConfiguration(); break; + case TEST_ENGINE: + setTestCamEngineConfiguration(); + break; + case TEST_CRANK_ENGINE: + setTestCrankEngineConfiguration(); + break; case FRANKENSO_QA_ENGINE: setFrankensoBoardTestConfiguration(); break;