lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for RGB and RGBW, fix bug where not enough data written

Browse Source
This commit is contained in:
Phil Bolduc 2021-09-20 15:21:19 -07:00
parent d1f4cdebf3
commit 83f4eeb3b5
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
wled00/udp.cpp
View File

@ -564,9 +564,10 @@ uint8_t* copyRgbwToRgb(uint8_t *destination, uint8_t *source, uint16_t length) {
// //
// client - the IP address to send to // client - the IP address to send to
// length - the number of pixels // length - the number of pixels
// rgbwData - a buffer of at least length*4 bytes long // buffer - a buffer of at least length*4 bytes long
// isRGBW - true if the buffer contains 4 components per pixel
// //
uint8_t realtimeBrodacast(IPAddress client, uint8_t *rgbwData, uint16_t length) { void realtimeBrodacast(IPAddress client, uint8_t *buffer, uint16_t length, bool isRGBW) {
WiFiUDP ddpUdp; WiFiUDP ddpUdp;
@ -578,25 +579,25 @@ uint8_t realtimeBrodacast(IPAddress client, uint8_t *rgbwData, uint16_t length)
} }
// allocatea buffer on the stack for the UDP packet // allocatea buffer on the stack for the UDP packet
uint8_t buffer[DDP_HEADER_LEN + DDP_CHANNELS_PER_PACKET] = { 0 }; uint8_t packet[DDP_HEADER_LEN + DDP_CHANNELS_PER_PACKET] = { 0 };
// set common header values // set common header values
buffer[0] = DDP_FLAGS1_VER1; packet[0] = DDP_FLAGS1_VER1;
buffer[2] = 1; packet[2] = 1;
buffer[3] = DDP_ID_DISPLAY; packet[3] = DDP_ID_DISPLAY;
// there are 3 channels per RGB pixel // there are 3 channels per RGB pixel
uint16_t channel = 0; // TODO: allow specifying the start channel uint16_t channel = 0; // TODO: allow specifying the start channel
for (uint16_t currentPacket = 0; currentPacket < packetCount; currentPacket++) { for (uint16_t currentPacket = 0; currentPacket < packetCount; currentPacket++) {
// how much data is after the header // the amount of data is AFTER the header
uint16_t packetSize = DDP_CHANNELS_PER_PACKET; uint16_t packetSize = DDP_CHANNELS_PER_PACKET;
if (currentPacket == (packetCount - 1)) { if (currentPacket == (packetCount - 1)) {
// last packet, set the push flag // last packet, set the push flag
// TODO: determine if we want to send an empty push packet to each destination after sending the pixel data // TODO: determine if we want to send an empty push packet to each destination after sending the pixel data
buffer[0] = DDP_FLAGS1_VER1 | DDP_FLAGS1_PUSH; packet[0] = DDP_FLAGS1_VER1 | DDP_FLAGS1_PUSH;
if (channelCount % DDP_CHANNELS_PER_PACKET) { if (channelCount % DDP_CHANNELS_PER_PACKET) {
packetSize = channelCount % DDP_CHANNELS_PER_PACKET; packetSize = channelCount % DDP_CHANNELS_PER_PACKET;
@ -604,24 +605,30 @@ uint8_t realtimeBrodacast(IPAddress client, uint8_t *rgbwData, uint16_t length)
} }
// data offset in bytes, 32-bit number, MSB first // data offset in bytes, 32-bit number, MSB first
buffer[4] = (channel & 0xFF000000) >> 24; packet[4] = (channel & 0xFF000000) >> 24;
buffer[5] = (channel & 0xFF0000) >> 16; packet[5] = (channel & 0xFF0000) >> 16;
buffer[6] = (channel & 0xFF00) >> 8; packet[6] = (channel & 0xFF00) >> 8;
buffer[7] = (channel & 0xFF); packet[7] = (channel & 0xFF);
// data length in bytes, 16-bit number, MSB first // data length in bytes, 16-bit number, MSB first
buffer[8] = (packetSize & 0xFF00) >> 8; packet[8] = (packetSize & 0xFF00) >> 8;
buffer[9] = packetSize & 0xFF; packet[9] = packetSize & 0xFF;
// copy the data from the source buffer into our pack if (isRGBW) {
rgbwData = copyRgbwToRgb(&buffer[DDP_HEADER_LEN], rgbwData, packetSize); // copy the data from the source buffer into our packet
buffer = copyRgbwToRgb(&packet[DDP_HEADER_LEN], buffer, packetSize);
ddpUdp.beginPacket(client, DDP_PORT); ddpUdp.beginPacket(client, DDP_PORT);
ddpUdp.write(buffer, packetSize); ddpUdp.write(packet, DDP_HEADER_LEN + packetSize);
ddpUdp.endPacket(); ddpUdp.endPacket();
} else {
// write the rgb values directly from the user supplied buffer
ddpUdp.beginPacket(client, DDP_PORT);
ddpUdp.write(packet, DDP_HEADER_LEN);
ddpUdp.write(buffer, packetSize);
ddpUdp.endPacket();
buffer += packetSize; // advance the buffer over the written bytes
}
channel += packetSize; channel += packetSize;
} }
}
return 0;
}

10
wled00/udp.h
View File

@ -26,14 +26,10 @@ void sendSysInfoUDP();
// Send real time DDP UDP updates to the specified client // Send real time DDP UDP updates to the specified client
// //
// client - the IP address to send to // client - the IP address to send to
// rgbwData - a buffer of at least length*4 bytes long // buffer - a buffer of at least length*3 or length*4 bytes long
// length - the number of pixels // length - the number of pixels
// // isRGBW - true if the buffer contains 4 components per pixel
// Returns void realtimeBrodacast(IPAddress client, uint8_t *buffer, uint16_t length, bool isRGBW);
// 0 - Ok
// 1 - could not allocate buffer
//
uint8_t realtimeBrodacast(IPAddress client, uint8_t *rgbwData, uint16_t length);
#define DDP_PORT 4048 #define DDP_PORT 4048