Public/esp32-sk6812
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Circumvent problems with UDP fragmentation

Browse source 
The ESP’s IP stack seems not to support UDP packet fragmentation and
drops such packets silently which is problematic for setups with many
LEDs and huge updates.

With this patch, the UDP server processes up to 3 full UDP packets per
frame, allowing much larger updates. Additionally, the new END_OF_UPDATE
flag allows to signal when a update sequence is finished. If this flag
is encountered, no further UDP packets are processed in the current
frame.
This commit is contained in:
Thomas Kolb 2020-04-14 21:03:39 +02:00
parent da37f32096
commit dc8bc98193
2 changed files with 71 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/UDPProto.h
View file

@ -12,6 +12,7 @@ public:
FADE_COLOUR = 1, FADE_COLOUR = 1,
ADD_COLOUR = 2, ADD_COLOUR = 2,
SET_FADESTEP = 3, SET_FADESTEP = 3,
END_OF_UPDATE = 254,
ACK_REQUEST = 255 ACK_REQUEST = 255
}; };
@ -24,6 +25,8 @@ public:
bool loop(void); bool loop(void);
private: private:
const static uint32_t MAX_PACKETS_PER_UPDATE = 3;
WiFiUDP m_udpServer; WiFiUDP m_udpServer;
Fader *m_fader; Fader *m_fader;
}; };

126
src/UDPProto.cpp
View file

@ -39,72 +39,82 @@ bool UDPProto::loop(void)
byte cmd[WS2801_CMD_LEN]; byte cmd[WS2801_CMD_LEN];
byte action, strip, module, r, g, b, w; byte action, strip, module, r, g, b, w;
int len; int len;
int packets_processed = 0;
bool done_something = false;
int32_t seq = -1; int32_t seq = -1;
int packetSize = m_udpServer.parsePacket(); while(packets_processed < MAX_PACKETS_PER_UPDATE) {
if(packetSize) int packetSize = m_udpServer.parsePacket();
{ if(packetSize)
// read the packet into packetBufffer {
while((len = m_udpServer.read(cmd, WS2801_CMD_LEN)) == WS2801_CMD_LEN) { // read the packet into packetBufffer
action = cmd[0]; while((len = m_udpServer.read(cmd, WS2801_CMD_LEN)) == WS2801_CMD_LEN) {
strip = cmd[1]; action = cmd[0];
module = cmd[2]; strip = cmd[1];
r = cmd[3]; module = cmd[2];
g = cmd[4]; r = cmd[3];
b = cmd[5]; g = cmd[4];
w = cmd[6]; b = cmd[5];
w = cmd[6];
Fader::Color color{r,g,b,w}; Fader::Color color{r,g,b,w};
if(strip >= m_fader->strips()) { if(strip >= m_fader->strips()) {
// strip index out of range // strip index out of range
continue; continue;
}
if(module >= m_fader->modules_per_strip()) {
// module index out of range
continue;
}
switch(action) {
case SET_COLOUR:
m_fader->set_color(strip, module, color);
break;
case FADE_COLOUR:
m_fader->fade_color(strip, module, color);
break;
case ADD_COLOUR:
m_fader->add_color(strip, module, color);
break;
case SET_FADESTEP:
m_fader->set_fadestep(r); // red channel contains the fadestep in this case
break;
case END_OF_UPDATE:
packets_processed = MAX_PACKETS_PER_UPDATE;
break;
case ACK_REQUEST:
seq = ((int32_t)r) << 8 | (int32_t)g;
default:
break;
}
}
// send a reply, to the IP address and port that sent us the packet we received
if(seq >= 0) {
uint8_t data[2];
data[0] = (seq >> 8) & 0xFF;
data[1] = seq & 0xFF;
m_udpServer.beginPacket(m_udpServer.remoteIP(), m_udpServer.remotePort());
m_udpServer.write(data, 2);
m_udpServer.endPacket();
} }
if(module >= m_fader->modules_per_strip()) { m_udpServer.flush();
// module index out of range
continue;
}
switch(action) { done_something = true;
case SET_COLOUR: } else {
m_fader->set_color(strip, module, color); break;
break;
case FADE_COLOUR:
m_fader->fade_color(strip, module, color);
break;
case ADD_COLOUR:
m_fader->add_color(strip, module, color);
break;
case SET_FADESTEP:
m_fader->set_fadestep(r); // red channel contains the fadestep in this case
break;
case ACK_REQUEST:
seq = ((int32_t)r) << 8 | (int32_t)g;
default:
break;
}
} }
// send a reply, to the IP address and port that sent us the packet we received
if(seq >= 0) {
uint8_t data[2];
data[0] = (seq >> 8) & 0xFF;
data[1] = seq & 0xFF;
m_udpServer.beginPacket(m_udpServer.remoteIP(), m_udpServer.remotePort());
m_udpServer.write(data, 2);
m_udpServer.endPacket();
}
m_udpServer.flush();
return true; // processed a packet
} else {
return false;
} }
return done_something;
} }