pinetime/InfiniTime
1
0
Fork 0
Code Activity

Fix misconfigured ADC and remove now unnecessary filtering

Browse source
This commit is contained in:
Riku Isokoski 2021-07-12 23:07:05 +03:00
parent 4f378e8726
commit 7efe2b7c51
2 changed files with 4 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/battery/BatteryController.cpp
View file

@ -26,7 +26,6 @@ void Battery::Update() {
return; return;
} }
// Non blocking read // Non blocking read
samples = 0;
isReading = true; isReading = true;
SaadcInit(); SaadcInit();
@ -45,7 +44,7 @@ void Battery::SaadcInit() {
.resistor_n = NRF_SAADC_RESISTOR_DISABLED, .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
.gain = NRF_SAADC_GAIN1_5, .gain = NRF_SAADC_GAIN1_5,
.reference = NRF_SAADC_REFERENCE_INTERNAL, .reference = NRF_SAADC_REFERENCE_INTERNAL,
.acq_time = NRF_SAADC_ACQTIME_3US, .acq_time = NRF_SAADC_ACQTIME_40US,
.mode = NRF_SAADC_MODE_SINGLE_ENDED, .mode = NRF_SAADC_MODE_SINGLE_ENDED,
.burst = NRF_SAADC_BURST_ENABLED, .burst = NRF_SAADC_BURST_ENABLED,
.pin_p = batteryVoltageAdcInput, .pin_p = batteryVoltageAdcInput,
@ -75,14 +74,7 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
percentRemaining = std::max(percentRemaining, 0); percentRemaining = std::max(percentRemaining, 0);
percentRemaining = std::min(percentRemaining, 100); percentRemaining = std::min(percentRemaining, 100);
percentRemainingBuffer.insert(percentRemaining);
samples++;
if (samples > percentRemainingSamples) {
nrfx_saadc_uninit(); nrfx_saadc_uninit();
isReading = false; isReading = false;
} else {
nrfx_saadc_sample();
}
} }
} }

38
src/components/battery/BatteryController.h
View file

@ -7,38 +7,6 @@
namespace Pinetime { namespace Pinetime {
namespace Controllers { 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 { class Battery {
public: public:
Battery(); Battery();
@ -47,7 +15,7 @@ namespace Pinetime {
void Update(); void Update();
int PercentRemaining() const { int PercentRemaining() const {
return percentRemainingBuffer.GetAverage(); return percentRemaining;
} }
uint16_t Voltage() const { uint16_t Voltage() const {
@ -65,9 +33,6 @@ namespace Pinetime {
static Battery* instance; static Battery* instance;
nrf_saadc_value_t saadc_value; nrf_saadc_value_t saadc_value;
static constexpr uint8_t percentRemainingSamples = 5;
CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
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;
@ -83,7 +48,6 @@ namespace Pinetime {
static void adcCallbackStatic(nrfx_saadc_evt_t const* event); static void adcCallbackStatic(nrfx_saadc_evt_t const* event);
bool isReading = false; bool isReading = false;
uint8_t samples = 0;
}; };
} }
} }