Avoid name collision. Fix wled instance access in ino.

kaflake · Mar 28, 2020 · f99f13a · f99f13a
1 parent f35ab12
commit f99f13a
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/usermods/blynk_relay_control/wled06_usermod.ino b/usermods/blynk_relay_control/wled06_usermod.ino
@@ -1,7 +1,7 @@
 /*
  * This file allows you to add own functionality to WLED more easily
  * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
- * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled01_eeprom.h)
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled_eeprom.h)
  * bytes 2400+ are currently ununsed, but might be used for future wled features
  */
 

diff --git a/usermods/stairway_wipe_basic/wled06_usermod.ino b/usermods/stairway_wipe_basic/wled06_usermod.ino
@@ -1,7 +1,7 @@
 /*
  * This file allows you to add own functionality to WLED more easily
  * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
- * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled01_eeprom.h)
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled_eeprom.h)
  * bytes 2400+ are currently ununsed, but might be used for future wled features
  */
 

diff --git a/wled00/alexa.cpp b/wled00/alexa.cpp
@@ -2,7 +2,7 @@
 #include "wled.h"
 #include "const.h"
 #include "led.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "colors.h"
 
 #ifndef WLED_DISABLE_ALEXA

diff --git a/wled00/button.cpp b/wled00/button.cpp
@@ -1,7 +1,7 @@
 #include "button.h"
 #include "wled.h"
 #include "led.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "set.h"
 
 /*

diff --git a/wled00/hue.cpp b/wled00/hue.cpp
@@ -1,7 +1,7 @@
 #include "hue.h"
 #include "wled.h"
 #include "colors.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "notify.h"
 #include "led.h"
 

diff --git a/wled00/ir.cpp b/wled00/ir.cpp
@@ -2,7 +2,7 @@
 #include "wled.h"
 #include "led.h"
 #include "colors.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 
 #if defined(WLED_DISABLE_INFRARED)
 void handleIR(){}

diff --git a/wled00/json.cpp b/wled00/json.cpp
@@ -1,6 +1,6 @@
 #include "json.h"
 #include "wled.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "led.h"
 
 void deserializeSegment(JsonObject elem, byte it)

diff --git a/wled00/led.cpp b/wled00/led.cpp
@@ -2,7 +2,7 @@
 #include "wled.h"
 #include "notify.h"
 #include "blynk.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "mqtt.h"
 #include "colors.h"
 

diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
@@ -1,6 +1,8 @@
 #include "ntp.h"
+#include "src/dependencies/timezone/Timezone.h"
 #include "wled.h"
-#include "eeprom.h" 
+#include "wled_eeprom.h" 
+
 TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
 Timezone tzUTC(UTCr, UTCr);
 

diff --git a/wled00/set.cpp b/wled00/set.cpp
@@ -4,7 +4,7 @@
 #include "hue.h"
 #include "led.h"
 #include "blynk.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "alexa.h"
 #include "cronixie.h"
 #include "xml.h"

diff --git a/wled00/usermod.cpp b/wled00/usermod.cpp
@@ -2,7 +2,7 @@
 /*
  * This file allows you to add own functionality to WLED more easily
  * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
- * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled01_eeprom.h)
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled01_wled_eeprom.h)
  * bytes 2400+ are currently ununsed, but might be used for future wled features
  */
 

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
@@ -12,9 +12,8 @@
 #include "blynk.h"
 #include "hue.h"
 #include "mqtt.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "server.h"
-// replaced
 // Global Variable definitions
 char versionString[] = "0.9.1";
 

diff --git a/wled00/wled00.ino b/wled00/wled00.ino
@@ -3,12 +3,10 @@
 */
 #include "wled.h"
 
-WLED& wled;
 void setup() {
-  wled = WLED::instance();
-  wled.setup();
+  WLED::instance().setup();
 }
 
 void loop() {
-  wled.loop();
+  WLED::instance().loop();
 }
diff --git a/wled00/eeprom.cpp → wled00/wled_eeprom.cpp b/wled00/eeprom.cpp → wled00/wled_eeprom.cpp
@@ -1,4 +1,5 @@
-#include "eeprom.h"
+#include "wled_eeprom.h"
+#include <EEPROM.h>
 #include "wled.h"
 #include "cronixie.h"
 #include "ntp.h"

diff --git a/wled00/eeprom.h → wled00/wled_eeprom.h b/wled00/eeprom.h → wled00/wled_eeprom.h
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
@@ -1,6 +1,6 @@
 #include "xml.h"
 #include "wled.h"
-#include "eeprom.h"
+#include "wled_eeprom.h"
 #include "ntp.h"