diff options
author | JF002 <JF002@users.noreply.github.com> | 2021-01-20 20:41:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-20 20:41:55 +0000 |
commit | be48f5275aeb289fd451ca1c06b7a12587b2e204 (patch) | |
tree | 23263e149f8d2343651672dae9f95e99bed106b8 /src/components/battery/BatteryController.h | |
parent | 6d8513938764fe1f9818d562bf1a45498aa87a30 (diff) | |
parent | b31c0e7e4571a2aef46672d49eedab0f31b820f4 (diff) |
Merge pull request #168 from Panky-codes/fix-erratic-battery
Fix erratic battery
Diffstat (limited to 'src/components/battery/BatteryController.h')
-rw-r--r-- | src/components/battery/BatteryController.h | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h index 7cc964e4..86250a57 100644 --- a/src/components/battery/BatteryController.h +++ b/src/components/battery/BatteryController.h @@ -1,14 +1,48 @@ #pragma once #include <cstdint> #include <drivers/include/nrfx_saadc.h> +#include <array> +#include <numeric> namespace Pinetime { namespace Controllers { + /** A simple circular buffer that can be used to average + out the sensor values. The total capacity of the CircBuffer + is given as the template parameter N. + */ + template <int N> + class CircBuffer { + public: + CircBuffer() : arr{}, sz{}, cap{N}, head{} {} + /** + insert member function overwrites the next data to the current + HEAD and moves the HEAD to the newly inserted value. + */ + void insert(const int num) { + head %= cap; + arr[head++] = num; + if (sz != cap) { + sz++; + } + } + + int GetAverage() const { + int sum = std::accumulate(arr.begin(), arr.end(), 0); + return (sum / sz); + } + + private: + std::array<int, N> arr; /**< internal array used to store the values*/ + uint8_t sz; /**< The current size of the array.*/ + uint8_t cap; /**< Total capacity of the CircBuffer.*/ + uint8_t head; /**< The current head of the CircBuffer*/ + }; + class Battery { public: void Init(); void Update(); - float PercentRemaining() const { return percentRemaining; } + int PercentRemaining() const { return percentRemainingBuffer.GetAverage(); } float Voltage() const { return voltage; } bool IsCharging() const { return isCharging; } bool IsPowerPresent() const { return isPowerPresent; } @@ -17,8 +51,9 @@ namespace Pinetime { static constexpr uint32_t chargingPin = 12; static constexpr uint32_t powerPresentPin = 19; static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7; + static constexpr uint8_t percentRemainingSamples = 10; static void SaadcEventHandler(nrfx_saadc_evt_t const * p_event); - float percentRemaining = 0.0f; + CircBuffer<percentRemainingSamples> percentRemainingBuffer {}; float voltage = 0.0f; bool isCharging = false; bool isPowerPresent = false; |