From 14e37e3cf47a0e9d3c7a97bfa139bdeb1b6fe93a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 23 Apr 2022 09:51:47 -0400 Subject: [PATCH] FasterEngineSpinUp should be enabled by default fix #4094 --- firmware/CHANGELOG.md | 3 +++ .../config/boards/hellen/cypress/board_configuration.cpp | 1 - firmware/config/boards/kinetis/board_configuration.cpp | 1 - firmware/config/engines/bmw_m73.cpp | 1 - firmware/config/engines/mazda_miata_1_6.cpp | 3 --- firmware/config/engines/mazda_miata_vvt.cpp | 7 ------- firmware/controllers/algo/defaults/default_cranking.cpp | 2 ++ .../tests/ignition_injection/test_fuel_wall_wetting.cpp | 1 + .../tests/ignition_injection/test_ignition_scheduling.cpp | 1 + .../tests/ignition_injection/test_one_cylinder_logic.cpp | 1 + .../test_startOfCrankingPrimingPulse.cpp | 2 +- unit_tests/tests/trigger/test_2jz_vvt.cpp | 1 + unit_tests/tests/trigger/test_map_cam.cpp | 1 + unit_tests/tests/trigger/test_nissan_vq_vvt.cpp | 1 + unit_tests/tests/trigger/test_quad_cam.cpp | 1 + .../tests/trigger/test_real_cranking_nissan_vq40.cpp | 1 + unit_tests/tests/trigger/test_trigger_decoder.cpp | 4 ++++ 17 files changed, 18 insertions(+), 14 deletions(-) diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md index 03b44066d9..c0da138b2b 100644 --- a/firmware/CHANGELOG.md +++ b/firmware/CHANGELOG.md @@ -23,6 +23,9 @@ Release template (copy/paste this for new release): # Changelog +### Added + - FasterEngineSpinUp should be enabled by default #4094 + ## April 20202 Release - "Day 58" All notable user-facing or behavior-altering changes will be documented in this file. diff --git a/firmware/config/boards/hellen/cypress/board_configuration.cpp b/firmware/config/boards/hellen/cypress/board_configuration.cpp index 7acd014a42..ea1b1d435a 100644 --- a/firmware/config/boards/hellen/cypress/board_configuration.cpp +++ b/firmware/config/boards/hellen/cypress/board_configuration.cpp @@ -13,7 +13,6 @@ void setBoardDefaultConfiguration() { setCrankOperationMode(); - engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->useNoiselessTriggerDecoder = true; engineConfiguration->isEngineChartEnabled = false; diff --git a/firmware/config/boards/kinetis/board_configuration.cpp b/firmware/config/boards/kinetis/board_configuration.cpp index cc260910e1..c2c49f625c 100644 --- a/firmware/config/boards/kinetis/board_configuration.cpp +++ b/firmware/config/boards/kinetis/board_configuration.cpp @@ -15,7 +15,6 @@ int __debugEnabled = 0; #endif void setBoardOverrides() { - engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->useNoiselessTriggerDecoder = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 4f689f8929..f5f5da54f1 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -95,7 +95,6 @@ void m73engine() { strcpy(engineConfiguration->engineMake, ENGINE_MAKE_BMW); strcpy(engineConfiguration->engineCode, "M73"); engineConfiguration->specs.firingOrder = FO_1_7_5_11_3_9_6_12_2_8_4_10; - engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->fuelAlgorithm = LM_ALPHA_N; engineConfiguration->canNbcType = CAN_BUS_NBC_NONE; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 62eccf0a92..8ee05c58e5 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -189,9 +189,6 @@ static void miataNAcommonEngineSettings() { engineConfiguration->idle.solenoidFrequency = 160; engineConfiguration->ignitionMode = IM_WASTED_SPARK; - engineConfiguration->isFasterEngineSpinUpEnabled = true; - - setMapVeTable(); engineConfiguration->idleMode = IM_AUTO; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 51b3fc186c..ac7d35fd26 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -519,9 +519,6 @@ void setMazdaMiata2003EngineConfiguration() { engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_2; */ - - engineConfiguration->isFasterEngineSpinUpEnabled = true; - //set etb_p 12 engineConfiguration->etb.pFactor = 12; // a bit lower p-factor seems to work better on TLE9201? MRE? engineConfiguration->etb.iFactor = 0; @@ -616,8 +613,6 @@ static void setMiataNB2_MRE_common() { // todo: AC fan // TLE8888_PIN_24: "43 - GP Out 4" - engineConfiguration->isFasterEngineSpinUpEnabled = true; - // set_analog_input_pin pps PA7 // EFI_ADC_7: "31 - AN volt 3" - PA7 // disabled for now since only allowed with ETB @@ -784,8 +779,6 @@ void setMiataNB2_ProteusEngineConfiguration() { engineConfiguration->tps1_1AdcChannel = EFI_ADC_12; - engineConfiguration->isFasterEngineSpinUpEnabled = true; - engineConfiguration->clt.adcChannel = PROTEUS_IN_ANALOG_TEMP_1; engineConfiguration->iat.adcChannel = PROTEUS_IN_ANALOG_TEMP_3; diff --git a/firmware/controllers/algo/defaults/default_cranking.cpp b/firmware/controllers/algo/defaults/default_cranking.cpp index 7f7a783023..fdceed14dc 100644 --- a/firmware/controllers/algo/defaults/default_cranking.cpp +++ b/firmware/controllers/algo/defaults/default_cranking.cpp @@ -18,6 +18,8 @@ void setDefaultCranking() { engineConfiguration->crankingIACposition = 50; engineConfiguration->afterCrankingIACtaperDuration = 200; + engineConfiguration->isFasterEngineSpinUpEnabled = true; + // After start enrichment #if !EFI_UNIT_TEST // don't set this for unit tests, as it makes things more complicated to test diff --git a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp index a456a05909..df0fb8f6ae 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp @@ -63,6 +63,7 @@ TEST(fuel, testWallWettingEnrichmentMath) { TEST(fuel, testWallWettingEnrichmentScheduling) { EngineTestHelper eth(FORD_ASPIRE_1996); + engineConfiguration->isFasterEngineSpinUpEnabled = false; setCrankOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp index 701093ce69..7899b694a0 100644 --- a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp +++ b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp @@ -39,6 +39,7 @@ TEST(ignition, twoCoils) { TEST(ignition, trailingSpark) { EngineTestHelper eth(TEST_ENGINE); + engineConfiguration->isFasterEngineSpinUpEnabled = false; /** // TODO #3220: this feature makes this test sad, eventually remove this line (and the ability to disable it altogether) diff --git a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp index 77a1b040ea..653fbb9ce9 100644 --- a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp +++ b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp @@ -8,6 +8,7 @@ TEST(issues, issueOneCylinderSpecialCase968) { EngineTestHelper eth(GY6_139QMB); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; // set injection_mode 1 engineConfiguration->injectionMode = IM_SEQUENTIAL; diff --git a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp index 8b6a724602..49d800282a 100644 --- a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp +++ b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp @@ -9,7 +9,7 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { EngineTestHelper eth(TEST_ENGINE); - + engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; engineConfiguration->cranking.baseFuel = 12; diff --git a/unit_tests/tests/trigger/test_2jz_vvt.cpp b/unit_tests/tests/trigger/test_2jz_vvt.cpp index 91ffbaf8fb..eae57279d4 100644 --- a/unit_tests/tests/trigger/test_2jz_vvt.cpp +++ b/unit_tests/tests/trigger/test_2jz_vvt.cpp @@ -10,6 +10,7 @@ TEST(sensors, test2jz) { EngineTestHelper eth(TOYOTA_2JZ_GTE_VVTi); + engineConfiguration->isFasterEngineSpinUpEnabled = false; // this crank trigger would be easier to test, crank shape is less important for this test diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index 605ec38335..9d89f2f1a1 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -6,6 +6,7 @@ TEST(trigger, map_cam_by_magic_point) { EngineTestHelper eth(TEST_CRANK_ENGINE); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->camInputs[0] = GPIOA_0; engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; diff --git a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp index 13cf1c12a7..e16739b14e 100644 --- a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp +++ b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp @@ -73,6 +73,7 @@ TEST(nissan, vq_vvt) { std::vector> ptrs; EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->isIgnitionEnabled = false; engineConfiguration->isInjectionEnabled = false; diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index 3ddb4b1b01..8df5f0ed02 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -8,6 +8,7 @@ TEST(trigger, testQuadCam) { // setting some weird engine EngineTestHelper eth(FORD_ESCORT_GT); + engineConfiguration->isFasterEngineSpinUpEnabled = false; setCrankOperationMode(); diff --git a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp index e4e2e5f8bf..e94c51ac6b 100644 --- a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp @@ -14,6 +14,7 @@ TEST(realCrankingVQ40, normalCranking) { reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", indeces); EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); + engineConfiguration->isFasterEngineSpinUpEnabled = false; bool hasSeenFirstVvt = false; diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index 87ed7d683a..e43e890fef 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -149,6 +149,7 @@ TEST(trigger, test1995FordInline6TriggerDecoder) { ASSERT_EQ( 0, getTriggerZeroEventIndex(FORD_INLINE_6_1995)) << "triggerIndex "; EngineTestHelper eth(FORD_INLINE_6_1995); + engineConfiguration->isFasterEngineSpinUpEnabled = false; setWholeTimingTable(-13); Sensor::setMockValue(SensorType::Iat, 49.579071f); @@ -645,6 +646,7 @@ void doTestFuelSchedulerBug299smallAndMedium(int startUpDelayMs) { printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n"); EngineTestHelper eth(TEST_ENGINE); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; eth.moveTimeForwardMs(startUpDelayMs); // nice to know that same test works the same with different anount of idle time on start setTestBug299(ð); @@ -946,6 +948,7 @@ TEST(big, testSequential) { TEST(big, testFuelSchedulerBug299smallAndLarge) { EngineTestHelper eth(TEST_ENGINE); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; setTestBug299(ð); ASSERT_EQ( 4, engine->executor.size()) << "Lqs#0"; @@ -1063,6 +1066,7 @@ TEST(big, testSparkReverseOrderBug319) { printf("*************************************************** testSparkReverseOrderBug319 small to medium\r\n"); EngineTestHelper eth(TEST_ENGINE); + engineConfiguration->isFasterEngineSpinUpEnabled = false; engine->tdcMarkEnabled = false; engineConfiguration->useOnlyRisingEdgeForTrigger = false;