diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-09-13 20:05:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 20:05:43 +0200 |
| commit | b0bdd2be1c30d349a1efef96b93a5771f5edbd06 (patch) | |
| tree | f87b3c1b7b2fb664bc26da96f4cafd0206aa53dc /src/components/battery | |
| parent | 84a93b54410681ce1aaae80ba7a7e6d3300dcfa1 (diff) | |
| parent | e614af1c4a53e943256b3b2acee4bfe7d7204bbf (diff) | |
Merge pull request #549 from hubmartin/pinmap
Put all duplicated GPIO pin definitions to a single file
Diffstat (limited to 'src/components/battery')
| -rw-r--r-- | src/components/battery/BatteryController.cpp | 7 | ||||
| -rw-r--r-- | src/components/battery/BatteryController.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp index aa038c5d..4ef20a24 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,12 +10,12 @@ Battery* Battery::instance = nullptr; Battery::Battery() { instance = this; - nrf_gpio_cfg_input(chargingPin, static_cast<nrf_gpio_pin_pull_t> GPIO_PIN_CNF_PULL_Disabled); + 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 (isReading) { return; diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h index ad304eba..8af27ea8 100644 --- a/src/components/battery/BatteryController.h +++ b/src/components/battery/BatteryController.h @@ -33,8 +33,6 @@ namespace Pinetime { static Battery* instance; nrf_saadc_value_t saadc_value; - static constexpr uint32_t chargingPin = 12; - static constexpr uint32_t powerPresentPin = 19; static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7; uint16_t voltage = 0; uint8_t percentRemaining = 0; |