Map3D considered harmful FOME-Tech#421

rusefi · May 4, 2024 · 044e575 · 044e575
1 parent a4897eb
commit 044e575
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h
@@ -50,7 +50,7 @@ class IEtbController : public ClosedLoopController<percent_t, percent_t>  {
 	virtual void setWastegatePosition(percent_t pos) = 0;
 	virtual void update() = 0;
 	virtual void autoCalibrateTps() = 0;
-	virtual bool isEtbMode() = 0;
+	virtual bool isEtbMode() const = 0;
 
 	virtual const pid_state_s& getPidState() const = 0;
 

diff --git a/firmware/controllers/actuators/electronic_throttle_impl.h b/firmware/controllers/actuators/electronic_throttle_impl.h
@@ -97,7 +97,7 @@ class EtbController : public IEtbController, public electronic_throttle_s {
 	 * @return true if OK, false if should be disabled
 	 */
 	bool checkStatus();
-	bool isEtbMode() {
+	bool isEtbMode() const override {
 		return m_function == DC_Throttle1 || m_function == DC_Throttle2;
 	}
 

diff --git a/unit_tests/mocks.h b/unit_tests/mocks.h
@@ -20,7 +20,7 @@ class MockEtb : public IEtbController {
 
 	// IEtbController mocks
 	MOCK_METHOD(void, reset, (), (override));
-	MOCK_METHOD(bool, isEtbMode, (), (override));
+	MOCK_METHOD(bool, isEtbMode, (), (const, override));
 	MOCK_METHOD(void, update, (), (override));
 	MOCK_METHOD(bool, init, (dc_function_e function, DcMotor* motor, pid_s* pidParameters, const ValueProvider3D* pedalMap, bool initializeThrottles), (override));
 	MOCK_METHOD(void, setIdlePosition, (percent_t pos), (override));

diff --git a/unit_tests/tests/actuators/test_etb.cpp b/unit_tests/tests/actuators/test_etb.cpp
@@ -61,7 +61,7 @@ TEST(etb, initializationSingleThrottle) {
 	StrictMock<MockEtb> mocks[ETB_COUNT];
 
 	EXPECT_CALL(mocks[0], isEtbMode())
-	      .WillOnce(Return(TRUE));
+	      .WillOnce(Return(true));
 
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
 		engineConfiguration->etbFunctions[0] = DC_Throttle1;
@@ -89,7 +89,7 @@ TEST(etb, initializationSingleThrottleInSecondSlot) {
 	StrictMock<MockEtb> mocks[ETB_COUNT];
 
 	EXPECT_CALL(mocks[1], isEtbMode())
-	      .WillOnce(Return(TRUE));
+	      .WillOnce(Return(true));
 
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
 		engineConfiguration->etbFunctions[0] = DC_None;
@@ -117,9 +117,9 @@ TEST(etb, initializationDualThrottle) {
 	StrictMock<MockEtb> mocks[ETB_COUNT];
 
 	EXPECT_CALL(mocks[0], isEtbMode())
-	      .WillOnce(Return(TRUE));
+	      .WillOnce(Return(true));
 	EXPECT_CALL(mocks[1], isEtbMode())
-	      .WillOnce(Return(TRUE));
+	      .WillOnce(Return(true));
 
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE);
 
@@ -339,18 +339,19 @@ TEST(etb, setpointSecondThrottleTrim) {
 			return y;
 		});
 
-	// Should get called with the un-adjusted setpoint
-	StrictMock<MockVp3d> throttleTrimTable;
-	EXPECT_CALL(throttleTrimTable, getValue(0, 47))
-		.WillOnce(Return(4));
+	struct MockEtb2 : EtbController2 {
+		MOCK_METHOD(percent_t, getThrottleTrim, (float rpm, percent_t targetPosition), (const, override));
+	};
 
 	// Must have TPS & PPS initialized for ETB setup
 	Sensor::setMockValue(SensorType::Tps1Primary, 0);
 	Sensor::setMockValue(SensorType::Tps1, 0.0f, true);
 	Sensor::setMockValue(SensorType::AcceleratorPedal, 0.0f, true);
 
-	EtbController2 etb(throttleTrimTable);
+	StrictMock<MockEtb2> etb;
 	etb.init(DC_Throttle1, nullptr, nullptr, &pedalMap, true);
+	// Should get called with the un-adjusted setpoint
+	EXPECT_CALL(etb, getThrottleTrim(0, 47)).WillOnce(Return(4));
 
 	Sensor::setMockValue(SensorType::AcceleratorPedal, 47, true);
 	EXPECT_EQ(51, etb.getSetpoint().value_or(-1));