summaryrefslogtreecommitdiff
path: root/src/components/battery
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/battery')
-rw-r--r--src/components/battery/BatteryController.cpp71
-rw-r--r--src/components/battery/BatteryController.h84
2 files changed, 86 insertions, 69 deletions
diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 4a7a2345..b39efefb 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -7,71 +7,78 @@
using namespace Pinetime::Controllers;
-Battery *Battery::instance = nullptr;
+Battery* Battery::instance = nullptr;
Battery::Battery() {
instance = this;
}
void Battery::Init() {
- nrf_gpio_cfg_input(chargingPin, (nrf_gpio_pin_pull_t)GPIO_PIN_CNF_PULL_Pullup);
- nrf_gpio_cfg_input(powerPresentPin, (nrf_gpio_pin_pull_t)GPIO_PIN_CNF_PULL_Pullup);
+ nrf_gpio_cfg_input(chargingPin, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pullup);
+ nrf_gpio_cfg_input(powerPresentPin, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pullup);
}
void Battery::Update() {
isCharging = !nrf_gpio_pin_read(chargingPin);
isPowerPresent = !nrf_gpio_pin_read(powerPresentPin);
-
+
+ if (isReading)
+ return;
// Non blocking read
+ samples = 0;
+ isReading = true;
SaadcInit();
+
nrfx_saadc_sample();
-
+}
+
+void Battery::adcCallbackStatic(nrfx_saadc_evt_t const* event) {
+ instance->SaadcEventHandler(event);
}
void Battery::SaadcInit() {
nrfx_saadc_config_t adcConfig = NRFX_SAADC_DEFAULT_CONFIG;
APP_ERROR_CHECK(nrfx_saadc_init(&adcConfig, adcCallbackStatic));
- nrf_saadc_channel_config_t adcChannelConfig = {
- .resistor_p = NRF_SAADC_RESISTOR_DISABLED,
- .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
- .gain = NRF_SAADC_GAIN1_5,
- .reference = NRF_SAADC_REFERENCE_INTERNAL,
- .acq_time = NRF_SAADC_ACQTIME_3US,
- .mode = NRF_SAADC_MODE_SINGLE_ENDED,
- .burst = NRF_SAADC_BURST_ENABLED,
- .pin_p = batteryVoltageAdcInput,
- .pin_n = NRF_SAADC_INPUT_DISABLED
- };
+ nrf_saadc_channel_config_t adcChannelConfig = {.resistor_p = NRF_SAADC_RESISTOR_DISABLED,
+ .resistor_n = NRF_SAADC_RESISTOR_DISABLED,
+ .gain = NRF_SAADC_GAIN1_5,
+ .reference = NRF_SAADC_REFERENCE_INTERNAL,
+ .acq_time = NRF_SAADC_ACQTIME_3US,
+ .mode = NRF_SAADC_MODE_SINGLE_ENDED,
+ .burst = NRF_SAADC_BURST_ENABLED,
+ .pin_p = batteryVoltageAdcInput,
+ .pin_n = NRF_SAADC_INPUT_DISABLED};
APP_ERROR_CHECK(nrfx_saadc_channel_init(0, &adcChannelConfig));
APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
-
}
-void Battery::SaadcEventHandler(nrfx_saadc_evt_t const * p_event) {
+void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
+
+ const float battery_max = 4.18; // maximum voltage of battery ( max charging voltage is 4.21 )
+ const float battery_min = 3.20; // minimum voltage of battery before shutdown ( depends on the battery )
- const float battery_max = 4.18; // maximum voltage of battery ( max charging voltage is 4.21 )
- const float battery_min = 3.20; // minimum voltage of battery before shutdown ( depends on the battery )
+ if (p_event->type == NRFX_SAADC_EVT_DONE) {
- if (p_event->type == NRFX_SAADC_EVT_DONE) {
-
- APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
+ APP_ERROR_CHECK(nrfx_saadc_buffer_convert(&saadc_value, 1));
- voltage = (static_cast<float>(p_event->data.done.p_buffer[0]) * 2.04f) / (1024 / 3.0f);
- voltage = roundf(voltage * 100) / 100;
+ voltage = (static_cast<float>(p_event->data.done.p_buffer[0]) * 2.04f) / (1024 / 3.0f);
+ voltage = roundf(voltage * 100) / 100;
- percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
+ percentRemaining = static_cast<int>(((voltage - battery_min) / (battery_max - battery_min)) * 100);
- percentRemaining = std::max(percentRemaining, 0);
- percentRemaining = std::min(percentRemaining, 100);
+ percentRemaining = std::max(percentRemaining, 0);
+ percentRemaining = std::min(percentRemaining, 100);
- percentRemainingBuffer.insert(percentRemaining);
+ percentRemainingBuffer.insert(percentRemaining);
+ samples++;
+ if (samples > percentRemainingSamples) {
nrfx_saadc_uninit();
+ isReading = false;
+ } else {
+ nrfx_saadc_sample();
}
}
-
-void Battery::adcCallbackStatic(nrfx_saadc_evt_t const *event) {
- instance->SaadcEventHandler(event);
}
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 2776687b..04bcf6b8 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -7,18 +7,18 @@
namespace Pinetime {
namespace Controllers {
- /** A simple circular buffer that can be used to average
- out the sensor values. The total capacity of the CircBuffer
+ /** 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 {
+ */
+ template <int N> class CircBuffer {
public:
- CircBuffer() : arr{}, sz{}, cap{N}, head{} {}
+ CircBuffer() : arr {}, sz {}, cap {N}, head {} {
+ }
/**
- insert member function overwrites the next data to the current
+ 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;
@@ -34,46 +34,56 @@ namespace Pinetime {
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*/
+ 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:
+ public:
+ Battery();
+
+ void Init();
+ void Update();
+
+ int PercentRemaining() const {
+ return percentRemainingBuffer.GetAverage();
+ }
- Battery();
+ float Voltage() const {
+ return voltage;
+ }
- void Init();
- void Update();
-
- int PercentRemaining() const { return percentRemainingBuffer.GetAverage(); }
+ bool IsCharging() const {
+ return isCharging;
+ }
+ bool IsPowerPresent() const {
+ return isPowerPresent;
+ }
+
+ private:
+ static Battery* instance;
+ nrf_saadc_value_t saadc_value;
- float Voltage() const { return voltage; }
+ static constexpr uint8_t percentRemainingSamples = 5;
+ CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
- bool IsCharging() const { return isCharging; }
- bool IsPowerPresent() const { return isPowerPresent; }
+ static constexpr uint32_t chargingPin = 12;
+ static constexpr uint32_t powerPresentPin = 19;
+ static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
+ float voltage = 0.0f;
+ int percentRemaining = -1;
- private:
- static Battery *instance;
- nrf_saadc_value_t saadc_value;
-
- static constexpr uint8_t percentRemainingSamples = 10;
- CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
+ bool isCharging = false;
+ bool isPowerPresent = false;
- static constexpr uint32_t chargingPin = 12;
- static constexpr uint32_t powerPresentPin = 19;
- static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
- float voltage = 0.0f;
- int percentRemaining = -1;
+ void SaadcInit();
- bool isCharging = false;
- bool isPowerPresent = false;
-
- void SaadcInit();
+ void SaadcEventHandler(nrfx_saadc_evt_t const* p_event);
+ static void adcCallbackStatic(nrfx_saadc_evt_t const* event);
- void SaadcEventHandler(nrfx_saadc_evt_t const * p_event);
- static void adcCallbackStatic(nrfx_saadc_evt_t const *event);
+ bool isReading = false;
+ uint8_t samples = 0;
};
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 03:23:17 +0000