diff --git a/wled00/wled.cpp b/wled00/wled.cpp index c6dac0d2..6edd58e2 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -356,23 +356,14 @@ WS2812FX strip = WS2812FX(); #define WLED_CONNECTED (WiFi.status() == WL_CONNECTED) #define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0) -//debug macros +//debug macro variable definitions #ifdef WLED_DEBUG -#define DEBUG_PRINT(x) Serial.print(x) -#define DEBUG_PRINTLN(x) Serial.println(x) -#define DEBUG_PRINTF(x) Serial.printf(x) unsigned long debugTime = 0; int lastWifiState = 3; unsigned long wifiStateChangedTime = 0; int loops = 0; -#else -#define DEBUG_PRINT(x) -#define DEBUG_PRINTLN(x) -#define DEBUG_PRINTF(x) #endif - - WLED::WLED() { } diff --git a/wled00/wled.h b/wled00/wled.h index e825668e..abcffac1 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -381,28 +381,23 @@ int getSignalQuality(int rssi); class WLED { public: + WLED(); static WLED &instance() { static WLED instance; return instance; } - WLED(); - - void reset(); - void loop(); - - //boot starts here void setup() { wledInit(); } + void loop(); + void reset(); -public: // TODO: privacy void wledInit(); void beginStrip(); - void handleConnection(); void initAP(bool resetAP = false); void initConnection();