jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-28 13:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pixel grouping support, configurable through JSON API. It probably breaks cronixie.

Browse Source
This commit is contained in:
Warren Spits 2019-11-27 08:41:17 +11:00
parent 4ffeb05120
commit 2c3cad6e61
5 changed files with 63 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX.h
View File

@ -187,6 +187,7 @@ class WS2812FX {
uint8_t intensity; uint8_t intensity;
uint8_t palette; uint8_t palette;
uint8_t mode; uint8_t mode;
uint8_t grouping;
uint8_t options; //bit pattern: msb first: transitional tbd tbd tbd tbd paused reverse selected uint8_t options; //bit pattern: msb first: transitional tbd tbd tbd tbd paused reverse selected
uint8_t group, spacing; uint8_t group, spacing;
uint8_t opacity; uint8_t opacity;
@ -331,7 +332,7 @@ class WS2812FX {
} }
void void
init(bool supportWhite, uint16_t countPixels, bool skipFirs, uint8_t disableNLeds), init(bool supportWhite, uint16_t countPixels, uint8_t grouping, uint8_t disableNLeds, bool skipFirst),
service(void), service(void),
blur(uint8_t), blur(uint8_t),
fade_out(uint8_t r), fade_out(uint8_t r),
@ -351,7 +352,7 @@ class WS2812FX {
unlockAll(void), unlockAll(void),
setTransitionMode(bool t), setTransitionMode(bool t),
trigger(void), trigger(void),
setSegment(uint8_t n, uint16_t start, uint16_t stop), setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t grouping),
resetSegments(), resetSegments(),
setPixelColor(uint16_t n, uint32_t c), setPixelColor(uint16_t n, uint32_t c),
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0), setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0),
@ -372,6 +373,7 @@ class WS2812FX {
colorOrder = 0, colorOrder = 0,
milliampsPerLed = 55, milliampsPerLed = 55,
_disableNLeds = 0, _disableNLeds = 0,
_grouping = 1,
getBrightness(void), getBrightness(void),
getMode(void), getMode(void),
getSpeed(void), getSpeed(void),
@ -508,7 +510,7 @@ class WS2812FX {
CRGBPalette16 targetPalette; CRGBPalette16 targetPalette;
uint32_t now; uint32_t now;
uint16_t _length, _lengthRaw, _usableCount; uint16_t _length, _lengthRaw;
uint16_t _rand16seed; uint16_t _rand16seed;
uint8_t _brightness; uint8_t _brightness;

101
wled00/FX_fcn.cpp
View File

@ -30,24 +30,14 @@
#define LED_SKIP_AMOUNT 1 #define LED_SKIP_AMOUNT 1
#define MIN_SHOW_DELAY 15 #define MIN_SHOW_DELAY 15
void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst, uint8_t disableNLeds) void WS2812FX::init(bool supportWhite, uint16_t countPixels, uint8_t grouping, uint8_t disableNLeds, bool skipFirst)
{ {
if (supportWhite == _rgbwMode && countPixels == _length && _locked != NULL && disableNLeds == _disableNLeds) return; if (supportWhite == _rgbwMode && countPixels == _length && _locked != NULL && grouping == _grouping && disableNLeds == _disableNLeds) return;
RESET_RUNTIME; RESET_RUNTIME;
_rgbwMode = supportWhite; _rgbwMode = supportWhite;
_skipFirstMode = skipFirst; _skipFirstMode = skipFirst;
_length = countPixels; _length = countPixels;
_grouping = grouping;
if (disableNLeds > 0) {
uint16_t groupCount = disableNLeds +1;
//since 1st led is lit, even partial group has a led lit, whereas int division truncates decimal.
bool hasExtraLight = _length % groupCount != 0;
_usableCount = _length/groupCount;
_usableCount += hasExtraLight ? 1 : 0;
} else {
_usableCount = _length;
}
_disableNLeds = disableNLeds; _disableNLeds = disableNLeds;
uint8_t ty = 1; uint8_t ty = 1;
@ -63,12 +53,17 @@ void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst, uin
_locked = new byte[_length]; _locked = new byte[_length];
_segments[0].start = 0; _segments[0].start = 0;
_segments[0].stop = _usableCount; _segments[0].stop = getUsableCount();
unlockAll(); unlockAll();
setBrightness(_brightness); setBrightness(_brightness);
} }
uint16_t WS2812FX::getUsableCount() {
uint16_t totalGroup = _grouping + _disableNLeds;
return (_length + totalGroup -1) / totalGroup;
}
void WS2812FX::service() { void WS2812FX::service() {
uint32_t nowUp = millis(); // Be aware, millis() rolls over every 49 days uint32_t nowUp = millis(); // Be aware, millis() rolls over every 49 days
now = nowUp + timebase; now = nowUp + timebase;
@ -114,29 +109,40 @@ void WS2812FX::setPixelColor(uint16_t n, uint32_t c) {
void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w) void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
{ {
i = i * (_disableNLeds+1);
if (_locked[i] && !_modeUsesLock) return; if (_locked[i] && !_modeUsesLock) return;
if (IS_REVERSE) i = SEGMENT.stop -1 -i + SEGMENT.start; //reverse just individual segment
byte tmpg = g; RgbwColor color;
color.W = w;
switch (colorOrder) //0 = Grb, default switch (colorOrder) //0 = Grb, default
{ {
case 0: break; //0 = Grb, default case 0: color.G = g; color.R = r; color.B = b; break; // 0 = GRB
case 1: g = r; r = tmpg; break; //1 = Rgb, common for WS2811 case 1: color.G = r; color.R = g; color.B = b; break; // 1 = RGB, common for WS2811
case 2: g = b; b = tmpg; break; //2 = Brg case 2: color.G = b; color.R = r; color.B = g; break; // 2 = BRG
case 3: g = b; b = r; r = tmpg; //3 = Rbg case 3: color.G = r; color.R = b; color.B = g; break; // 3 = RBG
} }
if (!_cronixieMode) if (!_cronixieMode)
{ {
if (reverseMode) i = _length -1 -i; uint16_t totalGroup = SEGMENT.grouping + _disableNLeds;
if (_skipFirstMode) uint16_t iMax = (SEGMENT.stop - SEGMENT.start) * totalGroup;
int16_t iGroup = (i - SEGMENT.start) * totalGroup;
/* reverse just an individual segment */
int16_t realIndex;
if IS_REVERSE
realIndex = SEGMENT.stop - iGroup -1;
else
realIndex = SEGMENT.start + iGroup;
/* Reverse the whole string */
if (reverseMode) realIndex = _length - 1 - realIndex;
/* Set all the pixels in the group, ensuring _skipFirstMode is honored */
{ {
if (i < LED_SKIP_AMOUNT) bus->SetPixelColor(i, RgbwColor(0,0,0,0)); bool reversed = reverseMode ^ IS_REVERSE;
i += LED_SKIP_AMOUNT; uint16_t skip = _skipFirstMode ? LED_SKIP_AMOUNT : 0;
} for (uint8_t l = 0; l < totalGroup; l++) {
if (i < _lengthRaw) bus->SetPixelColor(i, RgbwColor(r,g,b,w)); int16_t indexSet = realIndex + (reversed ? -l : l);
if (_disableNLeds > 0) { if (indexSet >= SEGMENT.start && (indexSet < SEGMENT.start + iMax))
for(uint16_t offCount=0; offCount < _disableNLeds; offCount++) { bus->SetPixelColor(indexSet + skip, l < SEGMENT.grouping ? color : RgbwColor(0, 0, 0, 0));
if (i < _lengthRaw) bus->SetPixelColor((i + offCount + 1), RgbwColor(0,0,0,0));
} }
} }
} else { } else {
@ -162,16 +168,16 @@ void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
if (_skipFirstMode) o += LED_SKIP_AMOUNT; if (_skipFirstMode) o += LED_SKIP_AMOUNT;
switch(_cronixieDigits[i]) switch(_cronixieDigits[i])
{ {
case 0: bus->SetPixelColor(o+5, RgbwColor(r,g,b,w)); break; case 0: bus->SetPixelColor(o+5, color); break;
case 1: bus->SetPixelColor(o+0, RgbwColor(r,g,b,w)); break; case 1: bus->SetPixelColor(o+0, color); break;
case 2: bus->SetPixelColor(o+6, RgbwColor(r,g,b,w)); break; case 2: bus->SetPixelColor(o+6, color); break;
case 3: bus->SetPixelColor(o+1, RgbwColor(r,g,b,w)); break; case 3: bus->SetPixelColor(o+1, color); break;
case 4: bus->SetPixelColor(o+7, RgbwColor(r,g,b,w)); break; case 4: bus->SetPixelColor(o+7, color); break;
case 5: bus->SetPixelColor(o+2, RgbwColor(r,g,b,w)); break; case 5: bus->SetPixelColor(o+2, color); break;
case 6: bus->SetPixelColor(o+8, RgbwColor(r,g,b,w)); break; case 6: bus->SetPixelColor(o+8, color); break;
case 7: bus->SetPixelColor(o+3, RgbwColor(r,g,b,w)); break; case 7: bus->SetPixelColor(o+3, color); break;
case 8: bus->SetPixelColor(o+9, RgbwColor(r,g,b,w)); break; case 8: bus->SetPixelColor(o+9, color); break;
case 9: bus->SetPixelColor(o+4, RgbwColor(r,g,b,w)); break; case 9: bus->SetPixelColor(o+4, color); break;
} }
} }
} }
@ -442,18 +448,14 @@ WS2812FX::Segment* WS2812FX::getSegments(void) {
return _segments; return _segments;
} }
uint16_t WS2812FX::getUsableCount(void) {
return _usableCount;
}
uint32_t WS2812FX::getLastShow(void) { uint32_t WS2812FX::getLastShow(void) {
return _lastShow; return _lastShow;
} }
void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2) { void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping) {
if (n >= MAX_NUM_SEGMENTS) return; if (n >= MAX_NUM_SEGMENTS) return;
Segment& seg = _segments[n]; Segment& seg = _segments[n];
if (seg.start == i1 && seg.stop == i2) return; if (seg.start == i1 && seg.stop == i2 && seg.grouping == grouping) return;
if (seg.isActive() && modeUsesLock(seg.mode)) if (seg.isActive() && modeUsesLock(seg.mode))
{ {
_modeUsesLock = false; _modeUsesLock = false;
@ -465,9 +467,11 @@ void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2) {
{ {
seg.stop = 0; return; seg.stop = 0; return;
} }
if (grouping > 0) seg.grouping = grouping;
if (i1 < _length) seg.start = i1; if (i1 < _length) seg.start = i1;
uint16_t maxStop = (_length - seg.start) / seg.grouping;
seg.stop = i2; seg.stop = i2;
if (i2 > _length) seg.stop = _length; if (i2 > maxStop) seg.stop = maxStop;
_segment_runtimes[n].reset(); _segment_runtimes[n].reset();
} }
@ -479,8 +483,9 @@ void WS2812FX::resetSegments() {
_segments[0].colors[0] = DEFAULT_COLOR; _segments[0].colors[0] = DEFAULT_COLOR;
_segments[0].start = 0; _segments[0].start = 0;
_segments[0].speed = DEFAULT_SPEED; _segments[0].speed = DEFAULT_SPEED;
_segments[0].stop = _length; _segments[0].stop = getUsableCount();
_segments[0].setOption(0, 1); //select _segments[0].setOption(0, 1); //select
_segments[0].grouping = _grouping;
} }
void WS2812FX::setIndividual(uint16_t i, uint32_t col) void WS2812FX::setIndividual(uint16_t i, uint32_t col)

4
wled00/wled03_set.ino
View File

@ -274,7 +274,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
} }
if (subPage != 6 || !doReboot) saveSettingsToEEPROM(); //do not save if factory reset if (subPage != 6 || !doReboot) saveSettingsToEEPROM(); //do not save if factory reset
if (subPage == 2) { if (subPage == 2) {
strip.init(useRGBW,ledCount,skipFirstLed,disableNLeds); strip.init(useRGBW,ledCount,1,disableNLeds,skipFirstLed);
} }
if (subPage == 4) alexaInit(); if (subPage == 4) alexaInit();
} }
@ -375,7 +375,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req)
if (pos > 0) { if (pos > 0) {
stopI = getNumVal(&req, pos); stopI = getNumVal(&req, pos);
} }
strip.setSegment(main, startI, stopI); strip.setSegment(main, startI, stopI, 1);
main = strip.getMainSegmentId(); main = strip.getMainSegmentId();

2
wled00/wled05_init.ino
View File

@ -30,7 +30,7 @@ void wledInit()
DEBUG_PRINT("heap "); DEBUG_PRINT("heap ");
DEBUG_PRINTLN(ESP.getFreeHeap()); DEBUG_PRINTLN(ESP.getFreeHeap());
strip.init(EEPROM.read(372),ledCount,EEPROM.read(2204),disableNLeds); //init LEDs quickly strip.init(EEPROM.read(372),ledCount,1,disableNLeds,EEPROM.read(2204)); //init LEDs quickly
strip.setBrightness(0); strip.setBrightness(0);
DEBUG_PRINT("LEDs inited. heap usage ~"); DEBUG_PRINT("LEDs inited. heap usage ~");

3
wled00/wled19_json.ino
View File

@ -15,7 +15,7 @@ void deserializeSegment(JsonObject elem, byte it)
uint16_t len = elem["len"]; uint16_t len = elem["len"];
stop = (len > 0) ? start + len : seg.stop; stop = (len > 0) ? start + len : seg.stop;
} }
strip.setSegment(id, start, stop); strip.setSegment(id, start, stop, 1);
JsonArray colarr = elem["col"]; JsonArray colarr = elem["col"];
if (!colarr.isNull()) if (!colarr.isNull())
@ -177,6 +177,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id)
root["ix"] = seg.intensity; root["ix"] = seg.intensity;
root["pal"] = seg.palette; root["pal"] = seg.palette;
root["sel"] = seg.isSelected(); root["sel"] = seg.isSelected();
root["grp"] = seg.grouping;
root["rev"] = seg.getOption(1); root["rev"] = seg.getOption(1);
} }