fix merge issues

2023-04-16 21:44:59 +02:00
parent 30db59d4a8
commit d353bc4f38
3 changed files with 10 additions and 10 deletions
--- a/FW/leo_muziekdoos_esp32/lib/ESP8266Audio
+++ b/FW/leo_muziekdoos_esp32/lib/ESP8266Audio
--- a/FW/leo_muziekdoos_esp32/lib/littleFS_esp32
+++ b/FW/leo_muziekdoos_esp32/lib/littleFS_esp32
--- a/FW/leo_muziekdoos_esp32/src/sensor.h
+++ b/FW/leo_muziekdoos_esp32/src/sensor.h
@@ -17,14 +17,14 @@
 #define HALLINTERVAL        100
 #define HALLTHRESHOLD       5

-static String HALLSENESORSTATES_ENUM2STR[HALL_LAST]
-{
-  "Hall Idle",
-  "Hall Increasing",
-  "Hall Tipover",
-  "Hall decreasing",
-  "Hall tipUnder"
-};
+// static String HALLSENESORSTATES_ENUM2STR[HALL_LAST]
+// {
+//   "Hall Idle",
+//   "Hall Increasing",
+//   "Hall Tipover",
+//   "Hall decreasing",
+//   "Hall tipUnder"
+// };

 void initSensor(void);
 void handleBatterySensor(void);