andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 19:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed again/ Now is nice!

Browse Source
This commit is contained in:
Andrey Klimov
2019-03-13 01:51:37 +03:00
parent 04caf6ffdf
commit 2f66491153
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lighthub/item.cpp
View File

@@ -574,9 +574,9 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
int whiteOffset=0;
int rgbsLimit =100; int rgbSaturation =map(Par[1], 0, 100, 0, 255);
int rgbvLevel =255; int rgbValue = map(Par[2], 0, 100, 0, 255);
switch (itemType) { switch (itemType) {
#ifdef _dmxout #ifdef _dmxout
@@ -589,14 +589,17 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
//50..100 RGB //50..100 RGB
{ {
int k; int k;
if (Par[2]<50) { // Using white if (Par[1]<50) { // Using white
DmxWrite(iaddr + 3, map((50 - Par[1]) * Par[2], 0, 5000, 0, 255)); DmxWrite(iaddr + 3, map((50 - Par[1]) * Par[2], 0, 5000, 0, 255));
rgbvLevel = map (Par[1],0,50,0,255); int rgbvLevel = map (Par[1],0,50,0,255*2);
rgbsLimit = Par[1]; rgbValue = map(Par[2], 0, 100, 0, rgbvLevel);
rgbSaturation = map(Par[1], 0, 50, 255, 100);
if (rgbValue>255) rgbValue = 255;
} }
else else
{ {
rgbsLimit=50; //rgbValue = map(Par[2], 0, 100, 0, 255);
rgbSaturation = map(Par[1], 50, 100, 100, 255);
DmxWrite(iaddr + 3, 0); DmxWrite(iaddr + 3, 0);
} }
//DmxWrite(iaddr + 3, k = map((100 - Par[1]) * Par[2], 0, 10000, 0, 255)); //DmxWrite(iaddr + 3, k = map((100 - Par[1]) * Par[2], 0, 10000, 0, 255));
@@ -604,7 +607,7 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int subItemN)
} }
case CH_RGB: // RGB case CH_RGB: // RGB
{ {
CRGB rgb = CHSV(map(Par[0], 0, 365, 0, 255), map(Par[1], 0, rgbsLimit, 0, 255), map(Par[2], 0, 100, 0, rgbvLevel)); CRGB rgb = CHSV(map(Par[0], 0, 365, 0, 255), rgbSaturation, rgbValue);
DmxWrite(iaddr, rgb.r); DmxWrite(iaddr, rgb.r);
DmxWrite(iaddr + 1, rgb.g); DmxWrite(iaddr + 1, rgb.g);
DmxWrite(iaddr + 2, rgb.b); DmxWrite(iaddr + 2, rgb.b);