From 7efe2b7c51e1d21305154edad6ddf1b608784451 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 12 Jul 2021 23:07:05 +0300
Subject: Fix misconfigured ADC and remove now unnecessary filtering

---
 src/components/battery/BatteryController.h | 38 +-----------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

(limited to 'src/components/battery/BatteryController.h')

diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 26e24938..84d488ed 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -7,38 +7,6 @@
 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:
       Battery();
@@ -47,7 +15,7 @@ namespace Pinetime {
       void Update();
 
       int PercentRemaining() const {
-        return percentRemainingBuffer.GetAverage();
+        return percentRemaining;
       }
 
       uint16_t Voltage() const {
@@ -65,9 +33,6 @@ namespace Pinetime {
       static Battery* instance;
       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 powerPresentPin = 19;
       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);
 
       bool isReading = false;
-      uint8_t samples = 0;
     };
   }
 }
-- 
cgit v1.2.3