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

Fix addEffect()

Browse Source
This commit is contained in:
Blaž Kristan 2022-08-08 10:21:11 +02:00
parent a8785570df
commit acb17dc575
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wled00/FX.cpp
View File

@ -7254,29 +7254,34 @@ static const char _data_FX_MODE_2DAKEMI[] PROGMEM = "Akemi@Color speed,Dance;Hea
// mode data // mode data
static const char _data_RESERVED[] PROGMEM = "Reserved"; static const char _data_RESERVED[] PROGMEM = "Reserved";
// add (or replace reserved) effect mode and data into vector
// use id==255 to find unallocatd gaps (with "Reserved" data string)
// if vector size() is smaller than id (single) data is appended at the end (regardless of id)
void WS2812FX::addEffect(uint8_t id, mode_ptr mode_fn, const char *mode_name) { void WS2812FX::addEffect(uint8_t id, mode_ptr mode_fn, const char *mode_name) {
/* if (id == 255) { // find empty slot
if (id == 255) { for (int i=1; i<_modeCount; i++) if (_mode[i] == &mode_static) { id = i; break; } } // find empty slot for (int i=1; i<_mode.size(); i++) if (_modeData[i] == _data_RESERVED) { id = i; break; }
if (id < _modeCount) {
if (_mode[id] != &mode_static) return; // do not overwrite alerady added effect
_mode[id] = mode_fn;
_modeData[id] = mode_name;
} }
*/ if (id < _mode.size()) {
if (id >= _mode.size()) { if (_modeData[id] != _data_RESERVED) return; // do not overwrite alerady added effect
_mode[id] = mode_fn;
_modeData[id] = mode_name;
} else {
_mode.push_back(mode_fn); _mode.push_back(mode_fn);
_modeData.push_back(mode_name); _modeData.push_back(mode_name);
} else { if (_modeCount < _mode.size()) _modeCount++;
_mode.insert(_mode.begin()+id, mode_fn);
_modeData.insert(_modeData.begin()+id, mode_name);
} }
} }
void WS2812FX::setupEffectData() { void WS2812FX::setupEffectData() {
// Solid must be first! (assuming vector is empty upon call to setup)
_mode.push_back(&mode_static);
_modeData.push_back(_data_FX_MODE_STATIC);
// fill reserved word in case there will be any gaps in the array // fill reserved word in case there will be any gaps in the array
for (int i=0; i<_modeCount; i++) { _mode[i] = &mode_static; _modeData[i] = _data_RESERVED; } for (int i=1; i<_modeCount; i++) {
//addEffect(FX_MODE_..., &mode_fcn, _data_FX_MODE_...); _mode.push_back(&mode_static);
addEffect(FX_MODE_STATIC, &mode_static, _data_FX_MODE_STATIC); _modeData.push_back(_data_RESERVED);
}
// now replace all pre-allocated effects
addEffect(FX_MODE_BLINK, &mode_blink, _data_FX_MODE_BLINK); addEffect(FX_MODE_BLINK, &mode_blink, _data_FX_MODE_BLINK);
addEffect(FX_MODE_COLOR_WIPE, &mode_color_wipe, _data_FX_MODE_COLOR_WIPE); addEffect(FX_MODE_COLOR_WIPE, &mode_color_wipe, _data_FX_MODE_COLOR_WIPE);
addEffect(FX_MODE_COLOR_WIPE_RANDOM, &mode_color_wipe_random, _data_FX_MODE_COLOR_WIPE_RANDOM); addEffect(FX_MODE_COLOR_WIPE_RANDOM, &mode_color_wipe_random, _data_FX_MODE_COLOR_WIPE_RANDOM);

6
wled00/FX.h
View File

@ -725,9 +725,9 @@ class WS2812FX { // 96 bytes
_mainSegment(0) _mainSegment(0)
{ {
WS2812FX::instance = this; WS2812FX::instance = this;
_mode.reserve(_modeCount); // allocate memory to prevent initial fragmentation _mode.reserve(_modeCount); // allocate memory to prevent initial fragmentation (does not increase size())
_modeData.reserve(_modeCount); // allocate memory to prevent initial fragmentation _modeData.reserve(_modeCount); // allocate memory to prevent initial fragmentation (does not increase size())
if (_mode.capacity() <= 1 || _modeData.capacity() <= 1) _modeCount = 1; if (_mode.capacity() <= 1 || _modeData.capacity() <= 1) _modeCount = 1; // memory allocation failed only show Solid
else setupEffectData(); else setupEffectData();
} }