merge in progress

This commit is contained in:
philippe44
2020-01-11 13:56:58 -08:00
parent 886676df88
commit e82d56fbfa
42 changed files with 2138 additions and 1951 deletions

View File

@@ -21,13 +21,11 @@
static const char TAG[] = "battery";
#ifdef CONFIG_SQUEEZEAMP
static struct {
float sum, avg;
int count;
TimerHandle_t timer;
} battery;
#endif
/****************************************************************************************
*