fix merge issues
This commit is contained in:
Submodule FW/leo_muziekdoos_esp32/lib/ESP8266Audio updated: 6110583190...818dfd5cb7
Submodule FW/leo_muziekdoos_esp32/lib/littleFS_esp32 updated: ccc54923d4...c28cf47f61
@@ -17,14 +17,14 @@
|
|||||||
#define HALLINTERVAL 100
|
#define HALLINTERVAL 100
|
||||||
#define HALLTHRESHOLD 5
|
#define HALLTHRESHOLD 5
|
||||||
|
|
||||||
static String HALLSENESORSTATES_ENUM2STR[HALL_LAST]
|
// static String HALLSENESORSTATES_ENUM2STR[HALL_LAST]
|
||||||
{
|
// {
|
||||||
"Hall Idle",
|
// "Hall Idle",
|
||||||
"Hall Increasing",
|
// "Hall Increasing",
|
||||||
"Hall Tipover",
|
// "Hall Tipover",
|
||||||
"Hall decreasing",
|
// "Hall decreasing",
|
||||||
"Hall tipUnder"
|
// "Hall tipUnder"
|
||||||
};
|
// };
|
||||||
|
|
||||||
void initSensor(void);
|
void initSensor(void);
|
||||||
void handleBatterySensor(void);
|
void handleBatterySensor(void);
|
||||||
|
|||||||
Reference in New Issue
Block a user