From 60fc30d34d4d49bb378f739c7f6f750aa73a212d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 4 Oct 2022 17:12:57 -0700 Subject: [PATCH] remove 898 (#4634) Co-authored-by: Matthew Kennedy --- firmware/config/engines/custom_engine.cpp | 6 ----- firmware/config/engines/custom_engine.h | 1 - .../controllers/algo/engine_configuration.cpp | 3 --- firmware/controllers/algo/engine_types.h | 5 +--- unit_tests/tests/tests.mk | 1 - unit_tests/tests/trigger/test_issue_898.cpp | 24 ------------------- 6 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 unit_tests/tests/trigger/test_issue_898.cpp diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index a96f71f270..a8cd83fb46 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -293,12 +293,6 @@ void setEtbTestConfiguration() { // see also setDefaultEtbBiasCurve } -#if EFI_UNIT_TEST -void setIssue898() { - engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; -} -#endif /* EFI_UNIT_TEST */ - #if HW_FRANKENSO && EFI_PROD_CODE diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index 512fc6db31..8caeaf7828 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -19,7 +19,6 @@ void setL9779TestConfiguration(); void setEepromTestConfiguration(); -void setIssue898(); void setTestQuadCam(); void mreBoardNewTest(); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 91f3e5cdf3..5b341143b8 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -826,9 +826,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case TEST_ISSUE_366_RISE: setTestEngineIssue366rise(); break; - case TEST_ISSUE_898: - setIssue898(); - break; #endif // EFI_UNIT_TEST #if HW_MICRO_RUSEFI case MRE_VW_B6: diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 9a81aea85d..fdb7290998 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -82,10 +82,7 @@ typedef enum __attribute__ ((__packed__)) { TEST_ENGINE = 26, - // used by unit test - // see https://github.com/rusefi/rusefi/issues/898 - // see TriggerWaveform::bothFrontsRequired - TEST_ISSUE_898 = 27, + UNUSED_27 = 27, TEST_CRANK_ENGINE = 28, diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk index 4b9f961447..aaaef707a5 100644 --- a/unit_tests/tests/tests.mk +++ b/unit_tests/tests/tests.mk @@ -55,7 +55,6 @@ TESTS_SRC_CPP = \ tests/test_fasterEngineSpinningUp.cpp \ tests/test_dwell_corner_case_issue_796.cpp \ tests/test_idle_controller.cpp \ - tests/test_issue_898.cpp \ tests/test_launch.cpp \ tests/test_fuel_map.cpp \ tests/test_gear_detector.cpp \ diff --git a/unit_tests/tests/trigger/test_issue_898.cpp b/unit_tests/tests/trigger/test_issue_898.cpp deleted file mode 100644 index ea7310e8c2..0000000000 --- a/unit_tests/tests/trigger/test_issue_898.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * @file test_issue_898.cpp - * - * @date Aug 8, 2019 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "pch.h" - -static void boardConfigurationForIssue898(engine_configuration_s *engineConfiguration) { - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; -} - -TEST(issues, issue898) { - EngineTestHelper eth(TEST_ISSUE_898, &boardConfigurationForIssue898); - - ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError"; - - ASSERT_EQ( 2, eth.recentWarnings()->getCount()) << "warningCounter#testFuelSchedulerBug299smallAndMedium"; - ASSERT_EQ(CUSTOM_ERR_BOTH_FRONTS_REQUIRED, eth.recentWarnings()->get(0).Code); - ASSERT_EQ(CUSTOM_ERR_TRIGGER_SYNC, eth.recentWarnings()->get(1).Code); -}