pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 11:23:53 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix battery voltage sensing on NRF52 boards

Browse Source
This commit is contained in:
Kevin Hester 2020-10-16 17:00:27 +08:00
parent b32e3f1269
commit 2b373048c6
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Power.cpp
View File

@ -18,6 +18,21 @@ Power *power;
using namespace meshtastic; using namespace meshtastic;
#if defined(NRF52_SERIES)
/*
* Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
* 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
*
* External Reference is VDD/4, with an adjustable gain of 1, 2 or 4, meaning
* VDD/4, VDD/2 or VDD for the ADC levels.
*
* Default settings are internal reference with 1/6 gain (GND..3.6V ADC range)
*/
#define AREF_VOLTAGE 3.6
#else
#define AREF_VOLTAGE 3.3
#endif
/** /**
* If this board has a battery level sensor, set this to a valid implementation * If this board has a battery level sensor, set this to a valid implementation
*/ */
@ -48,9 +63,13 @@ class AnalogBatteryLevel : public HasBatteryLevel
*/ */
virtual float getBattVoltage() virtual float getBattVoltage()
{ {
uint32_t raw = analogRead(BATTERY_PIN);
// Tested ttgo eink nrf52 board and the reported value is perfect
// DEBUG_MSG("raw val %u", raw);
return return
#ifdef BATTERY_PIN #ifdef BATTERY_PIN
1000.0 * analogRead(BATTERY_PIN) * 2.0 * (3.3 / 1024.0); 1000.0 * 2.0 * (AREF_VOLTAGE / 1024.0) * raw;
#else #else
NAN; NAN;
#endif #endif
@ -68,10 +87,18 @@ bool Power::analogInit()
{ {
#ifdef BATTERY_PIN #ifdef BATTERY_PIN
DEBUG_MSG("Using analog input for battery level\n"); DEBUG_MSG("Using analog input for battery level\n");
// disable any internal pullups
pinMode(BATTERY_PIN, INPUT);
#ifndef NO_ESP32 #ifndef NO_ESP32
// ESP32 needs special analog stuff // ESP32 needs special analog stuff
adcAttachPin(BATTERY_PIN); adcAttachPin(BATTERY_PIN);
#endif #endif
#ifdef NRF52_SERIES
analogReference(AR_INTERNAL); // 3.6V
#endif
// adcStart(BATTERY_PIN); // adcStart(BATTERY_PIN);
analogReadResolution(10); // Default of 12 is not very linear. Recommended to use 10 or 11 depending on needed resolution. analogReadResolution(10); // Default of 12 is not very linear. Recommended to use 10 or 11 depending on needed resolution.
batteryLevel = &analogLevel; batteryLevel = &analogLevel;