andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance hysterisis detection: now we use isAfterLaunch indicator on launch_control_state panel instead of hidden class field #5610

This commit is contained in:
kifir 2024-05-21 20:15:33 +03:00 committed by rusefillc
parent d3d7325aa1
commit 9f053cf4b7
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/launch_control.cpp
View File

@ -90,15 +90,15 @@ bool LaunchControlBase::isInsideRPMCondition(const int rpm) {
bool result = false;
switch (rpmLaunchCondition) {
case LaunchCondition::NotMet: {
m_afterLaunch = false;
isAfterLaunch = false;
break;
}
case LaunchCondition::PreLaunch: {
result = m_afterLaunch;
result = isAfterLaunch;
break;
}
case LaunchCondition::Launch: {
m_afterLaunch = true;
isAfterLaunch = true;
result = true;
break;
}

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

@ -39,7 +39,6 @@ private:
bool isLaunchRpmRetardCondition() const;
Timer m_launchTimer;
bool m_afterLaunch = false;
};
/**

18
unit_tests/tests/launch/test_rpm_condition.cpp
View File

@ -27,19 +27,24 @@ TEST(rpmCondition, IncreasingRpm) {
/* RPM hasn't reached Launch RPM parameter - rpmCondition isn't satisfied: */
EXPECT_FALSE(engine->launchController.rpmCondition); // check default value
EXPECT_FALSE(engine->launchController.isAfterLaunch); // check default value
updateRpm(TEST_PRELAUNCH_RPM - 1);
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM);
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM - 1);
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM);
/* RPM reached Launch RPM parameter - now rpmCondition is satisfied: */
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
}
TEST(rpmCondition, HysterisisOnDecreasingRpm) {
@ -50,17 +55,21 @@ TEST(rpmCondition, HysterisisOnDecreasingRpm) {
updateRpm(TEST_LAUNCH_RPM);
/* RPM reached Launch RPM parameter - rpmCondition is satisfied: */
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM - 1);
/* RPM is below Launch RPM parameter, but still in Launch Control Window - so rpmCondition is still satisfied: */
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM - 1);
/* RPM went down below Launch Control Window parameter - now rpmCondition is not satisfied: */
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
}
TEST(rpmCondition, HysterisisRpmOscillation) {
@ -71,30 +80,39 @@ TEST(rpmCondition, HysterisisRpmOscillation) {
updateRpm(TEST_LAUNCH_RPM);
/* RPM reached Launch RPM parameter - rpmCondition is satisfied: */
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM - 1);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM + 1);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM + 2);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM - 1);
/* RPM went down below Launch Control Window parameter - now rpmCondition is not satisfied: */
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
updateRpm(TEST_PRELAUNCH_RPM);
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
updateRpm(TEST_LAUNCH_RPM - 1);
EXPECT_FALSE(engine->launchController.rpmCondition);
EXPECT_FALSE(engine->launchController.isAfterLaunch);
/* RPM reached Launch RPM parameter again - now rpmCondition is satisfied: */
updateRpm(TEST_LAUNCH_RPM);
EXPECT_TRUE(engine->launchController.rpmCondition);
EXPECT_TRUE(engine->launchController.isAfterLaunch);
}