Rename files to remove wled_

wled00/alexa.cpp

@@ -1,9 +1,9 @@
-#include "wled_alexa.h"
+#include "alexa.h"
 #include "wled.h"
 #include "const.h"
-#include "wled_led.h"
-#include "wled_eeprom.h"
-#include "wled_colors.h"
+#include "led.h"
+#include "eeprom.h"
+#include "colors.h"
 
 #ifndef WLED_DISABLE_ALEXA
 void onAlexaChange(EspalexaDevice* dev);

wled00/alexa.h

@@ -1,17 +1,17 @@
-#ifndef WLED_ALEXA_H
-#define WLED_ALEXA_H
-/*
- * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
- * 
- * This was put together from these two excellent projects:
- * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
- * https://github.com/probonopd/ESP8266HueEmulator
- */
-#include "src/dependencies/espalexa/EspalexaDevice.h"
-
-void onAlexaChange(EspalexaDevice* dev);
-void alexaInit();
-void handleAlexa();
-void onAlexaChange(EspalexaDevice* dev);
-
+#ifndef WLED_ALEXA_H
+#define WLED_ALEXA_H
+/*
+ * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
+ * 
+ * This was put together from these two excellent projects:
+ * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
+ * https://github.com/probonopd/ESP8266HueEmulator
+ */
+#include "src/dependencies/espalexa/EspalexaDevice.h"
+
+void onAlexaChange(EspalexaDevice* dev);
+void alexaInit();
+void handleAlexa();
+void onAlexaChange(EspalexaDevice* dev);
+
 #endif // WLED_ALEXA_H

wled00/blynk.cpp

@@ -1,9 +1,9 @@
-#include "wled_blynk.h"
+#include "blynk.h"
 #include "const.h"
 #include "wled.h"
 #include "src/dependencies/blynk/Blynk/BlynkHandlers.h"
-#include "wled_led.h"
-#include "wled_colors.h"
+#include "led.h"
+#include "colors.h"
 
 uint16_t blHue = 0;
 byte blSat = 255;

wled00/blynk.h

@@ -1,13 +1,13 @@
-#ifndef WLED_BLYNK_H
-#define WLED_BLYNK_H
-#include <Arduino.h>
-/*
- * Remote light control with the free Blynk app
- */
-
-void initBlynk(const char* auth);
-void handleBlynk();
-void updateBlynk();
-// Unsure if the macro expansions need to accessed through the declaration... TODO
-
+#ifndef WLED_BLYNK_H
+#define WLED_BLYNK_H
+#include <Arduino.h>
+/*
+ * Remote light control with the free Blynk app
+ */
+
+void initBlynk(const char* auth);
+void handleBlynk();
+void updateBlynk();
+// Unsure if the macro expansions need to accessed through the declaration... TODO
+
 #endif //WLED_BLYNK_H

wled00/button.cpp

@@ -1,8 +1,8 @@
-#include "wled_button.h"
+#include "button.h"
 #include "wled.h"
-#include "wled_led.h"
-#include "wled_eeprom.h"
-#include "wled_set.h"
+#include "led.h"
+#include "eeprom.h"
+#include "set.h"
 
 /*
  * Physical IO

wled00/button.h

@@ -1,12 +1,12 @@
-#ifndef WLED_BUTTON_H
-#define WLED_BUTTON_H
-#include <Arduino.h>
-/*
- * Physical IO
- */
-
-void shortPressAction();
-void handleButton();
-void handleIO();
-
+#ifndef WLED_BUTTON_H
+#define WLED_BUTTON_H
+#include <Arduino.h>
+/*
+ * Physical IO
+ */
+
+void shortPressAction();
+void handleButton();
+void handleIO();
+
 #endif // WLED_BUTTON_H

wled00/colors.cpp

@@ -1,4 +1,4 @@
-#include "wled_colors.h"
+#include "colors.h"
 #include "wled.h"
 
 void colorFromUint32(uint32_t in, bool secondary)

wled00/colors.h

@@ -1,20 +1,20 @@
-#ifndef WLED_COLORS_H
-#define WLED_COLORS_H
-#include <Arduino.h>
-/*
- * Color conversion methods
- */
-
-void colorFromUint32(uint32_t in, bool secondary = false);
-void colorFromUint24(uint32_t in, bool secondary = false);
-void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
-void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
-void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum to rgb
-
-void colorXYtoRGB(float x, float y, byte* rgb); // only defined if huesync disabled TODO
-void colorRGBtoXY(byte* rgb, float* xy); // only defined if huesync disabled TODO
-
-void colorFromDecOrHexString(byte* rgb, char* in);
-void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
-
+#ifndef WLED_COLORS_H
+#define WLED_COLORS_H
+#include <Arduino.h>
+/*
+ * Color conversion methods
+ */
+
+void colorFromUint32(uint32_t in, bool secondary = false);
+void colorFromUint24(uint32_t in, bool secondary = false);
+void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
+void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
+void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum to rgb
+
+void colorXYtoRGB(float x, float y, byte* rgb); // only defined if huesync disabled TODO
+void colorRGBtoXY(byte* rgb, float* xy); // only defined if huesync disabled TODO
+
+void colorFromDecOrHexString(byte* rgb, char* in);
+void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
+
 #endif //WLED_COLORS_H

wled00/cronixie.cpp

@@ -1,4 +1,4 @@
-#include "wled_cronixie.h"
+#include "cronixie.h"
 #include "wled.h"
 
 #ifndef WLED_DISABLE_CRONIXIE

wled00/cronixie.h

@@ -1,13 +1,13 @@
-#ifndef WLED_CRONIXIE_H
-#define WLED_CRONIXIE_H
-#include <Arduino.h>
-/*
- * Support for the Cronixie clock
- */
-
-byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
-void setCronixie();
-void _overlayCronixie();    
-void _drawOverlayCronixie();
-
+#ifndef WLED_CRONIXIE_H
+#define WLED_CRONIXIE_H
+#include <Arduino.h>
+/*
+ * Support for the Cronixie clock
+ */
+
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
+void setCronixie();
+void _overlayCronixie();    
+void _drawOverlayCronixie();
+
 #endif // WLED_CRONIXIE_H

wled00/dmx.cpp

@@ -1,4 +1,4 @@
-#include "wled_dmx.h"
+#include "dmx.h"
 #include "wled.h"
 
 #ifdef WLED_ENABLE_DMX

wled00/dmx.h

@@ -1,11 +1,11 @@
-#ifndef WLED_DMX_H
-#define WLED_DMX_H
-/*
- * Support for DMX via MAX485.
- * Needs the espdmx library. You might have to change the output pin within the library. Sketchy, i know.
- * https://github.com/Rickgg/ESP-Dmx
- */
-
-void handleDMX();
-
+#ifndef WLED_DMX_H
+#define WLED_DMX_H
+/*
+ * Support for DMX via MAX485.
+ * Needs the espdmx library. You might have to change the output pin within the library. Sketchy, i know.
+ * https://github.com/Rickgg/ESP-Dmx
+ */
+
+void handleDMX();
+
 #endif //WLED_DMX_H

wled00/eeprom.cpp

@@ -1,9 +1,9 @@
-#include "wled_eeprom.h"
+#include "eeprom.h"
 #include "wled.h"
-#include "wled_cronixie.h"
-#include "wled_ntp.h"
-#include "wled_set.h"
-#include "wled_led.h"
+#include "cronixie.h"
+#include "ntp.h"
+#include "set.h"
+#include "led.h"
 
 
 //eeprom Version code, enables default settings instead of 0 init on update

wled00/eeprom.h

@@ -1,23 +1,23 @@
-#ifndef WLED_EPPROM_H
-#define WLED_EPPROM_H
-#include <Arduino.h>
-/*
- * Methods to handle saving and loading to non-volatile memory
- * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
- */
-#define EEPSIZE 2560  //Maximum is 4096
-
-void commit();
-void clearEEPROM();
-void writeStringToEEPROM(uint16_t pos, char* str, uint16_t len);
-void readStringFromEEPROM(uint16_t pos, char* str, uint16_t len);
-void saveSettingsToEEPROM();
-void loadSettingsFromEEPROM(bool first);
-void savedToPresets();
-bool applyPreset(byte index, bool loadBri = true);
-void savePreset(byte index, bool persist = true);
-void loadMacro(byte index, char* m);
-void applyMacro(byte index);
-void saveMacro(byte index, String mc, bool persist = true); //only commit on single save, not in settings
-
-#endif //WLED_EPPROM_H
+#ifndef WLED_EPPROM_H
+#define WLED_EPPROM_H
+#include <Arduino.h>
+/*
+ * Methods to handle saving and loading to non-volatile memory
+ * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
+ */
+#define EEPSIZE 2560  //Maximum is 4096
+
+void commit();
+void clearEEPROM();
+void writeStringToEEPROM(uint16_t pos, char* str, uint16_t len);
+void readStringFromEEPROM(uint16_t pos, char* str, uint16_t len);
+void saveSettingsToEEPROM();
+void loadSettingsFromEEPROM(bool first);
+void savedToPresets();
+bool applyPreset(byte index, bool loadBri = true);
+void savePreset(byte index, bool persist = true);
+void loadMacro(byte index, char* m);
+void applyMacro(byte index);
+void saveMacro(byte index, String mc, bool persist = true); //only commit on single save, not in settings
+
+#endif //WLED_EPPROM_H

wled00/file.cpp

@@ -1,7 +1,7 @@
-#include "wled_file.h"
+#include "file.h"
 #include "wled.h"
-#include "wled_led.h"
-#include "wled_notify.h"
+#include "led.h"
+#include "notify.h"
 
 //filesystem
 #ifndef WLED_DISABLE_FILESYSTEM

wled00/file.h

@@ -1,12 +1,12 @@
-#ifndef WLED_FILE_H
-#define WLED_FILE_H
-#include <Arduino.h>
-#include <ESPAsyncWebServer.h>
-/*
- * Utility for SPIFFS filesystem & Serial console
- */
-
-void handleSerial();
-bool handleFileRead(AsyncWebServerRequest*, String path);
-
+#ifndef WLED_FILE_H
+#define WLED_FILE_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+/*
+ * Utility for SPIFFS filesystem & Serial console
+ */
+
+void handleSerial();
+bool handleFileRead(AsyncWebServerRequest*, String path);
+
 #endif // WLED_FILE_H

wled00/hue.cpp

@@ -1,9 +1,9 @@
-#include "wled_hue.h"
+#include "hue.h"
 #include "wled.h"
-#include "wled_colors.h"
-#include "wled_eeprom.h"
-#include "wled_notify.h"
-#include "wled_led.h"
+#include "colors.h"
+#include "eeprom.h"
+#include "notify.h"
+#include "led.h"
 
 #ifndef WLED_DISABLE_HUESYNC
 

wled00/hue.h

@@ -1,16 +1,16 @@
-#ifndef WLED_HUE_H
-#define WLED_HUE_H
-/*
- * Sync to Philips hue lights
- */
-#include <Arduino.h>
-class AsyncClient;
-
-void handleHue();
-void reconnectHue();
-void onHueError(void* arg, AsyncClient* client, int8_t error);
-void onHueConnect(void* arg, AsyncClient* client);
-void sendHuePoll();
-void onHueData(void* arg, AsyncClient* client, void *data, size_t len);
-
+#ifndef WLED_HUE_H
+#define WLED_HUE_H
+/*
+ * Sync to Philips hue lights
+ */
+#include <Arduino.h>
+class AsyncClient;
+
+void handleHue();
+void reconnectHue();
+void onHueError(void* arg, AsyncClient* client, int8_t error);
+void onHueConnect(void* arg, AsyncClient* client);
+void sendHuePoll();
+void onHueData(void* arg, AsyncClient* client, void *data, size_t len);
+
 #endif //WLED_HUE_H

wled00/ir.cpp

@@ -1,8 +1,8 @@
-#include "wled_ir.h"
+#include "ir.h"
 #include "wled.h"
-#include "wled_led.h"
-#include "wled_colors.h"
-#include "wled_eeprom.h"
+#include "led.h"
+#include "colors.h"
+#include "eeprom.h"
 
 #if defined(WLED_DISABLE_INFRARED)
 void handleIR(){}

wled00/ir.h

@@ -1,24 +1,24 @@
-#ifndef WLED_IR_H
-#define WLED_IR_H
-#include <Arduino.h>
-/*
- * Infrared sensor support for generic 24/40/44 key RGB remotes
- */
-
-bool decodeIRCustom(uint32_t code);
-void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
-void changeEffectSpeed(int8_t amount);
-void changeEffectIntensity(int8_t amount);
-void decodeIR(uint32_t code);
-void decodeIR24(uint32_t code);
-void decodeIR24OLD(uint32_t code);
-void decodeIR24CT(uint32_t code);
-void decodeIR40(uint32_t code);
-void decodeIR44(uint32_t code);
-void decodeIR21(uint32_t code);
-void decodeIR6(uint32_t code);
-
-void initIR();
-void handleIR();
-
+#ifndef WLED_IR_H
+#define WLED_IR_H
+#include <Arduino.h>
+/*
+ * Infrared sensor support for generic 24/40/44 key RGB remotes
+ */
+
+bool decodeIRCustom(uint32_t code);
+void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
+void changeEffectSpeed(int8_t amount);
+void changeEffectIntensity(int8_t amount);
+void decodeIR(uint32_t code);
+void decodeIR24(uint32_t code);
+void decodeIR24OLD(uint32_t code);
+void decodeIR24CT(uint32_t code);
+void decodeIR40(uint32_t code);
+void decodeIR44(uint32_t code);
+void decodeIR21(uint32_t code);
+void decodeIR6(uint32_t code);
+
+void initIR();
+void handleIR();
+
 #endif //WLED_IR_H

wled00/json.cpp

@@ -1,7 +1,7 @@
-#include "wled_json.h"
+#include "json.h"
 #include "wled.h"
-#include "wled_eeprom.h"
-#include "wled_led.h"
+#include "eeprom.h"
+#include "led.h"
 
 void deserializeSegment(JsonObject elem, byte it)
 {

wled00/json.h

@@ -1,21 +1,21 @@
-#ifndef WLED_JSON_H
-#define WLED_JSON_H
-/*
- * JSON API (De)serialization
- */
-#include <Arduino.h>
-#include "ESPAsyncWebServer.h"
-#include "src/dependencies/json/ArduinoJson-v6.h"
-#include "src/dependencies/json/AsyncJson-v6.h"
-#include "fx.h"
-// TODO: AsynicWebServerRequest conflict?
-
-void deserializeSegment(JsonObject elem, byte it);
-bool deserializeState(JsonObject root);
-void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id);
-void serializeState(JsonObject root);
-void serializeInfo(JsonObject root);
-void serveJson(AsyncWebServerRequest* request);
-void serveLiveLeds(AsyncWebServerRequest* request);
-
+#ifndef WLED_JSON_H
+#define WLED_JSON_H
+/*
+ * JSON API (De)serialization
+ */
+#include <Arduino.h>
+#include "ESPAsyncWebServer.h"
+#include "src/dependencies/json/ArduinoJson-v6.h"
+#include "src/dependencies/json/AsyncJson-v6.h"
+#include "fx.h"
+// TODO: AsynicWebServerRequest conflict?
+
+void deserializeSegment(JsonObject elem, byte it);
+bool deserializeState(JsonObject root);
+void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id);
+void serializeState(JsonObject root);
+void serializeInfo(JsonObject root);
+void serveJson(AsyncWebServerRequest* request);
+void serveLiveLeds(AsyncWebServerRequest* request);
+
 #endif //WLED_JSON_H

wled00/led.cpp

@@ -1,10 +1,10 @@
-#include "wled_led.h"
+#include "led.h"
 #include "wled.h"
-#include "wled_notify.h"
-#include "wled_blynk.h"
-#include "wled_eeprom.h"
-#include "wled_mqtt.h"
-#include "wled_colors.h"
+#include "notify.h"
+#include "blynk.h"
+#include "eeprom.h"
+#include "mqtt.h"
+#include "colors.h"
 
 void setValuesFromMainSeg()
 {

wled00/led.h

@@ -1,19 +1,19 @@
-#ifndef WLED_LED_H
-#define WLED_LED_H
-#include <Arduino.h>
-/*
- * LED methods
- */
-
-void setValuesFromMainSeg();
-void resetTimebase();
-void toggleOnOff();
-void setAllLeds();
-void setLedsStandard(bool justColors = false);
-bool colorChanged();
-void colorUpdated(int callMode);
-void updateInterfaces(uint8_t callMode);
-void handleTransitions();
-void handleNightlight();
-
+#ifndef WLED_LED_H
+#define WLED_LED_H
+#include <Arduino.h>
+/*
+ * LED methods
+ */
+
+void setValuesFromMainSeg();
+void resetTimebase();
+void toggleOnOff();
+void setAllLeds();
+void setLedsStandard(bool justColors = false);
+bool colorChanged();
+void colorUpdated(int callMode);
+void updateInterfaces(uint8_t callMode);
+void handleTransitions();
+void handleNightlight();
+
 #endif

wled00/mqtt.cpp

@@ -1,10 +1,10 @@
-#include "wled_mqtt.h"
+#include "mqtt.h"
 #include "wled.h"
-#include "wled_notify.h"
-#include "wled_led.h"
-#include "wled_colors.h"
-#include "wled_xml.h"
-#include "wled_set.h"
+#include "notify.h"
+#include "led.h"
+#include "colors.h"
+#include "xml.h"
+#include "set.h"
 
 #ifdef WLED_ENABLE_MQTT
 #define MQTT_KEEP_ALIVE_TIME 60    // contact the MQTT broker every 60 seconds

wled00/mqtt.h

@@ -1,9 +1,9 @@
-#ifndef WLED_MQTT_H
-#define WLED_MQTT_H
-/*
- * MQTT communication protocol for home automation
- */
-bool initMqtt();
-void publishMqtt();
-
+#ifndef WLED_MQTT_H
+#define WLED_MQTT_H
+/*
+ * MQTT communication protocol for home automation
+ */
+bool initMqtt();
+void publishMqtt();
+
 #endif //WLED_MQTT_H

wled00/notify.cpp

@@ -1,7 +1,7 @@
-#include "wled_notify.h"
+#include "notify.h"
 #include "wled.h"
 #include "src/dependencies/e131/ESPAsyncE131.h"
-#include "wled_led.h"
+#include "led.h"
 
 #define WLEDPACKETSIZE 29
 #define UDP_IN_MAXSIZE 1472

wled00/notify.h

@@ -1,18 +1,18 @@
-#ifndef WLED_NOTIFY_H
-#define WLED_NOTIFY_H
-#include <Arduino.h>
-#include "src/dependencies/e131/ESPAsyncE131.h"
-#include "const.h"
-/*
- * UDP notifier
- */
-//union e131_packet_t;    // Will this compile?
-class IPAddress;
-
-void notify(byte callMode, bool followUp=false);
-void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
-void handleE131Packet(e131_packet_t* p, IPAddress clientIP);
-void handleNotifications();
-void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
-
+#ifndef WLED_NOTIFY_H
+#define WLED_NOTIFY_H
+#include <Arduino.h>
+#include "src/dependencies/e131/ESPAsyncE131.h"
+#include "const.h"
+/*
+ * UDP notifier
+ */
+//union e131_packet_t;    // Will this compile?
+class IPAddress;
+
+void notify(byte callMode, bool followUp=false);
+void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
+void handleE131Packet(e131_packet_t* p, IPAddress clientIP);
+void handleNotifications();
+void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
+
 #endif // WLED_NOTIFY_H

wled00/ntp.cpp

@@ -1,6 +1,6 @@
-#include "wled_ntp.h"
+#include "ntp.h"
 #include "wled.h"
-#include "wled_eeprom.h" 
+#include "eeprom.h" 
 TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
 Timezone tzUTC(UTCr, UTCr);
 

wled00/ntp.h

@@ -1,19 +1,18 @@
-#ifndef WLED_NTP_H
-#define WLED_NTP_H
-#include <Arduino.h>
-#include "timezone/Timezone.h"
-/*
- * Acquires time from NTP server
- */
-
-void handleNetworkTime();
-void sendNTPPacket();
-bool checkNTPResponse();    
-void updateLocalTime();
-void getTimeString(char* out);
-bool checkCountdown();
-void setCountdown();
-byte weekdayMondayFirst();
-void checkTimers();
-
+#ifndef WLED_NTP_H
+#define WLED_NTP_H
+#include <Arduino.h>
+/*
+ * Acquires time from NTP server
+ */
+
+void handleNetworkTime();
+void sendNTPPacket();
+bool checkNTPResponse();    
+void updateLocalTime();
+void getTimeString(char* out);
+bool checkCountdown();
+void setCountdown();
+byte weekdayMondayFirst();
+void checkTimers();
+
 #endif // WLED_NTP_H

wled00/overlay.cpp

@@ -1,7 +1,7 @@
-#include "wled_overlay.h"
+#include "overlay.h"
 #include "wled.h"
-#include "wled_cronixie.h"
-#include "wled_ntp.h"
+#include "cronixie.h"
+#include "ntp.h"
  
 void initCronixie()
 {

wled00/overlay.h

@@ -1,14 +1,14 @@
-#ifndef WLED_OVERLAYS_H
-#define WLED_OVERLAYS_H
-#include <Arduino.h>
-/*
- * Used to draw clock overlays over the strip
- */
-
-void initCronixie();
-void handleOverlays();
-void handleOverlayDraw();
-void _overlayAnalogCountdown();
-void _overlayAnalogClock();
-
+#ifndef WLED_OVERLAYS_H
+#define WLED_OVERLAYS_H
+#include <Arduino.h>
+/*
+ * Used to draw clock overlays over the strip
+ */
+
+void initCronixie();
+void handleOverlays();
+void handleOverlayDraw();
+void _overlayAnalogCountdown();
+void _overlayAnalogClock();
+
 #endif // WLED_OVERLAY_H

wled00/server.cpp

@@ -1,9 +1,9 @@
-#include "wled_server.h"
+#include "server.h"
 #include "wled.h"
-#include "wled_file.h"
-#include "wled_set.h"
-#include "wled_json.h"
-#include "wled_xml.h"
+#include "file.h"
+#include "set.h"
+#include "json.h"
+#include "xml.h"
 
 
 //Is this an IP?

wled00/server.h

@@ -1,21 +1,21 @@
-#ifndef WLED_SERVER_H
-#define WLED_SERVER_H
-#include <Arduino.h>
-/*
- * Server page declarations
- */
-class AsyncWebServerRequest;
-
-
-bool isIp(String str);
-bool captivePortal(AsyncWebServerRequest *request);
-void initServer();
-void serveIndexOrWelcome(AsyncWebServerRequest *request);
-void serveIndex(AsyncWebServerRequest* request);
-String msgProcessor(const String& var);
-void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255);
-String settingsProcessor(const String& var);
-String dmxProcessor(const String& var);
-void serveSettings(AsyncWebServerRequest* request);
-
+#ifndef WLED_SERVER_H
+#define WLED_SERVER_H
+#include <Arduino.h>
+/*
+ * Server page declarations
+ */
+class AsyncWebServerRequest;
+
+
+bool isIp(String str);
+bool captivePortal(AsyncWebServerRequest *request);
+void initServer();
+void serveIndexOrWelcome(AsyncWebServerRequest *request);
+void serveIndex(AsyncWebServerRequest* request);
+String msgProcessor(const String& var);
+void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255);
+String settingsProcessor(const String& var);
+String dmxProcessor(const String& var);
+void serveSettings(AsyncWebServerRequest* request);
+
 #endif //WLED_SERVER_H

wled00/set.cpp

@@ -1,13 +1,13 @@
-#include "wled_set.h"
+#include "set.h"
 #include "wled.h"
-#include "wled_colors.h"
-#include "wled_hue.h"
-#include "wled_led.h"
-#include "wled_blynk.h"
-#include "wled_eeprom.h"
-#include "wled_alexa.h"
-#include "wled_cronixie.h"
-#include "wled_xml.h"
+#include "colors.h"
+#include "hue.h"
+#include "led.h"
+#include "blynk.h"
+#include "eeprom.h"
+#include "alexa.h"
+#include "cronixie.h"
+#include "xml.h"
 
 void _setRandomColor(bool _sec,bool fromButton)
 {

wled00/set.h

@@ -1,16 +1,16 @@
-#ifndef WLED_SET_H
-#define WLED_SET_H
-#include <Arduino.h>
-#include <ESPAsyncWebServer.h>
-/*
- * Receives client input
- */
-
-void _setRandomColor(bool _sec,bool fromButton=false);
-bool isAsterisksOnly(const char* str, byte maxLen);
-void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
-bool handleSet(AsyncWebServerRequest *request, const String& req);
-int getNumVal(const String* req, uint16_t pos);
-bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
-
+#ifndef WLED_SET_H
+#define WLED_SET_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+/*
+ * Receives client input
+ */
+
+void _setRandomColor(bool _sec,bool fromButton=false);
+bool isAsterisksOnly(const char* str, byte maxLen);
+void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
+bool handleSet(AsyncWebServerRequest *request, const String& req);
+int getNumVal(const String* req, uint16_t pos);
+bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
+
 #endif // WLED_SET_H

wled00/usermod.h

@@ -1,8 +1,8 @@
-#ifndef WLED_USERMOD_H
-#define WLED_USERMOD_H
-
-void userSetup();
-void userConnected();
-void userLoop();
-
+#ifndef WLED_USERMOD_H
+#define WLED_USERMOD_H
+
+void userSetup();
+void userConnected();
+void userLoop();
+
 #endif // WLED_USERMOD_H

wled00/xml.cpp

@@ -1,7 +1,7 @@
-#include "wled_xml.h"
+#include "xml.h"
 #include "wled.h"
-#include "wled_eeprom.h"
-#include "wled_ntp.h"
+#include "eeprom.h"
+#include "ntp.h"
 
 
 //build XML response to HTTP /win API request

wled00/xml.h

@@ -1,15 +1,15 @@
-#ifndef WLED_XML_H
-#define WLED_XML_H
-#include <Arduino.h>
-#include <ESPAsyncWebServer.h>
-
-/*
- * Sending XML status files to client
- */
-char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
-char* URL_response(AsyncWebServerRequest *request);
-void sappend(char stype, const char* key, int val);
-void sappends(char stype, const char* key, char* val);
-void getSettingsJS(byte subPage, char* dest);
-
+#ifndef WLED_XML_H
+#define WLED_XML_H
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+
+/*
+ * Sending XML status files to client
+ */
+char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
+char* URL_response(AsyncWebServerRequest *request);
+void sappend(char stype, const char* key, int val);
+void sappends(char stype, const char* key, char* val);
+void getSettingsJS(byte subPage, char* dest);
+
 #endif // WLED_XML_H