diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-08-28 13:26:53 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-08-28 13:26:53 +1000 |
| commit | 3a0c42f9240eedfbc6a1e94ad3a59c52664fb5b5 (patch) | |
| tree | 0505db40de6fceaf5829548ef86f4cb53b739bcb /src/system_fsm/include | |
| parent | a1327763ab70dbf4996e032dd227de368f78f4ad (diff) | |
| download | tangara-fw-3a0c42f9240eedfbc6a1e94ad3a59c52664fb5b5.tar.gz | |
Move battery measurement to its own class
Diffstat (limited to 'src/system_fsm/include')
| -rw-r--r-- | src/system_fsm/include/system_events.hpp | 4 | ||||
| -rw-r--r-- | src/system_fsm/include/system_fsm.hpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/system_fsm/include/system_events.hpp b/src/system_fsm/include/system_events.hpp index 8a3ba5ec..64cbd393 100644 --- a/src/system_fsm/include/system_events.hpp +++ b/src/system_fsm/include/system_events.hpp @@ -53,7 +53,7 @@ struct HasPhonesChanged : tinyfsm::Event { }; struct ChargingStatusChanged : tinyfsm::Event {}; -struct BatteryPercentChanged : tinyfsm::Event {}; +struct BatteryStateChanged : tinyfsm::Event {}; namespace internal { @@ -62,8 +62,6 @@ struct SamdInterrupt : tinyfsm::Event {}; struct IdleTimeout : tinyfsm::Event {}; -struct BatteryTimerFired : tinyfsm::Event {}; - } // namespace internal } // namespace system_fsm diff --git a/src/system_fsm/include/system_fsm.hpp b/src/system_fsm/include/system_fsm.hpp index a556be9e..371e5527 100644 --- a/src/system_fsm/include/system_fsm.hpp +++ b/src/system_fsm/include/system_fsm.hpp @@ -48,7 +48,6 @@ class SystemState : public tinyfsm::Fsm<SystemState> { void react(const FatalError&); void react(const internal::GpioInterrupt&); void react(const internal::SamdInterrupt&); - void react(const internal::BatteryTimerFired&); virtual void react(const DisplayReady&) {} virtual void react(const BootComplete&) {} @@ -67,7 +66,8 @@ class SystemState : public tinyfsm::Fsm<SystemState> { static std::shared_ptr<drivers::TouchWheel> sTouch; static std::shared_ptr<drivers::RelativeWheel> sRelativeTouch; - static std::shared_ptr<drivers::Battery> sBattery; + static std::shared_ptr<drivers::AdcBattery> sAdc; + static std::shared_ptr<battery::Battery> sBattery; static std::shared_ptr<drivers::SdStorage> sStorage; static std::shared_ptr<drivers::Display> sDisplay; static std::shared_ptr<drivers::Bluetooth> sBluetooth; |