scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Replace pin numbers by constants

Browse source
This commit is contained in:
JF 2019-12-27 17:05:09 +01:00
parent fcbd341c1c
commit 11aa5e3d88
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Components/Battery/BatteryController.cpp
View file

@ -6,8 +6,8 @@
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;
void Battery::Init() { void Battery::Init() {
nrf_gpio_cfg_input(12, (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(19, (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);
nrfx_saadc_config_t adcConfig = NRFX_SAADC_DEFAULT_CONFIG; nrfx_saadc_config_t adcConfig = NRFX_SAADC_DEFAULT_CONFIG;
nrfx_saadc_init(&adcConfig, SaadcEventHandler); nrfx_saadc_init(&adcConfig, SaadcEventHandler);
@ -19,19 +19,20 @@ void Battery::Init() {
.acq_time = NRF_SAADC_ACQTIME_3US, .acq_time = NRF_SAADC_ACQTIME_3US,
.mode = NRF_SAADC_MODE_SINGLE_ENDED, .mode = NRF_SAADC_MODE_SINGLE_ENDED,
.burst = NRF_SAADC_BURST_DISABLED, .burst = NRF_SAADC_BURST_DISABLED,
.pin_p = (nrf_saadc_input_t)(SAADC_CH_PSELP_PSELP_AnalogInput7), .pin_p = batteryVoltageAdcInput,
.pin_n = NRF_SAADC_INPUT_DISABLED .pin_n = NRF_SAADC_INPUT_DISABLED
}; };
nrfx_saadc_channel_init(0, &adcChannelConfig); nrfx_saadc_channel_init(0, &adcChannelConfig);
} }
void Battery::Update() { void Battery::Update() {
isCharging = !nrf_gpio_pin_read(12); isCharging = !nrf_gpio_pin_read(chargingPin);
isPowerPresent = !nrf_gpio_pin_read(19); isPowerPresent = !nrf_gpio_pin_read(powerPresentPin);
nrf_saadc_value_t value = 0; nrf_saadc_value_t value = 0;
nrfx_saadc_sample_convert(0, &value); nrfx_saadc_sample_convert(0, &value);
// see https://forum.pine64.org/showthread.php?tid=8147
voltage = (value * 2.0f) / (1024/3.0f); voltage = (value * 2.0f) / (1024/3.0f);
percentRemaining = ((voltage - 3.55)*100)*3.9; percentRemaining = ((voltage - 3.55)*100)*3.9;

3
src/Components/Battery/BatteryController.h
View file

@ -14,6 +14,9 @@ namespace Pinetime {
bool IsPowerPresent() const { return isPowerPresent; } bool IsPowerPresent() const { return isPowerPresent; }
private: private:
static constexpr uint32_t chargingPin = 12;
static constexpr uint32_t powerPresentPin = 19;
static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
static void SaadcEventHandler(nrfx_saadc_evt_t const * p_event); static void SaadcEventHandler(nrfx_saadc_evt_t const * p_event);
float percentRemaining = 0.0f; float percentRemaining = 0.0f;
float voltage = 0.0f; float voltage = 0.0f;