From 831e016bc443e4b12b034c53413224644e325787 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 1 Apr 2023 23:17:50 -0700 Subject: [PATCH] register/unregister (cherry picked from commit c682c49d4608cb071e512f926b2729e6927e1d7d) --- firmware/controllers/algo/gear_detector.cpp | 5 +++++ firmware/controllers/algo/gear_detector.h | 1 + unit_tests/tests/test_gear_detector.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/firmware/controllers/algo/gear_detector.cpp b/firmware/controllers/algo/gear_detector.cpp index 1edeaf1670..ad7faec728 100644 --- a/firmware/controllers/algo/gear_detector.cpp +++ b/firmware/controllers/algo/gear_detector.cpp @@ -7,6 +7,11 @@ static constexpr float geometricMean(float x, float y) { GearDetector::GearDetector() : StoredValueSensor(SensorType::DetectedGear, MS2NT(100)) { + Register(); +} + +GearDetector::~GearDetector() { + unregister(); } void GearDetector::onConfigurationChange(engine_configuration_s const * /*previousConfig*/) { diff --git a/firmware/controllers/algo/gear_detector.h b/firmware/controllers/algo/gear_detector.h index b6753426aa..b07af8c4af 100644 --- a/firmware/controllers/algo/gear_detector.h +++ b/firmware/controllers/algo/gear_detector.h @@ -3,6 +3,7 @@ class GearDetector : public EngineModule, public StoredValueSensor { public: GearDetector(); + ~GearDetector(); void onSlowCallback() override; void onConfigurationChange(engine_configuration_s const * /*previousConfig*/) override; diff --git a/unit_tests/tests/test_gear_detector.cpp b/unit_tests/tests/test_gear_detector.cpp index 839f62600f..6b356df333 100644 --- a/unit_tests/tests/test_gear_detector.cpp +++ b/unit_tests/tests/test_gear_detector.cpp @@ -12,7 +12,7 @@ float GetGearRatioFor(float revPerKm, float axle, float kph, float rpm) { GearDetector dut; dut.onSlowCallback(); - return dut.get().value_or(0); + return Sensor::getOrZero(SensorType::DetectedGear); } TEST(GearDetector, ComputeGearRatio) {