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

migrating to SensorType::Rpm API

This commit is contained in:
Andrey 2022-01-20 22:31:07 -05:00
parent 3bc59bfbb6
commit 16b3e95865
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/actuators/vvt.cpp
View File

@ -52,7 +52,7 @@ expected<angle_t> VvtController::observePlant() const {
} }
expected<angle_t> VvtController::getSetpoint() { expected<angle_t> VvtController::getSetpoint() {
int rpm = GET_RPM(); int rpm = Sensor::getOrZero(SensorType::Rpm);
float load = getFuelingLoad(); float load = getFuelingLoad();
float target = m_targetMap->getValue(rpm, load); float target = m_targetMap->getValue(rpm, load);
@ -90,7 +90,7 @@ expected<percent_t> VvtController::getClosedLoop(angle_t target, angle_t observa
} }
void VvtController::setOutput(expected<percent_t> outputValue) { void VvtController::setOutput(expected<percent_t> outputValue) {
float rpm = GET_RPM(); float rpm = Sensor::getOrZero(SensorType::Rpm);
// todo: make this configurable? // todo: make this configurable?
bool enabledAtCurrentRpm = rpm > engineConfiguration->cranking.rpm; bool enabledAtCurrentRpm = rpm > engineConfiguration->cranking.rpm;

4
unit_tests/tests/test_vvt.cpp
View File

@ -5,7 +5,7 @@
using ::testing::StrictMock; using ::testing::StrictMock;
using ::testing::Return; using ::testing::Return;
TEST(Vvt, setpoint) { TEST(Vvt, TestSetPoint) {
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
// Set up a mock target map // Set up a mock target map
@ -15,7 +15,7 @@ TEST(Vvt, setpoint) {
// Mock necessary inputs // Mock necessary inputs
engine->engineState.fuelingLoad = 55; engine->engineState.fuelingLoad = 55;
engine->rpmCalculator.mockRpm = 4321; Sensor::setMockValue(SensorType::Rpm, 4321);
VvtController dut; VvtController dut;
dut.init(0, 0, 0, &targetMap); dut.init(0, 0, 0, &targetMap);