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

Merge pull request #592 from cyberman54/development

Browse Source 
Development
This commit is contained in:
Verkehrsrot 2020-04-14 00:19:04 +02:00 committed by GitHub
commit 7c632eebbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
include/power.h
View File

@ -15,17 +15,19 @@
#define BAT_MAX_VOLTAGE 4200 // millivolts
#endif
#ifndef BAT_MIN_VOLTAGE
#define BAT_MIN_VOLTAGE 2800 // millivolts
#define BAT_MIN_VOLTAGE 3100 // millivolts
#endif
typedef uint8_t (*mapFn_t)(uint16_t, uint16_t, uint16_t);
uint16_t read_voltage(void);
uint8_t read_battlevel(void);
void calibrate_voltage(void);
bool batt_sufficient(void);
#ifdef HAS_PMU
#include <axp20x.h>
extern AXP20X_Class pmu;
enum pmu_power_t { pmu_power_on, pmu_power_off, pmu_power_sleep };
void AXP192_powerevent_IRQ(void);
void AXP192_power(pmu_power_t powerlevel);
@ -34,4 +36,51 @@ void AXP192_showstatus(void);
#endif // HAS_PMU
// The following map functions were taken from
//
// Battery.h - Battery library
// Copyright (c) 2014 Roberto Lo Giacco
// https://github.com/rlogiacco/BatterySense
/**
* Symmetric sigmoidal approximation
* https://www.desmos.com/calculator/7m9lu26vpy
*
* c - c / (1 + k*x/v)^3
*/
static inline uint8_t sigmoidal(uint16_t voltage, uint16_t minVoltage, uint16_t maxVoltage) {
// slow
// uint8_t result = 110 - (110 / (1 + pow(1.468 * (voltage - minVoltage)/(maxVoltage - minVoltage), 6)));
// steep
// uint8_t result = 102 - (102 / (1 + pow(1.621 * (voltage - minVoltage)/(maxVoltage - minVoltage), 8.1)));
// normal
uint8_t result = 105 - (105 / (1 + pow(1.724 * (voltage - minVoltage)/(maxVoltage - minVoltage), 5.5)));
return result >= 100 ? 100 : result;
}
/**
* Asymmetric sigmoidal approximation
* https://www.desmos.com/calculator/oyhpsu8jnw
*
* c - c / [1 + (k*x/v)^4.5]^3
*/
static inline uint8_t asigmoidal(uint16_t voltage, uint16_t minVoltage, uint16_t maxVoltage) {
uint8_t result = 101 - (101 / pow(1 + pow(1.33 * (voltage - minVoltage)/(maxVoltage - minVoltage) ,4.5), 3));
return result >= 100 ? 100 : result;
}
/**
* Linear mapping
* https://www.desmos.com/calculator/sowyhttjta
*
* x * 100 / v
*/
static inline uint8_t linear(uint16_t voltage, uint16_t minVoltage, uint16_t maxVoltage) {
return (unsigned long)(voltage - minVoltage) * 100 / (maxVoltage - minVoltage);
}
uint8_t read_battlevel(mapFn_t mapFunction = &sigmoidal);
#endif

4
src/cyclic.cpp
View File

@ -68,10 +68,6 @@ void doHousekeeping() {
#if (defined BAT_MEASURE_ADC || defined HAS_PMU)
batt_level = read_battlevel();
ESP_LOGI(TAG, "Battery: %d%%", batt_level);
#if (HAS_LORA)
// to come with future LMIC version
// lora_setBattLevel(batt_level);
#endif
#ifdef HAS_PMU
AXP192_showstatus();
#endif

8
src/lorawan.cpp
View File

@ -485,12 +485,10 @@ void lora_setBattLevel(uint8_t batt_percent) {
#endif // HAS_PMU
else
lmic_batt_level = static_cast<uint8_t>(
(float)batt_percent /
(float)(MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1) * 100.0f);
lmic_batt_level =
batt_percent / 100.0 * (MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1);
LMIC_setBattLevel(lmic_batt_level);
ESP_LOGD(TAG, "lmic_batt_level = %d", lmic_batt_level);
//LMIC_setBattLevel(lmic_batt_level);
}
// event EV_RXCOMPLETE message handler

24
src/power.cpp
View File

@ -210,19 +210,29 @@ uint16_t read_voltage(void) {
return voltage;
}
uint8_t read_battlevel() {
uint8_t read_battlevel(mapFn_t mapFunction) {
// return the battery level in values 0 ... 255 [percent],
// values > 100 probably mean external power, depending on hardware
// returns the estimated battery level in values 0 ... 100 [percent]
const uint16_t batt_voltage = read_voltage();
float batt_percent_fl = (float)(batt_voltage - BAT_MIN_VOLTAGE) /
(float)(BAT_MAX_VOLTAGE - BAT_MIN_VOLTAGE) * 100.0f;
const uint8_t batt_percent = static_cast<uint8_t>(batt_percent_fl);
uint8_t batt_percent;
ESP_LOGD(TAG, "batt_voltage = %dmV / batt_percent = %u%%", batt_voltage,
if (batt_voltage <= BAT_MIN_VOLTAGE)
batt_percent = 0;
else if (batt_voltage >= BAT_MAX_VOLTAGE)
batt_percent = 100;
else
batt_percent =
(*mapFunction)(batt_voltage, BAT_MIN_VOLTAGE, BAT_MAX_VOLTAGE);
ESP_LOGD(TAG, "batt_voltage = %dmV / batt_percent = %d%%", batt_voltage,
batt_percent);
#if (HAS_LORA)
// to come with future LMIC version
lora_setBattLevel(batt_percent);
#endif
return batt_percent;
}