DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

battery level calculation fixes

Browse Source
This commit is contained in:
Klaus K Wilting 2020-04-14 00:15:51 +02:00
parent c8a5896043
commit af02c2c661
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/power.h
View File

@ -7,7 +7,6 @@
#include "i2c.h" #include "i2c.h"
#include "reset.h" #include "reset.h"
#include "lorawan.h"
#define DEFAULT_VREF 1100 // tbd: use adc2_vref_to_gpio() for better estimate #define DEFAULT_VREF 1100 // tbd: use adc2_vref_to_gpio() for better estimate
#define NO_OF_SAMPLES 64 // we do some multisampling to get better values #define NO_OF_SAMPLES 64 // we do some multisampling to get better values
@ -28,6 +27,7 @@ bool batt_sufficient(void);
#ifdef HAS_PMU #ifdef HAS_PMU
#include <axp20x.h> #include <axp20x.h>
extern AXP20X_Class pmu;
enum pmu_power_t { pmu_power_on, pmu_power_off, pmu_power_sleep }; enum pmu_power_t { pmu_power_on, pmu_power_off, pmu_power_sleep };
void AXP192_powerevent_IRQ(void); void AXP192_powerevent_IRQ(void);
void AXP192_power(pmu_power_t powerlevel); void AXP192_power(pmu_power_t powerlevel);
@ -37,22 +37,11 @@ void AXP192_showstatus(void);
#endif // HAS_PMU #endif // HAS_PMU
// The following map functions were taken from // The following map functions were taken from
//
/* // Battery.h - Battery library
Battery.h - Battery library // Copyright (c) 2014 Roberto Lo Giacco
Copyright (c) 2014 Roberto Lo Giacco. // https://github.com/rlogiacco/BatterySense
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** /**
* Symmetric sigmoidal approximation * Symmetric sigmoidal approximation
* https://www.desmos.com/calculator/7m9lu26vpy * https://www.desmos.com/calculator/7m9lu26vpy

2
src/lorawan.cpp
View File

@ -488,7 +488,7 @@ void lora_setBattLevel(uint8_t batt_percent) {
lmic_batt_level = lmic_batt_level =
batt_percent / 100.0 * (MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1); batt_percent / 100.0 * (MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1);
LMIC_setBattLevel(lmic_batt_level); //LMIC_setBattLevel(lmic_batt_level);
} }
// event EV_RXCOMPLETE message handler // event EV_RXCOMPLETE message handler

4
src/power.cpp
View File

@ -212,7 +212,7 @@ uint16_t read_voltage(void) {
uint8_t read_battlevel(mapFn_t mapFunction) { uint8_t read_battlevel(mapFn_t mapFunction) {
// returns the estimated battery level in values 0 ... 100 [percent], // returns the estimated battery level in values 0 ... 100 [percent]
const uint16_t batt_voltage = read_voltage(); const uint16_t batt_voltage = read_voltage();
uint8_t batt_percent; uint8_t batt_percent;
@ -230,7 +230,7 @@ uint8_t read_battlevel(mapFn_t mapFunction) {
#if (HAS_LORA) #if (HAS_LORA)
// to come with future LMIC version // to come with future LMIC version
// lora_setBattLevel(batt_percent); lora_setBattLevel(batt_percent);
#endif #endif
return batt_percent; return batt_percent;