jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-04-25 15:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplemented WARLS

Browse Source
This commit is contained in:
cschwinne 2017-02-04 23:37:28 +01:00
parent 17d60ef9a0
commit d566c0b1a9
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wled00/wled07_notify.ino
View File

@ -15,7 +15,7 @@ void notify(uint8_t callMode)
default: return; default: return;
} }
byte udpOut[16]; byte udpOut[16];
udpOut[0] = 233; //233: wled notifier protocol 0-7: ARLS8 protocol 253: IRGB protocol 254: RGB protocol udpOut[0] = 0; //0: wled notifier protocol 1: WARLS protocol
udpOut[1] = callMode; udpOut[1] = callMode;
udpOut[2] = bri; udpOut[2] = bri;
udpOut[3] = col[0]; udpOut[3] = col[0];
@ -41,7 +41,7 @@ void handleNotifications()
if(packetSize && notifierUdp.remoteIP() != WiFi.localIP()) if(packetSize && notifierUdp.remoteIP() != WiFi.localIP())
{ {
notifierUdp.read(udpIn, packetSize); notifierUdp.read(udpIn, packetSize);
if (udpIn[0] == 233) //wled notifier if (udpIn[0] == 0) //wled notifier
{ {
col[0] = udpIn[3]; col[0] = udpIn[3];
col[1] = udpIn[4]; col[1] = udpIn[4];
@ -62,11 +62,21 @@ void handleNotifications()
bri = udpIn[2]; bri = udpIn[2];
colorUpdated(3); colorUpdated(3);
} }
} else if (udpIn[0] == 253) //irgb } else if (udpIn[0] == 1) //warls
{ {
if (packetSize > 1) {
if (udpIn[1] == 0)
{
arlsTimeout = false;
} else {
if (!arlsTimeout){
strip.setRange(0, LEDCOUNT-1, 0);
strip.setMode(0);
}
arlsTimeout = true; arlsTimeout = true;
arlsTimeoutTime = millis() + arlsTimeoutMillis; arlsTimeoutTime = millis() + 1000*udpIn[1];
for (int i = 1; i < packetSize -3; i += 4) }
for (int i = 2; i < packetSize -3; i += 4)
{ {
if (udpIn[i] < LEDCOUNT) if (udpIn[i] < LEDCOUNT)
if (useGammaCorrectionRGB) if (useGammaCorrectionRGB)
@ -76,30 +86,14 @@ void handleNotifications()
strip.setIndividual(udpIn[i], ((uint32_t)udpIn[i+1] << 16) | ((uint32_t)udpIn[i+2] << 8) | udpIn[i+3]); strip.setIndividual(udpIn[i], ((uint32_t)udpIn[i+1] << 16) | ((uint32_t)udpIn[i+2] << 8) | udpIn[i+3]);
} }
} }
} else if (udpIn[0] == 254) //rgb
{
arlsTimeout = true;
arlsTimeoutTime = millis() + arlsTimeoutMillis;
for (int i = 1; i < packetSize -3; i += 3)
{
strip.setIndividual(udpIn[i/3], ((uint32_t)gamma8[udpIn[i]] << 16) | ((uint32_t)gamma8[udpIn[i]] << 8) | gamma8[udpIn[i]]);
} }
} else //ARLS8 for now
{
if (useGammaCorrectionRGB)
{
strip.setColor(gamma8[udpIn[13]], gamma8[udpIn[14]], gamma8[udpIn[15]]);
} else
{
strip.setColor(udpIn[13], udpIn[14], udpIn[15]);
}
strip.trigger();
} }
} }
if (arlsTimeout && millis() > arlsTimeoutTime) if (arlsTimeout && millis() > arlsTimeoutTime)
{ {
strip.unlockAll(); strip.unlockAll();
arlsTimeout = false; arlsTimeout = false;
strip.setMode(effectCurrent);
} }
} }
} }