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

implement flat shift condition monitoring #5608

This commit is contained in:
kifir 2024-10-03 23:45:13 +03:00 committed by kifir23917
parent 9de6091f88
commit 8115b7be64
4 changed files with 117 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/algo/shift_torque_reduction_controller.cpp
View File

@ -19,6 +19,9 @@ void ShiftTorqueReductionController::update() {
updateTimeConditionSatisfied();
updateRpmConditionSatisfied();
updateAppConditionSatisfied();
isFlatShiftConditionSatisfied = torqueReductionTriggerPinState && isTimeConditionSatisfied
&& isRpmConditionSatisfied && isAppConditionSatisfied;
}
}

1
firmware/controllers/algo/shift_torque_reduction_state.txt
View File

@ -5,5 +5,6 @@ bit torqueReductionTriggerPinState
bit isTimeConditionSatisfied
bit isRpmConditionSatisfied
bit isAppConditionSatisfied
bit isFlatShiftConditionSatisfied
end_struct

112
unit_tests/tests/shift_torque_reduction/test_shift_torque_reduction_flat_shift_condition.cpp Normal file
View File

@ -0,0 +1,112 @@
//
// Created by kifir on 10/4/24.
//
#include "pch.h"
#include "shift_torque_reduction_test_base.h"
namespace {
class ShiftTorqueReductionFlatShiftConditionTest : public ShiftTorqueReductionTestBase {
protected:
static constexpr switch_input_pin_e TEST_TORQUE_REDUCTION_BUTTON_PIN = Gpio::E13;
static constexpr float TEST_TORQUE_REDUCTION_TIME = 123.45f;
static constexpr float TEST_TORQUE_REDUCTION_ARMING_RPM = 678.90f;
static constexpr float TEST_TORQUE_REDUCTION_ARMING_APP = 12.3f;
static constexpr float IMMEDIATELY = 0.0f;
void SetUp() override;
void triggerPin();
void satisfyRpmCondition();
void satisfyAppCondition();
void waitAndCheckFlatShiftCondition(float timeoutInMs, bool expectedFlatShiftCondition, const char* context);
};
void ShiftTorqueReductionFlatShiftConditionTest::SetUp() {
TestBase::SetUp();
setUpTestConfig(ShiftTorqueReductionTestConfig()
.setTorqueReductionEnabled(true)
.setTorqueReductionActivationMode(torqueReductionActivationMode_e::TORQUE_REDUCTION_BUTTON)
.setTriggerPin(TEST_TORQUE_REDUCTION_BUTTON_PIN)
.setTorqueReductionTime(TEST_TORQUE_REDUCTION_TIME)
.setTorqueReductionArmingRpm(TEST_TORQUE_REDUCTION_ARMING_RPM)
.setTorqueReductionArmingApp(TEST_TORQUE_REDUCTION_ARMING_APP)
);
}
void ShiftTorqueReductionFlatShiftConditionTest::triggerPin() {
setMockState(TEST_TORQUE_REDUCTION_BUTTON_PIN, true);
periodicFastCallback();
EXPECT_TRUE(engine->shiftTorqueReductionController.isTorqueReductionTriggerPinValid);
EXPECT_TRUE(engine->shiftTorqueReductionController.torqueReductionTriggerPinState);
EXPECT_TRUE(engine->shiftTorqueReductionController.isTimeConditionSatisfied);
}
void ShiftTorqueReductionFlatShiftConditionTest::satisfyRpmCondition() {
updateRpm(TEST_TORQUE_REDUCTION_ARMING_RPM);
EXPECT_TRUE(engine->shiftTorqueReductionController.isRpmConditionSatisfied);
}
void ShiftTorqueReductionFlatShiftConditionTest::satisfyAppCondition() {
updateApp(TEST_TORQUE_REDUCTION_ARMING_APP);
EXPECT_TRUE(engine->shiftTorqueReductionController.isAppConditionSatisfied);
}
void ShiftTorqueReductionFlatShiftConditionTest::waitAndCheckFlatShiftCondition(
const float timeoutInMs,
const bool expectedFlatShiftCondition,
const char* const context
) {
advanceTimeUs(MS2US(timeoutInMs));
periodicFastCallback();
EXPECT_EQ(engine->shiftTorqueReductionController.isFlatShiftConditionSatisfied, expectedFlatShiftCondition)
<< context;
}
TEST_F(ShiftTorqueReductionFlatShiftConditionTest, checkSatisfiedFlatShiftCondition) {
triggerPin();
satisfyRpmCondition();
satisfyAppCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, true, "App condition is satisfied");
}
TEST_F(ShiftTorqueReductionFlatShiftConditionTest, checkWithoutTriggeredPin) {
//triggerPin();
satisfyRpmCondition();
satisfyAppCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Without triggered pin");
}
TEST_F(ShiftTorqueReductionFlatShiftConditionTest, checkWithoutRpmCondition) {
triggerPin();
//satisfyRpmCondition();
satisfyAppCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Without rpm condition");
}
TEST_F(ShiftTorqueReductionFlatShiftConditionTest, checkWithoutAppCondition) {
triggerPin();
satisfyRpmCondition();
//satisfyAppCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Without app condition");
}
TEST_F(ShiftTorqueReductionFlatShiftConditionTest, checkSatisfiedFlatShiftConditionExpiration) {
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Default");
triggerPin();
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Time condition is satisfied");
satisfyRpmCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, false, "Rpm condition is satisfied");
satisfyAppCondition();
waitAndCheckFlatShiftCondition(IMMEDIATELY, true, "App condition is satisfied");
waitAndCheckFlatShiftCondition(TEST_TORQUE_REDUCTION_TIME, true, "Flat shift condition is still satisfied");
waitAndCheckFlatShiftCondition(EPS3D, false, "Flat shift condition is expired");
}
}

1
unit_tests/tests/tests.mk
View File

@ -62,6 +62,7 @@ TESTS_SRC_CPP = \
tests/shift_torque_reduction/test_shift_torque_reduction_time_condition.cpp \
tests/shift_torque_reduction/test_shift_torque_reduction_rpm_condition.cpp \
tests/shift_torque_reduction/test_shift_torque_reduction_app_condition.cpp \
tests/shift_torque_reduction/test_shift_torque_reduction_flat_shift_condition.cpp \
tests/lua/test_lua_basic.cpp \
tests/lua/test_lookup.cpp \
tests/lua/test_lua_e38.cpp \