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

Merge branch 'Aircoookie:main' into task-fixing-comments-in-pin_manager-header

Browse Source
This commit is contained in:
Maximilian Mewes 2022-12-28 01:53:12 +01:00 committed by GitHub
commit 379c6045b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1985 additions and 1978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usermods/mpu6050_imu/usermod_mpu6050_imu.h
View File

@ -138,7 +138,7 @@ class MPU6050Driver : public Usermod {
// (if it's going to break, usually the code will be 1) // (if it's going to break, usually the code will be 1)
DEBUG_PRINT(F("DMP Initialization failed (code ")); DEBUG_PRINT(F("DMP Initialization failed (code "));
DEBUG_PRINT(devStatus); DEBUG_PRINT(devStatus);
DEBUG_PRINTLN(F(")")); DEBUG_PRINTLN(")");
} }
} }

85
usermods/sht/usermod_sht.h
View File

@ -26,9 +26,8 @@ class ShtUsermod : public Usermod
const byte shtI2cAddress = 0x44; // i2c address of the sensor. 0x44 is the default for all SHT sensors. Change this, if needed const byte shtI2cAddress = 0x44; // i2c address of the sensor. 0x44 is the default for all SHT sensors. Change this, if needed
unsigned long shtLastTimeUpdated = 0; // Remembers when we read data the last time unsigned long shtLastTimeUpdated = 0; // Remembers when we read data the last time
bool shtDataRequested = false; // Reading data is done async. This remembers if we asked the sensor to read data bool shtDataRequested = false; // Reading data is done async. This remembers if we asked the sensor to read data
float shtCurrentTempC = 0; // Last read temperature in Celsius float shtCurrentTempC = 0.0f; // Last read temperature in Celsius
float shtCurrentTempF = 0; // Last read temperature in Fahrenheit float shtCurrentHumidity = 0.0f; // Last read humidity in RH%
float shtCurrentHumidity = 0; // Last read humidity in RH%
void initShtTempHumiditySensor(); void initShtTempHumiditySensor();
@ -56,18 +55,22 @@ class ShtUsermod : public Usermod
bool readFromConfig(JsonObject &root); bool readFromConfig(JsonObject &root);
void addToJsonInfo(JsonObject& root); void addToJsonInfo(JsonObject& root);
float getTemperatureC(); bool isEnabled() { return enabled; }
float getTemperatureF();
float getHumidity(); float getTemperature();
float getTemperatureC() { return shtCurrentTempC; }
float getTemperatureF() { return (shtCurrentTempC * 1.8f) + 32.0f; }
float getHumidity() { return shtCurrentHumidity; }
const char* getUnitString();
uint16_t getId() { return USERMOD_ID_SHT; } uint16_t getId() { return USERMOD_ID_SHT; }
}; };
// Strings to reduce flash memory usage (used more than twice) // Strings to reduce flash memory usage (used more than twice)
const char ShtUsermod::_name[] PROGMEM = "SHT-Sensor"; const char ShtUsermod::_name[] PROGMEM = "SHT-Sensor";
const char ShtUsermod::_enabled[] PROGMEM = "Enabled"; const char ShtUsermod::_enabled[] PROGMEM = "Enabled";
const char ShtUsermod::_shtType[] PROGMEM = "SHT-Type"; const char ShtUsermod::_shtType[] PROGMEM = "SHT-Type";
const char ShtUsermod::_unitOfTemp[] PROGMEM = "Unit"; const char ShtUsermod::_unitOfTemp[] PROGMEM = "Unit";
const char ShtUsermod::_haMqttDiscovery[] PROGMEM = "Add-To-HA-MQTT-Discovery"; const char ShtUsermod::_haMqttDiscovery[] PROGMEM = "Add-To-HA-MQTT-Discovery";
/** /**
@ -90,7 +93,6 @@ void ShtUsermod::initShtTempHumiditySensor()
shtTempHumidSensor->begin(shtI2cAddress, i2c_sda, i2c_scl); shtTempHumidSensor->begin(shtI2cAddress, i2c_sda, i2c_scl);
if (shtTempHumidSensor->readStatus() == 0xFFFF) { if (shtTempHumidSensor->readStatus() == 0xFFFF) {
DEBUG_PRINTF("[%s] SHT init failed!\n", _name); DEBUG_PRINTF("[%s] SHT init failed!\n", _name);
cleanupShtTempHumiditySensor();
cleanup(); cleanup();
return; return;
} }
@ -107,12 +109,8 @@ void ShtUsermod::initShtTempHumiditySensor()
*/ */
void ShtUsermod::cleanupShtTempHumiditySensor() void ShtUsermod::cleanupShtTempHumiditySensor()
{ {
if (isShtReady()) { if (isShtReady()) shtTempHumidSensor->reset();
shtTempHumidSensor->reset();
}
delete shtTempHumidSensor; delete shtTempHumidSensor;
shtInitDone = false; shtInitDone = false;
} }
@ -126,9 +124,7 @@ void ShtUsermod::cleanupShtTempHumiditySensor()
*/ */
void ShtUsermod::cleanup() void ShtUsermod::cleanup()
{ {
if (isShtReady()) { cleanupShtTempHumiditySensor();
cleanupShtTempHumiditySensor();
}
if (pinAllocDone) { if (pinAllocDone) {
PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } }; PinManagerPinType pins[2] = { { i2c_sda, true }, { i2c_scl, true } };
@ -162,9 +158,9 @@ void ShtUsermod::publishTemperatureAndHumidityViaMqtt() {
char buf[128]; char buf[128];
snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic); snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic);
mqtt->publish(buf, 0, false, String((unitOfTemp ? getTemperatureF() : getTemperatureC())).c_str()); mqtt->publish(buf, 0, false, String(getTemperature()).c_str());
snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic); snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic);
mqtt->publish(buf, 0, false, String(shtCurrentHumidity).c_str()); mqtt->publish(buf, 0, false, String(getHumidity()).c_str());
} }
/** /**
@ -191,7 +187,7 @@ void ShtUsermod::publishHomeAssistantAutodiscovery() {
json[F("stat_cla")] = F("measurement"); json[F("stat_cla")] = F("measurement");
snprintf_P(buf, 127, PSTR("%s-temperature"), escapedMac.c_str()); snprintf_P(buf, 127, PSTR("%s-temperature"), escapedMac.c_str());
json[F("uniq_id")] = buf; json[F("uniq_id")] = buf;
json[F("unit_of_meas")] = F("°C"); json[F("unit_of_meas")] = unitOfTemp ? F("°F") : F("°C");
appendDeviceToMqttDiscoveryMessage(json); appendDeviceToMqttDiscoveryMessage(json);
payload_size = serializeJson(json, json_str); payload_size = serializeJson(json, json_str);
snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-temperature/config"), escapedMac.c_str(), escapedMac.c_str()); snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-temperature/config"), escapedMac.c_str(), escapedMac.c_str());
@ -222,7 +218,7 @@ void ShtUsermod::publishHomeAssistantAutodiscovery() {
* @return void * @return void
*/ */
void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) { void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) {
JsonObject device = root.createNestedObject("dev"); JsonObject device = root.createNestedObject(F("dev"));
device[F("ids")] = escapedMac.c_str(); device[F("ids")] = escapedMac.c_str();
device[F("name")] = serverDescription; device[F("name")] = serverDescription;
device[F("sw")] = versionString; device[F("sw")] = versionString;
@ -290,13 +286,11 @@ void ShtUsermod::loop()
if (shtTempHumidSensor->dataReady()) { if (shtTempHumidSensor->dataReady()) {
if (shtTempHumidSensor->readData(false)) { if (shtTempHumidSensor->readData(false)) {
shtCurrentTempC = shtTempHumidSensor->getTemperature(); shtCurrentTempC = shtTempHumidSensor->getTemperature();
shtCurrentTempF = shtTempHumidSensor->getFahrenheit();
shtCurrentHumidity = shtTempHumidSensor->getHumidity(); shtCurrentHumidity = shtTempHumidSensor->getHumidity();
publishTemperatureAndHumidityViaMqtt(); publishTemperatureAndHumidityViaMqtt();
shtReadDataSuccess = true; shtReadDataSuccess = true;
} } else {
else {
shtReadDataSuccess = false; shtReadDataSuccess = false;
} }
@ -387,6 +381,7 @@ bool ShtUsermod::readFromConfig(JsonObject &root)
bool oldEnabled = enabled; bool oldEnabled = enabled;
byte oldShtType = shtType; byte oldShtType = shtType;
byte oldUnitOfTemp = unitOfTemp;
bool oldHaMqttDiscovery = haMqttDiscovery; bool oldHaMqttDiscovery = haMqttDiscovery;
getJsonValue(top[FPSTR(_enabled)], enabled); getJsonValue(top[FPSTR(_enabled)], enabled);
@ -410,6 +405,11 @@ bool ShtUsermod::readFromConfig(JsonObject &root)
initShtTempHumiditySensor(); initShtTempHumiditySensor();
} }
if (oldUnitOfTemp != unitOfTemp) {
publishTemperatureAndHumidityViaMqtt();
publishHomeAssistantAutodiscovery();
}
if (oldHaMqttDiscovery != haMqttDiscovery && haMqttDiscovery) { if (oldHaMqttDiscovery != haMqttDiscovery && haMqttDiscovery) {
publishHomeAssistantAutodiscovery(); publishHomeAssistantAutodiscovery();
} }
@ -448,45 +448,34 @@ void ShtUsermod::addToJsonInfo(JsonObject& root)
if (shtLastTimeUpdated == 0) { if (shtLastTimeUpdated == 0) {
jsonTemp.add(F(" Not read yet")); jsonTemp.add(F(" Not read yet"));
jsonHumidity.add(F(" Not read yet")); jsonHumidity.add(F(" Not read yet"));
} } else {
else {
jsonTemp.add(F(" Error")); jsonTemp.add(F(" Error"));
jsonHumidity.add(F(" Error")); jsonHumidity.add(F(" Error"));
} }
return; return;
} }
jsonHumidity.add(shtCurrentHumidity); jsonHumidity.add(getHumidity());
jsonHumidity.add(F(" RH")); jsonHumidity.add(F(" RH"));
unitOfTemp ? jsonTemp.add(getTemperatureF()) : jsonTemp.add(getTemperatureC()); jsonTemp.add(getTemperature());
unitOfTemp ? jsonTemp.add(F(" °F")) : jsonTemp.add(F(" °C")); jsonTemp.add(unitOfTemp ? "°F" : "°C");
} }
/** /**
* Getter for last read temperature in Celsius. * Getter for last read temperature for configured unit.
* *
* @return float * @return float
*/ */
float ShtUsermod::getTemperatureC() { float ShtUsermod::getTemperature() {
return shtCurrentTempC; return unitOfTemp ? getTemperatureF() : getTemperatureC();
} }
/** /**
* Getter for last read temperature in Fahrenheit. * Returns the current configured unit as human readable string.
* *
* @return float * @return const char*
*/ */
float ShtUsermod::getTemperatureF() { const char* ShtUsermod::getUnitString() {
return shtCurrentTempF; return unitOfTemp ? "°F" : "°C";
}
/**
* Getter for last read humidity in RH%.
*
* @return float
*/
float ShtUsermod::getHumidity() {
return shtCurrentHumidity;
} }

8
wled00/FX.cpp
View File

@ -2351,7 +2351,7 @@ static const char _data_FX_MODE_METEOR_SMOOTH[] PROGMEM = "Meteor Smooth@!,Trail
//Railway Crossing / Christmas Fairy lights //Railway Crossing / Christmas Fairy lights
uint16_t mode_railway() uint16_t mode_railway()
{ {
uint16_t dur = 40 + (255 - SEGMENT.speed) * 10; uint16_t dur = (256 - SEGMENT.speed) * 40;
uint16_t rampdur = (dur * SEGMENT.intensity) >> 8; uint16_t rampdur = (dur * SEGMENT.intensity) >> 8;
if (SEGENV.step > dur) if (SEGENV.step > dur)
{ {
@ -2368,16 +2368,16 @@ uint16_t mode_railway()
if (SEGENV.aux0) pos = 255 - pos; if (SEGENV.aux0) pos = 255 - pos;
for (int i = 0; i < SEGLEN; i += 2) for (int i = 0; i < SEGLEN; i += 2)
{ {
SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(255 - pos, false, false, 255)); SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(255 - pos, false, false, 255)); // do not use color 1 or 2, always use palette
if (i < SEGLEN -1) if (i < SEGLEN -1)
{ {
SEGMENT.setPixelColor(i + 1, SEGMENT.color_from_palette(pos, false, false, 255)); SEGMENT.setPixelColor(i + 1, SEGMENT.color_from_palette(pos, false, false, 255)); // do not use color 1 or 2, always use palette
} }
} }
SEGENV.step += FRAMETIME; SEGENV.step += FRAMETIME;
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_RAILWAY[] PROGMEM = "Railway@!,Smoothness;;!"; static const char _data_FX_MODE_RAILWAY[] PROGMEM = "Railway@!,Smoothness;1,2;!";
//Water ripple //Water ripple

1
wled00/FX.h
View File

@ -504,6 +504,7 @@ typedef struct Segment {
static uint16_t getUsedSegmentData(void) { return _usedSegmentData; } static uint16_t getUsedSegmentData(void) { return _usedSegmentData; }
static void addUsedSegmentData(int len) { _usedSegmentData += len; } static void addUsedSegmentData(int len) { _usedSegmentData += len; }
void set(uint16_t i1, uint16_t i2, uint8_t grp=1, uint8_t spc=0, uint16_t ofs=UINT16_MAX, uint16_t i1Y=0, uint16_t i2Y=1);
bool setColor(uint8_t slot, uint32_t c); //returns true if changed bool setColor(uint8_t slot, uint32_t c); //returns true if changed
void setCCT(uint16_t k); void setCCT(uint16_t k);
void setOpacity(uint8_t o); void setOpacity(uint8_t o);

32
wled00/FX_2Dfcn.cpp
View File

@ -41,23 +41,29 @@ void WS2812FX::setUpMatrix() {
customMappingTable = nullptr; customMappingTable = nullptr;
customMappingSize = 0; customMappingSize = 0;
// important if called from set.cpp, irrelevant if called from cfg.cpp
// fix limits if not a matrix set-up (no finalizeInit() called from set.cpp)
Segment::maxWidth = _length;
Segment::maxHeight = 1;
// isMatrix is set in cfg.cpp or set.cpp // isMatrix is set in cfg.cpp or set.cpp
if (isMatrix) { if (isMatrix) {
Segment::maxWidth = hPanels * panelW; uint16_t maxWidth = hPanels * panelW;
Segment::maxHeight = vPanels * panelH; uint16_t maxHeight = vPanels * panelH;
// safety check // safety check
if (Segment::maxWidth * Segment::maxHeight > MAX_LEDS || Segment::maxWidth == 1 || Segment::maxHeight == 1) { if (maxWidth * maxHeight > MAX_LEDS || maxWidth == 1 || maxHeight == 1) {
Segment::maxWidth = _length;
Segment::maxHeight = 1;
isMatrix = false; isMatrix = false;
return; return;
} }
customMappingSize = Segment::maxWidth * Segment::maxHeight; customMappingTable = new uint16_t[maxWidth * maxHeight];
customMappingTable = new uint16_t[customMappingSize];
if (customMappingTable != nullptr) { if (customMappingTable != nullptr) {
Segment::maxWidth = maxWidth;
Segment::maxHeight = maxHeight;
customMappingSize = maxWidth * maxHeight;
uint16_t startL; // index in custom mapping array (logical strip) uint16_t startL; // index in custom mapping array (logical strip)
uint16_t startP; // position of 1st pixel of panel on (virtual) strip uint16_t startP; // position of 1st pixel of panel on (virtual) strip
uint16_t x, y, offset; uint16_t x, y, offset;
@ -94,18 +100,12 @@ void WS2812FX::setUpMatrix() {
} }
DEBUG_PRINTLN(); DEBUG_PRINTLN();
#endif #endif
} else { } else { // memory allocation error
// memory allocation error
Segment::maxWidth = _length;
Segment::maxHeight = 1;
isMatrix = false; isMatrix = false;
return;
} }
} else {
// not a matrix set up
Segment::maxWidth = _length;
Segment::maxHeight = 1;
} }
#else
isMatrix = false; // no matter what config says
#endif #endif
} }

147
wled00/FX_fcn.cpp
View File

@ -211,6 +211,7 @@ void Segment::setUpLeds() {
CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) { CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) {
static unsigned long _lastPaletteChange = 0; // perhaps it should be per segment static unsigned long _lastPaletteChange = 0; // perhaps it should be per segment
static CRGBPalette16 randomPalette = CRGBPalette16(DEFAULT_COLOR); static CRGBPalette16 randomPalette = CRGBPalette16(DEFAULT_COLOR);
static CRGBPalette16 prevRandomPalette = CRGBPalette16(CRGB(BLACK));
byte tcp[72]; byte tcp[72];
if (pal < 245 && pal > GRADIENT_PALETTE_COUNT+13) pal = 0; if (pal < 245 && pal > GRADIENT_PALETTE_COUNT+13) pal = 0;
if (pal > 245 && (strip.customPalettes.size() == 0 || 255U-pal > strip.customPalettes.size()-1)) pal = 0; if (pal > 245 && (strip.customPalettes.size() == 0 || 255U-pal > strip.customPalettes.size()-1)) pal = 0;
@ -230,16 +231,29 @@ CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) {
switch (pal) { switch (pal) {
case 0: //default palette. Exceptions for specific effects above case 0: //default palette. Exceptions for specific effects above
targetPalette = PartyColors_p; break; targetPalette = PartyColors_p; break;
case 1: //periodically replace palette with a random one. Doesn't work with multiple FastLED segments case 1: {//periodically replace palette with a random one. Transition palette change in 500ms
if (millis() - _lastPaletteChange > 5000 /*+ ((uint32_t)(255-intensity))*100*/) { uint32_t timeSinceLastChange = millis() - _lastPaletteChange;
if (timeSinceLastChange > 5000 /*+ ((uint32_t)(255-intensity))*100*/) {
prevRandomPalette = randomPalette;
randomPalette = CRGBPalette16( randomPalette = CRGBPalette16(
CHSV(random8(), random8(160, 255), random8(128, 255)), CHSV(random8(), random8(160, 255), random8(128, 255)),
CHSV(random8(), random8(160, 255), random8(128, 255)), CHSV(random8(), random8(160, 255), random8(128, 255)),
CHSV(random8(), random8(160, 255), random8(128, 255)), CHSV(random8(), random8(160, 255), random8(128, 255)),
CHSV(random8(), random8(160, 255), random8(128, 255))); CHSV(random8(), random8(160, 255), random8(128, 255)));
_lastPaletteChange = millis(); _lastPaletteChange = millis();
timeSinceLastChange = 0;
} }
targetPalette = randomPalette; break; if (timeSinceLastChange <= 500) {
targetPalette = prevRandomPalette;
// there needs to be 255 palette blends (48) for full blend but that is too resource intensive
// so 128 is a compromise (we need to perform full blend of the two palettes as each segment can have random
// palette selected but only 2 static palettes are used)
size_t noOfBlends = ((128U * timeSinceLastChange) / 500U);
for (size_t i=0; i<noOfBlends; i++) nblendPaletteTowardPalette(targetPalette, randomPalette, 48);
} else {
targetPalette = randomPalette;
}
break;}
case 2: {//primary color only case 2: {//primary color only
CRGB prim = gamma32(colors[0]); CRGB prim = gamma32(colors[0]);
targetPalette = CRGBPalette16(prim); break;} targetPalette = CRGBPalette16(prim); break;}
@ -294,7 +308,7 @@ void Segment::startTransition(uint16_t dur) {
// starting a transition has to occur before change so we get current values 1st // starting a transition has to occur before change so we get current values 1st
uint8_t _briT = currentBri(on ? opacity : 0); uint8_t _briT = currentBri(on ? opacity : 0);
uint8_t _cctT = currentBri(cct, true); uint8_t _cctT = currentBri(cct, true);
CRGBPalette16 _palT; loadPalette(_palT, palette); CRGBPalette16 _palT = CRGBPalette16(DEFAULT_COLOR); loadPalette(_palT, palette);
uint8_t _modeP = mode; uint8_t _modeP = mode;
uint32_t _colorT[NUM_COLORS]; uint32_t _colorT[NUM_COLORS];
for (size_t i=0; i<NUM_COLORS; i++) _colorT[i] = currentColor(i, colors[i]); for (size_t i=0; i<NUM_COLORS; i++) _colorT[i] = currentColor(i, colors[i]);
@ -363,6 +377,42 @@ void Segment::handleTransition() {
} }
} }
void Segment::set(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, uint16_t ofs, uint16_t i1Y, uint16_t i2Y) {
//return if neither bounds nor grouping have changed
bool boundsUnchanged = (start == i1 && stop == i2);
#ifndef WLED_DISABLE_2D
if (Segment::maxHeight>1) boundsUnchanged &= (startY == i1Y && stopY == i2Y); // 2D
#endif
if (boundsUnchanged
&& (!grp || (grouping == grp && spacing == spc))
&& (ofs == UINT16_MAX || ofs == offset)) return;
if (stop) fill(BLACK); //turn old segment range off
if (i2 <= i1) { //disable segment
stop = 0;
markForReset();
return;
}
if (i1 < Segment::maxWidth) start = i1; // Segment::maxWidth equals strip.getLengthTotal() for 1D
stop = i2 > Segment::maxWidth ? Segment::maxWidth : MAX(1,i2);
startY = 0;
stopY = 1;
#ifndef WLED_DISABLE_2D
if (Segment::maxHeight>1) { // 2D
if (i1Y < Segment::maxHeight) startY = i1Y;
stopY = i2Y > Segment::maxHeight ? Segment::maxHeight : MAX(1,i2Y);
}
#endif
if (grp) {
grouping = grp;
spacing = spc;
}
if (ofs < UINT16_MAX) offset = ofs;
markForReset();
if (!boundsUnchanged) refreshLightCapabilities();
}
bool Segment::setColor(uint8_t slot, uint32_t c) { //returns true if changed bool Segment::setColor(uint8_t slot, uint32_t c) { //returns true if changed
if (slot >= NUM_COLORS || c == colors[slot]) return false; if (slot >= NUM_COLORS || c == colors[slot]) return false;
if (fadeTransition) startTransition(strip.getTransition()); // start transition prior to change if (fadeTransition) startTransition(strip.getTransition()); // start transition prior to change
@ -689,7 +739,7 @@ void Segment::refreshLightCapabilities() {
if (bus->getStart() + bus->getLength() <= start) continue; if (bus->getStart() + bus->getLength() <= start) continue;
uint8_t type = bus->getType(); uint8_t type = bus->getType();
if (type == TYPE_ANALOG_1CH || (!cctFromRgb && type == TYPE_ANALOG_2CH)) capabilities &= 0xFE; // does not support RGB if (type == TYPE_ONOFF || type == TYPE_ANALOG_1CH || (!cctFromRgb && type == TYPE_ANALOG_2CH)) capabilities &= 0xFE; // does not support RGB
if (bus->isRgbw()) capabilities |= 0x02; // segment supports white channel if (bus->isRgbw()) capabilities |= 0x02; // segment supports white channel
if (!cctFromRgb) { if (!cctFromRgb) {
switch (type) { switch (type) {
@ -698,7 +748,7 @@ void Segment::refreshLightCapabilities() {
capabilities |= 0x04; //segment supports white CCT capabilities |= 0x04; //segment supports white CCT
} }
} }
if (correctWB && type != TYPE_ANALOG_1CH) capabilities |= 0x04; //white balance correction (uses CCT slider) if (correctWB && !(type == TYPE_ANALOG_1CH || type == TYPE_ONOFF)) capabilities |= 0x04; //white balance correction (uses CCT slider)
uint8_t aWM = Bus::getAutoWhiteMode()<255 ? Bus::getAutoWhiteMode() : bus->getAWMode(); uint8_t aWM = Bus::getAutoWhiteMode()<255 ? Bus::getAutoWhiteMode() : bus->getAWMode();
bool whiteSlider = (aWM == RGBW_MODE_DUAL || aWM == RGBW_MODE_MANUAL_ONLY); // white slider allowed bool whiteSlider = (aWM == RGBW_MODE_DUAL || aWM == RGBW_MODE_MANUAL_ONLY); // white slider allowed
if (bus->isRgbw() && (whiteSlider || !(capabilities & 0x01))) capabilities |= 0x08; // allow white channel adjustments (AWM allows or is not RGB) if (bus->isRgbw() && (whiteSlider || !(capabilities & 0x01))) capabilities |= 0x08; // allow white channel adjustments (AWM allows or is not RGB)
@ -944,6 +994,11 @@ void WS2812FX::finalizeInit(void)
#endif #endif
} }
if (!isMatrix) { // if 2D then max values defined in setUpMatrix() using panel set-up
Segment::maxWidth = _length;
Segment::maxHeight = 1;
}
//initialize leds array. TBD: realloc if nr of leds change //initialize leds array. TBD: realloc if nr of leds change
if (Segment::_globalLeds) { if (Segment::_globalLeds) {
purgeSegments(true); purgeSegments(true);
@ -1306,54 +1361,7 @@ Segment& WS2812FX::getSegment(uint8_t id) {
void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping, uint8_t spacing, uint16_t offset, uint16_t startY, uint16_t stopY) { void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping, uint8_t spacing, uint16_t offset, uint16_t startY, uint16_t stopY) {
if (n >= _segments.size()) return; if (n >= _segments.size()) return;
Segment& seg = _segments[n]; _segments[n].set(i1, i2, grouping, spacing, offset, startY, stopY);
//return if neither bounds nor grouping have changed
bool boundsUnchanged = (seg.start == i1 && seg.stop == i2);
if (isMatrix) {
boundsUnchanged &= (seg.startY == startY && seg.stopY == stopY);
}
if (boundsUnchanged
&& (!grouping || (seg.grouping == grouping && seg.spacing == spacing))
&& (offset == UINT16_MAX || offset == seg.offset)) return;
//if (seg.stop) setRange(seg.start, seg.stop -1, BLACK); //turn old segment range off
if (seg.stop) seg.fill(BLACK); //turn old segment range off
if (i2 <= i1) //disable segment
{
// disabled segments should get removed using purgeSegments()
DEBUG_PRINT(F("-- Segment ")); DEBUG_PRINT(n); DEBUG_PRINTLN(F(" marked inactive."));
seg.stop = 0;
seg.options = 0b0000000000000101; // on & selected
//if (seg.name) {
// delete[] seg.name;
// seg.name = nullptr;
//}
// if main segment is deleted, set first active as main segment
if (n == _mainSegment) setMainSegmentId(0);
seg.markForReset();
return;
}
if (isMatrix) {
#ifndef WLED_DISABLE_2D
if (i1 < Segment::maxWidth) seg.start = i1;
seg.stop = i2 > Segment::maxWidth ? Segment::maxWidth : i2;
if (startY < Segment::maxHeight) seg.startY = startY;
seg.stopY = stopY > Segment::maxHeight ? Segment::maxHeight : MAX(1,stopY);
#endif
} else {
if (i1 < _length) seg.start = i1;
seg.stop = i2 > _length ? _length : i2;
seg.startY = 0;
seg.stopY = 1;
}
if (grouping) {
seg.grouping = grouping;
seg.spacing = spacing;
}
if (offset < UINT16_MAX) seg.offset = offset;
seg.markForReset();
if (!boundsUnchanged) seg.refreshLightCapabilities();
} }
void WS2812FX::restartRuntime() { void WS2812FX::restartRuntime() {
@ -1511,15 +1519,28 @@ void WS2812FX::loadCustomPalettes()
if (readObjectFromFile(fileName, nullptr, &pDoc)) { if (readObjectFromFile(fileName, nullptr, &pDoc)) {
JsonArray pal = pDoc[F("palette")]; JsonArray pal = pDoc[F("palette")];
if (!pal.isNull() && pal.size()>7) { // not an empty palette (at least 2 entries) if (!pal.isNull() && pal.size()>4) { // not an empty palette (at least 2 entries)
size_t palSize = MIN(pal.size(), 72); if (pal[0].is<int>() && pal[1].is<const char *>()) {
palSize -= palSize % 4; // make sure size is multiple of 4 // we have an array of index & hex strings
for (size_t i=0; i<palSize && pal[i].as<int>()<256; i+=4) { size_t palSize = MIN(pal.size(), 36);
tcp[ i ] = (uint8_t) pal[ i ].as<int>(); // index palSize -= palSize % 2; // make sure size is multiple of 2
tcp[i+1] = (uint8_t) pal[i+1].as<int>(); // R for (size_t i=0, j=0; i<palSize && pal[i].as<int>()<256; i+=2, j+=4) {
tcp[i+2] = (uint8_t) pal[i+2].as<int>(); // G uint8_t rgbw[] = {0,0,0,0};
tcp[i+3] = (uint8_t) pal[i+3].as<int>(); // B tcp[ j ] = (uint8_t) pal[ i ].as<int>(); // index
DEBUG_PRINTF("%d(%d) : %d %d %d\n", i, int(tcp[i]), int(tcp[i+1]), int(tcp[i+2]), int(tcp[i+3])); colorFromHexString(rgbw, pal[i+1].as<const char *>()); // will catch non-string entires
for (size_t c=0; c<3; c++) tcp[j+1+c] = rgbw[c]; // only use RGB component
DEBUG_PRINTF("%d(%d) : %d %d %d\n", i, int(tcp[j]), int(tcp[j+1]), int(tcp[j+2]), int(tcp[j+3]));
}
} else {
size_t palSize = MIN(pal.size(), 72);
palSize -= palSize % 4; // make sure size is multiple of 4
for (size_t i=0; i<palSize && pal[i].as<int>()<256; i+=4) {
tcp[ i ] = (uint8_t) pal[ i ].as<int>(); // index
tcp[i+1] = (uint8_t) pal[i+1].as<int>(); // R
tcp[i+2] = (uint8_t) pal[i+2].as<int>(); // G
tcp[i+3] = (uint8_t) pal[i+3].as<int>(); // B
DEBUG_PRINTF("%d(%d) : %d %d %d\n", i, int(tcp[i]), int(tcp[i+1]), int(tcp[i+2]), int(tcp[i+3]));
}
} }
customPalettes.push_back(targetPalette.loadDynamicGradientPalette(tcp)); customPalettes.push_back(targetPalette.loadDynamicGradientPalette(tcp));
} }

2
wled00/data/index.js
View File

@ -1970,7 +1970,6 @@ function selSegAll(o)
function selSegEx(s) function selSegEx(s)
{ {
if (gId('selall')) gId('selall').checked = false;
var obj = {"seg":[]}; var obj = {"seg":[]};
for (let i=0; i<=lSeg; i++) obj.seg.push({"id":i,"sel":(i==s)}); for (let i=0; i<=lSeg; i++) obj.seg.push({"id":i,"sel":(i==s)});
obj.mainseg = s; obj.mainseg = s;
@ -1979,7 +1978,6 @@ function selSegEx(s)
function selSeg(s) function selSeg(s)
{ {
if (gId('selall')) gId('selall').checked = false;
var sel = gId(`seg${s}sel`).checked; var sel = gId(`seg${s}sel`).checked;
var obj = {"seg": {"id": s, "sel": sel}}; var obj = {"seg": {"id": s, "sel": sel}};
requestJson(obj); requestJson(obj);

2
wled00/data/settings_sync.htm
View File

@ -80,7 +80,7 @@
<h3>WLED Broadcast</h3> <h3>WLED Broadcast</h3>
UDP Port: <input name="UP" type="number" min="1" max="65535" class="d5" required><br> UDP Port: <input name="UP" type="number" min="1" max="65535" class="d5" required><br>
2nd Port: <input name="U2" type="number" min="1" max="65535" class="d5" required><br> 2nd Port: <input name="U2" type="number" min="1" max="65535" class="d5" required><br>
<h3>Sync grups</h3> <h3>Sync groups</h3>
<input name="GS" id="GS" type="number" style="display: none;"><!-- hidden inputs for bitwise group checkboxes --> <input name="GS" id="GS" type="number" style="display: none;"><!-- hidden inputs for bitwise group checkboxes -->
<input name="GR" id="GR" type="number" style="display: none;"> <input name="GR" id="GR" type="number" style="display: none;">
<table style="margin: 0 auto;"> <table style="margin: 0 auto;">

8
wled00/e131.cpp
View File

@ -96,11 +96,11 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol){
if (e131SkipOutOfSequence) if (e131SkipOutOfSequence)
if (seq < e131LastSequenceNumber[previousUniverses] && seq > 20 && e131LastSequenceNumber[previousUniverses] < 250){ if (seq < e131LastSequenceNumber[previousUniverses] && seq > 20 && e131LastSequenceNumber[previousUniverses] < 250){
DEBUG_PRINT("skipping E1.31 frame (last seq="); DEBUG_PRINT(F("skipping E1.31 frame (last seq="));
DEBUG_PRINT(e131LastSequenceNumber[previousUniverses]); DEBUG_PRINT(e131LastSequenceNumber[previousUniverses]);
DEBUG_PRINT(", current seq="); DEBUG_PRINT(F(", current seq="));
DEBUG_PRINT(seq); DEBUG_PRINT(seq);
DEBUG_PRINT(", universe="); DEBUG_PRINT(F(", universe="));
DEBUG_PRINT(uni); DEBUG_PRINT(uni);
DEBUG_PRINTLN(")"); DEBUG_PRINTLN(")");
return; return;
@ -444,7 +444,7 @@ void sendArtnetPollReply(ArtPollReply *reply, IPAddress ipAddress, uint16_t port
reply->reply_sub_sw = (uint8_t)((portAddress >> 4) & 0x000F); reply->reply_sub_sw = (uint8_t)((portAddress >> 4) & 0x000F);
reply->reply_sw_out[0] = (uint8_t)(portAddress & 0x000F); reply->reply_sw_out[0] = (uint8_t)(portAddress & 0x000F);
sprintf((char *)reply->reply_node_report, "#0001 [%04u] OK - WLED v" TOSTRING(WLED_VERSION), pollReplyCount); snprintf_P((char *)reply->reply_node_report, sizeof(reply->reply_node_report)-1, PSTR("#0001 [%04u] OK - WLED v" TOSTRING(WLED_VERSION)), pollReplyCount);
if (pollReplyCount < 9999) { if (pollReplyCount < 9999) {
pollReplyCount++; pollReplyCount++;

1498
wled00/html_other.h
View File

File diff suppressed because it is too large Load Diff

292
wled00/html_settings.h
View File

@ -8,7 +8,7 @@
// Autogenerated from wled00/data/style.css, do not edit!! // Autogenerated from wled00/data/style.css, do not edit!!
const uint16_t PAGE_settingsCss_length = 847; const uint16_t PAGE_settingsCss_length = 847;
const uint8_t PAGE_settingsCss[] PROGMEM = { const uint8_t PAGE_settingsCss[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0xc1, 0x8e, 0x9b, 0x30,
0x10, 0xfd, 0x15, 0xaa, 0x68, 0xa5, 0xad, 0x14, 0x10, 0x10, 0xc8, 0xa6, 0x46, 0x95, 0xaa, 0xde, 0x10, 0xfd, 0x15, 0xaa, 0x68, 0xa5, 0xad, 0x14, 0x10, 0x10, 0xc8, 0xa6, 0x46, 0x95, 0xaa, 0xde,
0x7b, 0xab, 0xaa, 0x4a, 0xd5, 0x1e, 0x0c, 0x1e, 0x82, 0x15, 0x63, 0x23, 0xdb, 0x74, 0x49, 0x11, 0x7b, 0xab, 0xaa, 0x4a, 0xd5, 0x1e, 0x0c, 0x1e, 0x82, 0x15, 0x63, 0x23, 0xdb, 0x74, 0x49, 0x11,
0xff, 0x5e, 0xdb, 0xc0, 0x42, 0xb2, 0x68, 0x7b, 0xa9, 0xa2, 0x44, 0xc4, 0x63, 0xc6, 0x6f, 0xde, 0xff, 0x5e, 0xdb, 0xc0, 0x42, 0xb2, 0x68, 0x7b, 0xa9, 0xa2, 0x44, 0xc4, 0x63, 0xc6, 0x6f, 0xde,
@ -67,7 +67,7 @@ const uint8_t PAGE_settingsCss[] PROGMEM = {
// Autogenerated from wled00/data/settings.htm, do not edit!! // Autogenerated from wled00/data/settings.htm, do not edit!!
const uint16_t PAGE_settings_length = 985; const uint16_t PAGE_settings_length = 985;
const uint8_t PAGE_settings[] PROGMEM = { const uint8_t PAGE_settings[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x56, 0x6d, 0x6f, 0xdb, 0x36,
0x10, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x58, 0x23, 0xa1, 0xb2, 0xec, 0x38, 0xc3, 0xb0, 0xc9, 0x96, 0x10, 0xfe, 0xee, 0x5f, 0xc1, 0xb0, 0x58, 0x23, 0xa1, 0xb2, 0xec, 0x38, 0xc3, 0xb0, 0xc9, 0x96,
0x8b, 0x35, 0x2f, 0x9d, 0x87, 0x04, 0x0d, 0x90, 0xa4, 0xdd, 0x80, 0x7d, 0xa1, 0xc9, 0x93, 0xcc, 0x8b, 0x35, 0x2f, 0x9d, 0x87, 0x04, 0x0d, 0x90, 0xa4, 0xdd, 0x80, 0x7d, 0xa1, 0xc9, 0x93, 0xcc,
0x46, 0x22, 0x05, 0xf2, 0xe4, 0xc4, 0x73, 0xf3, 0xdf, 0x77, 0x94, 0x9d, 0xb7, 0x36, 0xd8, 0x8a, 0x46, 0x22, 0x05, 0xf2, 0xe4, 0xc4, 0x73, 0xf3, 0xdf, 0x77, 0x94, 0x9d, 0xb7, 0x36, 0xd8, 0x8a,
@ -135,7 +135,7 @@ const uint8_t PAGE_settings[] PROGMEM = {
// Autogenerated from wled00/data/settings_wifi.htm, do not edit!! // Autogenerated from wled00/data/settings_wifi.htm, do not edit!!
const uint16_t PAGE_settings_wifi_length = 2098; const uint16_t PAGE_settings_wifi_length = 2098;
const uint8_t PAGE_settings_wifi[] PROGMEM = { const uint8_t PAGE_settings_wifi[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xb5, 0x58, 0x6b, 0x6f, 0xdb, 0xca,
0x11, 0xfd, 0xae, 0x5f, 0xb1, 0xde, 0x16, 0x06, 0x09, 0xd3, 0x94, 0x64, 0x35, 0x69, 0x60, 0x8b, 0x11, 0xfd, 0xae, 0x5f, 0xb1, 0xde, 0x16, 0x06, 0x09, 0xd3, 0x94, 0x64, 0x35, 0x69, 0x60, 0x8b,
0x4a, 0xfd, 0xd0, 0x8d, 0xdd, 0x3a, 0x8e, 0x0a, 0x19, 0xd7, 0x28, 0xd2, 0xe0, 0x5e, 0x9a, 0x1c, 0x4a, 0xfd, 0xd0, 0x8d, 0xdd, 0x3a, 0x8e, 0x0a, 0x19, 0xd7, 0x28, 0xd2, 0xe0, 0x5e, 0x9a, 0x1c,
0x49, 0x1b, 0x93, 0xbb, 0xbc, 0xdc, 0xa5, 0x64, 0xc3, 0xd6, 0x7f, 0xef, 0xcc, 0x2e, 0xf5, 0xb4, 0x49, 0x1b, 0x93, 0xbb, 0xbc, 0xdc, 0xa5, 0x64, 0xc3, 0xd6, 0x7f, 0xef, 0xcc, 0x2e, 0xf5, 0xb4,
@ -273,7 +273,7 @@ const uint8_t PAGE_settings_wifi[] PROGMEM = {
// Autogenerated from wled00/data/settings_leds.htm, do not edit!! // Autogenerated from wled00/data/settings_leds.htm, do not edit!!
const uint16_t PAGE_settings_leds_length = 7414; const uint16_t PAGE_settings_leds_length = 7414;
const uint8_t PAGE_settings_leds[] PROGMEM = { const uint8_t PAGE_settings_leds[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xdd, 0x3c, 0xdb, 0x76, 0xe2, 0x48,
0x92, 0xef, 0x7c, 0x45, 0x3a, 0xbb, 0xdb, 0x2d, 0x0d, 0x32, 0x48, 0x5c, 0xaa, 0x5d, 0x80, 0xf0, 0x92, 0xef, 0x7c, 0x45, 0x3a, 0xbb, 0xdb, 0x2d, 0x0d, 0x32, 0x48, 0x5c, 0xaa, 0x5d, 0x80, 0xf0,
0x1a, 0xdb, 0x55, 0xed, 0x19, 0xbb, 0xed, 0x63, 0xdc, 0x5d, 0x33, 0xa7, 0xba, 0x4e, 0x95, 0x90, 0x1a, 0xdb, 0x55, 0xed, 0x19, 0xbb, 0xed, 0x63, 0xdc, 0x5d, 0x33, 0xa7, 0xba, 0x4e, 0x95, 0x90,
0x12, 0x50, 0x59, 0x48, 0xb4, 0x24, 0xec, 0x62, 0x6d, 0xf6, 0x9b, 0xf6, 0x1b, 0xf6, 0xcb, 0x36, 0x12, 0x50, 0x59, 0x48, 0xb4, 0x24, 0xec, 0x62, 0x6d, 0xf6, 0x9b, 0xf6, 0x1b, 0xf6, 0xcb, 0x36,
@ -743,7 +743,7 @@ const uint8_t PAGE_settings_leds[] PROGMEM = {
// Autogenerated from wled00/data/settings_dmx.htm, do not edit!! // Autogenerated from wled00/data/settings_dmx.htm, do not edit!!
const uint16_t PAGE_settings_dmx_length = 1612; const uint16_t PAGE_settings_dmx_length = 1612;
const uint8_t PAGE_settings_dmx[] PROGMEM = { const uint8_t PAGE_settings_dmx[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x57, 0xdb, 0x72, 0xdb, 0x36,
0x10, 0x7d, 0xd7, 0x57, 0x20, 0x78, 0x88, 0xc9, 0x31, 0x43, 0x4a, 0x4e, 0x95, 0x36, 0x32, 0x49, 0x10, 0x7d, 0xd7, 0x57, 0x20, 0x78, 0x88, 0xc9, 0x31, 0x43, 0x4a, 0x4e, 0x95, 0x36, 0x32, 0x49,
0x37, 0x56, 0x5c, 0xdb, 0x1d, 0xdb, 0xf5, 0x44, 0x49, 0xd3, 0x4e, 0xd3, 0xe9, 0x40, 0xe4, 0x4a, 0x37, 0x56, 0x5c, 0xdb, 0x1d, 0xdb, 0xf5, 0x44, 0x49, 0xd3, 0x4e, 0xd3, 0xe9, 0x40, 0xe4, 0x4a,
0x44, 0x4c, 0x02, 0x2c, 0x00, 0x4a, 0x76, 0x2e, 0xff, 0xde, 0x05, 0x48, 0x5d, 0xec, 0xd8, 0x69, 0x44, 0x4c, 0x02, 0x2c, 0x00, 0x4a, 0x76, 0x2e, 0xff, 0xde, 0x05, 0x48, 0x5d, 0xec, 0xd8, 0x69,
@ -850,7 +850,7 @@ const uint8_t PAGE_settings_dmx[] PROGMEM = {
// Autogenerated from wled00/data/settings_ui.htm, do not edit!! // Autogenerated from wled00/data/settings_ui.htm, do not edit!!
const uint16_t PAGE_settings_ui_length = 3181; const uint16_t PAGE_settings_ui_length = 3181;
const uint8_t PAGE_settings_ui[] PROGMEM = { const uint8_t PAGE_settings_ui[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6d, 0x77, 0xda, 0x38,
0x16, 0xfe, 0xce, 0xaf, 0x50, 0xd5, 0x39, 0x19, 0x38, 0x71, 0x81, 0xb4, 0xb3, 0x67, 0x5b, 0xc0, 0x16, 0xfe, 0xce, 0xaf, 0x50, 0xd5, 0x39, 0x19, 0x38, 0x71, 0x81, 0xb4, 0xb3, 0x67, 0x5b, 0xc0,
0x64, 0x9b, 0x34, 0xd3, 0x66, 0x4e, 0x3a, 0xed, 0x96, 0x74, 0x3b, 0x73, 0xba, 0x3d, 0x19, 0x63, 0x64, 0x9b, 0x34, 0xd3, 0x66, 0x4e, 0x3a, 0xed, 0x96, 0x74, 0x3b, 0x73, 0xba, 0x3d, 0x19, 0x63,
0x0b, 0x50, 0x63, 0x5b, 0x1e, 0x4b, 0x0e, 0xc9, 0x52, 0xfe, 0xfb, 0x3e, 0x57, 0xb2, 0xc1, 0x90, 0x0b, 0x50, 0x63, 0x5b, 0x1e, 0x4b, 0x0e, 0xc9, 0x52, 0xfe, 0xfb, 0x3e, 0x57, 0xb2, 0xc1, 0x90,
@ -1055,7 +1055,7 @@ const uint8_t PAGE_settings_ui[] PROGMEM = {
// Autogenerated from wled00/data/settings_sync.htm, do not edit!! // Autogenerated from wled00/data/settings_sync.htm, do not edit!!
const uint16_t PAGE_settings_sync_length = 3345; const uint16_t PAGE_settings_sync_length = 3345;
const uint8_t PAGE_settings_sync[] PROGMEM = { const uint8_t PAGE_settings_sync[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x5a, 0xeb, 0x73, 0xe2, 0x38,
0x12, 0xff, 0xee, 0xbf, 0x42, 0xe3, 0xad, 0x9a, 0x83, 0x0d, 0x01, 0x13, 0x42, 0x26, 0x93, 0x60, 0x12, 0xff, 0xee, 0xbf, 0x42, 0xe3, 0xad, 0x9a, 0x83, 0x0d, 0x01, 0x13, 0x42, 0x26, 0x93, 0x60,
0xcf, 0x85, 0x90, 0x49, 0xb8, 0x9d, 0x24, 0x0c, 0x24, 0xfb, 0xa8, 0xba, 0xaa, 0x2d, 0x61, 0x0b, 0xcf, 0x85, 0x90, 0x49, 0xb8, 0x9d, 0x24, 0x0c, 0x24, 0xfb, 0xa8, 0xba, 0xaa, 0x2d, 0x61, 0x0b,
0x70, 0x62, 0x5b, 0x5e, 0x4b, 0xce, 0xa3, 0x66, 0xe7, 0x7f, 0xbf, 0x6e, 0xc9, 0x36, 0xe0, 0xf0, 0x70, 0x62, 0x5b, 0x5e, 0x4b, 0xce, 0xa3, 0x66, 0xe7, 0x7f, 0xbf, 0x6e, 0xc9, 0x36, 0xe0, 0xf0,
@ -1130,140 +1130,140 @@ const uint8_t PAGE_settings_sync[] PROGMEM = {
0xfd, 0xc0, 0xcc, 0x85, 0x8b, 0xd2, 0x70, 0xcc, 0x12, 0xd0, 0x96, 0x1f, 0xd9, 0x66, 0x13, 0xfe, 0xfd, 0xc0, 0xcc, 0x85, 0x8b, 0xd2, 0x70, 0xcc, 0x12, 0xd0, 0x96, 0x1f, 0xd9, 0x66, 0x13, 0xfe,
0xd2, 0x17, 0xdb, 0x3c, 0x6a, 0xb7, 0x5b, 0x6d, 0x33, 0x57, 0x8f, 0x07, 0x8f, 0x09, 0xfb, 0x2b, 0xd2, 0x17, 0xdb, 0x3c, 0x6a, 0xb7, 0x5b, 0x6d, 0x33, 0x57, 0x8f, 0x07, 0x8f, 0x09, 0xfb, 0x2b,
0xf5, 0x13, 0x86, 0x56, 0x48, 0x9c, 0x83, 0xc8, 0x5b, 0xe6, 0x9a, 0x55, 0x0f, 0xf7, 0x07, 0x26, 0xf5, 0x13, 0x86, 0x56, 0x48, 0x9c, 0x83, 0xc8, 0x5b, 0xe6, 0x9a, 0x55, 0x0f, 0xf7, 0x07, 0x26,
0xf9, 0xff, 0xb9, 0xe2, 0x11, 0x0c, 0x75, 0xac, 0x69, 0x92, 0xc6, 0x42, 0xc9, 0xbf, 0x24, 0x35, 0xf9, 0xff, 0xb9, 0xe2, 0x11, 0x0c, 0x75, 0xac, 0x69, 0xc2, 0xd3, 0x58, 0xa8, 0x03, 0x2c, 0x89,
0x60, 0x89, 0x32, 0x35, 0xfe, 0x5d, 0xde, 0x46, 0xf9, 0x09, 0xb0, 0xd4, 0xd8, 0x70, 0xa2, 0x60, 0x0d, 0x60, 0xa2, 0x6c, 0x8d, 0x7f, 0x97, 0xf7, 0x51, 0x8e, 0x02, 0x3c, 0x35, 0x38, 0x9c, 0x28,
0xc1, 0x21, 0xc6, 0x32, 0xf5, 0x30, 0xa3, 0x1e, 0xee, 0x44, 0xdd, 0x91, 0x58, 0x1b, 0x11, 0x23, 0x5c, 0x70, 0x88, 0xb1, 0x4c, 0x3d, 0xcc, 0xa8, 0x87, 0x3b, 0x51, 0x77, 0x24, 0x16, 0x47, 0xc4,
0x9b, 0x0c, 0x69, 0x32, 0xf5, 0xa3, 0x13, 0x8b, 0xd0, 0x54, 0x72, 0x9c, 0x05, 0x79, 0x25, 0xc8, 0xc8, 0x26, 0x43, 0x9a, 0x4c, 0xfd, 0xe8, 0xc4, 0x22, 0x34, 0x95, 0x1c, 0x67, 0x41, 0x60, 0x09,
0xdd, 0xc0, 0x1f, 0xf8, 0xd7, 0x2c, 0x9e, 0x0e, 0x8a, 0xa7, 0x56, 0xf1, 0x74, 0x58, 0x3c, 0xb5, 0x82, 0x37, 0xf0, 0x07, 0xfe, 0x35, 0x8b, 0xa7, 0x83, 0xe2, 0xa9, 0x55, 0x3c, 0x1d, 0x16, 0x4f,
0x8d, 0xe2, 0xf1, 0xa8, 0x78, 0xfa, 0x50, 0x3c, 0x1d, 0xeb, 0xa7, 0x86, 0x62, 0xaf, 0xb7, 0x18, 0x6d, 0xa3, 0x78, 0x3c, 0x2a, 0x9e, 0x3e, 0x14, 0x4f, 0xc7, 0xfa, 0xa9, 0xa1, 0xd8, 0xeb, 0x2d,
0x41, 0xd6, 0x3b, 0x29, 0x16, 0xe4, 0x0a, 0xd7, 0x27, 0x50, 0x88, 0x3b, 0xe6, 0x2f, 0xd9, 0xc9, 0x46, 0x90, 0xf6, 0x4e, 0x8a, 0x05, 0xb9, 0xc6, 0xf5, 0x09, 0x14, 0xe4, 0x8e, 0xf9, 0x4b, 0x76,
0x9a, 0xb9, 0xfb, 0xc3, 0x93, 0x53, 0x26, 0x59, 0x49, 0x71, 0x50, 0x54, 0x7e, 0xf0, 0xb8, 0x1b, 0xb2, 0x66, 0xee, 0xff, 0xf0, 0xe4, 0x94, 0x49, 0x56, 0x52, 0x1c, 0x14, 0xa5, 0x1f, 0x3c, 0xee,
0x49, 0xab, 0xd8, 0xa4, 0xf5, 0x96, 0x62, 0xb5, 0x5c, 0x87, 0x05, 0xc9, 0xe1, 0x8e, 0x9b, 0xb4, 0x46, 0xd2, 0x2a, 0x36, 0x69, 0xbd, 0xa5, 0x58, 0x2d, 0xd7, 0x61, 0x41, 0x72, 0xb8, 0xe3, 0x26,
0xe7, 0x72, 0xb5, 0x77, 0x24, 0x39, 0x2a, 0x36, 0x39, 0xda, 0x55, 0xae, 0x0f, 0x05, 0xc9, 0x87, 0xed, 0xb9, 0x5c, 0xed, 0x1d, 0x49, 0x8e, 0x8a, 0x4d, 0x8e, 0x76, 0x95, 0xeb, 0x43, 0x41, 0xf2,
0x1d, 0x37, 0x39, 0x9e, 0xcb, 0x75, 0x9c, 0x93, 0x2c, 0x1a, 0x6b, 0xc8, 0x5c, 0xe6, 0x3f, 0xb1, 0x61, 0xc7, 0x4d, 0x8e, 0xe7, 0x72, 0x1d, 0xe7, 0x24, 0x8b, 0xc6, 0x1a, 0x32, 0x97, 0xf9, 0x4f,
0x93, 0x5d, 0x98, 0x0d, 0x9b, 0x05, 0xb3, 0xe1, 0x8e, 0xf6, 0x1a, 0x1e, 0xe4, 0x12, 0x0f, 0x0f, 0xec, 0x64, 0x17, 0x66, 0xc3, 0x66, 0xc1, 0x6c, 0xb8, 0xa3, 0xbd, 0x86, 0x07, 0xb9, 0xc4, 0xc3,
0x76, 0x3c, 0xe4, 0xb0, 0xb0, 0xd7, 0xb0, 0xb5, 0xe3, 0x26, 0x87, 0x73, 0xb9, 0x76, 0xb4, 0xd7, 0x83, 0x1d, 0x0f, 0x39, 0x2c, 0xec, 0x35, 0x6c, 0xed, 0xb8, 0xc9, 0xe1, 0x5c, 0xae, 0x1d, 0xed,
0xb0, 0x5d, 0x6c, 0xd2, 0xde, 0x55, 0xae, 0xc2, 0x5e, 0xc3, 0xa3, 0x1d, 0x37, 0xf9, 0x30, 0x97, 0x35, 0x6c, 0x17, 0x9b, 0xb4, 0x77, 0x95, 0xab, 0xb0, 0xd7, 0xf0, 0x68, 0xc7, 0x4d, 0x3e, 0xcc,
0x6b, 0x47, 0x7b, 0x0d, 0x8f, 0x8b, 0x4d, 0x96, 0xcd, 0xd5, 0x50, 0xd1, 0x0d, 0x78, 0x0a, 0xb8, 0xe5, 0xda, 0xd1, 0x5e, 0xc3, 0xe3, 0x62, 0x93, 0x65, 0x73, 0x35, 0x54, 0x74, 0x03, 0xa0, 0x02,
0x53, 0xd8, 0x2c, 0xe2, 0xcf, 0x09, 0x8d, 0xd7, 0xf1, 0xcb, 0xf8, 0x40, 0x4a, 0xe8, 0x26, 0xfe, 0xf0, 0x14, 0x36, 0x8b, 0xf8, 0x73, 0x42, 0xe3, 0x75, 0xfc, 0x32, 0x3e, 0x90, 0x13, 0xba, 0x89,
0x74, 0x26, 0x23, 0x26, 0x44, 0xad, 0xd3, 0xc8, 0x88, 0x8c, 0xdd, 0xa8, 0xcf, 0x4d, 0xe7, 0x9c, 0x3f, 0x9d, 0xc9, 0x88, 0x09, 0x51, 0xeb, 0x34, 0x32, 0x22, 0x63, 0x37, 0xea, 0x73, 0xd3, 0x39,
0x07, 0x3c, 0x99, 0x13, 0xe6, 0x74, 0x14, 0x30, 0x75, 0x9d, 0xbe, 0x32, 0xe2, 0xdf, 0x4d, 0xe7, 0xe7, 0x01, 0x4f, 0xe6, 0x84, 0x39, 0x1d, 0x05, 0x50, 0x5d, 0xa7, 0xaf, 0x8c, 0xf8, 0x77, 0xd3,
0x62, 0x32, 0x61, 0xae, 0x14, 0x73, 0x6a, 0xc4, 0xcd, 0x4d, 0x3b, 0x8e, 0x6e, 0xa1, 0x63, 0x84, 0xb9, 0x98, 0x4c, 0x98, 0x2b, 0xc5, 0x9c, 0x1a, 0x81, 0x73, 0xd3, 0x8e, 0xa3, 0x5b, 0x68, 0x19,
0xca, 0x67, 0x8a, 0xf5, 0x3a, 0xe1, 0x31, 0x16, 0x13, 0xa2, 0x46, 0x36, 0xd3, 0x5c, 0x02, 0x78, 0xa1, 0xf4, 0x99, 0x62, 0xc1, 0x4e, 0x78, 0x8c, 0xd5, 0x84, 0xa8, 0x91, 0xcd, 0x34, 0x97, 0x00,
0x8e, 0x79, 0x1a, 0x79, 0x02, 0xf9, 0x1b, 0x88, 0x40, 0x44, 0x37, 0x3e, 0xba, 0x1a, 0x11, 0x58, 0x9e, 0x63, 0x9e, 0x46, 0x9e, 0x40, 0xfe, 0x06, 0x22, 0x10, 0xd1, 0x9d, 0x8f, 0x2e, 0x47, 0x04,
0x1a, 0x7b, 0x00, 0xdc, 0xae, 0xc4, 0x0e, 0x31, 0x9a, 0xb2, 0x93, 0x2d, 0x1c, 0x7b, 0xa6, 0xb3, 0xd6, 0xc6, 0x1e, 0x20, 0xb7, 0x2b, 0xb1, 0x45, 0x8c, 0xa6, 0xec, 0x64, 0x0b, 0xc7, 0x9e, 0xe9,
0x81, 0x55, 0x96, 0xfc, 0xe2, 0x04, 0x54, 0x4a, 0xa0, 0xf0, 0xee, 0x0f, 0xb7, 0xf1, 0xeb, 0x2e, 0x6c, 0x60, 0x95, 0x65, 0xbf, 0x38, 0x01, 0x95, 0x12, 0xa8, 0xbc, 0xfb, 0xc3, 0x6d, 0xfc, 0xba,
0xf2, 0x3b, 0x0b, 0xd8, 0x0b, 0x5d, 0xe6, 0xba, 0x8d, 0xfe, 0x6c, 0x91, 0x7e, 0x00, 0x3d, 0x85, 0x8b, 0xfc, 0xce, 0x02, 0xf6, 0x42, 0x97, 0xb9, 0x6e, 0xa3, 0x3f, 0x5b, 0xa4, 0x1f, 0x40, 0x53,
0x1f, 0x0b, 0x72, 0x95, 0xb2, 0xec, 0x38, 0x3f, 0xc6, 0xec, 0x6a, 0x91, 0xd9, 0x35, 0x75, 0x13, 0xe1, 0xc7, 0x82, 0x5c, 0xa5, 0x2c, 0x3b, 0xce, 0x8f, 0x31, 0xbb, 0x5a, 0x64, 0x76, 0x4d, 0xdd,
0xfe, 0x63, 0xf4, 0xd7, 0x19, 0x3d, 0x26, 0xeb, 0x18, 0xaa, 0x02, 0x68, 0xb5, 0xa0, 0x2d, 0x4e, 0x84, 0xff, 0x18, 0xfd, 0x75, 0x46, 0x8f, 0xd9, 0x3a, 0x86, 0xb2, 0x00, 0x7a, 0x2d, 0xe8, 0x8b,
0x68, 0x24, 0x42, 0x5f, 0x88, 0x25, 0x0e, 0x59, 0x9e, 0x1d, 0xae, 0xcc, 0xb3, 0x56, 0x96, 0x67, 0x13, 0x1a, 0x89, 0xd0, 0x17, 0x62, 0x89, 0x43, 0x96, 0x68, 0x87, 0x2b, 0x13, 0xad, 0x95, 0x25,
0x5b, 0xf0, 0x60, 0xac, 0xcd, 0xb2, 0xca, 0x63, 0xc0, 0xe9, 0xc7, 0x9c, 0xcb, 0x62, 0x0a, 0x7a, 0xda, 0x16, 0x3c, 0x18, 0x6b, 0xd3, 0xac, 0xf2, 0x18, 0x70, 0xfa, 0x31, 0xe7, 0xb2, 0x98, 0x82,
0x6c, 0x02, 0x0d, 0x56, 0xf0, 0x9a, 0x29, 0x40, 0xd4, 0x3b, 0x0d, 0x1f, 0x4b, 0x8e, 0x82, 0x91, 0x26, 0x9b, 0x40, 0x87, 0x15, 0xbc, 0x66, 0x0a, 0x10, 0xf5, 0x4e, 0xc3, 0xc7, 0x9a, 0xa3, 0x60,
0x08, 0x03, 0x53, 0xa5, 0xe8, 0x7e, 0x24, 0x24, 0x8d, 0x5c, 0x46, 0xb0, 0x8d, 0x52, 0x49, 0xfa, 0x24, 0xc2, 0xc0, 0x54, 0x39, 0xba, 0x1f, 0x09, 0x49, 0x23, 0x97, 0x11, 0xec, 0xa3, 0x54, 0x92,
0x22, 0x52, 0xa9, 0xd2, 0xcf, 0x27, 0x02, 0x98, 0x58, 0x7b, 0xe6, 0x2c, 0x82, 0x6f, 0xbe, 0xe8, 0xbe, 0x88, 0x54, 0xaa, 0xf4, 0xf3, 0x89, 0x00, 0x26, 0xd6, 0x9e, 0x39, 0x8b, 0xe0, 0x9b, 0x2f,
0x43, 0x5f, 0xd3, 0x47, 0x46, 0xe4, 0xcc, 0x17, 0x73, 0x72, 0xc8, 0xc3, 0x2e, 0x7f, 0x62, 0x09, 0xfa, 0xd0, 0xd7, 0xf4, 0x91, 0x11, 0x39, 0xf3, 0xc5, 0x9c, 0x1c, 0xf2, 0xb0, 0xcb, 0x9f, 0x58,
0x32, 0xdd, 0xa2, 0xba, 0x9b, 0x2e, 0xde, 0x87, 0x80, 0x94, 0x65, 0x21, 0x87, 0x8c, 0x06, 0xd2, 0x82, 0x4c, 0xb7, 0xa8, 0xee, 0xa6, 0x8b, 0x17, 0x22, 0x20, 0x65, 0x59, 0xc8, 0x21, 0xa3, 0x81,
0x0f, 0x99, 0x92, 0x2f, 0x0b, 0x70, 0x82, 0xfa, 0x4d, 0xb2, 0x89, 0x6d, 0xf2, 0x0d, 0x33, 0x8f, 0xf4, 0x43, 0xa6, 0xe4, 0xcb, 0x02, 0x9c, 0xa0, 0x7e, 0x93, 0x6c, 0x62, 0x9b, 0x7c, 0xc3, 0xcc,
0xbd, 0x87, 0x0a, 0x39, 0xa4, 0x3e, 0x34, 0x76, 0x79, 0x08, 0x45, 0xc1, 0xeb, 0x16, 0xa9, 0xae, 0x63, 0xef, 0xa1, 0x44, 0x0e, 0xa9, 0x0f, 0x9d, 0x5d, 0x1e, 0x42, 0x51, 0xf0, 0xba, 0x45, 0xaa,
0x6f, 0xcd, 0x42, 0xd5, 0x50, 0x83, 0x38, 0x37, 0x4c, 0x3e, 0xf3, 0xe4, 0x91, 0xf4, 0xae, 0x7f, 0xeb, 0x5b, 0xb3, 0x50, 0x35, 0xd4, 0x20, 0xce, 0x0d, 0x93, 0xcf, 0x3c, 0x79, 0x24, 0xbd, 0xeb,
0x27, 0x8a, 0x4e, 0xe9, 0x16, 0x26, 0xef, 0x80, 0x1c, 0x78, 0x09, 0x16, 0x60, 0x24, 0x69, 0xe2, 0xdf, 0x89, 0xa2, 0x53, 0xba, 0x85, 0xc9, 0x3b, 0x20, 0x07, 0x5e, 0x82, 0x05, 0x18, 0x49, 0x9a,
0x5e, 0x5f, 0x15, 0x8a, 0xca, 0x0a, 0xe0, 0x1b, 0xd8, 0x26, 0xa8, 0x0b, 0x03, 0x3c, 0xa8, 0x0e, 0xb8, 0xd7, 0x57, 0x95, 0xa2, 0xb2, 0x02, 0xf8, 0x06, 0xf6, 0x09, 0xea, 0xc6, 0x00, 0x0f, 0xaa,
0x5f, 0xa2, 0xdb, 0x08, 0x13, 0xbb, 0x11, 0x40, 0x84, 0x66, 0xbd, 0xd5, 0x24, 0x15, 0x71, 0x76, 0xc3, 0x97, 0xe8, 0x3e, 0xc2, 0xc4, 0x76, 0x04, 0x10, 0xa1, 0x59, 0x6f, 0x35, 0x49, 0x45, 0x9c,
0x7e, 0x53, 0xed, 0x34, 0xf4, 0x0a, 0xa7, 0xb4, 0x12, 0x9b, 0x12, 0xd3, 0x39, 0x4b, 0xe4, 0x3e, 0x9d, 0xdf, 0x54, 0x3b, 0x0d, 0xbd, 0xc2, 0x29, 0xad, 0xc4, 0xae, 0xc4, 0x74, 0xce, 0x12, 0xb9,
0x88, 0x52, 0x2c, 0x2a, 0xf3, 0x03, 0xaf, 0xd1, 0x92, 0x40, 0xef, 0x68, 0xe6, 0x4f, 0x80, 0x57, 0x0f, 0xa2, 0x14, 0x8b, 0xca, 0xfc, 0xc0, 0x6b, 0xb4, 0x24, 0xd0, 0x3c, 0x9a, 0xf9, 0x13, 0xe0,
0xa9, 0x90, 0x3c, 0x24, 0x58, 0xa2, 0xcf, 0xf9, 0x37, 0xf4, 0xbc, 0x3e, 0xa6, 0xaa, 0x9a, 0x11, 0x55, 0x2a, 0x24, 0x0f, 0x09, 0xd6, 0xe8, 0x73, 0xfe, 0x0d, 0x3d, 0xaf, 0x8f, 0xa9, 0xca, 0x66,
0x6e, 0xa1, 0x4d, 0x73, 0x56, 0x54, 0x9b, 0x17, 0x83, 0x5d, 0xca, 0xc2, 0xc5, 0x53, 0x6d, 0x70, 0x84, 0x5b, 0xe8, 0xd3, 0x9c, 0x15, 0xe5, 0xe6, 0xc5, 0x60, 0x97, 0xba, 0x70, 0xf1, 0x54, 0x1b,
0x5f, 0x55, 0x00, 0x5f, 0xa7, 0x60, 0x44, 0x2c, 0x72, 0xb7, 0x58, 0xe2, 0x22, 0x0f, 0xad, 0x91, 0xdc, 0x57, 0x55, 0xc0, 0xd7, 0x29, 0x18, 0x11, 0xab, 0xdc, 0x2d, 0x96, 0xb8, 0xc8, 0x43, 0x6b,
0xa4, 0xd8, 0x61, 0x44, 0xe0, 0x06, 0xd0, 0xf3, 0x95, 0xe5, 0xbb, 0xdf, 0x18, 0x4e, 0x47, 0xad, 0x24, 0x29, 0xb6, 0x18, 0x11, 0xb8, 0x01, 0x34, 0x7d, 0x65, 0xf9, 0xee, 0x37, 0x86, 0xd3, 0x51,
0x8f, 0x1f, 0x3f, 0x96, 0xc4, 0x30, 0xde, 0x86, 0x90, 0x8a, 0x18, 0x72, 0x8e, 0x12, 0x10, 0x0e, 0xeb, 0xe3, 0xc7, 0x8f, 0x25, 0x31, 0x8c, 0xb7, 0x21, 0xa4, 0x22, 0x86, 0x9c, 0xa3, 0x04, 0x84,
0xbc, 0x3b, 0x94, 0xcc, 0x12, 0x36, 0xb1, 0x8b, 0x5b, 0xa5, 0xa9, 0x2f, 0x67, 0xe9, 0xb8, 0xee, 0x03, 0xef, 0x0e, 0x25, 0xb3, 0x84, 0x4d, 0xec, 0xe2, 0x5a, 0x69, 0xea, 0xcb, 0x59, 0x3a, 0xae,
0xf2, 0xb0, 0xf1, 0x85, 0x79, 0x9f, 0x5f, 0xf4, 0x2f, 0x16, 0xe2, 0x50, 0x5b, 0xe2, 0x1d, 0xdb, 0xbb, 0x3c, 0x6c, 0x7c, 0x61, 0xde, 0xe7, 0x17, 0xfd, 0x8b, 0x95, 0x38, 0xd4, 0x96, 0x78, 0xc9,
0x9f, 0xe3, 0x80, 0x46, 0x8f, 0xa6, 0xa3, 0xc6, 0x3b, 0x0d, 0xea, 0xbc, 0xc3, 0xad, 0x46, 0x8f, 0xf6, 0xe7, 0x38, 0xa0, 0xd1, 0xa3, 0xe9, 0xa8, 0xf1, 0x4e, 0x83, 0x3a, 0xef, 0x70, 0xab, 0xd1,
0x7e, 0x8c, 0x0c, 0xf7, 0xf9, 0x64, 0x5f, 0xc0, 0x5e, 0x0c, 0x63, 0x44, 0xc3, 0xc4, 0x1c, 0x17, 0xa3, 0x1f, 0x23, 0xc3, 0x7d, 0x3e, 0xd9, 0x17, 0xb0, 0x17, 0xc3, 0x18, 0xd1, 0x30, 0x31, 0xc7,
0xd6, 0xa4, 0x8c, 0x8b, 0x91, 0x3e, 0x3f, 0x7a, 0x9e, 0x50, 0x2a, 0xa0, 0x9e, 0x87, 0x28, 0x5b, 0x85, 0x35, 0x29, 0xe3, 0x62, 0xa4, 0xcf, 0x8f, 0x9e, 0x27, 0x94, 0x0a, 0xa8, 0xe7, 0x21, 0xca,
0xd2, 0x40, 0xef, 0xac, 0xac, 0x01, 0x63, 0xc9, 0x44, 0xed, 0xa6, 0x55, 0x52, 0x00, 0x72, 0x0c, 0x96, 0x34, 0xd0, 0x3b, 0x2b, 0x6b, 0xc0, 0x58, 0x32, 0x51, 0xbb, 0x69, 0x95, 0x14, 0x80, 0x1c,
0xa1, 0x8d, 0x7c, 0xe3, 0xbe, 0xa8, 0xf1, 0xb2, 0x5f, 0x39, 0x46, 0xcf, 0x17, 0x18, 0xce, 0xde, 0x43, 0xe8, 0x23, 0xdf, 0xb8, 0x2f, 0x6a, 0xbc, 0xec, 0x57, 0x8e, 0xd1, 0xf3, 0x05, 0x86, 0xb3,
0x3a, 0x0f, 0x85, 0xfa, 0x67, 0x04, 0xbd, 0x22, 0xa0, 0xc8, 0xf0, 0xb2, 0xbb, 0x6e, 0x11, 0x94, 0xb7, 0xce, 0x43, 0xa1, 0xfe, 0x19, 0x41, 0xb3, 0x08, 0x28, 0x32, 0xbc, 0xec, 0xae, 0x5b, 0x04,
0x3c, 0x46, 0xb6, 0xaa, 0xb7, 0x61, 0x59, 0x2b, 0x4f, 0x93, 0xeb, 0x16, 0x40, 0x2c, 0x28, 0x07, 0x25, 0x8f, 0x91, 0xad, 0xea, 0x6d, 0x58, 0xd6, 0xca, 0xd3, 0xe4, 0xba, 0x05, 0x10, 0x0b, 0xca,
0xc2, 0xbd, 0x8c, 0x75, 0x8b, 0xa0, 0x8e, 0xe9, 0xf9, 0x61, 0x08, 0xad, 0xf1, 0x1e, 0x29, 0x56, 0x81, 0x70, 0x2f, 0x63, 0xdd, 0x22, 0xa8, 0x63, 0x7a, 0x7e, 0x18, 0x42, 0x6f, 0xbc, 0x47, 0x8a,
0xaf, 0x0d, 0x30, 0x90, 0xac, 0x58, 0xf4, 0xdb, 0x9a, 0x30, 0xa1, 0xc4, 0x58, 0x76, 0x88, 0x35, 0xd5, 0x6b, 0x03, 0x0c, 0x24, 0x2b, 0x16, 0xfd, 0xb6, 0x26, 0x4c, 0x28, 0x31, 0x96, 0x1d, 0x62,
0xd7, 0x8c, 0x0c, 0x23, 0x7a, 0xdf, 0x0b, 0x5f, 0x1a, 0x60, 0x94, 0x92, 0x6b, 0xe8, 0x68, 0xf7, 0xcd, 0x3d, 0x23, 0xc3, 0x88, 0xde, 0xf7, 0xc2, 0x97, 0x06, 0x18, 0xa5, 0xe4, 0x1a, 0x3a, 0xda,
0xa3, 0x09, 0x47, 0xff, 0x50, 0xe5, 0xcb, 0x1d, 0xa0, 0x19, 0xb8, 0x47, 0xd9, 0xa7, 0xef, 0xb6, 0xfd, 0x68, 0xc2, 0xd1, 0x3f, 0x54, 0xf9, 0x72, 0x07, 0x68, 0x06, 0xee, 0x51, 0xf6, 0xe9, 0xbb,
0xc4, 0x9c, 0x65, 0x2d, 0x9a, 0x94, 0x84, 0x3a, 0xd5, 0x7f, 0xe6, 0x89, 0x8b, 0x80, 0xf7, 0x42, 0x2d, 0x31, 0x67, 0x59, 0x8b, 0x26, 0x25, 0xa1, 0x4e, 0xf5, 0x9f, 0x79, 0xe2, 0x22, 0xe0, 0xbd,
0xc6, 0x45, 0x91, 0xb3, 0x25, 0xc6, 0x3e, 0xe7, 0xb9, 0x38, 0xb3, 0x71, 0x01, 0xb1, 0x64, 0x4a, 0x90, 0x71, 0x51, 0xe4, 0x6c, 0x89, 0xb1, 0xcf, 0x79, 0x2e, 0xce, 0x6c, 0x5c, 0x40, 0x2c, 0x99,
0xc3, 0x90, 0x12, 0x97, 0x27, 0x58, 0x28, 0x80, 0x3e, 0xb6, 0x30, 0x1a, 0x5e, 0x66, 0x8c, 0x72, 0xd2, 0x30, 0xa4, 0xc4, 0xe5, 0x09, 0x16, 0x0a, 0xa0, 0x8f, 0x2d, 0x8c, 0x86, 0x97, 0x19, 0xa3,
0xf0, 0x26, 0xd8, 0xcf, 0xf2, 0xc9, 0x04, 0xba, 0xdc, 0xd2, 0xe9, 0x7e, 0xbb, 0x5d, 0x79, 0xba, 0x1c, 0xbc, 0x09, 0x36, 0xb4, 0x7c, 0x32, 0x81, 0x36, 0xb7, 0x74, 0xba, 0xdf, 0x6e, 0x57, 0x9e,
0xfd, 0x83, 0x76, 0x3b, 0x3b, 0xa0, 0x7a, 0x32, 0xe6, 0x2e, 0xbb, 0x22, 0x47, 0xe8, 0xb2, 0xe1, 0x6e, 0xff, 0xa0, 0xdd, 0xce, 0x0e, 0xa8, 0x9e, 0x8c, 0xb9, 0xcb, 0xae, 0xc8, 0x11, 0xba, 0x6c,
0x57, 0xee, 0xc3, 0x89, 0xcf, 0x20, 0xcf, 0x62, 0xfa, 0xd1, 0x09, 0x4d, 0x21, 0x1a, 0x02, 0xda, 0xf8, 0x95, 0xfb, 0x70, 0xe2, 0x33, 0xc8, 0xb3, 0x98, 0x7e, 0x74, 0x42, 0x53, 0x88, 0x86, 0x80,
0x0d, 0x57, 0x8b, 0xe6, 0x78, 0xa4, 0xae, 0x90, 0x9d, 0x0e, 0x0b, 0xf3, 0xa6, 0xd1, 0xc5, 0x6a, 0x76, 0xc3, 0xd5, 0xa2, 0x39, 0x1e, 0xa9, 0x3b, 0x64, 0xa7, 0xc3, 0xc2, 0xbc, 0x69, 0x74, 0xb1,
0xee, 0xe4, 0xa7, 0x09, 0x45, 0x2f, 0xbf, 0xc3, 0x3c, 0x36, 0xf1, 0x93, 0xf0, 0x99, 0x26, 0x0c, 0x9a, 0x3b, 0xf9, 0x69, 0x42, 0xd1, 0xcb, 0xef, 0x30, 0x8f, 0x4d, 0xfc, 0x24, 0x7c, 0xa6, 0x09,
0xaa, 0x1a, 0x3f, 0xf0, 0x88, 0xc7, 0x99, 0xc0, 0x72, 0x00, 0x8c, 0xe6, 0x06, 0xa9, 0xc7, 0xb2, 0x83, 0xaa, 0xc6, 0x0f, 0x3c, 0xe2, 0x71, 0x26, 0xb0, 0x1c, 0x00, 0xa3, 0xb9, 0x41, 0xea, 0xb1,
0x6a, 0x45, 0xa4, 0x31, 0x22, 0x6a, 0x5d, 0x63, 0x1a, 0x0b, 0x17, 0xc0, 0x6d, 0x8e, 0xa7, 0x7a, 0xac, 0x5a, 0x11, 0x69, 0x8c, 0x88, 0x5a, 0xd7, 0x98, 0xc6, 0xc2, 0x05, 0x70, 0x9b, 0xe3, 0xa9,
0x73, 0xe7, 0x22, 0x4c, 0x03, 0x2a, 0x73, 0x4a, 0x7d, 0xd1, 0xbf, 0x45, 0x97, 0x67, 0x59, 0x7a, 0xde, 0xdc, 0xb9, 0x08, 0xd3, 0x80, 0xca, 0x9c, 0x52, 0xdf, 0xf4, 0x6f, 0xd1, 0xe5, 0x59, 0x96,
0x35, 0x34, 0x8d, 0x1f, 0x3d, 0x65, 0x17, 0x49, 0x6a, 0xbe, 0x44, 0x8c, 0x97, 0xb1, 0x05, 0x61, 0x5e, 0x0d, 0x4d, 0xe3, 0x47, 0x4f, 0xd9, 0x4d, 0x92, 0x9a, 0x2f, 0x11, 0xe3, 0x6d, 0x6c, 0x41,
0x5f, 0x29, 0x30, 0x60, 0xd1, 0x54, 0xce, 0x20, 0x96, 0x0e, 0x0a, 0x3e, 0x82, 0x13, 0x96, 0x09, 0xd8, 0x57, 0x0a, 0x0c, 0x58, 0x34, 0x95, 0x33, 0x88, 0xa5, 0x83, 0x82, 0x8f, 0xe0, 0x84, 0x65,
0xa2, 0x45, 0x10, 0x58, 0x34, 0xb8, 0x34, 0x08, 0x20, 0x7f, 0x33, 0x3c, 0xb6, 0x90, 0xcb, 0x56, 0x82, 0x68, 0x11, 0x04, 0x16, 0x0d, 0x2e, 0x0d, 0x02, 0xc8, 0xdf, 0x0c, 0x8f, 0x2d, 0xe4, 0xb2,
0x3a, 0x7b, 0x83, 0xfb, 0xb9, 0x09, 0x72, 0x7c, 0xc9, 0x21, 0x76, 0x11, 0x5e, 0x55, 0x19, 0x08, 0x95, 0xce, 0xde, 0xe0, 0x7e, 0x6e, 0x82, 0x1c, 0x5f, 0x72, 0x88, 0x5d, 0x84, 0x57, 0x55, 0x06,
0xd8, 0x56, 0x14, 0x2b, 0xd9, 0x95, 0x47, 0xc9, 0x80, 0x4a, 0x49, 0x2b, 0x8c, 0xf0, 0xfe, 0xa7, 0x02, 0xb6, 0x15, 0xc5, 0x4a, 0x76, 0xe7, 0x51, 0x32, 0xa0, 0x52, 0xd2, 0x0a, 0x23, 0xbc, 0xff,
0x8f, 0xc7, 0xc7, 0xc7, 0xa7, 0xa4, 0x33, 0x76, 0x8c, 0x6e, 0xf0, 0x1a, 0x3d, 0xd6, 0xc8, 0xf5, 0xe9, 0xe3, 0xf1, 0xf1, 0xf1, 0x29, 0xe9, 0x8c, 0x1d, 0xa3, 0x1b, 0xbc, 0x46, 0x8f, 0x35, 0x72,
0xd7, 0xbb, 0x3b, 0x82, 0xf5, 0x35, 0x16, 0x78, 0x78, 0xad, 0x4c, 0x50, 0x68, 0x97, 0x47, 0x11, 0xfd, 0xf5, 0xee, 0x8e, 0x60, 0x7d, 0x8d, 0x05, 0x1e, 0xde, 0x2b, 0x13, 0x14, 0xda, 0xe5, 0x51,
0xe2, 0x16, 0x1c, 0x02, 0xce, 0xcf, 0x92, 0x88, 0x06, 0x64, 0xc6, 0x85, 0x14, 0x0a, 0x75, 0xb5, 0x84, 0xb8, 0x05, 0x87, 0x80, 0xf3, 0xb3, 0x24, 0xa2, 0x01, 0x99, 0x71, 0x21, 0x85, 0x42, 0x5d,
0x2d, 0x43, 0xfa, 0x4a, 0xfc, 0x10, 0xc0, 0x56, 0xaa, 0x33, 0x82, 0x60, 0x31, 0x54, 0x63, 0x90, 0x6d, 0xcb, 0x90, 0xbe, 0x12, 0x3f, 0x04, 0xb0, 0x95, 0xea, 0x8c, 0x20, 0x58, 0x0c, 0xd5, 0x18,
0x44, 0x22, 0x55, 0xa9, 0x4e, 0xd4, 0xb5, 0x19, 0x00, 0xff, 0x78, 0x41, 0x52, 0x8c, 0x21, 0x32, 0x24, 0x91, 0x48, 0x55, 0xaa, 0x13, 0x75, 0x6f, 0x06, 0xc0, 0x3f, 0x5e, 0x90, 0x14, 0x63, 0x88,
0x66, 0x02, 0x33, 0x83, 0x00, 0x4c, 0x80, 0x6a, 0x1b, 0x6b, 0x06, 0x92, 0x42, 0x25, 0xc1, 0x23, 0x8c, 0x99, 0xc0, 0xcc, 0x20, 0x00, 0x13, 0xa0, 0xda, 0xc6, 0x9a, 0x81, 0xa4, 0x50, 0x49, 0xf0,
0x86, 0x54, 0xc0, 0x0b, 0x5e, 0x04, 0x4b, 0xb4, 0x1a, 0x29, 0xc0, 0x32, 0x41, 0x87, 0x57, 0xde, 0x88, 0x21, 0x15, 0xf0, 0x82, 0x17, 0xc1, 0x12, 0xad, 0x46, 0x0a, 0xb0, 0x4c, 0xd0, 0xe1, 0x95,
0x60, 0x54, 0xc0, 0xfb, 0x51, 0x1c, 0x09, 0xfb, 0x04, 0xaf, 0xb5, 0x42, 0x50, 0x70, 0x1a, 0x06, 0x37, 0x18, 0x15, 0xf0, 0x7e, 0x14, 0x47, 0xc2, 0x3e, 0xc1, 0x6b, 0xad, 0x10, 0x14, 0x9c, 0x86,
0xcf, 0x1e, 0xb9, 0x18, 0x0d, 0x50, 0x6a, 0xe0, 0x12, 0xaa, 0x63, 0x21, 0x67, 0x14, 0x0f, 0xeb, 0xc1, 0xb3, 0x47, 0x2e, 0x46, 0x03, 0x94, 0x1a, 0xb8, 0x84, 0xea, 0x58, 0xc8, 0x19, 0xc5, 0xc3,
0x1b, 0x3c, 0x5e, 0x75, 0x65, 0xdd, 0xa6, 0x94, 0x51, 0x76, 0x6f, 0x35, 0x58, 0xd8, 0xe5, 0x1f, 0xfa, 0x06, 0x8f, 0x57, 0x5d, 0x59, 0xb7, 0x29, 0x65, 0x94, 0xdd, 0x5b, 0x0d, 0x16, 0x76, 0xf9,
0xf0, 0x6e, 0xc5, 0x70, 0x85, 0x77, 0x97, 0x3c, 0x5b, 0xef, 0xeb, 0x5c, 0xf1, 0x37, 0x29, 0x7c, 0x07, 0xbc, 0x5b, 0x31, 0x5c, 0xe1, 0xdd, 0x25, 0xcf, 0xd6, 0xfb, 0x3a, 0x57, 0xfc, 0x4d, 0x0a,
0xd1, 0x19, 0xbb, 0x57, 0x6f, 0x9c, 0x71, 0xe5, 0xbd, 0x53, 0xf7, 0x47, 0x0a, 0x8c, 0x63, 0x6b, 0x5f, 0x74, 0xc6, 0xee, 0xd5, 0x1b, 0x67, 0x5c, 0x79, 0xf1, 0xd4, 0xfd, 0x91, 0x02, 0xe3, 0xd8,
0xf1, 0x0a, 0x2a, 0x83, 0x2e, 0xe5, 0xd0, 0xe4, 0x2c, 0x95, 0x33, 0xd0, 0xec, 0x23, 0x8b, 0x4a, 0x5a, 0xbc, 0x83, 0xca, 0xa0, 0x4b, 0x39, 0x34, 0x39, 0x4b, 0xe5, 0x0c, 0x34, 0xfb, 0xc8, 0xa2,
0x78, 0xd3, 0xfd, 0x65, 0x59, 0x90, 0x96, 0x99, 0xd7, 0xd1, 0xc6, 0x79, 0xc0, 0x68, 0xa2, 0xd4, 0x12, 0xde, 0x74, 0x7f, 0x59, 0x16, 0xa4, 0x65, 0xe6, 0x75, 0xb4, 0x71, 0x1e, 0x30, 0x9a, 0x28,
0xaf, 0x08, 0x41, 0x41, 0x2c, 0x50, 0xe5, 0xb4, 0xa7, 0xe1, 0xb0, 0x4e, 0x54, 0xb5, 0xb7, 0x2b, 0xf5, 0x2b, 0x42, 0x50, 0x10, 0x0b, 0x54, 0x39, 0xed, 0x69, 0x38, 0xac, 0x13, 0x55, 0xed, 0xed,
0xf8, 0x8f, 0x51, 0x31, 0x2b, 0x80, 0x7f, 0x84, 0x37, 0x7d, 0x0b, 0xc0, 0x9f, 0x05, 0x45, 0xcb, 0x0a, 0xfe, 0x63, 0x54, 0xcc, 0x0a, 0xe0, 0x1f, 0xe1, 0x55, 0xdf, 0x02, 0xf0, 0x67, 0x41, 0xd1,
0x41, 0xe7, 0x2e, 0x5b, 0x15, 0xc7, 0xfe, 0x49, 0xa3, 0xaa, 0x00, 0xda, 0x64, 0x53, 0xdc, 0x56, 0x72, 0xd0, 0xb9, 0xcb, 0x56, 0xc5, 0xb1, 0x7f, 0xd2, 0xa8, 0x2a, 0x80, 0x36, 0xd9, 0x14, 0xb7,
0x6d, 0xea, 0x18, 0x59, 0x33, 0x80, 0x6f, 0xdb, 0xca, 0xe4, 0xaf, 0x5a, 0x8b, 0xdd, 0x04, 0x14, 0x55, 0x9b, 0x3a, 0x46, 0xd6, 0x0c, 0xe0, 0xdb, 0xb6, 0x32, 0xf9, 0xab, 0xd6, 0x62, 0x37, 0x01,
0x97, 0xac, 0x74, 0x83, 0xcc, 0xbe, 0xd7, 0xa3, 0x2d, 0x7e, 0x90, 0x33, 0x1c, 0xdc, 0x0e, 0xd7, 0xc5, 0x25, 0x2b, 0xdd, 0x20, 0xb3, 0xef, 0xf5, 0x68, 0x8b, 0x1f, 0xe4, 0x0c, 0x07, 0xb7, 0xc3,
0xe6, 0x3d, 0x63, 0xf5, 0x1d, 0x64, 0x56, 0xa9, 0xa3, 0x26, 0xb2, 0x83, 0xba, 0x80, 0x42, 0x50, 0xb5, 0x79, 0xcf, 0x58, 0x7d, 0x09, 0x99, 0x55, 0xea, 0xa8, 0x89, 0xec, 0xa0, 0x2e, 0xa0, 0x10,
0xe9, 0xfb, 0x34, 0x80, 0xd0, 0x4c, 0x30, 0x4e, 0xb1, 0xec, 0x87, 0xc2, 0x11, 0x82, 0x0d, 0x4a, 0x54, 0xfa, 0x3e, 0x0d, 0x20, 0x34, 0x13, 0x8c, 0x53, 0x2c, 0xfb, 0xa1, 0x70, 0x84, 0x60, 0x83,
0x48, 0x08, 0xc2, 0x14, 0x3b, 0xa6, 0x2c, 0x2c, 0xf1, 0x72, 0x5e, 0xf9, 0xd0, 0x0d, 0xc3, 0x25, 0x12, 0x12, 0x82, 0x30, 0xc5, 0x8e, 0x29, 0x0b, 0x4b, 0xbc, 0x9d, 0x57, 0x3e, 0x74, 0xc3, 0x70,
0x79, 0x2c, 0x2a, 0x4e, 0x31, 0x6c, 0x02, 0x95, 0xbf, 0x47, 0x26, 0x1c, 0x89, 0x39, 0x4c, 0x24, 0x49, 0x1e, 0x8b, 0x8a, 0x53, 0x0c, 0x9b, 0x40, 0xe5, 0xef, 0x91, 0x09, 0x47, 0x62, 0x0e, 0x13,
0x79, 0xd8, 0xbf, 0xcb, 0x51, 0x03, 0x3a, 0x8c, 0x64, 0x09, 0x94, 0x8d, 0xb7, 0x81, 0x70, 0xfd, 0x49, 0x1e, 0xf6, 0xef, 0x72, 0xd4, 0x80, 0x0e, 0x23, 0x59, 0x02, 0x65, 0xe3, 0x6d, 0x20, 0x5c,
0xf5, 0x7e, 0x74, 0x31, 0x5c, 0x52, 0xc2, 0xa1, 0xa5, 0x45, 0x1f, 0x64, 0x7b, 0x94, 0xf4, 0x97, 0x7f, 0xbd, 0x1f, 0x5d, 0x0c, 0x97, 0x94, 0x70, 0x68, 0x69, 0xd1, 0x07, 0xd9, 0x1e, 0x25, 0xfd,
0x6f, 0x3d, 0xd7, 0xe1, 0xd7, 0xc1, 0xd9, 0x68, 0x59, 0x8f, 0x47, 0x87, 0x9a, 0xc5, 0x79, 0xe0, 0xe5, 0x5b, 0xcf, 0x75, 0xf8, 0x75, 0x70, 0x36, 0x5a, 0xd6, 0xe3, 0xd1, 0xa1, 0x66, 0x71, 0x1e,
0xe3, 0x11, 0xfb, 0xbd, 0x0d, 0xa1, 0x78, 0xfd, 0xf5, 0xbc, 0xdf, 0xd3, 0x4a, 0x2c, 0x4b, 0x90, 0xf8, 0x78, 0xc4, 0x7e, 0x6f, 0x43, 0x28, 0x5e, 0x7f, 0x3d, 0xef, 0xf7, 0xb4, 0x12, 0xcb, 0x12,
0x05, 0xcf, 0x1d, 0x8f, 0x7d, 0x77, 0x13, 0x87, 0xde, 0x1b, 0x23, 0xaa, 0xfa, 0xe5, 0x32, 0xe1, 0x64, 0xc1, 0x73, 0xc7, 0x63, 0xdf, 0xdd, 0xc4, 0xa1, 0xf7, 0xc6, 0x88, 0xaa, 0x7e, 0xb9, 0xc4,
0xe0, 0xd9, 0x5b, 0xa9, 0x2f, 0x57, 0xe7, 0xa5, 0x41, 0x3a, 0x86, 0x76, 0x73, 0x56, 0xbe, 0x45, 0xdb, 0xde, 0xed, 0xd4, 0x97, 0xab, 0xf3, 0xd2, 0x20, 0x1d, 0x43, 0xbb, 0x39, 0x2b, 0xdf, 0x22,
0xd8, 0xe2, 0x7a, 0xdd, 0xeb, 0x79, 0x00, 0x6f, 0xed, 0x84, 0x7f, 0x2c, 0x80, 0xc3, 0xbf, 0xa4, 0x6c, 0x71, 0xbd, 0xee, 0xf5, 0x3c, 0x80, 0xb7, 0x76, 0xc2, 0x3f, 0x16, 0xc0, 0xe1, 0x5f, 0x52,
0x5c, 0x11, 0xbf, 0xca, 0x1f, 0xf2, 0xf0, 0xcd, 0x12, 0x05, 0x86, 0xef, 0xc2, 0xdd, 0x43, 0x39, 0xae, 0x88, 0x5f, 0xe5, 0x0f, 0x79, 0xf8, 0x66, 0x89, 0x02, 0xc3, 0x77, 0xe1, 0xee, 0xa1, 0x1c,
0x8a, 0x61, 0xe8, 0x9f, 0x0c, 0xe2, 0xc5, 0x5b, 0x8e, 0xad, 0xf8, 0x8c, 0x7b, 0x2b, 0xed, 0xfc, 0xc5, 0x30, 0xf4, 0x4f, 0x06, 0xf1, 0xe2, 0x2d, 0xc7, 0x56, 0x7c, 0xc6, 0xbd, 0x95, 0x76, 0xfe,
0xc1, 0x53, 0xc8, 0xf1, 0x08, 0x6b, 0x90, 0x68, 0xd0, 0xb1, 0xa1, 0x2e, 0xf4, 0xa6, 0x8c, 0xf4, 0xe0, 0x29, 0xe4, 0x78, 0x84, 0x35, 0x48, 0x34, 0xe8, 0xd8, 0x50, 0x17, 0x7a, 0x53, 0x46, 0xfa,
0x07, 0x2a, 0xf5, 0xe0, 0x48, 0x80, 0x85, 0x22, 0xd1, 0xe1, 0x06, 0xbb, 0xa9, 0xb1, 0x7f, 0x9d, 0x03, 0x95, 0x7a, 0x70, 0x24, 0xc0, 0x42, 0x91, 0xe8, 0x70, 0x83, 0xdd, 0xd4, 0xd8, 0xbf, 0xce,
0x8d, 0xa1, 0x26, 0xfd, 0x17, 0x66, 0x2c, 0x55, 0x75, 0xe8, 0xa4, 0x47, 0x66, 0xb0, 0x37, 0x28, 0xc6, 0x50, 0x93, 0xfe, 0x0b, 0x33, 0x96, 0xaa, 0x3a, 0x74, 0xd2, 0x23, 0x33, 0xd8, 0x1b, 0x94,
0xb7, 0x6e, 0xe4, 0x1d, 0xf0, 0x80, 0x43, 0x26, 0x46, 0x89, 0x34, 0x93, 0xa5, 0x70, 0xbe, 0xfa, 0x5b, 0x37, 0xf2, 0x0e, 0x78, 0xc0, 0x21, 0x13, 0xa3, 0x44, 0x9a, 0xc9, 0x52, 0x38, 0x5f, 0x7d,
0xb2, 0x11, 0xd5, 0xa1, 0x27, 0x73, 0x08, 0xc6, 0xdc, 0x6b, 0xe9, 0xa2, 0xff, 0xaa, 0xbf, 0x9a, 0xd9, 0x88, 0xea, 0xd0, 0x93, 0x39, 0x04, 0x63, 0xee, 0xb5, 0x74, 0xd1, 0x7f, 0xd5, 0x5f, 0x4d,
0xce, 0xb2, 0x96, 0x8a, 0x5f, 0xac, 0x79, 0xb7, 0xf5, 0x4f, 0x57, 0x03, 0xed, 0x27, 0x80, 0x0d, 0x67, 0x59, 0x4b, 0xc5, 0x2f, 0xd6, 0xbc, 0xdb, 0xfa, 0xa7, 0xab, 0x81, 0xf6, 0x13, 0xc0, 0x86,
0x51, 0x0d, 0x5c, 0x44, 0xdf, 0x23, 0x6c, 0x74, 0xad, 0x2b, 0x75, 0xe1, 0x76, 0x1b, 0x35, 0x6e, 0xa8, 0x06, 0x2e, 0xa2, 0xef, 0x11, 0x36, 0xba, 0xd6, 0x95, 0xba, 0x70, 0xbb, 0x8d, 0x1a, 0xb7,
0x27, 0x93, 0x2d, 0xf7, 0x6c, 0x57, 0x50, 0x39, 0x93, 0x85, 0xcb, 0x44, 0xb2, 0xfd, 0x0e, 0xf0, 0x93, 0xc9, 0x96, 0x7b, 0xb6, 0x2b, 0xa8, 0x9c, 0xc9, 0xc2, 0x65, 0x22, 0xd9, 0x7e, 0x07, 0x78,
0xea, 0x1c, 0x48, 0xd4, 0x0d, 0x22, 0x8a, 0x85, 0x8a, 0xeb, 0xe6, 0xf6, 0x38, 0x59, 0xb8, 0x0b, 0x75, 0x0e, 0x24, 0xea, 0x06, 0x11, 0xc5, 0x42, 0xc5, 0x75, 0x73, 0x7b, 0x9c, 0x2c, 0xdc, 0x05,
0xcc, 0x16, 0x5b, 0x6f, 0xbe, 0xf2, 0xcc, 0x0b, 0xb0, 0xa5, 0xfa, 0x0b, 0xab, 0x65, 0x87, 0xd4, 0x66, 0x8b, 0xad, 0x37, 0x9f, 0x79, 0xe6, 0x05, 0xd8, 0x52, 0xfd, 0x85, 0xd5, 0xb2, 0x43, 0xea,
0x4b, 0xfa, 0x6f, 0xbe, 0x69, 0x0a, 0x7f, 0x88, 0xfc, 0x60, 0x7d, 0xf5, 0x97, 0x53, 0x1b, 0x1b, 0x25, 0xfd, 0x37, 0xdf, 0x34, 0x85, 0x3f, 0x44, 0x7e, 0xb0, 0xbe, 0xfa, 0xcb, 0xa9, 0x8d, 0x0d,
0xc8, 0x5b, 0xdb, 0xc9, 0xe7, 0xd4, 0x39, 0x88, 0x0f, 0xd4, 0x15, 0x22, 0xba, 0x5a, 0x9c, 0x8a, 0xe4, 0xad, 0xed, 0xe4, 0x73, 0xea, 0x1c, 0xc4, 0x07, 0xea, 0x0a, 0x11, 0x5d, 0x2d, 0x4e, 0xc5,
0x59, 0xe0, 0x43, 0x2d, 0x92, 0xc1, 0x02, 0x8f, 0x16, 0xdc, 0x17, 0x54, 0x3d, 0xc1, 0xaf, 0x9e, 0x2c, 0xf0, 0xa1, 0x16, 0xc9, 0x60, 0x81, 0x47, 0x0b, 0xee, 0x0b, 0xaa, 0x9e, 0xe0, 0x67, 0x4f,
0x72, 0x06, 0xb5, 0x97, 0xa0, 0x4f, 0xd9, 0x15, 0x14, 0x7e, 0xa1, 0x2f, 0x70, 0xd9, 0xa8, 0x3c, 0x39, 0x83, 0xda, 0x4b, 0xd0, 0xa7, 0xec, 0x0a, 0x0a, 0x3f, 0xd1, 0x17, 0xb8, 0x6c, 0x54, 0x9e,
0xcf, 0x54, 0x3e, 0xc7, 0xba, 0x36, 0x07, 0xfb, 0x68, 0x5a, 0xcd, 0x15, 0x0f, 0xed, 0x82, 0x4c, 0x67, 0x2a, 0x9f, 0x63, 0x5d, 0x9b, 0x83, 0x7d, 0x34, 0xad, 0xe6, 0x8a, 0x87, 0x76, 0x41, 0xa6,
0xd1, 0x83, 0x44, 0x0c, 0xf1, 0x91, 0x0b, 0xe7, 0xc7, 0xd8, 0x37, 0xea, 0x66, 0x57, 0x07, 0x03, 0xe8, 0x41, 0x22, 0x86, 0xf8, 0xc8, 0x85, 0xf3, 0x63, 0xec, 0x1b, 0x75, 0xb3, 0xab, 0x83, 0x01,
0xf0, 0x55, 0x11, 0x89, 0xdf, 0x3d, 0x61, 0xa5, 0x33, 0x4f, 0xdd, 0x23, 0x96, 0x40, 0x92, 0x51, 0xf8, 0xaa, 0x88, 0xc4, 0x0f, 0x9f, 0xb0, 0xd2, 0x99, 0xa7, 0xee, 0x11, 0x4b, 0x20, 0xc9, 0xa8,
0x61, 0xdf, 0xa5, 0xa9, 0x47, 0x12, 0xa8, 0xad, 0xcb, 0xfd, 0x74, 0xb7, 0xf7, 0xa6, 0x9f, 0x6e, 0xb0, 0xef, 0xd2, 0xd4, 0x23, 0x09, 0xd4, 0xd6, 0xe5, 0x7e, 0xba, 0xdb, 0x7b, 0xd3, 0x4f, 0x37,
0x36, 0xdb, 0x88, 0x9d, 0xf8, 0xc7, 0xb2, 0xd6, 0xf6, 0xca, 0x2d, 0x0b, 0xd0, 0x1d, 0x7f, 0xd7, 0x9b, 0x6d, 0xc4, 0x4e, 0xfc, 0x63, 0x59, 0x6b, 0x7b, 0xe5, 0x96, 0x05, 0xe8, 0x8e, 0xbf, 0xeb,
0xaf, 0x39, 0x3c, 0xb2, 0x8e, 0x4d, 0x07, 0x7f, 0x2d, 0x6b, 0x7d, 0x1f, 0xac, 0x62, 0x05, 0x7f, 0xd7, 0x1c, 0x1e, 0x59, 0xc7, 0xa6, 0x83, 0xbf, 0x96, 0xb5, 0xbe, 0x0f, 0x56, 0xb1, 0x82, 0xbf,
0xd7, 0x33, 0x6a, 0x7f, 0x38, 0xc2, 0x35, 0xf0, 0xbb, 0x81, 0xd1, 0xc7, 0x83, 0x26, 0xb4, 0xc9, 0xeb, 0x19, 0xb5, 0x3f, 0x1c, 0xe1, 0x1a, 0xf8, 0xdd, 0xc0, 0xe8, 0xe3, 0x41, 0x13, 0xda, 0x64,
0xf8, 0xbb, 0x9e, 0x51, 0xd3, 0x52, 0xbb, 0xa9, 0x3f, 0x1b, 0x58, 0x35, 0xb5, 0x50, 0xcd, 0xb2, 0xfc, 0x5d, 0xcf, 0xa8, 0x69, 0xa9, 0xdd, 0xd4, 0x9f, 0x0d, 0xac, 0x9a, 0x5a, 0xa8, 0x66, 0x59,
0x54, 0x4b, 0xed, 0x36, 0x80, 0xd7, 0x2f, 0x8c, 0xc5, 0x58, 0x5d, 0x6b, 0x55, 0x21, 0xb2, 0x63, 0xaa, 0xa5, 0x76, 0x1b, 0xc0, 0xeb, 0x17, 0xc6, 0x62, 0xac, 0xae, 0xb5, 0xaa, 0x10, 0xd9, 0x31,
0x7a, 0xee, 0x87, 0x71, 0xc2, 0x9f, 0xea, 0x64, 0xc4, 0xa1, 0xc5, 0x1c, 0x73, 0x9a, 0x78, 0xba, 0x3d, 0xf7, 0xc3, 0x38, 0xe1, 0x4f, 0x75, 0x32, 0xe2, 0xd0, 0x62, 0x8e, 0x39, 0x4d, 0x3c, 0x5d,
0xd0, 0x47, 0xb0, 0xcc, 0x80, 0x91, 0xcc, 0x20, 0x28, 0x95, 0x3d, 0x8a, 0x8b, 0x50, 0x4c, 0x56, 0xe8, 0x23, 0x58, 0x66, 0xc0, 0x48, 0x66, 0x10, 0x94, 0xca, 0x1e, 0xc5, 0x45, 0x28, 0x26, 0xab,
0x1b, 0xbf, 0x04, 0xff, 0xc8, 0x47, 0x5d, 0x63, 0xe1, 0x83, 0x31, 0x7e, 0xb8, 0x86, 0x3f, 0xf8, 0x8d, 0x9f, 0x82, 0x7f, 0xe4, 0xab, 0xae, 0xb1, 0xf0, 0xc5, 0x18, 0xbf, 0x5c, 0xc3, 0x1f, 0xfc,
0x71, 0x1b, 0xbf, 0x74, 0xe3, 0x7f, 0x11, 0xfb, 0x1f, 0xa2, 0x19, 0x06, 0x2b, 0x32, 0x26, 0x00, 0xba, 0x8d, 0x9f, 0xba, 0xf1, 0xff, 0x88, 0xfd, 0x0f, 0xeb, 0x52, 0xcb, 0xf8, 0x33, 0x26, 0x00,
0x00 0x00
}; };
@ -1271,7 +1271,7 @@ const uint8_t PAGE_settings_sync[] PROGMEM = {
// Autogenerated from wled00/data/settings_time.htm, do not edit!! // Autogenerated from wled00/data/settings_time.htm, do not edit!!
const uint16_t PAGE_settings_time_length = 3313; const uint16_t PAGE_settings_time_length = 3313;
const uint8_t PAGE_settings_time[] PROGMEM = { const uint8_t PAGE_settings_time[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x38,
0xf6, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0x98, 0x78, 0x70, 0x9e, 0x90, 0x16, 0x92, 0xd8, 0xdd, 0x10, 0xf6, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0x98, 0x78, 0x70, 0x9e, 0x90, 0x16, 0x92, 0xd8, 0xdd, 0x10,
0xd2, 0x42, 0x4b, 0x02, 0x67, 0x92, 0x0e, 0xbb, 0xd3, 0xf6, 0x4c, 0x15, 0x5b, 0x49, 0x0c, 0x8e, 0xd2, 0x42, 0x4b, 0x02, 0x67, 0x92, 0x0e, 0xbb, 0xd3, 0xf6, 0x4c, 0x15, 0x5b, 0x49, 0x0c, 0x8e,
0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x7b, 0x25, 0x39, 0xce, 0xd3, 0xd0, 0x76, 0x66, 0x3f, 0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x7b, 0x25, 0x39, 0xce, 0xd3, 0xd0, 0x76, 0x66, 0x3f,
@ -1485,7 +1485,7 @@ const uint8_t PAGE_settings_time[] PROGMEM = {
// Autogenerated from wled00/data/settings_sec.htm, do not edit!! // Autogenerated from wled00/data/settings_sec.htm, do not edit!!
const uint16_t PAGE_settings_sec_length = 2405; const uint16_t PAGE_settings_sec_length = 2405;
const uint8_t PAGE_settings_sec[] PROGMEM = { const uint8_t PAGE_settings_sec[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6d, 0x53, 0xdb, 0x48,
0x12, 0xfe, 0xee, 0x5f, 0x31, 0x4c, 0xaa, 0x58, 0xeb, 0x22, 0x2c, 0x43, 0x72, 0x5b, 0x09, 0x20, 0x12, 0xfe, 0xee, 0x5f, 0x31, 0x4c, 0xaa, 0x58, 0xeb, 0x22, 0x2c, 0x43, 0x72, 0x5b, 0x09, 0x20,
0xe7, 0x20, 0x90, 0x0d, 0x57, 0x10, 0x28, 0x6c, 0x36, 0x77, 0x95, 0x4b, 0xa5, 0xc6, 0xd2, 0xd8, 0xe7, 0x20, 0x90, 0x0d, 0x57, 0x10, 0x28, 0x6c, 0x36, 0x77, 0x95, 0x4b, 0xa5, 0xc6, 0xd2, 0xd8,
0x9a, 0x58, 0xd6, 0x68, 0x67, 0x46, 0x38, 0xbe, 0xec, 0xfe, 0xf7, 0x7b, 0x7a, 0x24, 0xd9, 0x86, 0x9a, 0x58, 0xd6, 0x68, 0x67, 0x46, 0x38, 0xbe, 0xec, 0xfe, 0xf7, 0x7b, 0x7a, 0x24, 0xd9, 0x86,
@ -1642,7 +1642,7 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
// Autogenerated from wled00/data/settings_um.htm, do not edit!! // Autogenerated from wled00/data/settings_um.htm, do not edit!!
const uint16_t PAGE_settings_um_length = 2748; const uint16_t PAGE_settings_um_length = 2748;
const uint8_t PAGE_settings_um[] PROGMEM = { const uint8_t PAGE_settings_um[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x38,
0x12, 0xfe, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0xbb, 0x40, 0xd7, 0xb6, 0x12, 0xfe, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0xbb, 0x40, 0xd7, 0xb6,
0x94, 0x6b, 0xd3, 0xee, 0xd6, 0xd7, 0x97, 0x04, 0x48, 0xbb, 0x8b, 0x43, 0x9a, 0x6b, 0x64, 0x89, 0x94, 0x6b, 0xd3, 0xee, 0xd6, 0xd7, 0x97, 0x04, 0x48, 0xbb, 0x8b, 0x43, 0x9a, 0x6b, 0x64, 0x89,
0xb6, 0xd9, 0xc8, 0xa4, 0x4e, 0xa4, 0xf2, 0x72, 0x8e, 0xff, 0xfb, 0x3d, 0x43, 0x49, 0xb6, 0x9c, 0xb6, 0xd9, 0xc8, 0xa4, 0x4e, 0xa4, 0xf2, 0x72, 0x8e, 0xff, 0xfb, 0x3d, 0x43, 0x49, 0xb6, 0x9c,
@ -1820,7 +1820,7 @@ const uint8_t PAGE_settings_um[] PROGMEM = {
// Autogenerated from wled00/data/settings_2D.htm, do not edit!! // Autogenerated from wled00/data/settings_2D.htm, do not edit!!
const uint16_t PAGE_settings_2D_length = 1745; const uint16_t PAGE_settings_2D_length = 1745;
const uint8_t PAGE_settings_2D[] PROGMEM = { const uint8_t PAGE_settings_2D[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x95, 0x58, 0x5b, 0x6f, 0xdb, 0x36, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x58, 0x5b, 0x6f, 0xdb, 0x36,
0x14, 0x7e, 0xd7, 0xaf, 0x60, 0x88, 0xa2, 0x93, 0x5a, 0x59, 0x8e, 0xbb, 0x0b, 0x8a, 0x58, 0x52, 0x14, 0x7e, 0xd7, 0xaf, 0x60, 0x88, 0xa2, 0x93, 0x5a, 0x59, 0x8e, 0xbb, 0x0b, 0x8a, 0x58, 0x52,
0xd6, 0x34, 0xd9, 0x92, 0x21, 0x41, 0x83, 0xba, 0x4b, 0x31, 0xac, 0x43, 0x4b, 0x4b, 0xc7, 0x16, 0xd6, 0x34, 0xd9, 0x92, 0x21, 0x41, 0x83, 0xba, 0x4b, 0x31, 0xac, 0x43, 0x4b, 0x4b, 0xc7, 0x16,
0x1b, 0x89, 0x14, 0x48, 0xca, 0x49, 0xe6, 0xe6, 0xbf, 0xef, 0x90, 0x92, 0xaf, 0x71, 0xda, 0xee, 0x1b, 0x89, 0x14, 0x48, 0xca, 0x49, 0xe6, 0xe6, 0xbf, 0xef, 0x90, 0x92, 0xaf, 0x71, 0xda, 0xee,
@ -1936,7 +1936,7 @@ const uint8_t PAGE_settings_2D[] PROGMEM = {
// Autogenerated from wled00/data/settings_pin.htm, do not edit!! // Autogenerated from wled00/data/settings_pin.htm, do not edit!!
const uint16_t PAGE_settings_pin_length = 471; const uint16_t PAGE_settings_pin_length = 471;
const uint8_t PAGE_settings_pin[] PROGMEM = { const uint8_t PAGE_settings_pin[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x5d, 0x52, 0x4d, 0x6f, 0x13, 0x31,
0x10, 0xbd, 0xef, 0xaf, 0x30, 0x73, 0x69, 0x82, 0x92, 0x6c, 0xa8, 0xa8, 0x04, 0xaa, 0xbd, 0x42, 0x10, 0xbd, 0xef, 0xaf, 0x30, 0x73, 0x69, 0x82, 0x92, 0x6c, 0xa8, 0xa8, 0x04, 0xaa, 0xbd, 0x42,
0x81, 0x1e, 0xb8, 0x94, 0x48, 0xe5, 0x52, 0x55, 0x55, 0xe5, 0xd8, 0xb3, 0x89, 0x55, 0x7f, 0x2c, 0x81, 0x1e, 0xb8, 0x94, 0x48, 0xe5, 0x52, 0x55, 0x55, 0xe5, 0xd8, 0xb3, 0x89, 0x55, 0x7f, 0x2c,
0xb6, 0x37, 0x21, 0x54, 0xfc, 0x77, 0xc6, 0xbb, 0xa1, 0xa0, 0x5c, 0xd6, 0x7e, 0x33, 0xe3, 0x37, 0xb6, 0x37, 0x21, 0x54, 0xfc, 0x77, 0xc6, 0xbb, 0xa1, 0xa0, 0x5c, 0xd6, 0x7e, 0x33, 0xe3, 0x37,

1873
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/json.cpp
View File

@ -105,7 +105,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
of = offsetAbs; of = offsetAbs;
} }
if (stop > start && of > len -1) of = len -1; if (stop > start && of > len -1) of = len -1;
strip.setSegment(id, start, stop, grp, spc, of, startY, stopY); seg.set(start, stop, grp, spc, of, startY, stopY);
byte segbri = seg.opacity; byte segbri = seg.opacity;
if (getVal(elem["bri"], &segbri)) { if (getVal(elem["bri"], &segbri)) {

2
wled00/set.cpp
View File

@ -744,7 +744,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply)
if (pos > 0) { if (pos > 0) {
spcI = getNumVal(&req, pos); spcI = getNumVal(&req, pos);
} }
strip.setSegment(selectedSeg, startI, stopI, grpI, spcI, UINT16_MAX, startY, stopY); selseg.set(startI, stopI, grpI, spcI, UINT16_MAX, startY, stopY);
pos = req.indexOf(F("RV=")); //Segment reverse pos = req.indexOf(F("RV=")); //Segment reverse
if (pos > 0) selseg.reverse = req.charAt(pos+3) != '0'; if (pos > 0) selseg.reverse = req.charAt(pos+3) != '0';

7
wled00/udp.cpp
View File

@ -363,7 +363,7 @@ void handleNotifications()
uint16_t stopY = 1, stop = (udpIn[3+ofs] << 8 | udpIn[4+ofs]); uint16_t stopY = 1, stop = (udpIn[3+ofs] << 8 | udpIn[4+ofs]);
uint16_t offset = (udpIn[7+ofs] << 8 | udpIn[8+ofs]); uint16_t offset = (udpIn[7+ofs] << 8 | udpIn[8+ofs]);
if (!receiveSegmentOptions) { if (!receiveSegmentOptions) {
strip.setSegment(id, start, stop, selseg.grouping, selseg.spacing, offset, startY, stopY); selseg.set(start, stop, selseg.grouping, selseg.spacing, offset, startY, stopY);
continue; continue;
} }
//for (size_t j = 1; j<4; j++) selseg.setOption(j, (udpIn[9 +ofs] >> j) & 0x01); //only take into account mirrored, on, reversed; ignore selected //for (size_t j = 1; j<4; j++) selseg.setOption(j, (udpIn[9 +ofs] >> j) & 0x01); //only take into account mirrored, on, reversed; ignore selected
@ -396,11 +396,10 @@ void handleNotifications()
startY = (udpIn[32+ofs] << 8 | udpIn[33+ofs]); startY = (udpIn[32+ofs] << 8 | udpIn[33+ofs]);
stopY = (udpIn[34+ofs] << 8 | udpIn[35+ofs]); stopY = (udpIn[34+ofs] << 8 | udpIn[35+ofs]);
} }
//setSegment() also properly resets segments
if (receiveSegmentBounds) { if (receiveSegmentBounds) {
strip.setSegment(id, start, stop, udpIn[5+ofs], udpIn[6+ofs], offset, startY, stopY); selseg.set(start, stop, udpIn[5+ofs], udpIn[6+ofs], offset, startY, stopY);
} else { } else {
strip.setSegment(id, selseg.start, selseg.stop, udpIn[5+ofs], udpIn[6+ofs], selseg.offset, selseg.startY, selseg.stopY); selseg.set(selseg.start, selseg.stop, udpIn[5+ofs], udpIn[6+ofs], selseg.offset, selseg.startY, selseg.stopY);
} }
} }
stateChanged = true; stateChanged = true;

2
wled00/wled.cpp
View File

@ -569,7 +569,7 @@ bool WLED::initEthernet()
} else { } else {
DEBUG_PRINT(F("initE: Failing due to invalid eth_clk_mode (")); DEBUG_PRINT(F("initE: Failing due to invalid eth_clk_mode ("));
DEBUG_PRINT(es.eth_clk_mode); DEBUG_PRINT(es.eth_clk_mode);
DEBUG_PRINTLN(F(")")); DEBUG_PRINTLN(")");
return false; return false;
} }