restore battery buffer
This commit is contained in:
parent
365e68e6cc
commit
3cf4df905a
|
@ -66,6 +66,8 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const * p_event) {
|
|||
percentRemaining = std::max(percentRemaining, 0);
|
||||
percentRemaining = std::min(percentRemaining, 100);
|
||||
|
||||
percentRemainingBuffer.insert(percentRemaining);
|
||||
|
||||
nrfx_saadc_uninit();
|
||||
}
|
||||
}
|
||||
|
@ -73,11 +75,3 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const * p_event) {
|
|||
void Battery::adcCallbackStatic(nrfx_saadc_evt_t const *event) {
|
||||
instance->SaadcEventHandler(event);
|
||||
}
|
||||
|
||||
int Battery::PercentRemaining() {
|
||||
return percentRemaining;
|
||||
}
|
||||
|
||||
float Battery::Voltage() {
|
||||
return voltage;
|
||||
}
|
|
@ -7,6 +7,38 @@
|
|||
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:
|
||||
|
||||
|
@ -15,8 +47,9 @@ namespace Pinetime {
|
|||
void Init();
|
||||
void Update();
|
||||
|
||||
int PercentRemaining();
|
||||
float Voltage();
|
||||
int PercentRemaining() const { return percentRemainingBuffer.GetAverage(); }
|
||||
|
||||
float Voltage() const { return voltage; }
|
||||
|
||||
bool IsCharging() const { return isCharging; }
|
||||
bool IsPowerPresent() const { return isPowerPresent; }
|
||||
|
@ -24,6 +57,9 @@ namespace Pinetime {
|
|||
private:
|
||||
static Battery *instance;
|
||||
nrf_saadc_value_t saadc_value;
|
||||
|
||||
static constexpr uint8_t percentRemainingSamples = 10;
|
||||
CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
|
||||
|
||||
static constexpr uint32_t chargingPin = 12;
|
||||
static constexpr uint32_t powerPresentPin = 19;
|
||||
|
|
|
@ -153,8 +153,7 @@ bool Twos::tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCo
|
|||
}
|
||||
|
||||
bool Twos::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||
bool validMove;
|
||||
validMove = false;
|
||||
bool validMove = false;
|
||||
for(int row = 0; row < 4; row++) {
|
||||
for(int col = 0; col < 4; col++) {
|
||||
grid[row][col].merged = false; // reinitialize merge state
|
||||
|
|
Loading…
Reference in New Issue
Block a user