will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented a circular buffer and added an average alg for batter remaining percentage.

Browse Source
This commit is contained in:
panky-codes 2021-01-14 21:22:36 +01:00
parent f1e7d0b469
commit b8f943e73c
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/battery/BatteryController.cpp
View File

@ -34,10 +34,12 @@ void Battery::Update() {
// see https://forum.pine64.org/showthread.php?tid=8147 // see https://forum.pine64.org/showthread.php?tid=8147
voltage = (value * 2.0f) / (1024/3.0f); voltage = (value * 2.0f) / (1024/3.0f);
percentRemaining = ((voltage - 3.55f)*100.0f)*3.9f; float percentRemaining = ((voltage - 3.55f)*100.0f)*3.9f;
percentRemaining = std::max(percentRemaining, 0.0f); percentRemaining = std::max(percentRemaining, 0.0f);
percentRemaining = std::min(percentRemaining, 100.0f); percentRemaining = std::min(percentRemaining, 100.0f);
percentRemainingBuffer.insert(percentRemaining);
// NRF_LOG_INFO("BATTERY " NRF_LOG_FLOAT_MARKER " %% - " NRF_LOG_FLOAT_MARKER " v", NRF_LOG_FLOAT(percentRemaining), NRF_LOG_FLOAT(voltage)); // NRF_LOG_INFO("BATTERY " NRF_LOG_FLOAT_MARKER " %% - " NRF_LOG_FLOAT_MARKER " v", NRF_LOG_FLOAT(percentRemaining), NRF_LOG_FLOAT(voltage));
// NRF_LOG_INFO("POWER Charging : %d - Power : %d", isCharging, isPowerPresent); // NRF_LOG_INFO("POWER Charging : %d - Power : %d", isCharging, isPowerPresent);
} }

32
src/components/battery/BatteryController.h
View File

@ -1,14 +1,41 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <drivers/include/nrfx_saadc.h> #include <drivers/include/nrfx_saadc.h>
#include <array>
#include <numeric>
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {
// A simple circular buffer that can be used to average
// out sensor values
template <int N>
class CircBuffer {
public:
CircBuffer() : arr{}, sz{}, cap{N}, loc{} {}
void insert(const float num) {
loc %= cap;
arr[loc++] = num;
if (sz != cap) {
sz++;
}
}
float GetAverage() const {
float sum = std::accumulate(arr.begin(), arr.end(), 0);
return (sum / sz);
}
private:
std::array<float, N> arr;
uint8_t sz;
uint8_t cap;
uint8_t loc;
};
class Battery { class Battery {
public: public:
void Init(); void Init();
void Update(); void Update();
float PercentRemaining() const { return percentRemaining; } float PercentRemaining() const { return percentRemainingBuffer.GetAverage(); }
float Voltage() const { return voltage; } float Voltage() const { return voltage; }
bool IsCharging() const { return isCharging; } bool IsCharging() const { return isCharging; }
bool IsPowerPresent() const { return isPowerPresent; } bool IsPowerPresent() const { return isPowerPresent; }
@ -17,8 +44,9 @@ namespace Pinetime {
static constexpr uint32_t chargingPin = 12; static constexpr uint32_t chargingPin = 12;
static constexpr uint32_t powerPresentPin = 19; static constexpr uint32_t powerPresentPin = 19;
static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7; 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); static void SaadcEventHandler(nrfx_saadc_evt_t const * p_event);
float percentRemaining = 0.0f; CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
float voltage = 0.0f; float voltage = 0.0f;
bool isCharging = false; bool isCharging = false;
bool isPowerPresent = false; bool isPowerPresent = false;