⚡ (battery): Remove Ticker and use only EventQueue call_every

leka · Mar 3, 2022 · 9cfef5d · 9cfef5d
1 parent 724eb85
commit 9cfef5d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 25 deletions.
diff --git a/app/os/main.cpp b/app/os/main.cpp
@@ -16,12 +16,11 @@
 using namespace leka;
 using namespace std::chrono;
 
-auto sleep_timeout	= CoreTimeout {};
-auto battery_ticker = CoreTicker {};
+auto sleep_timeout = CoreTimeout {};
 
 auto charge_input = mbed::InterruptIn {PinName::BATTERY_CHARGE_STATUS};
 auto corebattery  = leka::CoreBattery {PinName::BATTERY_VOLTAGE, charge_input};
-auto batterykit	  = leka::BatteryKit {corebattery, battery_ticker};
+auto batterykit	  = leka::BatteryKit {corebattery};
 
 auto service_battery = BLEServiceBattery {};
 auto services		 = std::to_array<interface::BLEService *>({&service_battery});

diff --git a/drivers/CoreEventQueue/include/CoreEventQueue.h b/drivers/CoreEventQueue/include/CoreEventQueue.h
@@ -20,6 +20,11 @@ class CoreEventQueue : public interface::EventQueue
 
 	void call(auto f, auto... params) { _event_queue.call(f, params...); }
 
+	void call_every(std::chrono::duration<int, std::milli> duration, auto f, auto... params)
+	{
+		_event_queue.call_every(duration, f, params...);
+	}
+
 	// ? Overload needed for mbed::BLE compatibility
 	void callMbedCallback(mbed::Callback<void()> const &f);
 

diff --git a/libs/BatteryKit/include/BatteryKit.h b/libs/BatteryKit/include/BatteryKit.h
@@ -6,17 +6,15 @@
 
 #include "CoreEventQueue.h"
 #include "interface/drivers/Battery.h"
-#include "interface/drivers/Ticker.h"
 
 namespace leka {
 
 class BatteryKit
 {
   public:
-	explicit BatteryKit(interface::Battery &battery, interface::Ticker &ticker) : _battery(battery), _ticker(ticker) {};
+	explicit BatteryKit(interface::Battery &battery) : _battery(battery) {};
 
 	void startRoutine();
-	void stopRoutine();
 
 	auto level() -> uint8_t;
 	auto isCharging() -> bool;
@@ -29,8 +27,6 @@ class BatteryKit
   private:
 	interface::Battery &_battery;
 
-	interface::Ticker &_ticker;
-
 	CoreEventQueue _event_queue {};
 
 	std::function<void(uint8_t)> on_data_updated {};

diff --git a/libs/BatteryKit/source/BatteryKit.cpp b/libs/BatteryKit/source/BatteryKit.cpp
@@ -10,26 +10,17 @@ using namespace std::chrono_literals;
 void BatteryKit::startRoutine()
 {
 	auto on_tick = [this] {
-		_event_queue.call([this] {
-			if (level() == 0) {
-				on_low_battery();
-			}
-			on_data_updated(level());
-		});
+		if (level() == 0) {
+			on_low_battery();
+		}
+		on_data_updated(level());
 	};
 
-	_ticker.onTick(on_tick);
-
-	_ticker.start(1s);
+	_event_queue.call_every(1s, on_tick);
 
 	_event_queue.dispatch_forever();
 }
 
-void BatteryKit::stopRoutine()
-{
-	_ticker.stop();
-}
-
 auto BatteryKit::level() -> uint8_t
 {
 	return _battery.level();

diff --git a/spikes/lk_sensors_battery/main.cpp b/spikes/lk_sensors_battery/main.cpp
@@ -14,11 +14,9 @@
 using namespace leka;
 using namespace std::chrono;
 
-auto battery_ticker = CoreTicker {};
-
 auto charge_input  = mbed::InterruptIn {PinName::BATTERY_CHARGE_STATUS};
 auto corebattery   = CoreBattery {PinName::BATTERY_VOLTAGE, charge_input};
-auto batterykit	   = BatteryKit {corebattery, battery_ticker};
+auto batterykit	   = BatteryKit {corebattery};
 auto mainboard_led = mbed::DigitalOut {LED1};
 
 auto main() -> int