From d353bc4f38ea9b37aa83ce649bb75e62021638e5 Mon Sep 17 00:00:00 2001
From: Willem Oldemans <willem@oldemans.nl>
Date: Sun, 16 Apr 2023 21:44:59 +0200
Subject: [PATCH] fix merge issues

---
 FW/leo_muziekdoos_esp32/lib/ESP8266Audio   |  2 +-
 FW/leo_muziekdoos_esp32/lib/littleFS_esp32 |  2 +-
 FW/leo_muziekdoos_esp32/src/sensor.h       | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/FW/leo_muziekdoos_esp32/lib/ESP8266Audio b/FW/leo_muziekdoos_esp32/lib/ESP8266Audio
index 6110583..818dfd5 160000
--- a/FW/leo_muziekdoos_esp32/lib/ESP8266Audio
+++ b/FW/leo_muziekdoos_esp32/lib/ESP8266Audio
@@ -1 +1 @@
-Subproject commit 611058319075fb826c064e77ffd46ac32086412f
+Subproject commit 818dfd5cb7b3cd9ae8cf68c4bc719748c914e9d9
diff --git a/FW/leo_muziekdoos_esp32/lib/littleFS_esp32 b/FW/leo_muziekdoos_esp32/lib/littleFS_esp32
index ccc5492..c28cf47 160000
--- a/FW/leo_muziekdoos_esp32/lib/littleFS_esp32
+++ b/FW/leo_muziekdoos_esp32/lib/littleFS_esp32
@@ -1 +1 @@
-Subproject commit ccc54923d43571b812e0c2916d0f7ca7ecb6f1d6
+Subproject commit c28cf47f613fc500d142da50e3c0966d9be9bcd8
diff --git a/FW/leo_muziekdoos_esp32/src/sensor.h b/FW/leo_muziekdoos_esp32/src/sensor.h
index 848766b..910c922 100644
--- 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);