fix merge issues

This commit is contained in:
2023-04-16 21:44:59 +02:00
parent 30db59d4a8
commit d353bc4f38
3 changed files with 10 additions and 10 deletions

View File

@@ -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);