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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2020-11-25 13:17:53 -05:00
parent 46d9eacc7c 492498f8d0
commit 32f242983b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/actuators/boost_control.cpp
View File

@ -67,6 +67,12 @@ expected<float> BoostController::observePlant() const {
} }
expected<float> BoostController::getSetpoint() const { expected<float> BoostController::getSetpoint() const {
// If we're in open loop only mode, disregard any target computation.
// Open loop needs to work even in case of invalid closed loop config
if (engineConfiguration->boostType != CLOSED_LOOP) {
return 0;
}
float rpm = GET_RPM(); float rpm = GET_RPM();
auto tps = Sensor::get(SensorType::DriverThrottleIntent); auto tps = Sensor::get(SensorType::DriverThrottleIntent);

1
unit_tests/tests/test_boost.cpp
View File

@ -15,6 +15,7 @@ TEST(BoostControl, Setpoint) {
.WillRepeatedly([](float xRpm, float tps) { return tps * 2; }); .WillRepeatedly([](float xRpm, float tps) { return tps * 2; });
WITH_ENGINE_TEST_HELPER(TEST_ENGINE); WITH_ENGINE_TEST_HELPER(TEST_ENGINE);
engineConfiguration->boostType = CLOSED_LOOP;
BoostController bc; BoostController bc;
INJECT_ENGINE_REFERENCE(&bc); INJECT_ENGINE_REFERENCE(&bc);