Avoid name collision. Fix wled instance access in ino.

This commit is contained in:
Travis J Dean 2020-03-28 08:45:20 -04:00
parent f35ab125ec
commit f99f13a090
16 changed files with 19 additions and 19 deletions

View File

@ -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
*/

View File

@ -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
*/

View File

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

View File

@ -1,7 +1,7 @@
#include "button.h"
#include "wled.h"
#include "led.h"
#include "eeprom.h"
#include "wled_eeprom.h"
#include "set.h"
/*

View File

@ -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"

View File

@ -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(){}

View File

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

View File

@ -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"

View File

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

View File

@ -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"

View File

@ -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
*/

View File

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

View File

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

View File

@ -1,4 +1,5 @@
#include "eeprom.h"
#include "wled_eeprom.h"
#include <EEPROM.h>
#include "wled.h"
#include "cronixie.h"
#include "ntp.h"

View File

@ -1,6 +1,6 @@
#include "xml.h"
#include "wled.h"
#include "eeprom.h"
#include "wled_eeprom.h"
#include "ntp.h"