Further fixing of includes.
This commit is contained in:
parent
12131764d1
commit
6f5e71164a
@ -514,7 +514,7 @@ public:
|
|||||||
wledInit();
|
wledInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
public: // TODO: privacy
|
||||||
void wledInit();
|
void wledInit();
|
||||||
void beginStrip();
|
void beginStrip();
|
||||||
|
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
#include "wled_alexa.h"
|
#include "wled_alexa.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
#include "src/dependencies/espalexa/EspalexaDevice.h"
|
|
||||||
#include "const.h"
|
#include "const.h"
|
||||||
|
#include "wled_led.h"
|
||||||
|
#include "wled_eeprom.h"
|
||||||
|
#include "wled_colors.h"
|
||||||
|
|
||||||
#ifndef WLED_DISABLE_ALEXA
|
#ifndef WLED_DISABLE_ALEXA
|
||||||
void onAlexaChange(EspalexaDevice* dev);
|
void onAlexaChange(EspalexaDevice* dev);
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
#include "wled_button.h"
|
#include "wled_button.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
#include "wled_led.h"
|
||||||
|
#include "wled_eeprom.h"
|
||||||
|
#include "wled_set.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Physical IO
|
* Physical IO
|
||||||
*/
|
*/
|
||||||
@ -46,7 +50,7 @@ void handleButton()
|
|||||||
|
|
||||||
if (dur > 6000) //long press
|
if (dur > 6000) //long press
|
||||||
{
|
{
|
||||||
initAP(true);
|
WLED::instance().initAP(true);
|
||||||
}
|
}
|
||||||
else if (!buttonLongPressed) { //short press
|
else if (!buttonLongPressed) { //short press
|
||||||
if (macroDoublePress)
|
if (macroDoublePress)
|
||||||
|
@ -592,7 +592,7 @@ void savedToPresets()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool applyPreset(byte index, bool loadBri = true)
|
bool applyPreset(byte index, bool loadBri)
|
||||||
{
|
{
|
||||||
if (index == 255 || index == 0)
|
if (index == 255 || index == 0)
|
||||||
{
|
{
|
||||||
@ -630,7 +630,7 @@ bool applyPreset(byte index, bool loadBri = true)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void savePreset(byte index, bool persist = true)
|
void savePreset(byte index, bool persist)
|
||||||
{
|
{
|
||||||
if (index > 16) return;
|
if (index > 16) return;
|
||||||
if (index < 1) {saveSettingsToEEPROM();return;}
|
if (index < 1) {saveSettingsToEEPROM();return;}
|
||||||
@ -698,7 +698,7 @@ void applyMacro(byte index)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void saveMacro(byte index, String mc, bool persist = true) //only commit on single save, not in settings
|
void saveMacro(byte index, String mc, bool persist) //only commit on single save, not in settings
|
||||||
{
|
{
|
||||||
index-=1;
|
index-=1;
|
||||||
if (index > 15) return;
|
if (index > 15) return;
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#include "wled_hue.h"
|
#include "wled_hue.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
#include "wled_colors.h"
|
||||||
|
#include "wled_eeprom.h"
|
||||||
|
|
||||||
#ifndef WLED_DISABLE_HUESYNC
|
#ifndef WLED_DISABLE_HUESYNC
|
||||||
|
|
||||||
|
@ -3,8 +3,14 @@
|
|||||||
/*
|
/*
|
||||||
* Sync to Philips hue lights
|
* Sync to Philips hue lights
|
||||||
*/
|
*/
|
||||||
|
#include <Arduino.h>
|
||||||
|
#include <ESPAsyncTCP.h>
|
||||||
|
|
||||||
void handleHue();
|
void handleHue();
|
||||||
void reconnectHue();
|
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
|
#endif //WLED_HUE_H
|
@ -1,5 +1,7 @@
|
|||||||
#include "wled_json.h"
|
#include "wled_json.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
#include "wled_eeprom.h"
|
||||||
|
#include "wled_led.h"
|
||||||
|
|
||||||
void deserializeSegment(JsonObject elem, byte it)
|
void deserializeSegment(JsonObject elem, byte it)
|
||||||
{
|
{
|
||||||
|
@ -3,6 +3,12 @@
|
|||||||
/*
|
/*
|
||||||
* JSON API (De)serialization
|
* 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);
|
void deserializeSegment(JsonObject elem, byte it);
|
||||||
bool deserializeState(JsonObject root);
|
bool deserializeState(JsonObject root);
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
#include "wled_led.h"
|
#include "wled_led.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
#include "wled_notify.h"
|
||||||
|
#include "wled_blynk.h"
|
||||||
|
#include "wled_eeprom.h"
|
||||||
|
#include "wled_mqtt.h"
|
||||||
|
#include "wled_colors.h"
|
||||||
|
|
||||||
void setValuesFromMainSeg()
|
void setValuesFromMainSeg()
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#include "wled_mqtt.h"
|
#include "wled_mqtt.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
|
#include "wled_notify.h"
|
||||||
|
#include "wled_led.h"
|
||||||
|
|
||||||
#ifdef WLED_ENABLE_MQTT
|
#ifdef WLED_ENABLE_MQTT
|
||||||
#define MQTT_KEEP_ALIVE_TIME 60 // contact the MQTT broker every 60 seconds
|
#define MQTT_KEEP_ALIVE_TIME 60 // contact the MQTT broker every 60 seconds
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
#include "wled_notify.h"
|
#include "wled_notify.h"
|
||||||
#include "wled.h"
|
#include "wled.h"
|
||||||
#include "src/dependencies/e131/ESPAsyncE131.h"
|
#include "src/dependencies/e131/ESPAsyncE131.h"
|
||||||
|
#include "wled_led.h"
|
||||||
|
|
||||||
#define WLEDPACKETSIZE 29
|
#define WLEDPACKETSIZE 29
|
||||||
#define UDP_IN_MAXSIZE 1472
|
#define UDP_IN_MAXSIZE 1472
|
||||||
|
|
||||||
|
|
||||||
void notify(byte callMode, bool followUp=false)
|
void notify(byte callMode, bool followUp)
|
||||||
{
|
{
|
||||||
if (!udpConnected) return;
|
if (!udpConnected) return;
|
||||||
switch (callMode)
|
switch (callMode)
|
||||||
@ -71,7 +72,7 @@ void notify(byte callMode, bool followUp=false)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC)
|
void arlsLock(uint32_t timeoutMs, byte md)
|
||||||
{
|
{
|
||||||
if (!realtimeMode){
|
if (!realtimeMode){
|
||||||
for (uint16_t i = 0; i < ledCount; i++)
|
for (uint16_t i = 0; i < ledCount; i++)
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
/*
|
/*
|
||||||
* UDP notifier
|
* UDP notifier
|
||||||
*/
|
*/
|
||||||
union e131_packet_t; // Will this compile?
|
//union e131_packet_t; // Will this compile?
|
||||||
class IPAddress;
|
class IPAddress;
|
||||||
|
|
||||||
void notify(byte callMode, bool followUp=false);
|
void notify(byte callMode, bool followUp=false);
|
||||||
|
Loading…
Reference in New Issue
Block a user