CRLF madness. :(
This commit is contained in:
Blaz Kristan
parent
7132e1fee1
commit
93cefb88f5
@ -1,257 +1,257 @@
|
|||||||
#ifndef WLED_FCN_DECLARE_H
|
#ifndef WLED_FCN_DECLARE_H
|
||||||
#define WLED_FCN_DECLARE_H
|
#define WLED_FCN_DECLARE_H
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include "src/dependencies/espalexa/EspalexaDevice.h"
|
#include "src/dependencies/espalexa/EspalexaDevice.h"
|
||||||
#include "src/dependencies/e131/ESPAsyncE131.h"
|
#include "src/dependencies/e131/ESPAsyncE131.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* All globally accessible functions are declared here
|
* All globally accessible functions are declared here
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//alexa.cpp
|
//alexa.cpp
|
||||||
void onAlexaChange(EspalexaDevice* dev);
|
void onAlexaChange(EspalexaDevice* dev);
|
||||||
void alexaInit();
|
void alexaInit();
|
||||||
void handleAlexa();
|
void handleAlexa();
|
||||||
void onAlexaChange(EspalexaDevice* dev);
|
void onAlexaChange(EspalexaDevice* dev);
|
||||||
|
|
||||||
//blynk.cpp
|
//blynk.cpp
|
||||||
void initBlynk(const char* auth, const char* host, uint16_t port);
|
void initBlynk(const char* auth, const char* host, uint16_t port);
|
||||||
void handleBlynk();
|
void handleBlynk();
|
||||||
void updateBlynk();
|
void updateBlynk();
|
||||||
|
|
||||||
//button.cpp
|
//button.cpp
|
||||||
void shortPressAction();
|
void shortPressAction();
|
||||||
bool isButtonPressed();
|
bool isButtonPressed();
|
||||||
void handleButton();
|
void handleButton();
|
||||||
void handleIO();
|
void handleIO();
|
||||||
|
|
||||||
//cfg.cpp
|
//cfg.cpp
|
||||||
void deserializeConfig();
|
void deserializeConfig();
|
||||||
bool deserializeConfigSec();
|
bool deserializeConfigSec();
|
||||||
void serializeConfig();
|
void serializeConfig();
|
||||||
void serializeConfigSec();
|
void serializeConfigSec();
|
||||||
|
|
||||||
//colors.cpp
|
//colors.cpp
|
||||||
void colorFromUint32(uint32_t in, bool secondary = false);
|
void colorFromUint32(uint32_t in, bool secondary = false);
|
||||||
void colorFromUint24(uint32_t in, bool secondary = false);
|
void colorFromUint24(uint32_t in, bool secondary = false);
|
||||||
uint32_t colorFromRgbw(byte* rgbw);
|
uint32_t colorFromRgbw(byte* rgbw);
|
||||||
void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
|
void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
|
||||||
void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
|
void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
|
||||||
void colorKtoRGB(uint16_t kelvin, byte* rgb);
|
void colorKtoRGB(uint16_t kelvin, byte* rgb);
|
||||||
void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum 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 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 colorRGBtoXY(byte* rgb, float* xy); // only defined if huesync disabled TODO
|
||||||
|
|
||||||
void colorFromDecOrHexString(byte* rgb, char* in);
|
void colorFromDecOrHexString(byte* rgb, char* in);
|
||||||
bool colorFromHexString(byte* rgb, const char* in);
|
bool colorFromHexString(byte* rgb, const char* in);
|
||||||
void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
|
void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
|
||||||
|
|
||||||
//dmx.cpp
|
//dmx.cpp
|
||||||
void initDMX();
|
void initDMX();
|
||||||
void handleDMX();
|
void handleDMX();
|
||||||
|
|
||||||
//e131.cpp
|
//e131.cpp
|
||||||
void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol);
|
void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol);
|
||||||
|
|
||||||
//file.cpp
|
//file.cpp
|
||||||
bool handleFileRead(AsyncWebServerRequest*, String path);
|
bool handleFileRead(AsyncWebServerRequest*, String path);
|
||||||
bool writeObjectToFileUsingId(const char* file, uint16_t id, JsonDocument* content);
|
bool writeObjectToFileUsingId(const char* file, uint16_t id, JsonDocument* content);
|
||||||
bool writeObjectToFile(const char* file, const char* key, JsonDocument* content);
|
bool writeObjectToFile(const char* file, const char* key, JsonDocument* content);
|
||||||
bool readObjectFromFileUsingId(const char* file, uint16_t id, JsonDocument* dest);
|
bool readObjectFromFileUsingId(const char* file, uint16_t id, JsonDocument* dest);
|
||||||
bool readObjectFromFile(const char* file, const char* key, JsonDocument* dest);
|
bool readObjectFromFile(const char* file, const char* key, JsonDocument* dest);
|
||||||
void updateFSInfo();
|
void updateFSInfo();
|
||||||
void closeFile();
|
void closeFile();
|
||||||
|
|
||||||
//hue.cpp
|
//hue.cpp
|
||||||
void handleHue();
|
void handleHue();
|
||||||
void reconnectHue();
|
void reconnectHue();
|
||||||
void onHueError(void* arg, AsyncClient* client, int8_t error);
|
void onHueError(void* arg, AsyncClient* client, int8_t error);
|
||||||
void onHueConnect(void* arg, AsyncClient* client);
|
void onHueConnect(void* arg, AsyncClient* client);
|
||||||
void sendHuePoll();
|
void sendHuePoll();
|
||||||
void onHueData(void* arg, AsyncClient* client, void *data, size_t len);
|
void onHueData(void* arg, AsyncClient* client, void *data, size_t len);
|
||||||
|
|
||||||
//ir.cpp
|
//ir.cpp
|
||||||
bool decodeIRCustom(uint32_t code);
|
bool decodeIRCustom(uint32_t code);
|
||||||
void applyRepeatActions();
|
void applyRepeatActions();
|
||||||
void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
|
void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
|
||||||
void changeEffectSpeed(int8_t amount);
|
void changeEffectSpeed(int8_t amount);
|
||||||
void changeEffectIntensity(int8_t amount);
|
void changeEffectIntensity(int8_t amount);
|
||||||
void decodeIR(uint32_t code);
|
void decodeIR(uint32_t code);
|
||||||
void decodeIR24(uint32_t code);
|
void decodeIR24(uint32_t code);
|
||||||
void decodeIR24OLD(uint32_t code);
|
void decodeIR24OLD(uint32_t code);
|
||||||
void decodeIR24CT(uint32_t code);
|
void decodeIR24CT(uint32_t code);
|
||||||
void decodeIR40(uint32_t code);
|
void decodeIR40(uint32_t code);
|
||||||
void decodeIR44(uint32_t code);
|
void decodeIR44(uint32_t code);
|
||||||
void decodeIR21(uint32_t code);
|
void decodeIR21(uint32_t code);
|
||||||
void decodeIR6(uint32_t code);
|
void decodeIR6(uint32_t code);
|
||||||
void decodeIR9(uint32_t code);
|
void decodeIR9(uint32_t code);
|
||||||
|
|
||||||
void initIR();
|
void initIR();
|
||||||
void handleIR();
|
void handleIR();
|
||||||
|
|
||||||
//json.cpp
|
//json.cpp
|
||||||
#include "ESPAsyncWebServer.h"
|
#include "ESPAsyncWebServer.h"
|
||||||
#include "src/dependencies/json/ArduinoJson-v6.h"
|
#include "src/dependencies/json/ArduinoJson-v6.h"
|
||||||
#include "src/dependencies/json/AsyncJson-v6.h"
|
#include "src/dependencies/json/AsyncJson-v6.h"
|
||||||
#include "FX.h"
|
#include "FX.h"
|
||||||
|
|
||||||
void deserializeSegment(JsonObject elem, byte it);
|
void deserializeSegment(JsonObject elem, byte it);
|
||||||
bool deserializeState(JsonObject root);
|
bool deserializeState(JsonObject root);
|
||||||
void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool forPreset = false, bool segmentBounds = true, uint8_t versionAPI = 1);
|
void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool forPreset = false, bool segmentBounds = true, uint8_t versionAPI = 1);
|
||||||
void serializeState(JsonObject root, bool forPreset = false, bool includeBri = true, bool segmentBounds = true);
|
void serializeState(JsonObject root, bool forPreset = false, bool includeBri = true, bool segmentBounds = true);
|
||||||
void serializeInfo(JsonObject root);
|
void serializeInfo(JsonObject root);
|
||||||
void serveJson(AsyncWebServerRequest* request, uint8_t versionAPI = 1);
|
void serveJson(AsyncWebServerRequest* request, uint8_t versionAPI = 1);
|
||||||
bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient = 0);
|
bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient = 0);
|
||||||
|
|
||||||
//led.cpp
|
//led.cpp
|
||||||
void setValuesFromMainSeg();
|
void setValuesFromMainSeg();
|
||||||
void resetTimebase();
|
void resetTimebase();
|
||||||
void toggleOnOff();
|
void toggleOnOff();
|
||||||
void setAllLeds();
|
void setAllLeds();
|
||||||
void setLedsStandard();
|
void setLedsStandard();
|
||||||
bool colorChanged();
|
bool colorChanged();
|
||||||
void colorUpdated(int callMode);
|
void colorUpdated(int callMode);
|
||||||
void updateInterfaces(uint8_t callMode);
|
void updateInterfaces(uint8_t callMode);
|
||||||
void handleTransitions();
|
void handleTransitions();
|
||||||
void handleNightlight();
|
void handleNightlight();
|
||||||
byte scaledBri(byte in);
|
byte scaledBri(byte in);
|
||||||
|
|
||||||
//lx_parser.cpp
|
//lx_parser.cpp
|
||||||
bool parseLx(int lxValue, byte* rgbw);
|
bool parseLx(int lxValue, byte* rgbw);
|
||||||
void parseLxJson(int lxValue, byte segId, bool secondary);
|
void parseLxJson(int lxValue, byte segId, bool secondary);
|
||||||
|
|
||||||
//mqtt.cpp
|
//mqtt.cpp
|
||||||
bool initMqtt();
|
bool initMqtt();
|
||||||
void publishMqtt();
|
void publishMqtt();
|
||||||
|
|
||||||
//ntp.cpp
|
//ntp.cpp
|
||||||
void handleNetworkTime();
|
void handleNetworkTime();
|
||||||
void sendNTPPacket();
|
void sendNTPPacket();
|
||||||
bool checkNTPResponse();
|
bool checkNTPResponse();
|
||||||
void updateLocalTime();
|
void updateLocalTime();
|
||||||
void getTimeString(char* out);
|
void getTimeString(char* out);
|
||||||
bool checkCountdown();
|
bool checkCountdown();
|
||||||
void setCountdown();
|
void setCountdown();
|
||||||
byte weekdayMondayFirst();
|
byte weekdayMondayFirst();
|
||||||
void checkTimers();
|
void checkTimers();
|
||||||
void calculateSunriseAndSunset();
|
void calculateSunriseAndSunset();
|
||||||
|
|
||||||
//overlay.cpp
|
//overlay.cpp
|
||||||
void initCronixie();
|
void initCronixie();
|
||||||
void handleOverlays();
|
void handleOverlays();
|
||||||
void handleOverlayDraw();
|
void handleOverlayDraw();
|
||||||
void _overlayAnalogCountdown();
|
void _overlayAnalogCountdown();
|
||||||
void _overlayAnalogClock();
|
void _overlayAnalogClock();
|
||||||
|
|
||||||
byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
|
byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
|
||||||
void setCronixie();
|
void setCronixie();
|
||||||
void _overlayCronixie();
|
void _overlayCronixie();
|
||||||
void _drawOverlayCronixie();
|
void _drawOverlayCronixie();
|
||||||
|
|
||||||
//playlist.cpp
|
//playlist.cpp
|
||||||
void shufflePlaylist();
|
void shufflePlaylist();
|
||||||
void unloadPlaylist();
|
void unloadPlaylist();
|
||||||
void loadPlaylist(JsonObject playlistObject);
|
void loadPlaylist(JsonObject playlistObject);
|
||||||
void handlePlaylist();
|
void handlePlaylist();
|
||||||
|
|
||||||
//presets.cpp
|
//presets.cpp
|
||||||
bool applyPreset(byte index);
|
bool applyPreset(byte index);
|
||||||
void savePreset(byte index, bool persist = true, const char* pname = nullptr, JsonObject saveobj = JsonObject());
|
void savePreset(byte index, bool persist = true, const char* pname = nullptr, JsonObject saveobj = JsonObject());
|
||||||
void deletePreset(byte index);
|
void deletePreset(byte index);
|
||||||
|
|
||||||
//set.cpp
|
//set.cpp
|
||||||
void _setRandomColor(bool _sec,bool fromButton=false);
|
void _setRandomColor(bool _sec,bool fromButton=false);
|
||||||
bool isAsterisksOnly(const char* str, byte maxLen);
|
bool isAsterisksOnly(const char* str, byte maxLen);
|
||||||
void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
|
void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
|
||||||
bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply=true);
|
bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply=true);
|
||||||
int getNumVal(const String* req, uint16_t pos);
|
int getNumVal(const String* req, uint16_t pos);
|
||||||
bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
|
bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
|
||||||
|
|
||||||
//udp.cpp
|
//udp.cpp
|
||||||
void notify(byte callMode, bool followUp=false);
|
void notify(byte callMode, bool followUp=false);
|
||||||
void realtimeLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
|
void realtimeLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
|
||||||
void handleNotifications();
|
void handleNotifications();
|
||||||
void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
|
void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
|
||||||
void refreshNodeList();
|
void refreshNodeList();
|
||||||
void sendSysInfoUDP();
|
void sendSysInfoUDP();
|
||||||
|
|
||||||
//um_manager.cpp
|
//um_manager.cpp
|
||||||
class Usermod {
|
class Usermod {
|
||||||
public:
|
public:
|
||||||
virtual void loop() {}
|
virtual void loop() {}
|
||||||
virtual void setup() {}
|
virtual void setup() {}
|
||||||
virtual void connected() {}
|
virtual void connected() {}
|
||||||
virtual void addToJsonState(JsonObject& obj) {}
|
virtual void addToJsonState(JsonObject& obj) {}
|
||||||
virtual void addToJsonInfo(JsonObject& obj) {}
|
virtual void addToJsonInfo(JsonObject& obj) {}
|
||||||
virtual void readFromJsonState(JsonObject& obj) {}
|
virtual void readFromJsonState(JsonObject& obj) {}
|
||||||
virtual void addToConfig(JsonObject& obj) {}
|
virtual void addToConfig(JsonObject& obj) {}
|
||||||
virtual void readFromConfig(JsonObject& obj) {}
|
virtual void readFromConfig(JsonObject& obj) {}
|
||||||
virtual uint16_t getId() {return USERMOD_ID_UNSPECIFIED;}
|
virtual uint16_t getId() {return USERMOD_ID_UNSPECIFIED;}
|
||||||
};
|
};
|
||||||
|
|
||||||
class UsermodManager {
|
class UsermodManager {
|
||||||
private:
|
private:
|
||||||
Usermod* ums[WLED_MAX_USERMODS];
|
Usermod* ums[WLED_MAX_USERMODS];
|
||||||
byte numMods = 0;
|
byte numMods = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void loop();
|
void loop();
|
||||||
|
|
||||||
void setup();
|
void setup();
|
||||||
void connected();
|
void connected();
|
||||||
|
|
||||||
void addToJsonState(JsonObject& obj);
|
void addToJsonState(JsonObject& obj);
|
||||||
void addToJsonInfo(JsonObject& obj);
|
void addToJsonInfo(JsonObject& obj);
|
||||||
void readFromJsonState(JsonObject& obj);
|
void readFromJsonState(JsonObject& obj);
|
||||||
|
|
||||||
void addToConfig(JsonObject& obj);
|
void addToConfig(JsonObject& obj);
|
||||||
void readFromConfig(JsonObject& obj);
|
void readFromConfig(JsonObject& obj);
|
||||||
|
|
||||||
bool add(Usermod* um);
|
bool add(Usermod* um);
|
||||||
Usermod* lookup(uint16_t mod_id);
|
Usermod* lookup(uint16_t mod_id);
|
||||||
byte getModCount();
|
byte getModCount();
|
||||||
};
|
};
|
||||||
|
|
||||||
//usermods_list.cpp
|
//usermods_list.cpp
|
||||||
void registerUsermods();
|
void registerUsermods();
|
||||||
|
|
||||||
//usermod.cpp
|
//usermod.cpp
|
||||||
void userSetup();
|
void userSetup();
|
||||||
void userConnected();
|
void userConnected();
|
||||||
void userLoop();
|
void userLoop();
|
||||||
|
|
||||||
//wled_eeprom.cpp
|
//wled_eeprom.cpp
|
||||||
void applyMacro(byte index);
|
void applyMacro(byte index);
|
||||||
void deEEP();
|
void deEEP();
|
||||||
void deEEPSettings();
|
void deEEPSettings();
|
||||||
void clearEEPROM();
|
void clearEEPROM();
|
||||||
|
|
||||||
//wled_serial.cpp
|
//wled_serial.cpp
|
||||||
void handleSerial();
|
void handleSerial();
|
||||||
|
|
||||||
//wled_server.cpp
|
//wled_server.cpp
|
||||||
bool isIp(String str);
|
bool isIp(String str);
|
||||||
bool captivePortal(AsyncWebServerRequest *request);
|
bool captivePortal(AsyncWebServerRequest *request);
|
||||||
void initServer();
|
void initServer();
|
||||||
void serveIndexOrWelcome(AsyncWebServerRequest *request);
|
void serveIndexOrWelcome(AsyncWebServerRequest *request);
|
||||||
void serveIndex(AsyncWebServerRequest* request);
|
void serveIndex(AsyncWebServerRequest* request);
|
||||||
String msgProcessor(const String& var);
|
String msgProcessor(const String& var);
|
||||||
void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& headl, const String& subl="", byte optionT=255);
|
void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& headl, const String& subl="", byte optionT=255);
|
||||||
String settingsProcessor(const String& var);
|
String settingsProcessor(const String& var);
|
||||||
String dmxProcessor(const String& var);
|
String dmxProcessor(const String& var);
|
||||||
void serveSettings(AsyncWebServerRequest* request, bool post = false);
|
void serveSettings(AsyncWebServerRequest* request, bool post = false);
|
||||||
|
|
||||||
//ws.cpp
|
//ws.cpp
|
||||||
void handleWs();
|
void handleWs();
|
||||||
void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
|
void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
|
||||||
void sendDataWs(AsyncWebSocketClient * client = nullptr);
|
void sendDataWs(AsyncWebSocketClient * client = nullptr);
|
||||||
|
|
||||||
//xml.cpp
|
//xml.cpp
|
||||||
void XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
|
void XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
|
||||||
void URL_response(AsyncWebServerRequest *request);
|
void URL_response(AsyncWebServerRequest *request);
|
||||||
void sappend(char stype, const char* key, int val);
|
void sappend(char stype, const char* key, int val);
|
||||||
void sappends(char stype, const char* key, char* val);
|
void sappends(char stype, const char* key, char* val);
|
||||||
void getSettingsJS(byte subPage, char* dest);
|
void getSettingsJS(byte subPage, char* dest);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
1660
wled00/json.cpp
1660
wled00/json.cpp
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2103250
|
#define VERSION 2103251
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
|
|||||||
@ -1,424 +1,424 @@
|
|||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Integrated HTTP web server page declarations
|
* Integrated HTTP web server page declarations
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//Is this an IP?
|
//Is this an IP?
|
||||||
bool isIp(String str) {
|
bool isIp(String str) {
|
||||||
for (size_t i = 0; i < str.length(); i++) {
|
for (size_t i = 0; i < str.length(); i++) {
|
||||||
int c = str.charAt(i);
|
int c = str.charAt(i);
|
||||||
if (c != '.' && (c < '0' || c > '9')) {
|
if (c != '.' && (c < '0' || c > '9')) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool captivePortal(AsyncWebServerRequest *request)
|
bool captivePortal(AsyncWebServerRequest *request)
|
||||||
{
|
{
|
||||||
if (ON_STA_FILTER(request)) return false; //only serve captive in AP mode
|
if (ON_STA_FILTER(request)) return false; //only serve captive in AP mode
|
||||||
String hostH;
|
String hostH;
|
||||||
if (!request->hasHeader("Host")) return false;
|
if (!request->hasHeader("Host")) return false;
|
||||||
hostH = request->getHeader("Host")->value();
|
hostH = request->getHeader("Host")->value();
|
||||||
|
|
||||||
if (!isIp(hostH) && hostH.indexOf("wled.me") < 0 && hostH.indexOf(cmDNS) < 0) {
|
if (!isIp(hostH) && hostH.indexOf("wled.me") < 0 && hostH.indexOf(cmDNS) < 0) {
|
||||||
DEBUG_PRINTLN("Captive portal");
|
DEBUG_PRINTLN("Captive portal");
|
||||||
AsyncWebServerResponse *response = request->beginResponse(302);
|
AsyncWebServerResponse *response = request->beginResponse(302);
|
||||||
response->addHeader(F("Location"), F("http://4.3.2.1"));
|
response->addHeader(F("Location"), F("http://4.3.2.1"));
|
||||||
request->send(response);
|
request->send(response);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void initServer()
|
void initServer()
|
||||||
{
|
{
|
||||||
//CORS compatiblity
|
//CORS compatiblity
|
||||||
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Origin"), "*");
|
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Origin"), "*");
|
||||||
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Methods"), "*");
|
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Methods"), "*");
|
||||||
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Headers"), "*");
|
DefaultHeaders::Instance().addHeader(F("Access-Control-Allow-Headers"), "*");
|
||||||
|
|
||||||
#ifdef WLED_ENABLE_WEBSOCKETS
|
#ifdef WLED_ENABLE_WEBSOCKETS
|
||||||
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send_P(200, "text/html", PAGE_liveviewws);
|
request->send_P(200, "text/html", PAGE_liveviewws);
|
||||||
});
|
});
|
||||||
#else
|
#else
|
||||||
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send_P(200, "text/html", PAGE_liveview);
|
request->send_P(200, "text/html", PAGE_liveview);
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//settings page
|
//settings page
|
||||||
server.on("/settings", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/settings", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveSettings(request);
|
serveSettings(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
if(!handleFileRead(request, "/favicon.ico"))
|
if(!handleFileRead(request, "/favicon.ico"))
|
||||||
{
|
{
|
||||||
request->send_P(200, "image/x-icon", favicon, 156);
|
request->send_P(200, "image/x-icon", favicon, 156);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/sliders", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/sliders", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveIndex(request);
|
serveIndex(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/welcome", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/welcome", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveSettings(request);
|
serveSettings(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/reset", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/reset", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 200,F("Rebooting now..."),F("Please wait ~10 seconds..."),129);
|
serveMessage(request, 200,F("Rebooting now..."),F("Please wait ~10 seconds..."),129);
|
||||||
doReboot = true;
|
doReboot = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/settings", HTTP_POST, [](AsyncWebServerRequest *request){
|
server.on("/settings", HTTP_POST, [](AsyncWebServerRequest *request){
|
||||||
serveSettings(request, true);
|
serveSettings(request, true);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveJson(request);
|
serveJson(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/json", [](AsyncWebServerRequest *request) {
|
AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/json", [](AsyncWebServerRequest *request) {
|
||||||
bool verboseResponse = false;
|
bool verboseResponse = false;
|
||||||
uint8_t vAPI = 1;
|
uint8_t vAPI = 1;
|
||||||
{ //scope JsonDocument so it releases its buffer
|
{ //scope JsonDocument so it releases its buffer
|
||||||
DynamicJsonDocument jsonBuffer(JSON_BUFFER_SIZE);
|
DynamicJsonDocument jsonBuffer(JSON_BUFFER_SIZE);
|
||||||
DeserializationError error = deserializeJson(jsonBuffer, (uint8_t*)(request->_tempObject));
|
DeserializationError error = deserializeJson(jsonBuffer, (uint8_t*)(request->_tempObject));
|
||||||
JsonObject root = jsonBuffer.as<JsonObject>();
|
JsonObject root = jsonBuffer.as<JsonObject>();
|
||||||
if (error || root.isNull()) {
|
if (error || root.isNull()) {
|
||||||
request->send(400, "application/json", F("{\"error\":9}")); return;
|
request->send(400, "application/json", F("{\"error\":9}")); return;
|
||||||
}
|
}
|
||||||
if (root.containsKey("rev"))
|
if (root.containsKey("rev"))
|
||||||
{
|
{
|
||||||
vAPI = root["rev"] | 1;
|
vAPI = root["rev"] | 1;
|
||||||
}
|
}
|
||||||
fileDoc = &jsonBuffer; // used for applying presets (presets.cpp)
|
fileDoc = &jsonBuffer; // used for applying presets (presets.cpp)
|
||||||
verboseResponse = deserializeState(root);
|
verboseResponse = deserializeState(root);
|
||||||
fileDoc = nullptr;
|
fileDoc = nullptr;
|
||||||
}
|
}
|
||||||
if (verboseResponse) { //if JSON contains "v"
|
if (verboseResponse) { //if JSON contains "v"
|
||||||
serveJson(request,vAPI); return;
|
serveJson(request,vAPI); return;
|
||||||
}
|
}
|
||||||
request->send(200, "application/json", F("{\"success\":true}"));
|
request->send(200, "application/json", F("{\"success\":true}"));
|
||||||
});
|
});
|
||||||
server.addHandler(handler);
|
server.addHandler(handler);
|
||||||
|
|
||||||
server.on("/version", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/version", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", (String)VERSION);
|
request->send(200, "text/plain", (String)VERSION);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/uptime", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/uptime", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", (String)millis());
|
request->send(200, "text/plain", (String)millis());
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/freeheap", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/freeheap", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", (String)ESP.getFreeHeap());
|
request->send(200, "text/plain", (String)ESP.getFreeHeap());
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/u", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/u", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send_P(200, "text/html", PAGE_usermod);
|
request->send_P(200, "text/html", PAGE_usermod);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/url", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/url", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
URL_response(request);
|
URL_response(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/teapot", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/teapot", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 418, F("418. I'm a teapot."), F("(Tangible Embedded Advanced Project Of Twinkling)"), 254);
|
serveMessage(request, 418, F("418. I'm a teapot."), F("(Tangible Embedded Advanced Project Of Twinkling)"), 254);
|
||||||
});
|
});
|
||||||
|
|
||||||
//if OTA is allowed
|
//if OTA is allowed
|
||||||
if (!otaLock){
|
if (!otaLock){
|
||||||
#ifdef WLED_ENABLE_FS_EDITOR
|
#ifdef WLED_ENABLE_FS_EDITOR
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
server.addHandler(new SPIFFSEditor(WLED_FS));//http_username,http_password));
|
server.addHandler(new SPIFFSEditor(WLED_FS));//http_username,http_password));
|
||||||
#else
|
#else
|
||||||
server.addHandler(new SPIFFSEditor("","",WLED_FS));//http_username,http_password));
|
server.addHandler(new SPIFFSEditor("","",WLED_FS));//http_username,http_password));
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
server.on("/edit", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/edit", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 501, "Not implemented", F("The FS editor is disabled in this build."), 254);
|
serveMessage(request, 501, "Not implemented", F("The FS editor is disabled in this build."), 254);
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
//init ota page
|
//init ota page
|
||||||
#ifndef WLED_DISABLE_OTA
|
#ifndef WLED_DISABLE_OTA
|
||||||
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send_P(200, "text/html", PAGE_update);
|
request->send_P(200, "text/html", PAGE_update);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
|
server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
|
||||||
if (Update.hasError())
|
if (Update.hasError())
|
||||||
{
|
{
|
||||||
serveMessage(request, 500, F("Failed updating firmware!"), F("Please check your file and retry!"), 254); return;
|
serveMessage(request, 500, F("Failed updating firmware!"), F("Please check your file and retry!"), 254); return;
|
||||||
}
|
}
|
||||||
serveMessage(request, 200, F("Successfully updated firmware!"), F("Please wait while the module reboots..."), 131);
|
serveMessage(request, 200, F("Successfully updated firmware!"), F("Please wait while the module reboots..."), 131);
|
||||||
doReboot = true;
|
doReboot = true;
|
||||||
},[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
|
},[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
|
||||||
if(!index){
|
if(!index){
|
||||||
DEBUG_PRINTLN(F("OTA Update Start"));
|
DEBUG_PRINTLN(F("OTA Update Start"));
|
||||||
#ifdef ESP8266
|
#ifdef ESP8266
|
||||||
Update.runAsync(true);
|
Update.runAsync(true);
|
||||||
#endif
|
#endif
|
||||||
Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
|
Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
|
||||||
}
|
}
|
||||||
if(!Update.hasError()) Update.write(data, len);
|
if(!Update.hasError()) Update.write(data, len);
|
||||||
if(final){
|
if(final){
|
||||||
if(Update.end(true)){
|
if(Update.end(true)){
|
||||||
DEBUG_PRINTLN(F("Update Success"));
|
DEBUG_PRINTLN(F("Update Success"));
|
||||||
} else {
|
} else {
|
||||||
DEBUG_PRINTLN(F("Update Failed"));
|
DEBUG_PRINTLN(F("Update Failed"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
#else
|
#else
|
||||||
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 501, "Not implemented", F("OTA updates are disabled in this build."), 254);
|
serveMessage(request, 501, "Not implemented", F("OTA updates are disabled in this build."), 254);
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
server.on("/edit", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/edit", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254);
|
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254);
|
||||||
});
|
});
|
||||||
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254);
|
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef WLED_ENABLE_DMX
|
#ifdef WLED_ENABLE_DMX
|
||||||
server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send_P(200, "text/html", PAGE_dmxmap , dmxProcessor);
|
request->send_P(200, "text/html", PAGE_dmxmap , dmxProcessor);
|
||||||
});
|
});
|
||||||
#else
|
#else
|
||||||
server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
serveMessage(request, 501, "Not implemented", F("DMX support is not enabled in this build."), 254);
|
serveMessage(request, 501, "Not implemented", F("DMX support is not enabled in this build."), 254);
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
if (captivePortal(request)) return;
|
if (captivePortal(request)) return;
|
||||||
serveIndexOrWelcome(request);
|
serveIndexOrWelcome(request);
|
||||||
});
|
});
|
||||||
|
|
||||||
#ifdef WLED_ENABLE_WEBSOCKETS
|
#ifdef WLED_ENABLE_WEBSOCKETS
|
||||||
server.addHandler(&ws);
|
server.addHandler(&ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//called when the url is not defined here, ajax-in; get-settings
|
//called when the url is not defined here, ajax-in; get-settings
|
||||||
server.onNotFound([](AsyncWebServerRequest *request){
|
server.onNotFound([](AsyncWebServerRequest *request){
|
||||||
DEBUG_PRINTLN("Not-Found HTTP call:");
|
DEBUG_PRINTLN("Not-Found HTTP call:");
|
||||||
DEBUG_PRINTLN("URI: " + request->url());
|
DEBUG_PRINTLN("URI: " + request->url());
|
||||||
if (captivePortal(request)) return;
|
if (captivePortal(request)) return;
|
||||||
|
|
||||||
//make API CORS compatible
|
//make API CORS compatible
|
||||||
if (request->method() == HTTP_OPTIONS)
|
if (request->method() == HTTP_OPTIONS)
|
||||||
{
|
{
|
||||||
request->send(200); return;
|
request->send(200); return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(handleSet(request, request->url())) return;
|
if(handleSet(request, request->url())) return;
|
||||||
#ifndef WLED_DISABLE_ALEXA
|
#ifndef WLED_DISABLE_ALEXA
|
||||||
if(espalexa.handleAlexaApiCall(request)) return;
|
if(espalexa.handleAlexaApiCall(request)) return;
|
||||||
#endif
|
#endif
|
||||||
if(handleFileRead(request, request->url())) return;
|
if(handleFileRead(request, request->url())) return;
|
||||||
request->send_P(404, "text/html", PAGE_404);
|
request->send_P(404, "text/html", PAGE_404);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void serveIndexOrWelcome(AsyncWebServerRequest *request)
|
void serveIndexOrWelcome(AsyncWebServerRequest *request)
|
||||||
{
|
{
|
||||||
if (!showWelcomePage){
|
if (!showWelcomePage){
|
||||||
serveIndex(request);
|
serveIndex(request);
|
||||||
} else {
|
} else {
|
||||||
serveSettings(request);
|
serveSettings(request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool handleIfNoneMatchCacheHeader(AsyncWebServerRequest* request)
|
bool handleIfNoneMatchCacheHeader(AsyncWebServerRequest* request)
|
||||||
{
|
{
|
||||||
AsyncWebHeader* header = request->getHeader("If-None-Match");
|
AsyncWebHeader* header = request->getHeader("If-None-Match");
|
||||||
if (header && header->value() == String(VERSION)) {
|
if (header && header->value() == String(VERSION)) {
|
||||||
request->send(304);
|
request->send(304);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setStaticContentCacheHeaders(AsyncWebServerResponse *response)
|
void setStaticContentCacheHeaders(AsyncWebServerResponse *response)
|
||||||
{
|
{
|
||||||
response->addHeader(F("Cache-Control"),"max-age=2592000");
|
response->addHeader(F("Cache-Control"),"max-age=2592000");
|
||||||
response->addHeader(F("ETag"), String(VERSION));
|
response->addHeader(F("ETag"), String(VERSION));
|
||||||
}
|
}
|
||||||
|
|
||||||
void serveIndex(AsyncWebServerRequest* request)
|
void serveIndex(AsyncWebServerRequest* request)
|
||||||
{
|
{
|
||||||
if (handleFileRead(request, "/index.htm")) return;
|
if (handleFileRead(request, "/index.htm")) return;
|
||||||
|
|
||||||
if (handleIfNoneMatchCacheHeader(request)) return;
|
if (handleIfNoneMatchCacheHeader(request)) return;
|
||||||
|
|
||||||
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_index, PAGE_index_L);
|
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_index, PAGE_index_L);
|
||||||
|
|
||||||
response->addHeader(F("Content-Encoding"),"gzip");
|
response->addHeader(F("Content-Encoding"),"gzip");
|
||||||
#ifndef WLED_DEBUG
|
#ifndef WLED_DEBUG
|
||||||
setStaticContentCacheHeaders(response);
|
setStaticContentCacheHeaders(response);
|
||||||
#endif
|
#endif
|
||||||
request->send(response);
|
request->send(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
String msgProcessor(const String& var)
|
String msgProcessor(const String& var)
|
||||||
{
|
{
|
||||||
if (var == "MSG") {
|
if (var == "MSG") {
|
||||||
String messageBody = messageHead;
|
String messageBody = messageHead;
|
||||||
messageBody += F("</h2>");
|
messageBody += F("</h2>");
|
||||||
messageBody += messageSub;
|
messageBody += messageSub;
|
||||||
uint32_t optt = optionType;
|
uint32_t optt = optionType;
|
||||||
|
|
||||||
if (optt < 60) //redirect to settings after optionType seconds
|
if (optt < 60) //redirect to settings after optionType seconds
|
||||||
{
|
{
|
||||||
messageBody += F("<script>setTimeout(RS,");
|
messageBody += F("<script>setTimeout(RS,");
|
||||||
messageBody +=String(optt*1000);
|
messageBody +=String(optt*1000);
|
||||||
messageBody += F(")</script>");
|
messageBody += F(")</script>");
|
||||||
} else if (optt < 120) //redirect back after optionType-60 seconds, unused
|
} else if (optt < 120) //redirect back after optionType-60 seconds, unused
|
||||||
{
|
{
|
||||||
//messageBody += "<script>setTimeout(B," + String((optt-60)*1000) + ")</script>";
|
//messageBody += "<script>setTimeout(B," + String((optt-60)*1000) + ")</script>";
|
||||||
} else if (optt < 180) //reload parent after optionType-120 seconds
|
} else if (optt < 180) //reload parent after optionType-120 seconds
|
||||||
{
|
{
|
||||||
messageBody += F("<script>setTimeout(RP,");
|
messageBody += F("<script>setTimeout(RP,");
|
||||||
messageBody += String((optt-120)*1000);
|
messageBody += String((optt-120)*1000);
|
||||||
messageBody += F(")</script>");
|
messageBody += F(")</script>");
|
||||||
} else if (optt == 253)
|
} else if (optt == 253)
|
||||||
{
|
{
|
||||||
messageBody += F("<br><br><form action=/settings><button class=\"bt\" type=submit>Back</button></form>"); //button to settings
|
messageBody += F("<br><br><form action=/settings><button class=\"bt\" type=submit>Back</button></form>"); //button to settings
|
||||||
} else if (optt == 254)
|
} else if (optt == 254)
|
||||||
{
|
{
|
||||||
messageBody += F("<br><br><button type=\"button\" class=\"bt\" onclick=\"B()\">Back</button>");
|
messageBody += F("<br><br><button type=\"button\" class=\"bt\" onclick=\"B()\">Back</button>");
|
||||||
}
|
}
|
||||||
return messageBody;
|
return messageBody;
|
||||||
}
|
}
|
||||||
return String();
|
return String();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& headl, const String& subl, byte optionT)
|
void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& headl, const String& subl, byte optionT)
|
||||||
{
|
{
|
||||||
messageHead = headl;
|
messageHead = headl;
|
||||||
messageSub = subl;
|
messageSub = subl;
|
||||||
optionType = optionT;
|
optionType = optionT;
|
||||||
|
|
||||||
request->send_P(code, "text/html", PAGE_msg, msgProcessor);
|
request->send_P(code, "text/html", PAGE_msg, msgProcessor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
String settingsProcessor(const String& var)
|
String settingsProcessor(const String& var)
|
||||||
{
|
{
|
||||||
if (var == "CSS") {
|
if (var == "CSS") {
|
||||||
char buf[2048];
|
char buf[2048];
|
||||||
getSettingsJS(optionType, buf);
|
getSettingsJS(optionType, buf);
|
||||||
return String(buf);
|
return String(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WLED_ENABLE_DMX
|
#ifdef WLED_ENABLE_DMX
|
||||||
|
|
||||||
if (var == "DMXMENU") {
|
if (var == "DMXMENU") {
|
||||||
return String(F("<form action=/settings/dmx><button type=submit>DMX Output</button></form>"));
|
return String(F("<form action=/settings/dmx><button type=submit>DMX Output</button></form>"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
if (var == "SCSS") return String(FPSTR(PAGE_settingsCss));
|
if (var == "SCSS") return String(FPSTR(PAGE_settingsCss));
|
||||||
return String();
|
return String();
|
||||||
}
|
}
|
||||||
|
|
||||||
String dmxProcessor(const String& var)
|
String dmxProcessor(const String& var)
|
||||||
{
|
{
|
||||||
String mapJS;
|
String mapJS;
|
||||||
#ifdef WLED_ENABLE_DMX
|
#ifdef WLED_ENABLE_DMX
|
||||||
if (var == "DMXVARS") {
|
if (var == "DMXVARS") {
|
||||||
mapJS += "\nCN=" + String(DMXChannels) + ";\n";
|
mapJS += "\nCN=" + String(DMXChannels) + ";\n";
|
||||||
mapJS += "CS=" + String(DMXStart) + ";\n";
|
mapJS += "CS=" + String(DMXStart) + ";\n";
|
||||||
mapJS += "CG=" + String(DMXGap) + ";\n";
|
mapJS += "CG=" + String(DMXGap) + ";\n";
|
||||||
mapJS += "LC=" + String(ledCount) + ";\n";
|
mapJS += "LC=" + String(ledCount) + ";\n";
|
||||||
mapJS += "var CH=[";
|
mapJS += "var CH=[";
|
||||||
for (int i=0;i<15;i++) {
|
for (int i=0;i<15;i++) {
|
||||||
mapJS += String(DMXFixtureMap[i]) + ",";
|
mapJS += String(DMXFixtureMap[i]) + ",";
|
||||||
}
|
}
|
||||||
mapJS += "0];";
|
mapJS += "0];";
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return mapJS;
|
return mapJS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void serveSettings(AsyncWebServerRequest* request, bool post)
|
void serveSettings(AsyncWebServerRequest* request, bool post)
|
||||||
{
|
{
|
||||||
byte subPage = 0;
|
byte subPage = 0;
|
||||||
const String& url = request->url();
|
const String& url = request->url();
|
||||||
if (url.indexOf("sett") >= 0)
|
if (url.indexOf("sett") >= 0)
|
||||||
{
|
{
|
||||||
if (url.indexOf("wifi") > 0) subPage = 1;
|
if (url.indexOf("wifi") > 0) subPage = 1;
|
||||||
else if (url.indexOf("leds") > 0) subPage = 2;
|
else if (url.indexOf("leds") > 0) subPage = 2;
|
||||||
else if (url.indexOf("ui") > 0) subPage = 3;
|
else if (url.indexOf("ui") > 0) subPage = 3;
|
||||||
else if (url.indexOf("sync") > 0) subPage = 4;
|
else if (url.indexOf("sync") > 0) subPage = 4;
|
||||||
else if (url.indexOf("time") > 0) subPage = 5;
|
else if (url.indexOf("time") > 0) subPage = 5;
|
||||||
else if (url.indexOf("sec") > 0) subPage = 6;
|
else if (url.indexOf("sec") > 0) subPage = 6;
|
||||||
#ifdef WLED_ENABLE_DMX // include only if DMX is enabled
|
#ifdef WLED_ENABLE_DMX // include only if DMX is enabled
|
||||||
else if (url.indexOf("dmx") > 0) subPage = 7;
|
else if (url.indexOf("dmx") > 0) subPage = 7;
|
||||||
#endif
|
#endif
|
||||||
} else subPage = 255; //welcome page
|
} else subPage = 255; //welcome page
|
||||||
|
|
||||||
if (subPage == 1 && wifiLock && otaLock)
|
if (subPage == 1 && wifiLock && otaLock)
|
||||||
{
|
{
|
||||||
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254); return;
|
serveMessage(request, 500, "Access Denied", F("Please unlock OTA in security settings!"), 254); return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (post) { //settings/set POST request, saving
|
if (post) { //settings/set POST request, saving
|
||||||
if (subPage != 1 || !(wifiLock && otaLock)) handleSettingsSet(request, subPage);
|
if (subPage != 1 || !(wifiLock && otaLock)) handleSettingsSet(request, subPage);
|
||||||
|
|
||||||
char s[32];
|
char s[32];
|
||||||
char s2[45] = "";
|
char s2[45] = "";
|
||||||
|
|
||||||
switch (subPage) {
|
switch (subPage) {
|
||||||
case 1: strcpy_P(s, PSTR("WiFi")); strcpy_P(s2, PSTR("Please connect to the new IP (if changed)")); forceReconnect = true; break;
|
case 1: strcpy_P(s, PSTR("WiFi")); strcpy_P(s2, PSTR("Please connect to the new IP (if changed)")); forceReconnect = true; break;
|
||||||
case 2: strcpy_P(s, PSTR("LED")); break;
|
case 2: strcpy_P(s, PSTR("LED")); break;
|
||||||
case 3: strcpy_P(s, PSTR("UI")); break;
|
case 3: strcpy_P(s, PSTR("UI")); break;
|
||||||
case 4: strcpy_P(s, PSTR("Sync")); break;
|
case 4: strcpy_P(s, PSTR("Sync")); break;
|
||||||
case 5: strcpy_P(s, PSTR("Time")); break;
|
case 5: strcpy_P(s, PSTR("Time")); break;
|
||||||
case 6: strcpy_P(s, PSTR("Security")); strcpy_P(s2, PSTR("Rebooting, please wait ~10 seconds...")); break;
|
case 6: strcpy_P(s, PSTR("Security")); strcpy_P(s2, PSTR("Rebooting, please wait ~10 seconds...")); break;
|
||||||
case 7: strcpy_P(s, PSTR("DMX")); break;
|
case 7: strcpy_P(s, PSTR("DMX")); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
strcat_P(s, PSTR(" settings saved."));
|
strcat_P(s, PSTR(" settings saved."));
|
||||||
if (!s2[0]) strcpy_P(s2, PSTR("Redirecting..."));
|
if (!s2[0]) strcpy_P(s2, PSTR("Redirecting..."));
|
||||||
|
|
||||||
if (!doReboot) serveMessage(request, 200, s, s2, (subPage == 1 || subPage == 6) ? 129 : 1);
|
if (!doReboot) serveMessage(request, 200, s, s2, (subPage == 1 || subPage == 6) ? 129 : 1);
|
||||||
if (subPage == 6) doReboot = true;
|
if (subPage == 6) doReboot = true;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WLED_DISABLE_MOBILE_UI //disable welcome page if not enough storage
|
#ifdef WLED_DISABLE_MOBILE_UI //disable welcome page if not enough storage
|
||||||
if (subPage == 255) {serveIndex(request); return;}
|
if (subPage == 255) {serveIndex(request); return;}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
optionType = subPage;
|
optionType = subPage;
|
||||||
|
|
||||||
switch (subPage)
|
switch (subPage)
|
||||||
{
|
{
|
||||||
case 1: request->send_P(200, "text/html", PAGE_settings_wifi, settingsProcessor); break;
|
case 1: request->send_P(200, "text/html", PAGE_settings_wifi, settingsProcessor); break;
|
||||||
case 2: request->send_P(200, "text/html", PAGE_settings_leds, settingsProcessor); break;
|
case 2: request->send_P(200, "text/html", PAGE_settings_leds, settingsProcessor); break;
|
||||||
case 3: request->send_P(200, "text/html", PAGE_settings_ui , settingsProcessor); break;
|
case 3: request->send_P(200, "text/html", PAGE_settings_ui , settingsProcessor); break;
|
||||||
case 4: request->send_P(200, "text/html", PAGE_settings_sync, settingsProcessor); break;
|
case 4: request->send_P(200, "text/html", PAGE_settings_sync, settingsProcessor); break;
|
||||||
case 5: request->send_P(200, "text/html", PAGE_settings_time, settingsProcessor); break;
|
case 5: request->send_P(200, "text/html", PAGE_settings_time, settingsProcessor); break;
|
||||||
case 6: request->send_P(200, "text/html", PAGE_settings_sec , settingsProcessor); break;
|
case 6: request->send_P(200, "text/html", PAGE_settings_sec , settingsProcessor); break;
|
||||||
case 7: request->send_P(200, "text/html", PAGE_settings_dmx , settingsProcessor); break;
|
case 7: request->send_P(200, "text/html", PAGE_settings_dmx , settingsProcessor); break;
|
||||||
case 255: request->send_P(200, "text/html", PAGE_welcome); break;
|
case 255: request->send_P(200, "text/html", PAGE_welcome); break;
|
||||||
default: request->send_P(200, "text/html", PAGE_settings , settingsProcessor);
|
default: request->send_P(200, "text/html", PAGE_settings , settingsProcessor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
310
wled00/ws.cpp
310
wled00/ws.cpp
@ -1,156 +1,156 @@
|
|||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* WebSockets server for bidirectional communication
|
* WebSockets server for bidirectional communication
|
||||||
*/
|
*/
|
||||||
#ifdef WLED_ENABLE_WEBSOCKETS
|
#ifdef WLED_ENABLE_WEBSOCKETS
|
||||||
|
|
||||||
uint16_t wsLiveClientId = 0;
|
uint16_t wsLiveClientId = 0;
|
||||||
unsigned long wsLastLiveTime = 0;
|
unsigned long wsLastLiveTime = 0;
|
||||||
//uint8_t* wsFrameBuffer = nullptr;
|
//uint8_t* wsFrameBuffer = nullptr;
|
||||||
uint8_t vAPI = 2;
|
uint8_t vAPI = 2;
|
||||||
struct client_api {
|
struct client_api {
|
||||||
uint32_t c = 0;
|
uint32_t c = 0;
|
||||||
uint8_t vAPI = 1;
|
uint8_t vAPI = 1;
|
||||||
} ClientApis[DEFAULT_MAX_WS_CLIENTS];
|
} ClientApis[DEFAULT_MAX_WS_CLIENTS];
|
||||||
|
|
||||||
#define WS_LIVE_INTERVAL 40
|
#define WS_LIVE_INTERVAL 40
|
||||||
|
|
||||||
void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
|
void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
|
||||||
{
|
{
|
||||||
if(type == WS_EVT_CONNECT){
|
if(type == WS_EVT_CONNECT){
|
||||||
//client connected
|
//client connected
|
||||||
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
||||||
if (ClientApis[i].c) continue; // used slot
|
if (ClientApis[i].c) continue; // used slot
|
||||||
ClientApis[i].c = client->id();
|
ClientApis[i].c = client->id();
|
||||||
ClientApis[i].vAPI = 1;
|
ClientApis[i].vAPI = 1;
|
||||||
DEBUG_PRINTF("New WS client [%d]: %ld\n", (int)i, client->id());
|
DEBUG_PRINTF("New WS client [%d]: %ld\n", (int)i, client->id());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sendDataWs(client);
|
sendDataWs(client);
|
||||||
//client->ping();
|
//client->ping();
|
||||||
} else if(type == WS_EVT_DISCONNECT){
|
} else if(type == WS_EVT_DISCONNECT){
|
||||||
//client disconnected
|
//client disconnected
|
||||||
if (client->id() == wsLiveClientId) wsLiveClientId = 0;
|
if (client->id() == wsLiveClientId) wsLiveClientId = 0;
|
||||||
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
||||||
if (ClientApis[i].c != client->id()) continue;
|
if (ClientApis[i].c != client->id()) continue;
|
||||||
ClientApis[i].c = 0; // clear slot
|
ClientApis[i].c = 0; // clear slot
|
||||||
ClientApis[i].vAPI = 1;
|
ClientApis[i].vAPI = 1;
|
||||||
DEBUG_PRINTF("Removed WS client [%d]: %ld\n", (int)i, client->id());
|
DEBUG_PRINTF("Removed WS client [%d]: %ld\n", (int)i, client->id());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if(type == WS_EVT_DATA){
|
} else if(type == WS_EVT_DATA){
|
||||||
//data packet
|
//data packet
|
||||||
AwsFrameInfo * info = (AwsFrameInfo*)arg;
|
AwsFrameInfo * info = (AwsFrameInfo*)arg;
|
||||||
if(info->final && info->index == 0 && info->len == len){
|
if(info->final && info->index == 0 && info->len == len){
|
||||||
//the whole message is in a single frame and we got all of it's data (max. 1450byte)
|
//the whole message is in a single frame and we got all of it's data (max. 1450byte)
|
||||||
if(info->opcode == WS_TEXT)
|
if(info->opcode == WS_TEXT)
|
||||||
{
|
{
|
||||||
bool verboseResponse = false;
|
bool verboseResponse = false;
|
||||||
{ //scope JsonDocument so it releases its buffer
|
{ //scope JsonDocument so it releases its buffer
|
||||||
DynamicJsonDocument jsonBuffer(JSON_BUFFER_SIZE);
|
DynamicJsonDocument jsonBuffer(JSON_BUFFER_SIZE);
|
||||||
DeserializationError error = deserializeJson(jsonBuffer, data, len);
|
DeserializationError error = deserializeJson(jsonBuffer, data, len);
|
||||||
JsonObject root = jsonBuffer.as<JsonObject>();
|
JsonObject root = jsonBuffer.as<JsonObject>();
|
||||||
if (error || root.isNull()) return;
|
if (error || root.isNull()) return;
|
||||||
|
|
||||||
if (root.containsKey("lv"))
|
if (root.containsKey("lv"))
|
||||||
{
|
{
|
||||||
wsLiveClientId = root["lv"] ? client->id() : 0;
|
wsLiveClientId = root["lv"] ? client->id() : 0;
|
||||||
}
|
}
|
||||||
if (root.containsKey("rev"))
|
if (root.containsKey("rev"))
|
||||||
{
|
{
|
||||||
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
||||||
if (ClientApis[i].c != client->id()) continue;
|
if (ClientApis[i].c != client->id()) continue;
|
||||||
ClientApis[i].vAPI = root["rev"];
|
ClientApis[i].vAPI = root["rev"];
|
||||||
DEBUG_PRINTF("API for WS client [%d]: %d\n", (int)i, (int)ClientApis[i].vAPI);
|
DEBUG_PRINTF("API for WS client [%d]: %d\n", (int)i, (int)ClientApis[i].vAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
verboseResponse = deserializeState(root);
|
verboseResponse = deserializeState(root);
|
||||||
}
|
}
|
||||||
if (verboseResponse || millis() - lastInterfaceUpdate < 1900) sendDataWs(client); //update if it takes longer than 100ms until next "broadcast"
|
if (verboseResponse || millis() - lastInterfaceUpdate < 1900) sendDataWs(client); //update if it takes longer than 100ms until next "broadcast"
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//message is comprised of multiple frames or the frame is split into multiple packets
|
//message is comprised of multiple frames or the frame is split into multiple packets
|
||||||
//if(info->index == 0){
|
//if(info->index == 0){
|
||||||
//if (!wsFrameBuffer && len < 4096) wsFrameBuffer = new uint8_t[4096];
|
//if (!wsFrameBuffer && len < 4096) wsFrameBuffer = new uint8_t[4096];
|
||||||
//}
|
//}
|
||||||
|
|
||||||
//if (wsFrameBuffer && len < 4096 && info->index + info->)
|
//if (wsFrameBuffer && len < 4096 && info->index + info->)
|
||||||
//{
|
//{
|
||||||
|
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if((info->index + len) == info->len){
|
if((info->index + len) == info->len){
|
||||||
if(info->final){
|
if(info->final){
|
||||||
if(info->message_opcode == WS_TEXT) {
|
if(info->message_opcode == WS_TEXT) {
|
||||||
client->text(F("{\"error\":9}")); //we do not handle split packets right now
|
client->text(F("{\"error\":9}")); //we do not handle split packets right now
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if(type == WS_EVT_ERROR){
|
} else if(type == WS_EVT_ERROR){
|
||||||
//error was received from the other end
|
//error was received from the other end
|
||||||
|
|
||||||
} else if(type == WS_EVT_PONG){
|
} else if(type == WS_EVT_PONG){
|
||||||
//pong message was received (in response to a ping request maybe)
|
//pong message was received (in response to a ping request maybe)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void sendDataWs(AsyncWebSocketClient * client)
|
void sendDataWs(AsyncWebSocketClient * client)
|
||||||
{
|
{
|
||||||
if (!ws.count()) return;
|
if (!ws.count()) return;
|
||||||
AsyncWebSocketMessageBuffer * buffer;
|
AsyncWebSocketMessageBuffer * buffer;
|
||||||
|
|
||||||
{ //scope JsonDocument so it releases its buffer
|
{ //scope JsonDocument so it releases its buffer
|
||||||
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
||||||
JsonObject state = doc.createNestedObject("state");
|
JsonObject state = doc.createNestedObject("state");
|
||||||
if (client) {
|
if (client) {
|
||||||
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
||||||
if (ClientApis[i].c != client->id()) continue;
|
if (ClientApis[i].c != client->id()) continue;
|
||||||
state["rev"] = ClientApis[i].vAPI;
|
state["rev"] = ClientApis[i].vAPI;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
uint8_t minAPI = 2;
|
uint8_t minAPI = 2;
|
||||||
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
for (uint8_t i=0; i<DEFAULT_MAX_WS_CLIENTS; i++) {
|
||||||
if (!ClientApis[i].c) continue;
|
if (!ClientApis[i].c) continue;
|
||||||
if (minAPI > ClientApis[i].vAPI) minAPI = ClientApis[i].vAPI;
|
if (minAPI > ClientApis[i].vAPI) minAPI = ClientApis[i].vAPI;
|
||||||
}
|
}
|
||||||
state["rev"] = minAPI;
|
state["rev"] = minAPI;
|
||||||
}
|
}
|
||||||
DEBUG_PRINTF("Actual API used: %d\n", (int)state["rev"]);
|
DEBUG_PRINTF("Actual API used: %d\n", (int)state["rev"]);
|
||||||
serializeState(state);
|
serializeState(state);
|
||||||
JsonObject info = doc.createNestedObject("info");
|
JsonObject info = doc.createNestedObject("info");
|
||||||
serializeInfo(info);
|
serializeInfo(info);
|
||||||
size_t len = measureJson(doc);
|
size_t len = measureJson(doc);
|
||||||
buffer = ws.makeBuffer(len);
|
buffer = ws.makeBuffer(len);
|
||||||
if (!buffer) return; //out of memory
|
if (!buffer) return; //out of memory
|
||||||
|
|
||||||
serializeJson(doc, (char *)buffer->get(), len +1);
|
serializeJson(doc, (char *)buffer->get(), len +1);
|
||||||
}
|
}
|
||||||
if (client) {
|
if (client) {
|
||||||
client->text(buffer);
|
client->text(buffer);
|
||||||
} else {
|
} else {
|
||||||
ws.textAll(buffer);
|
ws.textAll(buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleWs()
|
void handleWs()
|
||||||
{
|
{
|
||||||
if (millis() - wsLastLiveTime > WS_LIVE_INTERVAL)
|
if (millis() - wsLastLiveTime > WS_LIVE_INTERVAL)
|
||||||
{
|
{
|
||||||
ws.cleanupClients();
|
ws.cleanupClients();
|
||||||
bool success = true;
|
bool success = true;
|
||||||
if (wsLiveClientId)
|
if (wsLiveClientId)
|
||||||
success = serveLiveLeds(nullptr, wsLiveClientId);
|
success = serveLiveLeds(nullptr, wsLiveClientId);
|
||||||
wsLastLiveTime = millis();
|
wsLastLiveTime = millis();
|
||||||
if (!success) wsLastLiveTime -= 20; //try again in 20ms if failed due to non-empty WS queue
|
if (!success) wsLastLiveTime -= 20; //try again in 20ms if failed due to non-empty WS queue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
void handleWs() {}
|
void handleWs() {}
|
||||||
void sendDataWs(AsyncWebSocketClient * client) {}
|
void sendDataWs(AsyncWebSocketClient * client) {}
|
||||||
#endif
|
#endif
|
||||||
Loading…
Reference in New Issue
Block a user