From 7de492caa7a001c45eb7db087cb1398644e3e6d6 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Thu, 23 Sep 2021 21:13:44 +0200 Subject: [PATCH] Compiling for ESP8266. --- wled00/udp.cpp | 2 +- wled00/udp.h | 93 -------------------------------------------------- wled00/wled.h | 1 - 3 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 wled00/udp.h diff --git a/wled00/udp.cpp b/wled00/udp.cpp index b33fbae44..dd708145d 100644 --- a/wled00/udp.cpp +++ b/wled00/udp.cpp @@ -576,7 +576,7 @@ uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8 for (uint16_t currentPacket = 0; currentPacket < packetCount; currentPacket++) { if (sequenceNumber > 15) sequenceNumber = 0; - if (!ddpUdp.beginPacket(client, DDP_PORT)) { + if (!ddpUdp.beginPacket(client, DDP_DEFAULT_PORT)) { // port defined in ESPAsyncE131.h DEBUG_PRINTLN(F("WiFiUDP.beginPacket returned an error")); return 1; // problem } diff --git a/wled00/udp.h b/wled00/udp.h deleted file mode 100644 index 3765cea08..000000000 --- a/wled00/udp.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef UDP_H -#define UDP_H - -// expected to be included from wled.h where other dependencies are loaded first - -void notify(byte callMode, bool followUp); -void realtimeLock(uint32_t timeoutMs, byte md); -void sendTPM2Ack(); -void handleNotifications(); -void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w); - -/*********************************************************************************************\ - Refresh aging for remote units, drop if too old... -\*********************************************************************************************/ -void refreshNodeList(); - -/*********************************************************************************************\ - Broadcast system info to other nodes. (to update node lists) -\*********************************************************************************************/ -void sendSysInfoUDP(); - -/*********************************************************************************************\ - * Art-Net, DDP, E131 output - work in progress -\*********************************************************************************************/ - -// Send real time DDP UDP updates to the specified client -// -// client - the IP address to send to -// buffer - a buffer of at least length*3 or length*4 bytes long -// length - the number of pixels -// isRGBW - true if the buffer contains 4 components per pixel -uint8_t realtimeBroadcast(IPAddress client, uint16_t length, uint8_t *buffer, bool isRGBW); - -#define DDP_PORT 4048 - -#define DDP_PUSH_FLAG 0x01 -#define DDP_TIMECODE_FLAG 0x10 - -#ifdef UPD_OUTPUT // just disable out for now -// Base class for all UDP output types. -class UDPOutputData { -public: - UDPOutputData(const JsonDocument& config); - virtual ~UDPOutputData(); - - virtual bool IsPingable() = 0; - - virtual void PrepareData(unsigned char* channelData /*,UDPOutputMessages& msgs*/) = 0; - virtual void PostPrepareData(unsigned char* channelData /*,UDPOutputMessages& msgs*/) { } - - int startChannel; - int channelCount; - IPAddress ipAddress; - - UDPOutputData(UDPOutputData const&) = delete; - void operator=(UDPOutputData const& x) = delete; - -protected: - // functions and settings to detect duplicate frames to avoid sending the same data as last time - void SaveFrame(unsigned char* channelData, int len); - bool NeedToOutputFrame(unsigned char* channelData, int startChannel, int savedIdx, int count); - bool deDuplicate = false; - int skippedFrames; - unsigned char* lastData; -}; - -// Art-Net - https://en.wikipedia.org/wiki/Art-Net -class ArtNetOutputData : public UDPOutputData { - // TODO -}; - -// Distributed Display Protocol (DDP) -class DDPOutputData : public UDPOutputData { -public: - explicit DDPOutputData(const JsonDocument& config); - virtual ~DDPOutputData(); - - virtual bool IsPingable() override { return true; } - virtual void PrepareData(unsigned char* channelData /*,UDPOutputMessages& msgs*/) override; -}; - -// E1.31 (Streaming-ACN) Protocol -class E131OutputData : public UDPOutputData { - // TODO -}; - -class UDPOutput { -public: - void AddOutput(UDPOutputData*); -}; -#endif // UPD_OUTPUT - -#endif \ No newline at end of file diff --git a/wled00/wled.h b/wled00/wled.h index a088199dd..af19b1eb0 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -149,7 +149,6 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument; #include "NodeStruct.h" #include "pin_manager.h" #include "bus_manager.h" -#include "udp.h" #ifndef CLIENT_SSID #define CLIENT_SSID DEFAULT_CLIENT_SSID