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

Merge pull request #601 from cyberman54/development

Browse Source 
Development
This commit is contained in:
Verkehrsrot 2020-05-02 17:25:54 +02:00 committed by GitHub
commit 3e9e027a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/display.cpp
View File

@ -283,10 +283,8 @@ void dp_drawPage(time_t t, bool nextpage) {
#if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306) #if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306)
if (batt_level == 0) if (batt_level == 0)
dp_printf("No batt "); dp_printf("No batt ");
else if (batt_level < 100)
dp_printf("B:%3d%% ", batt_level);
else else
dp_printf("ext.Pwr "); dp_printf("B:%3d%% ", batt_level);
#else #else
dp_printf(" "); dp_printf(" ");
#endif #endif

17
src/lorawan.cpp
View File

@ -482,29 +482,22 @@ uint8_t myBattLevelCb(void *pUserData) {
// we calculate the applicable value from MCMD_DEVS_BATT_MIN to // we calculate the applicable value from MCMD_DEVS_BATT_MIN to
// MCMD_DEVS_BATT_MAX from bat_percent value // MCMD_DEVS_BATT_MAX from bat_percent value
uint8_t lmic_batt_level;
uint8_t const batt_percent = read_battlevel(); uint8_t const batt_percent = read_battlevel();
if (batt_percent == 0) if (batt_percent == 0)
lmic_batt_level = MCMD_DEVS_BATT_NOINFO; return MCMD_DEVS_BATT_NOINFO;
else else
#ifdef HAS_PMU #ifdef HAS_PMU
if (pmu.isVBUSPlug()) if (pmu.isVBUSPlug())
lmic_batt_level = MCMD_DEVS_EXT_POWER; return MCMD_DEVS_EXT_POWER;
#elif defined HAS_IP5306 #elif defined HAS_IP5306
if (IP5306_GetPowerSource()) if (IP5306_GetPowerSource())
lmic_batt_level = MCMD_DEVS_EXT_POWER; return MCMD_DEVS_EXT_POWER;
#else #else
if (batt_percent >= 100) return (batt_percent / 100.0 *
lmic_batt_level = MCMD_DEVS_EXT_POWER; (MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1));
#endif // HAS_PMU #endif // HAS_PMU
else
lmic_batt_level =
batt_percent / 100.0 * (MCMD_DEVS_BATT_MAX - MCMD_DEVS_BATT_MIN + 1);
return lmic_batt_level;
} }
// event EV_RXCOMPLETE message handler // event EV_RXCOMPLETE message handler

1
src/main.cpp
View File

@ -233,7 +233,6 @@ void setup() {
#ifdef HAS_RGB_LED #ifdef HAS_RGB_LED
switch_LED(LED_ON); switch_LED(LED_ON);
strcat_P(features, " RGB"); strcat_P(features, " RGB");
rgb_set_color(COLOR_PINK);
#endif #endif
#endif // HAS_LED #endif // HAS_LED

18
src/power.cpp
View File

@ -211,26 +211,18 @@ 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]
uint8_t batt_percent;
#ifdef HAS_IP5306 #ifdef HAS_IP5306
batt_percent = IP5306_GetBatteryLevel(); return IP5306_GetBatteryLevel();
#else #else
const uint16_t batt_voltage = read_voltage(); const uint16_t batt_voltage = read_voltage();
if (batt_voltage <= BAT_MIN_VOLTAGE) if (batt_voltage <= BAT_MIN_VOLTAGE)
batt_percent = 0; return 0;
else if (batt_voltage >= BAT_MAX_VOLTAGE) else if (batt_voltage >= BAT_MAX_VOLTAGE)
batt_percent = 100; return 100;
else else
batt_percent = return (*mapFunction)(batt_voltage, BAT_MIN_VOLTAGE, BAT_MAX_VOLTAGE);
(*mapFunction)(batt_voltage, BAT_MIN_VOLTAGE, BAT_MAX_VOLTAGE); #endif
#endif // HAS_IP5306
return batt_percent;
} }
bool batt_sufficient() { bool batt_sufficient() {