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

minor bugfix

This commit is contained in:
Andrey 2023-02-18 23:58:06 -05:00
parent a818d1916f
commit f99f0e1dcf
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -1041,7 +1041,8 @@ void doInitElectronicThrottle() {
auto pid = getEtbPidForFunction(func); auto pid = getEtbPidForFunction(func);
bool etbConfigured = controller->init(func, motor, pid, &pedal2tpsMap, hasPedal); bool dcConfigured = controller->init(func, motor, pid, &pedal2tpsMap, hasPedal);
bool etbConfigured = dcConfigured && controller->isEtbMode();
if (i == 0) { if (i == 0) {
engineConfiguration->etb1configured = etbConfigured; engineConfiguration->etb1configured = etbConfigured;
} else if (i == 1) { } else if (i == 1) {

16
unit_tests/tests/actuators/test_etb.cpp
View File

@ -60,6 +60,9 @@ TEST(etb, initializationMissingThrottle) {
TEST(etb, initializationSingleThrottle) { TEST(etb, initializationSingleThrottle) {
StrictMock<MockEtb> mocks[ETB_COUNT]; StrictMock<MockEtb> mocks[ETB_COUNT];
EXPECT_CALL(mocks[0], isEtbMode())
.WillOnce(Return(TRUE));
EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
engineConfiguration->etbFunctions[0] = DC_Throttle1; engineConfiguration->etbFunctions[0] = DC_Throttle1;
engineConfiguration->etbFunctions[1] = DC_None; engineConfiguration->etbFunctions[1] = DC_None;
@ -85,6 +88,9 @@ TEST(etb, initializationSingleThrottle) {
TEST(etb, initializationSingleThrottleInSecondSlot) { TEST(etb, initializationSingleThrottleInSecondSlot) {
StrictMock<MockEtb> mocks[ETB_COUNT]; StrictMock<MockEtb> mocks[ETB_COUNT];
EXPECT_CALL(mocks[1], isEtbMode())
.WillOnce(Return(TRUE));
EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[0] = DC_None;
engineConfiguration->etbFunctions[1] = DC_Throttle1; engineConfiguration->etbFunctions[1] = DC_Throttle1;
@ -110,6 +116,11 @@ TEST(etb, initializationSingleThrottleInSecondSlot) {
TEST(etb, initializationDualThrottle) { TEST(etb, initializationDualThrottle) {
StrictMock<MockEtb> mocks[ETB_COUNT]; StrictMock<MockEtb> mocks[ETB_COUNT];
EXPECT_CALL(mocks[0], isEtbMode())
.WillOnce(Return(TRUE));
EXPECT_CALL(mocks[1], isEtbMode())
.WillOnce(Return(TRUE));
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
for (int i = 0; i < ETB_COUNT; i++) { for (int i = 0; i < ETB_COUNT; i++) {
@ -138,6 +149,9 @@ TEST(etb, initializationDualThrottle) {
TEST(etb, initializationWastegate) { TEST(etb, initializationWastegate) {
StrictMock<MockEtb> mocks[ETB_COUNT]; StrictMock<MockEtb> mocks[ETB_COUNT];
EXPECT_CALL(mocks[0], isEtbMode())
.WillOnce(Return(false));
EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { EngineTestHelper eth(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
engineConfiguration->etbFunctions[0] = DC_Wastegate; engineConfiguration->etbFunctions[0] = DC_Wastegate;
engineConfiguration->etbFunctions[1] = DC_None; engineConfiguration->etbFunctions[1] = DC_None;
@ -155,7 +169,7 @@ TEST(etb, initializationWastegate) {
doInitElectronicThrottle(); doInitElectronicThrottle();
ASSERT_TRUE(engineConfiguration->etb1configured); // huh?! ASSERT_FALSE(engineConfiguration->etb1configured);
} }
TEST(etb, initializationNoFunction) { TEST(etb, initializationNoFunction) {