rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring launch

This commit is contained in:
Andrey 2021-11-15 19:54:34 -05:00
parent 0d5df34f36
commit 05fa6071dd
4 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/algo/launch_control.h
View File

@ -23,9 +23,14 @@ public:
bool isInsideSwitchCondition() const; bool isInsideSwitchCondition() const;
bool isInsideRPMCondition(int rpm) const; bool isInsideRPMCondition(int rpm) const;
bool isLaunchConditionMet(int rpm) const; bool isLaunchConditionMet(int rpm) const;
bool isLaunchSparkRpmRetardCondition() const;
bool isLaunchFuelRpmRetardCondition() const;
int retardThresholdRpm; int retardThresholdRpm;
void applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX);
private: private:
bool isLaunchRpmRetardCondition() const;
Timer m_launchTimer; Timer m_launchTimer;
}; };

4
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -416,7 +416,9 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp DECLARE
#if EFI_LAUNCH_CONTROL #if EFI_LAUNCH_CONTROL
if (engine->isLaunchCondition && !limitedSpark && !limitedFuel) { if (engine->isLaunchCondition && !limitedSpark && !limitedFuel) {
/* in case we are not already on a limited conditions, check launch as well */ /* in case we are not already on a limited conditions, check launch as well */
engine->launchController.applyLaunchControlLimiting(&limitedSpark, &limitedFuel PASS_ENGINE_PARAMETER_SUFFIX);
limitedSpark &= engine->launchController.isLaunchSparkRpmRetardCondition();
limitedFuel &= engine->launchController.isLaunchFuelRpmRetardCondition();
} }
#endif #endif
if (trgEventIndex == 0) { if (trgEventIndex == 0) {

4
unit_tests/tests/test_engine_math.cpp
View File

@ -93,7 +93,3 @@ TEST(misc, testIgnitionMapGenerator) {
assertEqualsM2("4400", 41.9, getInitialAdvance(4400, 40, 36), 0.1); assertEqualsM2("4400", 41.9, getInitialAdvance(4400, 40, 36), 0.1);
assertEqualsM2("20@800", 14.2, getInitialAdvance(800, 20, 36), 0.2); assertEqualsM2("20@800", 14.2, getInitialAdvance(800, 20, 36), 0.2);
} }
float getMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return engine->mockMapValue;
}

33
unit_tests/tests/test_launch.cpp
View File

@ -127,7 +127,6 @@ TEST(LaunchControl, CombinedCondition) {
} }
TEST(LaunchControl, CompleteRun) { TEST(LaunchControl, CompleteRun) {
bool spark, fuel;
WITH_ENGINE_TEST_HELPER(TEST_ENGINE); WITH_ENGINE_TEST_HELPER(TEST_ENGINE);
initLaunchControl(PASS_ENGINE_PARAMETER_SIGNATURE); initLaunchControl(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -152,11 +151,8 @@ TEST(LaunchControl, CompleteRun) {
//check if we have some sort of cut? we should not have at this point //check if we have some sort of cut? we should not have at this point
spark = false; EXPECT_FALSE(engine->launchController.isLaunchSparkRpmRetardCondition());
fuel = false; EXPECT_FALSE(engine->launchController.isLaunchFuelRpmRetardCondition());
engine->launchController.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_FALSE(spark);
EXPECT_FALSE(fuel);
engine->rpmCalculator.mockRpm = 3510; engine->rpmCalculator.mockRpm = 3510;
@ -167,29 +163,22 @@ TEST(LaunchControl, CompleteRun) {
//we have a 3 seconds delay to actually enable it! //we have a 3 seconds delay to actually enable it!
eth.moveTimeForwardAndInvokeEventsSec(1); eth.moveTimeForwardAndInvokeEventsSec(1);
engine->launchController.update(); engine->launchController.update();
spark = false;
fuel = false;
engine->launchController.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_FALSE(spark); EXPECT_FALSE(engine->launchController.isLaunchSparkRpmRetardCondition());
EXPECT_FALSE(fuel); EXPECT_FALSE(engine->launchController.isLaunchFuelRpmRetardCondition());
eth.moveTimeForwardAndInvokeEventsSec(3); eth.moveTimeForwardAndInvokeEventsSec(3);
engine->launchController.update(); engine->launchController.update();
spark = false;
fuel = false;
engine->launchController.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_TRUE(spark);
EXPECT_FALSE(fuel); EXPECT_TRUE(engine->launchController.isLaunchSparkRpmRetardCondition());
EXPECT_FALSE(engine->launchController.isLaunchFuelRpmRetardCondition());
Sensor::setMockValue(SensorType::VehicleSpeed, 40.0); Sensor::setMockValue(SensorType::VehicleSpeed, 40.0);
engine->launchController.update(); engine->launchController.update();
spark = false;
fuel = false;
engine->launchController.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX); EXPECT_FALSE(engine->launchController.isLaunchSparkRpmRetardCondition());
EXPECT_FALSE(spark); EXPECT_FALSE(engine->launchController.isLaunchFuelRpmRetardCondition());
EXPECT_FALSE(fuel);
} }