diff options
author | Riku Isokoski <riksu9000@gmail.com> | 2021-09-22 12:03:41 +0300 |
---|---|---|
committer | Riku Isokoski <riksu9000@gmail.com> | 2021-09-22 12:03:41 +0300 |
commit | b2100908373f76660fcfb5f3c454eb69a38ca4ef (patch) | |
tree | 090a52c4e10646a0d7a9383920452342b4898f4c /src/components/battery/BatteryController.cpp | |
parent | b31b2425f8afd5022173852f5a78592b37104c39 (diff) | |
parent | 1c3c3c8db919c703bbd3f1be4ce9c6833237ea6f (diff) |
Merge branch 'develop' into detect_full_charge
Diffstat (limited to 'src/components/battery/BatteryController.cpp')
-rw-r--r-- | src/components/battery/BatteryController.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp index 619e227c..d2ddae74 100644 --- a/src/components/battery/BatteryController.cpp +++ b/src/components/battery/BatteryController.cpp @@ -1,4 +1,5 @@ #include "BatteryController.h" +#include "drivers/PinMap.h" #include <hal/nrf_gpio.h> #include <nrfx_saadc.h> #include <algorithm> @@ -9,15 +10,12 @@ Battery* Battery::instance = nullptr; Battery::Battery() { instance = this; -} - -void Battery::Init() { - nrf_gpio_cfg_input(chargingPin, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Pullup); + nrf_gpio_cfg_input(PinMap::Charging, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Disabled); } void Battery::Update() { - isCharging = !nrf_gpio_pin_read(chargingPin); - isPowerPresent = !nrf_gpio_pin_read(powerPresentPin); + isCharging = !nrf_gpio_pin_read(PinMap::Charging); + isPowerPresent = !nrf_gpio_pin_read(PinMap::PowerPresent); if (isPowerPresent && !isCharging) { isFull = true; @@ -81,5 +79,11 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) { nrfx_saadc_uninit(); isReading = false; + + systemTask->PushMessage(System::Messages::BatteryMeasurementDone); } } + +void Battery::Register(Pinetime::System::SystemTask* systemTask) { + this->systemTask = systemTask; +} |