jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-24 03:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tertiary color to sync (#451)

Browse Source
This commit is contained in:
cschwinne 2019-12-13 14:14:36 +01:00
parent 0c9bcb2445
commit 9088d79390
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/wled00.ino
View File

@ -98,7 +98,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1912121 #define VERSION 1912131
char versionString[] = "0.9.0-b1"; char versionString[] = "0.9.0-b1";

21
wled00/wled07_notify.ino
View File

@ -38,7 +38,7 @@ void notify(byte callMode, bool followUp=false)
//0: old 1: supports white 2: supports secondary color //0: old 1: supports white 2: supports secondary color
//3: supports FX intensity, 24 byte packet 4: supports transitionDelay 5: sup palette //3: supports FX intensity, 24 byte packet 4: supports transitionDelay 5: sup palette
//6: supports timebase syncing, 29 byte packet 7: supports tertiary color //6: supports timebase syncing, 29 byte packet 7: supports tertiary color
udpOut[11] = 6; udpOut[11] = 7;
udpOut[12] = colSec[0]; udpOut[12] = colSec[0];
udpOut[13] = colSec[1]; udpOut[13] = colSec[1];
udpOut[14] = colSec[2]; udpOut[14] = colSec[2];
@ -47,10 +47,12 @@ void notify(byte callMode, bool followUp=false)
udpOut[17] = (transitionDelay >> 0) & 0xFF; udpOut[17] = (transitionDelay >> 0) & 0xFF;
udpOut[18] = (transitionDelay >> 8) & 0xFF; udpOut[18] = (transitionDelay >> 8) & 0xFF;
udpOut[19] = effectPalette; udpOut[19] = effectPalette;
/*udpOut[20] = colTer[0]; uint32_t colTer = strip.getSegment(strip.getMainSegmentId()).colors[2];
udpOut[21] = colTer[1]; udpOut[20] = (t >> 16) & 0xFF;
udpOut[22] = colTer[2]; udpOut[21] = (t >> 8) & 0xFF;
udpOut[23] = colTer[3];*/ udpOut[22] = (t >> 0) & 0xFF;
udpOut[23] = (t >> 24) & 0xFF;
udpOut[24] = followUp; udpOut[24] = followUp;
uint32_t t = millis() + strip.timebase; uint32_t t = millis() + strip.timebase;
udpOut[25] = (t >> 24) & 0xFF; udpOut[25] = (t >> 24) & 0xFF;
@ -196,13 +198,10 @@ void handleNotifications()
t -= millis(); t -= millis();
strip.timebase = t; strip.timebase = t;
} }
/*if (udpIn[11] > 6) if (udpIn[11] > 6)
{ {
colTer[0] = udpIn[20]; strip.setColor(2, udpIn[20], udpIn[21], udpIn[22], udpIn[23]); //tertiary color
colTer[1] = udpIn[21]; }
colTer[2] = udpIn[22];
colSec[3] = udpIn[23];
}*/
} }
} }