summaryrefslogtreecommitdiff
path: root/src/components/battery/BatteryController.cpp
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-07-12 23:07:05 +0300
committerRiku Isokoski <riksu9000@gmail.com>2021-07-12 23:07:05 +0300
commit7efe2b7c51e1d21305154edad6ddf1b608784451 (patch)
tree6a5884cb0b4b04ee8e335a7fb931354aa699ce04 /src/components/battery/BatteryController.cpp
parent4f378e8726fdcff72598aa6ed12eeaa6b3e61355 (diff)
Fix misconfigured ADC and remove now unnecessary filtering
Diffstat (limited to 'src/components/battery/BatteryController.cpp')
-rw-r--r--src/components/battery/BatteryController.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 76ad8cb3..41b4c483 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -26,7 +26,6 @@ void Battery::Update() {
return;
}
// Non blocking read
- samples = 0;
isReading = true;
SaadcInit();
@@ -45,7 +44,7 @@ void Battery::SaadcInit() {
.resistor_n = NRF_SAADC_RESISTOR_DISABLED,
.gain = NRF_SAADC_GAIN1_5,
.reference = NRF_SAADC_REFERENCE_INTERNAL,
- .acq_time = NRF_SAADC_ACQTIME_3US,
+ .acq_time = NRF_SAADC_ACQTIME_40US,
.mode = NRF_SAADC_MODE_SINGLE_ENDED,
.burst = NRF_SAADC_BURST_ENABLED,
.pin_p = batteryVoltageAdcInput,
@@ -75,14 +74,7 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
percentRemaining = std::max(percentRemaining, 0);
percentRemaining = std::min(percentRemaining, 100);
- percentRemainingBuffer.insert(percentRemaining);
-
- samples++;
- if (samples > percentRemainingSamples) {
- nrfx_saadc_uninit();
- isReading = false;
- } else {
- nrfx_saadc_sample();
- }
+ nrfx_saadc_uninit();
+ isReading = false;
}
}