update code for v1.1

This commit is contained in:
2021-05-08 12:50:25 +02:00
parent 6853c220db
commit 47c5c06191
5 changed files with 58 additions and 34 deletions

View File

@@ -7,13 +7,18 @@
#ifdef VBATTPIN
#include "Battery.h"
Battery battery(VBATTMIN, VBATTMAX, VBATTPIN);
Battery battery(VBATTMIN, VBATTMAX, VBATTPIN);
#endif
void initBattery(void)
{
#ifdef VBATTPIN
battery.begin(VBATTREF, (R12+R13)/R13); //R1 = 220K, R2 = 100K, factor = (R1+R2)/R2
#ifdef MEAS_EN
battery.begin(VBATTREF, (R12 + R13) / R13); //R1 = 220K, R2 = 100K, factor = (R1+R2)/R2
battery.onDemand(MEAS_EN, HIGH);
#else
battery.begin(VBATTREF, (R12 + R13) / R13); //R1 = 220K, R2 = 100K, factor = (R1+R2)/R2
#endif
#endif
}
@@ -21,19 +26,19 @@ void batterydisplay(void)
{
#ifdef VBATTPIN
uint16_t currentlevel = battery.level();
if (currentlevel > 90)
{
turnOnLed(3);
}
if (currentlevel > 50)
{
turnOnLed(2);
}
if (currentlevel > 20)
{
turnOnLed(1);
}
if (currentlevel > 90)
{
turnOnLed(3);
}
if (currentlevel > 50)
{
turnOnLed(2);
}
if (currentlevel > 20)
{
turnOnLed(1);
}
#endif
}
@@ -43,7 +48,7 @@ void batteryCheck(void)
#ifdef VBATTPIN
if (battery.voltage() < VBATTMIN)
{
for( int i = 0; i < 10;i++)
for (int i = 0; i < 10; i++)
{
turnOnLed(1);
delay(300);
@@ -56,15 +61,27 @@ void batteryCheck(void)
#endif
}
void initShutdown(void)
{
#ifdef PW_HOLD
pinMode(PW_HOLD, OUTPUT);
pinMode(BTN_PWR, INPUT);
digitalWrite(PW_HOLD, HIGH);
#endif
}
//low power
void initLowPower(void)
void initPower(void)
{
LowPower_init();
initBattery();
}
void shutdown(void)
{
LowPower_shutdown();
delay(2000);
//digitalWrite()
}
void HandlePower(void)
@@ -73,6 +90,9 @@ void HandlePower(void)
batteryCheck();
}
void HandlePowerOn(void)
{
}
void HandleTimeOut(void)
{