From 73ed1afd064a1aa422f2f61f56093c6d20a6bec6 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Thu, 11 May 2023 14:37:48 -0700
Subject: [PATCH] mockable throttle model

(cherry picked from commit 57263be2fe2886d7a3d4116764396b4b5c24dc49)
---
 firmware/controllers/actuators/idle_thread.h | 3 ++-
 firmware/controllers/algo/engine.h           | 2 +-
 firmware/controllers/math/throttle_model.h   | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/firmware/controllers/actuators/idle_thread.h b/firmware/controllers/actuators/idle_thread.h
index 2dc1e35b2c..45af308a93 100644
--- a/firmware/controllers/actuators/idle_thread.h
+++ b/firmware/controllers/actuators/idle_thread.h
@@ -37,7 +37,8 @@ struct IIdleController {
 
 class IdleController : public IIdleController, public EngineModule, public idle_state_s {
 public:
-	typedef IIdleController interface_t;
+	// Mockable<> interface
+	using interface_t = IIdleController;
 
 	void init();
 
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 655b39b4bb..897b931e4c 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -131,7 +131,7 @@ public:
 #if EFI_HPFP && EFI_ENGINE_CONTROL
 		HpfpController,
 #endif // EFI_HPFP && EFI_ENGINE_CONTROL
-		ThrottleModel,
+		Mockable<ThrottleModel>,
 #if EFI_ALTERNATOR_CONTROL
 		AlternatorController,
 #endif /* EFI_ALTERNATOR_CONTROL */
diff --git a/firmware/controllers/math/throttle_model.h b/firmware/controllers/math/throttle_model.h
index d57906fcd7..062e8d76eb 100644
--- a/firmware/controllers/math/throttle_model.h
+++ b/firmware/controllers/math/throttle_model.h
@@ -4,6 +4,8 @@
 
 struct ThrottleModelBase : public throttle_model_s, public EngineModule {
 public:
+	using interface_t = ThrottleModelBase;
+
 	void onSlowCallback() override;
 
 	float estimateThrottleFlow(float tip, float tps, float map, float iat);