Merge branch 'dev' of https://github.com/blazoncek/WLED into async-psave
This commit is contained in:
commit
7de35b4830
@ -293,8 +293,8 @@ class MultiRelay : public Usermod {
|
|||||||
|
|
||||||
json[F("stat_t")] = "~";
|
json[F("stat_t")] = "~";
|
||||||
json[F("cmd_t")] = F("~/command");
|
json[F("cmd_t")] = F("~/command");
|
||||||
json[F("pl_off")] = F("off");
|
json[F("pl_off")] = "off";
|
||||||
json[F("pl_on")] = F("on");
|
json[F("pl_on")] = "on";
|
||||||
json[F("uniq_id")] = uid;
|
json[F("uniq_id")] = uid;
|
||||||
|
|
||||||
strcpy(buf, mqttDeviceTopic); //max length: 33 + 7 = 40
|
strcpy(buf, mqttDeviceTopic); //max length: 33 + 7 = 40
|
||||||
|
@ -4106,14 +4106,14 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
|
|
||||||
if (spotlights[i].width <= 1) {
|
if (spotlights[i].width <= 1) {
|
||||||
if (start >= 0 && start < SEGLEN) {
|
if (start >= 0 && start < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start, color, 128); // TODO
|
SEGMENT.blendPixelColor(start, color, 128);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (spotlights[i].type) {
|
switch (spotlights[i].type) {
|
||||||
case SPOT_TYPE_SOLID:
|
case SPOT_TYPE_SOLID:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4121,7 +4121,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
case SPOT_TYPE_GRADIENT:
|
case SPOT_TYPE_GRADIENT:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
|
SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4129,7 +4129,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
case SPOT_TYPE_2X_GRADIENT:
|
case SPOT_TYPE_2X_GRADIENT:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
|
SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4137,7 +4137,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
case SPOT_TYPE_2X_DOT:
|
case SPOT_TYPE_2X_DOT:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j += 2) {
|
for (size_t j = 0; j < spotlights[i].width; j += 2) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4145,7 +4145,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
case SPOT_TYPE_3X_DOT:
|
case SPOT_TYPE_3X_DOT:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j += 3) {
|
for (size_t j = 0; j < spotlights[i].width; j += 3) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4153,7 +4153,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
case SPOT_TYPE_4X_DOT:
|
case SPOT_TYPE_4X_DOT:
|
||||||
for (size_t j = 0; j < spotlights[i].width; j += 4) {
|
for (size_t j = 0; j < spotlights[i].width; j += 4) {
|
||||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4163,7 +4163,7 @@ uint16_t mode_dancing_shadows(void)
|
|||||||
|
|
||||||
return FRAMETIME;
|
return FRAMETIME;
|
||||||
}
|
}
|
||||||
static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,,;!;1d";
|
static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,!,!;!;1d";
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -4524,7 +4524,7 @@ uint16_t mode_perlinmove(void) {
|
|||||||
|
|
||||||
return FRAMETIME;
|
return FRAMETIME;
|
||||||
} // mode_perlinmove()
|
} // mode_perlinmove()
|
||||||
static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;,!;!;1d";
|
static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;!,!;!;1d";
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
|
@ -1501,9 +1501,7 @@ void WS2812FX::loadCustomPalettes()
|
|||||||
CRGBPalette16 targetPalette;
|
CRGBPalette16 targetPalette;
|
||||||
for (int index = 0; index<10; index++) {
|
for (int index = 0; index<10; index++) {
|
||||||
char fileName[32];
|
char fileName[32];
|
||||||
strcpy_P(fileName, PSTR("/palette"));
|
sprintf_P(fileName, PSTR("/palette%d.json"), index);
|
||||||
sprintf(fileName +8, "%d", index);
|
|
||||||
strcat(fileName, ".json");
|
|
||||||
|
|
||||||
StaticJsonDocument<1536> pDoc; // barely enough to fit 72 numbers
|
StaticJsonDocument<1536> pDoc; // barely enough to fit 72 numbers
|
||||||
if (WLED_FS.exists(fileName)) {
|
if (WLED_FS.exists(fileName)) {
|
||||||
|
@ -4,9 +4,12 @@
|
|||||||
#include "NeoPixelBrightnessBus.h"
|
#include "NeoPixelBrightnessBus.h"
|
||||||
|
|
||||||
// temporary - these defines should actually be set in platformio.ini
|
// temporary - these defines should actually be set in platformio.ini
|
||||||
// C3: I2S0 and I2S1 methods not supported
|
// C3: I2S0 and I2S1 methods not supported (has one I2S bus)
|
||||||
// S2: I2S1 methods not supported
|
// S2: I2S1 methods not supported (has one I2S bus)
|
||||||
// S3: I2S0 and I2S1 methods not supported yet
|
// S3: I2S0 and I2S1 methods not supported yet (has two I2S buses)
|
||||||
|
// https://github.com/Makuna/NeoPixelBus/blob/b32f719e95ef3c35c46da5c99538017ef925c026/src/internal/Esp32_i2s.h#L4
|
||||||
|
// https://github.com/Makuna/NeoPixelBus/blob/b32f719e95ef3c35c46da5c99538017ef925c026/src/internal/NeoEsp32RmtMethod.h#L857
|
||||||
|
|
||||||
#if !defined(WLED_NO_I2S0_PIXELBUS) && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3))
|
#if !defined(WLED_NO_I2S0_PIXELBUS) && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3))
|
||||||
#define WLED_NO_I2S0_PIXELBUS
|
#define WLED_NO_I2S0_PIXELBUS
|
||||||
#endif
|
#endif
|
||||||
@ -46,54 +49,57 @@
|
|||||||
#define I_8266_DM_TM1_4 15
|
#define I_8266_DM_TM1_4 15
|
||||||
#define I_8266_BB_TM1_4 16
|
#define I_8266_BB_TM1_4 16
|
||||||
//TM1829 (RGB)
|
//TM1829 (RGB)
|
||||||
#define I_8266_U0_TM2_3 39
|
#define I_8266_U0_TM2_3 17
|
||||||
#define I_8266_U1_TM2_3 40
|
#define I_8266_U1_TM2_3 18
|
||||||
#define I_8266_DM_TM2_3 41
|
#define I_8266_DM_TM2_3 19
|
||||||
#define I_8266_BB_TM2_3 42
|
#define I_8266_BB_TM2_3 20
|
||||||
|
|
||||||
/*** ESP32 Neopixel methods ***/
|
/*** ESP32 Neopixel methods ***/
|
||||||
//RGB
|
//RGB
|
||||||
#define I_32_RN_NEO_3 17
|
#define I_32_RN_NEO_3 21
|
||||||
#define I_32_I0_NEO_3 18
|
#define I_32_I0_NEO_3 22
|
||||||
#define I_32_I1_NEO_3 19
|
#define I_32_I1_NEO_3 23
|
||||||
|
#define I_32_BB_NEO_3 24 // bitbangging on ESP32 not recommended
|
||||||
//RGBW
|
//RGBW
|
||||||
#define I_32_RN_NEO_4 20
|
#define I_32_RN_NEO_4 25
|
||||||
#define I_32_I0_NEO_4 21
|
#define I_32_I0_NEO_4 26
|
||||||
#define I_32_I1_NEO_4 22
|
#define I_32_I1_NEO_4 27
|
||||||
|
#define I_32_BB_NEO_4 28 // bitbangging on ESP32 not recommended
|
||||||
//400Kbps
|
//400Kbps
|
||||||
#define I_32_RN_400_3 23
|
#define I_32_RN_400_3 29
|
||||||
#define I_32_I0_400_3 24
|
#define I_32_I0_400_3 30
|
||||||
#define I_32_I1_400_3 25
|
#define I_32_I1_400_3 31
|
||||||
|
#define I_32_BB_400_3 32 // bitbangging on ESP32 not recommended
|
||||||
//TM1814 (RGBW)
|
//TM1814 (RGBW)
|
||||||
#define I_32_RN_TM1_4 26
|
#define I_32_RN_TM1_4 33
|
||||||
#define I_32_I0_TM1_4 27
|
#define I_32_I0_TM1_4 34
|
||||||
#define I_32_I1_TM1_4 28
|
#define I_32_I1_TM1_4 35
|
||||||
//Bit Bang theoratically possible, but very undesirable and not needed (no pin restrictions on RMT and I2S)
|
//Bit Bang theoratically possible, but very undesirable and not needed (no pin restrictions on RMT and I2S)
|
||||||
//TM1829 (RGB)
|
//TM1829 (RGB)
|
||||||
#define I_32_RN_TM2_3 43
|
#define I_32_RN_TM2_3 36
|
||||||
#define I_32_I0_TM2_3 44
|
#define I_32_I0_TM2_3 37
|
||||||
#define I_32_I1_TM2_3 45
|
#define I_32_I1_TM2_3 38
|
||||||
//Bit Bang theoratically possible, but very undesirable and not needed (no pin restrictions on RMT and I2S)
|
//Bit Bang theoratically possible, but very undesirable and not needed (no pin restrictions on RMT and I2S)
|
||||||
|
|
||||||
//APA102
|
//APA102
|
||||||
#define I_HS_DOT_3 29 //hardware SPI
|
#define I_HS_DOT_3 39 //hardware SPI
|
||||||
#define I_SS_DOT_3 30 //soft SPI
|
#define I_SS_DOT_3 40 //soft SPI
|
||||||
|
|
||||||
//LPD8806
|
//LPD8806
|
||||||
#define I_HS_LPD_3 31
|
#define I_HS_LPD_3 41
|
||||||
#define I_SS_LPD_3 32
|
#define I_SS_LPD_3 42
|
||||||
|
|
||||||
//WS2801
|
//WS2801
|
||||||
#define I_HS_WS1_3 33
|
#define I_HS_WS1_3 43
|
||||||
#define I_SS_WS1_3 34
|
#define I_SS_WS1_3 44
|
||||||
|
|
||||||
//P9813
|
//P9813
|
||||||
#define I_HS_P98_3 35
|
#define I_HS_P98_3 45
|
||||||
#define I_SS_P98_3 36
|
#define I_SS_P98_3 46
|
||||||
|
|
||||||
//LPD6803
|
//LPD6803
|
||||||
#define I_HS_LPO_3 37
|
#define I_HS_LPO_3 47
|
||||||
#define I_SS_LPO_3 38
|
#define I_SS_LPO_3 48
|
||||||
|
|
||||||
|
|
||||||
/*** ESP8266 Neopixel methods ***/
|
/*** ESP8266 Neopixel methods ***/
|
||||||
@ -135,6 +141,7 @@
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
#define B_32_I1_NEO_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32I2s1800KbpsMethod>
|
#define B_32_I1_NEO_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32I2s1800KbpsMethod>
|
||||||
#endif
|
#endif
|
||||||
|
//#define B_32_BB_NEO_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32BitBang800KbpsMethod> // NeoEsp8266BitBang800KbpsMethod
|
||||||
//RGBW
|
//RGBW
|
||||||
#define B_32_RN_NEO_4 NeoPixelBrightnessBus<NeoGrbwFeature, NeoEsp32RmtNWs2812xMethod>
|
#define B_32_RN_NEO_4 NeoPixelBrightnessBus<NeoGrbwFeature, NeoEsp32RmtNWs2812xMethod>
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -143,6 +150,7 @@
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
#define B_32_I1_NEO_4 NeoPixelBrightnessBus<NeoGrbwFeature, NeoEsp32I2s1800KbpsMethod>
|
#define B_32_I1_NEO_4 NeoPixelBrightnessBus<NeoGrbwFeature, NeoEsp32I2s1800KbpsMethod>
|
||||||
#endif
|
#endif
|
||||||
|
//#define B_32_BB_NEO_4 NeoPixelBrightnessBus<NeoGrbwFeature, NeoEsp32BitBang800KbpsMethod> // NeoEsp8266BitBang800KbpsMethod
|
||||||
//400Kbps
|
//400Kbps
|
||||||
#define B_32_RN_400_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32RmtN400KbpsMethod>
|
#define B_32_RN_400_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32RmtN400KbpsMethod>
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -151,6 +159,7 @@
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
#define B_32_I1_400_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32I2s1400KbpsMethod>
|
#define B_32_I1_400_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32I2s1400KbpsMethod>
|
||||||
#endif
|
#endif
|
||||||
|
//#define B_32_BB_400_3 NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32BitBang400KbpsMethod> // NeoEsp8266BitBang400KbpsMethod
|
||||||
//TM1814 (RGBW)
|
//TM1814 (RGBW)
|
||||||
#define B_32_RN_TM1_4 NeoPixelBrightnessBus<NeoWrgbTm1814Feature, NeoEsp32RmtNTm1814Method>
|
#define B_32_RN_TM1_4 NeoPixelBrightnessBus<NeoWrgbTm1814Feature, NeoEsp32RmtNTm1814Method>
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -255,6 +264,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Begin(); break;
|
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Begin(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Begin(); break;
|
||||||
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Begin(); break;
|
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Begin(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Begin(); break;
|
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Begin(); break;
|
||||||
@ -262,6 +272,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Begin(); break;
|
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Begin(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->Begin(); break;
|
||||||
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Begin(); break;
|
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Begin(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Begin(); break;
|
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Begin(); break;
|
||||||
@ -269,6 +280,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Begin(); break;
|
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Begin(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->Begin(); break;
|
||||||
case I_32_RN_TM1_4: beginTM1814<B_32_RN_TM1_4*>(busPtr); break;
|
case I_32_RN_TM1_4: beginTM1814<B_32_RN_TM1_4*>(busPtr); break;
|
||||||
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Begin(); break;
|
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Begin(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -327,6 +339,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: busPtr = new B_32_I1_NEO_3(len, pins[0]); break;
|
case I_32_I1_NEO_3: busPtr = new B_32_I1_NEO_3(len, pins[0]); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: busPtr = new B_32_BB_NEO_3(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
case I_32_RN_NEO_4: busPtr = new B_32_RN_NEO_4(len, pins[0], (NeoBusChannel)channel); break;
|
case I_32_RN_NEO_4: busPtr = new B_32_RN_NEO_4(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: busPtr = new B_32_I0_NEO_4(len, pins[0]); break;
|
case I_32_I0_NEO_4: busPtr = new B_32_I0_NEO_4(len, pins[0]); break;
|
||||||
@ -334,6 +347,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: busPtr = new B_32_I1_NEO_4(len, pins[0]); break;
|
case I_32_I1_NEO_4: busPtr = new B_32_I1_NEO_4(len, pins[0]); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: busPtr = new B_32_BB_NEO_4(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
case I_32_RN_400_3: busPtr = new B_32_RN_400_3(len, pins[0], (NeoBusChannel)channel); break;
|
case I_32_RN_400_3: busPtr = new B_32_RN_400_3(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: busPtr = new B_32_I0_400_3(len, pins[0]); break;
|
case I_32_I0_400_3: busPtr = new B_32_I0_400_3(len, pins[0]); break;
|
||||||
@ -341,6 +355,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: busPtr = new B_32_I1_400_3(len, pins[0]); break;
|
case I_32_I1_400_3: busPtr = new B_32_I1_400_3(len, pins[0]); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: busPtr = new B_32_BB_400_3(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
case I_32_RN_TM1_4: busPtr = new B_32_RN_TM1_4(len, pins[0], (NeoBusChannel)channel); break;
|
case I_32_RN_TM1_4: busPtr = new B_32_RN_TM1_4(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
case I_32_RN_TM2_3: busPtr = new B_32_RN_TM2_3(len, pins[0], (NeoBusChannel)channel); break;
|
case I_32_RN_TM2_3: busPtr = new B_32_RN_TM2_3(len, pins[0], (NeoBusChannel)channel); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -400,6 +415,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Show(); break;
|
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->Show(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->Show(); break;
|
||||||
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Show(); break;
|
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->Show(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Show(); break;
|
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->Show(); break;
|
||||||
@ -407,6 +423,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Show(); break;
|
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->Show(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->Show(); break;
|
||||||
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Show(); break;
|
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->Show(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Show(); break;
|
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->Show(); break;
|
||||||
@ -414,6 +431,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Show(); break;
|
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->Show(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->Show(); break;
|
||||||
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->Show(); break;
|
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->Show(); break;
|
||||||
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Show(); break;
|
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->Show(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -470,6 +488,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: return (static_cast<B_32_I1_NEO_3*>(busPtr))->CanShow(); break;
|
case I_32_I1_NEO_3: return (static_cast<B_32_I1_NEO_3*>(busPtr))->CanShow(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: return (static_cast<B_32_BB_NEO_3*>(busPtr))->CanShow(); break;
|
||||||
case I_32_RN_NEO_4: return (static_cast<B_32_RN_NEO_4*>(busPtr))->CanShow(); break;
|
case I_32_RN_NEO_4: return (static_cast<B_32_RN_NEO_4*>(busPtr))->CanShow(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: return (static_cast<B_32_I0_NEO_4*>(busPtr))->CanShow(); break;
|
case I_32_I0_NEO_4: return (static_cast<B_32_I0_NEO_4*>(busPtr))->CanShow(); break;
|
||||||
@ -477,6 +496,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: return (static_cast<B_32_I1_NEO_4*>(busPtr))->CanShow(); break;
|
case I_32_I1_NEO_4: return (static_cast<B_32_I1_NEO_4*>(busPtr))->CanShow(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: return (static_cast<B_32_BB_NEO_4*>(busPtr))->CanShow(); break;
|
||||||
case I_32_RN_400_3: return (static_cast<B_32_RN_400_3*>(busPtr))->CanShow(); break;
|
case I_32_RN_400_3: return (static_cast<B_32_RN_400_3*>(busPtr))->CanShow(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: return (static_cast<B_32_I0_400_3*>(busPtr))->CanShow(); break;
|
case I_32_I0_400_3: return (static_cast<B_32_I0_400_3*>(busPtr))->CanShow(); break;
|
||||||
@ -484,6 +504,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: return (static_cast<B_32_I1_400_3*>(busPtr))->CanShow(); break;
|
case I_32_I1_400_3: return (static_cast<B_32_I1_400_3*>(busPtr))->CanShow(); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: return (static_cast<B_32_BB_400_3*>(busPtr))->CanShow(); break;
|
||||||
case I_32_RN_TM1_4: return (static_cast<B_32_RN_TM1_4*>(busPtr))->CanShow(); break;
|
case I_32_RN_TM1_4: return (static_cast<B_32_RN_TM1_4*>(busPtr))->CanShow(); break;
|
||||||
case I_32_RN_TM2_3: return (static_cast<B_32_RN_TM2_3*>(busPtr))->CanShow(); break;
|
case I_32_RN_TM2_3: return (static_cast<B_32_RN_TM2_3*>(busPtr))->CanShow(); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -564,6 +585,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
||||||
@ -571,6 +593,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->SetPixelColor(pix, col); break;
|
||||||
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
@ -578,6 +601,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->SetPixelColor(pix, col); break;
|
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->SetPixelColor(pix, col); break;
|
||||||
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->SetPixelColor(pix, RgbColor(col.R,col.G,col.B)); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -634,6 +658,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->SetBrightness(b); break;
|
case I_32_I1_NEO_3: (static_cast<B_32_I1_NEO_3*>(busPtr))->SetBrightness(b); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: (static_cast<B_32_BB_NEO_3*>(busPtr))->SetBrightness(b); break;
|
||||||
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->SetBrightness(b); break;
|
case I_32_RN_NEO_4: (static_cast<B_32_RN_NEO_4*>(busPtr))->SetBrightness(b); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->SetBrightness(b); break;
|
case I_32_I0_NEO_4: (static_cast<B_32_I0_NEO_4*>(busPtr))->SetBrightness(b); break;
|
||||||
@ -641,6 +666,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->SetBrightness(b); break;
|
case I_32_I1_NEO_4: (static_cast<B_32_I1_NEO_4*>(busPtr))->SetBrightness(b); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: (static_cast<B_32_BB_NEO_4*>(busPtr))->SetBrightness(b); break;
|
||||||
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->SetBrightness(b); break;
|
case I_32_RN_400_3: (static_cast<B_32_RN_400_3*>(busPtr))->SetBrightness(b); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->SetBrightness(b); break;
|
case I_32_I0_400_3: (static_cast<B_32_I0_400_3*>(busPtr))->SetBrightness(b); break;
|
||||||
@ -648,6 +674,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->SetBrightness(b); break;
|
case I_32_I1_400_3: (static_cast<B_32_I1_400_3*>(busPtr))->SetBrightness(b); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: (static_cast<B_32_BB_400_3*>(busPtr))->SetBrightness(b); break;
|
||||||
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->SetBrightness(b); break;
|
case I_32_RN_TM1_4: (static_cast<B_32_RN_TM1_4*>(busPtr))->SetBrightness(b); break;
|
||||||
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->SetBrightness(b); break;
|
case I_32_RN_TM2_3: (static_cast<B_32_RN_TM2_3*>(busPtr))->SetBrightness(b); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -705,6 +732,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: col = (static_cast<B_32_I1_NEO_3*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_I1_NEO_3: col = (static_cast<B_32_I1_NEO_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: col = (static_cast<B_32_BB_NEO_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
case I_32_RN_NEO_4: col = (static_cast<B_32_RN_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_RN_NEO_4: col = (static_cast<B_32_RN_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: col = (static_cast<B_32_I0_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_I0_NEO_4: col = (static_cast<B_32_I0_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
||||||
@ -712,6 +740,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: col = (static_cast<B_32_I1_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_I1_NEO_4: col = (static_cast<B_32_I1_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: col = (static_cast<B_32_BB_NEO_4*>(busPtr))->GetPixelColor(pix); break;
|
||||||
case I_32_RN_400_3: col = (static_cast<B_32_RN_400_3*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_RN_400_3: col = (static_cast<B_32_RN_400_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: col = (static_cast<B_32_I0_400_3*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_I0_400_3: col = (static_cast<B_32_I0_400_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
@ -719,6 +748,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: col = (static_cast<B_32_I1_400_3*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_I1_400_3: col = (static_cast<B_32_I1_400_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: col = (static_cast<B_32_BB_400_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
case I_32_RN_TM1_4: col = (static_cast<B_32_RN_TM1_4*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_RN_TM1_4: col = (static_cast<B_32_RN_TM1_4*>(busPtr))->GetPixelColor(pix); break;
|
||||||
case I_32_RN_TM2_3: col = (static_cast<B_32_RN_TM2_3*>(busPtr))->GetPixelColor(pix); break;
|
case I_32_RN_TM2_3: col = (static_cast<B_32_RN_TM2_3*>(busPtr))->GetPixelColor(pix); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -795,6 +825,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_3: delete (static_cast<B_32_I1_NEO_3*>(busPtr)); break;
|
case I_32_I1_NEO_3: delete (static_cast<B_32_I1_NEO_3*>(busPtr)); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_3: delete (static_cast<B_32_BB_NEO_3*>(busPtr)); break;
|
||||||
case I_32_RN_NEO_4: delete (static_cast<B_32_RN_NEO_4*>(busPtr)); break;
|
case I_32_RN_NEO_4: delete (static_cast<B_32_RN_NEO_4*>(busPtr)); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_NEO_4: delete (static_cast<B_32_I0_NEO_4*>(busPtr)); break;
|
case I_32_I0_NEO_4: delete (static_cast<B_32_I0_NEO_4*>(busPtr)); break;
|
||||||
@ -802,6 +833,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_NEO_4: delete (static_cast<B_32_I1_NEO_4*>(busPtr)); break;
|
case I_32_I1_NEO_4: delete (static_cast<B_32_I1_NEO_4*>(busPtr)); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_NEO_4: delete (static_cast<B_32_BB_NEO_4*>(busPtr)); break;
|
||||||
case I_32_RN_400_3: delete (static_cast<B_32_RN_400_3*>(busPtr)); break;
|
case I_32_RN_400_3: delete (static_cast<B_32_RN_400_3*>(busPtr)); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
case I_32_I0_400_3: delete (static_cast<B_32_I0_400_3*>(busPtr)); break;
|
case I_32_I0_400_3: delete (static_cast<B_32_I0_400_3*>(busPtr)); break;
|
||||||
@ -809,6 +841,7 @@ class PolyBus {
|
|||||||
#ifndef WLED_NO_I2S1_PIXELBUS
|
#ifndef WLED_NO_I2S1_PIXELBUS
|
||||||
case I_32_I1_400_3: delete (static_cast<B_32_I1_400_3*>(busPtr)); break;
|
case I_32_I1_400_3: delete (static_cast<B_32_I1_400_3*>(busPtr)); break;
|
||||||
#endif
|
#endif
|
||||||
|
// case I_32_BB_400_3: delete (static_cast<B_32_BB_400_3*>(busPtr)); break;
|
||||||
case I_32_RN_TM1_4: delete (static_cast<B_32_RN_TM1_4*>(busPtr)); break;
|
case I_32_RN_TM1_4: delete (static_cast<B_32_RN_TM1_4*>(busPtr)); break;
|
||||||
case I_32_RN_TM2_3: delete (static_cast<B_32_RN_TM2_3*>(busPtr)); break;
|
case I_32_RN_TM2_3: delete (static_cast<B_32_RN_TM2_3*>(busPtr)); break;
|
||||||
#ifndef WLED_NO_I2S0_PIXELBUS
|
#ifndef WLED_NO_I2S0_PIXELBUS
|
||||||
@ -875,18 +908,18 @@ class PolyBus {
|
|||||||
}
|
}
|
||||||
#else //ESP32
|
#else //ESP32
|
||||||
uint8_t offset = 0; //0 = RMT (num 0-7) 8 = I2S0 9 = I2S1
|
uint8_t offset = 0; //0 = RMT (num 0-7) 8 = I2S0 9 = I2S1
|
||||||
#ifdef CONFIG_IDF_TARGET_ESP32S2
|
#if defined(CONFIG_IDF_TARGET_ESP32S2)
|
||||||
// ESP32-S2 only has 4 RMT channels
|
// ESP32-S2 only has 4 RMT channels
|
||||||
if (num > 4) return I_NONE;
|
if (num > 4) return I_NONE;
|
||||||
if (num > 3) offset = num -3;
|
if (num > 3) offset = 1; // only one I2S
|
||||||
#elif defined(CONFIG_IDF_TARGET_ESP32C3)
|
#elif defined(CONFIG_IDF_TARGET_ESP32C3)
|
||||||
// On ESP32-C3 only the first 2 RMT channels are usable for transmitting
|
// On ESP32-C3 only the first 2 RMT channels are usable for transmitting
|
||||||
if (num > 1) return I_NONE;
|
if (num > 1) return I_NONE;
|
||||||
//if (num > 2) offset = num -2; // I2S not supported yet
|
//if (num > 1) offset = 1; // I2S not supported yet (only 1 I2S)
|
||||||
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
|
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
|
||||||
// On ESP32-S3 only the first 4 RMT channels are usable for transmitting
|
// On ESP32-S3 only the first 4 RMT channels are usable for transmitting
|
||||||
if (num > 3) return I_NONE;
|
if (num > 3) return I_NONE;
|
||||||
//if (num > 4) offset = num -4; // I2S not supported yet
|
//if (num > 3) offset = num -4; // I2S not supported yet
|
||||||
#else
|
#else
|
||||||
// standard ESP32 has 8 RMT and 2 I2S channels
|
// standard ESP32 has 8 RMT and 2 I2S channels
|
||||||
if (num > 9) return I_NONE;
|
if (num > 9) return I_NONE;
|
||||||
|
@ -25,10 +25,18 @@
|
|||||||
#ifdef ESP8266
|
#ifdef ESP8266
|
||||||
#define WLED_MAX_BUSSES 3
|
#define WLED_MAX_BUSSES 3
|
||||||
#else
|
#else
|
||||||
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
|
#if defined(CONFIG_IDF_TARGET_ESP32C3) // 2 RMT, only has 1 I2S but NPB does not support it ATM
|
||||||
#define WLED_MAX_BUSSES 5
|
#define WLED_MAX_BUSSES 2
|
||||||
|
#elif defined(CONFIG_IDF_TARGET_ESP32S2) // 4 RMT, only has 1 I2S bus, supported in NPB
|
||||||
|
#if defined(USERMOD_AUDIOREACTIVE) // requested by @softhack007 https://github.com/blazoncek/WLED/issues/33
|
||||||
|
#define WLED_MAX_BUSSES 4
|
||||||
|
#else
|
||||||
|
#define WLED_MAX_BUSSES 5
|
||||||
|
#endif
|
||||||
|
#elif defined(CONFIG_IDF_TARGET_ESP32S3) // 4 RMT, has 2 I2S but NPB does not support them ATM
|
||||||
|
#define WLED_MAX_BUSSES 4
|
||||||
#else
|
#else
|
||||||
#if defined(CONFIG_IDF_TARGET_ESP32S3)
|
#if defined(USERMOD_AUDIOREACTIVE) // requested by @softhack007 https://github.com/blazoncek/WLED/issues/33
|
||||||
#define WLED_MAX_BUSSES 8
|
#define WLED_MAX_BUSSES 8
|
||||||
#else
|
#else
|
||||||
#define WLED_MAX_BUSSES 10
|
#define WLED_MAX_BUSSES 10
|
||||||
@ -286,7 +294,7 @@
|
|||||||
#ifdef ESP8266
|
#ifdef ESP8266
|
||||||
#define MAX_LED_MEMORY 4000
|
#define MAX_LED_MEMORY 4000
|
||||||
#else
|
#else
|
||||||
#ifdef ARDUINO_ARCH_ESP32S2
|
#if defined(ARDUINO_ARCH_ESP32S2) || defined(ARDUINO_ARCH_ESP32C3)
|
||||||
#define MAX_LED_MEMORY 32000
|
#define MAX_LED_MEMORY 32000
|
||||||
#else
|
#else
|
||||||
#define MAX_LED_MEMORY 64000
|
#define MAX_LED_MEMORY 64000
|
||||||
|
@ -399,7 +399,7 @@ function presetError(empty)
|
|||||||
if (bckstr.length > 10) hasBackup = true;
|
if (bckstr.length > 10) hasBackup = true;
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
|
|
||||||
var cn = `<div class="pres c" ${empty?'style="padding:8px;margin-top: 16px;"':'onclick="loadPresets()" style="cursor:pointer;padding:8px;margin-top: 16px;"'}>`;
|
var cn = `<div class="pres c" ${empty?'style="padding:8px;margin-top: 16px;"':'onclick="pmtLast=0;loadPresets();" style="cursor:pointer;padding:8px;margin-top: 16px;"'}>`;
|
||||||
if (empty)
|
if (empty)
|
||||||
cn += `You have no presets yet!`;
|
cn += `You have no presets yet!`;
|
||||||
else
|
else
|
||||||
@ -1531,7 +1531,7 @@ function requestJson(command=null)
|
|||||||
div.outerHTML = generateListItemHtml(
|
div.outerHTML = generateListItemHtml(
|
||||||
'palette',
|
'palette',
|
||||||
255-j,
|
255-j,
|
||||||
'~ Custom '+j+1+' ~',
|
'~ Custom '+j+' ~',
|
||||||
'setPalette',
|
'setPalette',
|
||||||
`<div class="lstIprev" style="${genPalPrevCss(255-j)}"></div>`
|
`<div class="lstIprev" style="${genPalPrevCss(255-j)}"></div>`
|
||||||
);
|
);
|
||||||
@ -2240,7 +2240,7 @@ function saveP(i,pl)
|
|||||||
}
|
}
|
||||||
populatePresets();
|
populatePresets();
|
||||||
resetPUtil();
|
resetPUtil();
|
||||||
setTimeout(()=>{pmtLast=0; loadPresets();}, 500); // force reloading of presets
|
setTimeout(()=>{pmtLast=0; loadPresets();}, 750); // force reloading of presets
|
||||||
}
|
}
|
||||||
|
|
||||||
function testPl(i,bt) {
|
function testPl(i,bt) {
|
||||||
@ -2269,6 +2269,7 @@ function delP(i) {
|
|||||||
requestJson(obj);
|
requestJson(obj);
|
||||||
delete pJson[i];
|
delete pJson[i];
|
||||||
populatePresets();
|
populatePresets();
|
||||||
|
gId('putil').classList.add("staybot");
|
||||||
} else {
|
} else {
|
||||||
bt.style.color = "var(--c-r)";
|
bt.style.color = "var(--c-r)";
|
||||||
bt.innerHTML = "<i class='icons btn-icon'></i>Delete!";
|
bt.innerHTML = "<i class='icons btn-icon'></i>Delete!";
|
||||||
|
@ -135,7 +135,7 @@ void handleIR();
|
|||||||
void deserializeSegment(JsonObject elem, byte it, byte presetId = 0);
|
void deserializeSegment(JsonObject elem, byte it, byte presetId = 0);
|
||||||
bool deserializeState(JsonObject root, byte callMode = CALL_MODE_DIRECT_CHANGE, byte presetId = 0);
|
bool deserializeState(JsonObject root, byte callMode = CALL_MODE_DIRECT_CHANGE, byte presetId = 0);
|
||||||
void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset = false, bool segmentBounds = true);
|
void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset = false, bool segmentBounds = true);
|
||||||
void serializeState(JsonObject root, bool forPreset = false, bool includeBri = true, bool segmentBounds = true);
|
void serializeState(JsonObject root, bool forPreset = false, bool includeBri = true, bool segmentBounds = true, bool selectedSegmentsOnly = false);
|
||||||
void serializeInfo(JsonObject root);
|
void serializeInfo(JsonObject root);
|
||||||
void serializeModeNames(JsonArray arr, const char *qstring);
|
void serializeModeNames(JsonArray arr, const char *qstring);
|
||||||
void serializeModeData(JsonObject root);
|
void serializeModeData(JsonObject root);
|
||||||
@ -192,6 +192,7 @@ void shufflePlaylist();
|
|||||||
void unloadPlaylist();
|
void unloadPlaylist();
|
||||||
int16_t loadPlaylist(JsonObject playlistObject, byte presetId = 0);
|
int16_t loadPlaylist(JsonObject playlistObject, byte presetId = 0);
|
||||||
void handlePlaylist();
|
void handlePlaylist();
|
||||||
|
void serializePlaylist(JsonObject obj);
|
||||||
|
|
||||||
//presets.cpp
|
//presets.cpp
|
||||||
void handlePresets();
|
void handlePresets();
|
||||||
|
@ -41,7 +41,7 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Autogenerated from wled00/data/update.htm, do not edit!!
|
// Autogenerated from wled00/data/update.htm, do not edit!!
|
||||||
const uint16_t PAGE_update_length = 615;
|
const uint16_t PAGE_update_length = 616;
|
||||||
const uint8_t PAGE_update[] PROGMEM = {
|
const uint8_t PAGE_update[] PROGMEM = {
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0x5d, 0x6f, 0xd4, 0x30,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0x5d, 0x6f, 0xd4, 0x30,
|
||||||
0x10, 0x7c, 0xcf, 0xaf, 0x70, 0xfd, 0x74, 0x27, 0x71, 0x4e, 0x41, 0xbc, 0x50, 0x92, 0x14, 0x8e,
|
0x10, 0x7c, 0xcf, 0xaf, 0x70, 0xfd, 0x74, 0x27, 0x71, 0x4e, 0x41, 0xbc, 0x50, 0x92, 0x14, 0x8e,
|
||||||
@ -66,22 +66,22 @@ const uint8_t PAGE_update[] PROGMEM = {
|
|||||||
0xe9, 0xc1, 0x32, 0x20, 0xe5, 0x0e, 0x03, 0x99, 0xd2, 0x8f, 0x16, 0xcd, 0x20, 0x03, 0xe6, 0x53,
|
0xe9, 0xc1, 0x32, 0x20, 0xe5, 0x0e, 0x03, 0x99, 0xd2, 0x8f, 0x16, 0xcd, 0x20, 0x03, 0xe6, 0x53,
|
||||||
0xff, 0x8a, 0x60, 0x92, 0xd3, 0xcd, 0x71, 0xac, 0x7b, 0x43, 0x6e, 0x3e, 0x4c, 0x17, 0xdf, 0xb8,
|
0xff, 0x8a, 0x60, 0x92, 0xd3, 0xcd, 0x71, 0xac, 0x7b, 0x43, 0x6e, 0x3e, 0x4c, 0x17, 0xdf, 0xb8,
|
||||||
0x88, 0xd2, 0x5a, 0xd0, 0x6c, 0x07, 0x21, 0x12, 0xe3, 0x05, 0x2b, 0xe2, 0x20, 0x1d, 0xcb, 0x94,
|
0x88, 0xd2, 0x5a, 0xd0, 0x6c, 0x07, 0x21, 0x12, 0xe3, 0x05, 0x2b, 0xe2, 0x20, 0x1d, 0xcb, 0x94,
|
||||||
0x95, 0x31, 0x96, 0x3c, 0x9a, 0x81, 0x57, 0xe7, 0xe2, 0xe5, 0x6b, 0x71, 0xbe, 0xaa, 0xcf, 0x69,
|
0x95, 0x31, 0x96, 0x3c, 0x9a, 0x81, 0x57, 0xe7, 0xe2, 0xe5, 0x6b, 0x71, 0xbe, 0xaa, 0xed, 0x39,
|
||||||
0x19, 0x2a, 0xd2, 0x12, 0xa1, 0xba, 0xf2, 0xfb, 0xb4, 0x04, 0xc3, 0x0e, 0x98, 0xa5, 0x11, 0x22,
|
0x6d, 0x43, 0x55, 0xda, 0x22, 0x54, 0x57, 0x7e, 0x9f, 0xb6, 0x60, 0xd8, 0x01, 0xb3, 0x34, 0x43,
|
||||||
0xb2, 0xda, 0x38, 0x19, 0x0e, 0x44, 0x21, 0x59, 0xd6, 0x05, 0x68, 0x4a, 0xde, 0x21, 0x0e, 0xf1,
|
0x44, 0x56, 0x1b, 0x27, 0xc3, 0x81, 0x38, 0x24, 0xcb, 0xba, 0x00, 0x4d, 0xc9, 0x3b, 0xc4, 0x21,
|
||||||
0x22, 0xcf, 0x5b, 0x83, 0xdd, 0x58, 0x0b, 0xe5, 0xfb, 0xfc, 0xbd, 0x09, 0xca, 0x7b, 0xbf, 0x35,
|
0x5e, 0xe4, 0x79, 0x6b, 0xb0, 0x1b, 0x6b, 0xa1, 0x7c, 0x9f, 0xbf, 0x37, 0x41, 0x79, 0xef, 0xb7,
|
||||||
0x90, 0x4f, 0x1b, 0xe7, 0x01, 0x2c, 0xc8, 0x08, 0x91, 0x33, 0x94, 0x81, 0xec, 0x2a, 0xf9, 0xb7,
|
0x06, 0xf2, 0x69, 0xe5, 0x3c, 0x80, 0x05, 0x19, 0x21, 0x72, 0x86, 0x32, 0x90, 0x5f, 0x25, 0xff,
|
||||||
0xda, 0x4a, 0xb7, 0x25, 0x55, 0x4c, 0xdf, 0xb2, 0x2c, 0x79, 0x70, 0xe2, 0xa1, 0x2f, 0x22, 0x76,
|
0x56, 0x5b, 0xe9, 0xb6, 0x24, 0x8b, 0xe9, 0x5b, 0x96, 0x25, 0x13, 0x4e, 0x3c, 0xf4, 0x45, 0xc4,
|
||||||
0x06, 0xac, 0x8e, 0xc2, 0xf8, 0x23, 0xed, 0x89, 0xe2, 0x4f, 0x6a, 0x11, 0x77, 0xed, 0x65, 0x52,
|
0xce, 0x80, 0xd5, 0x51, 0x18, 0x7f, 0xa4, 0x3d, 0x51, 0xfc, 0x49, 0x2d, 0xe2, 0xae, 0xbd, 0x4c,
|
||||||
0xbf, 0x6c, 0x68, 0xc2, 0x55, 0x7c, 0x1c, 0x49, 0xd9, 0x29, 0xa3, 0xb9, 0x4c, 0x3b, 0x14, 0xc6,
|
0xf2, 0x97, 0x0d, 0x4d, 0xb8, 0x8a, 0x8f, 0x23, 0x49, 0x3b, 0x85, 0x34, 0x97, 0x69, 0x87, 0xc2,
|
||||||
0x0d, 0x23, 0xb2, 0x59, 0xae, 0xc6, 0x58, 0x38, 0xe5, 0xf9, 0x24, 0x6a, 0x80, 0xc7, 0xd1, 0x04,
|
0xb8, 0x61, 0x44, 0x36, 0xeb, 0xd5, 0x18, 0x0b, 0xa7, 0x40, 0x9f, 0x54, 0x0d, 0xf0, 0x38, 0x9a,
|
||||||
0xd0, 0x33, 0xba, 0x1e, 0x11, 0x29, 0x92, 0x33, 0x7c, 0x96, 0x91, 0xc8, 0x66, 0xa3, 0xce, 0x8a,
|
0x00, 0x7a, 0x46, 0xd7, 0x23, 0x22, 0x65, 0x72, 0x86, 0xcf, 0x3a, 0x12, 0xd9, 0xec, 0xd4, 0x59,
|
||||||
0x7c, 0x2e, 0xff, 0x03, 0x3a, 0x1f, 0x26, 0xed, 0x95, 0x35, 0x6a, 0x5b, 0xf2, 0xf5, 0x24, 0xfd,
|
0x91, 0xcf, 0xe5, 0x7f, 0x40, 0xe7, 0xc3, 0x24, 0xbe, 0xb2, 0x46, 0x6d, 0x4b, 0xbe, 0x9e, 0xb4,
|
||||||
0x9a, 0x92, 0xfe, 0xab, 0x29, 0x79, 0x54, 0x15, 0xda, 0xec, 0xb2, 0x64, 0xe5, 0x94, 0x53, 0xa2,
|
0x5f, 0x53, 0xd4, 0x7f, 0x35, 0x25, 0x93, 0xaa, 0x42, 0x9b, 0x5d, 0x96, 0xbc, 0x9c, 0x82, 0x4a,
|
||||||
0xa9, 0x12, 0x3b, 0x85, 0x4f, 0x08, 0x41, 0xe0, 0x44, 0xbe, 0x49, 0xcb, 0x32, 0xed, 0x99, 0xf3,
|
0x34, 0x55, 0x62, 0xa7, 0xf4, 0x09, 0x21, 0x08, 0x9c, 0xc8, 0x37, 0x69, 0x59, 0xa6, 0x3d, 0x73,
|
||||||
0xc8, 0x94, 0xf5, 0x74, 0xf0, 0x81, 0x66, 0x6d, 0x02, 0xc4, 0x2e, 0xf9, 0x31, 0xc8, 0x16, 0xd8,
|
0x1e, 0x99, 0xb2, 0x9e, 0x0e, 0x3e, 0xd0, 0xac, 0x4d, 0x80, 0xd8, 0x25, 0x3f, 0x06, 0xd9, 0x02,
|
||||||
0xc5, 0xb2, 0xc8, 0x89, 0x6f, 0x5a, 0x77, 0x0a, 0xdd, 0x94, 0xc0, 0xe9, 0xd7, 0xfe, 0x09, 0x43,
|
0xbb, 0x58, 0x16, 0x39, 0xf1, 0x4d, 0xeb, 0x4e, 0xa9, 0x9b, 0x22, 0x38, 0xfd, 0xdb, 0x3f, 0x01,
|
||||||
0x44, 0x4f, 0x48, 0xf0, 0x03, 0x00, 0x00
|
0xce, 0x0e, 0xa3, 0x73, 0xf1, 0x03, 0x00, 0x00
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -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 = 824;
|
const uint16_t PAGE_settingsCss_length = 824;
|
||||||
const uint8_t PAGE_settingsCss[] PROGMEM = {
|
const uint8_t PAGE_settingsCss[] PROGMEM = {
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x55, 0x5d, 0x8b, 0x9c, 0x30,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x55, 0x5d, 0x8b, 0x9c, 0x30,
|
||||||
0x14, 0xfd, 0x2b, 0x96, 0x61, 0x61, 0x0b, 0xa3, 0xa8, 0xa3, 0xb3, 0xd3, 0x48, 0xa1, 0xf4, 0xbd,
|
0x14, 0xfd, 0x2b, 0x96, 0x61, 0x61, 0x0b, 0xa3, 0xa8, 0xa3, 0xb3, 0xd3, 0x48, 0xa1, 0xf4, 0xbd,
|
||||||
0x6f, 0xa5, 0x14, 0xca, 0x3e, 0x44, 0x73, 0x1d, 0xc3, 0xe4, 0x43, 0x92, 0xd8, 0x75, 0x2a, 0xfe,
|
0x6f, 0xa5, 0x14, 0xca, 0x3e, 0x44, 0x73, 0x1d, 0xc3, 0xe4, 0x43, 0x92, 0xd8, 0x75, 0x2a, 0xfe,
|
||||||
0xf7, 0x26, 0x7e, 0xac, 0xce, 0xac, 0x6c, 0x5f, 0xca, 0xe0, 0xa0, 0xde, 0x98, 0x7b, 0xee, 0xb9,
|
0xf7, 0x26, 0x7e, 0xac, 0xce, 0xac, 0x6c, 0x5f, 0xca, 0xe0, 0xa0, 0xde, 0x98, 0x7b, 0xee, 0xb9,
|
||||||
@ -66,7 +66,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,
|
||||||
@ -134,7 +134,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 = 1557;
|
const uint16_t PAGE_settings_wifi_length = 1557;
|
||||||
const uint8_t PAGE_settings_wifi[] PROGMEM = {
|
const uint8_t PAGE_settings_wifi[] PROGMEM = {
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xad, 0x57, 0xff, 0x4f, 0xdb, 0x38,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x57, 0xff, 0x4f, 0xdb, 0x38,
|
||||||
0x14, 0xff, 0x3d, 0x7f, 0x85, 0xf1, 0x49, 0x53, 0xa3, 0x85, 0x94, 0xb6, 0xc7, 0x6e, 0x62, 0x49,
|
0x14, 0xff, 0x3d, 0x7f, 0x85, 0xf1, 0x49, 0x53, 0xa3, 0x85, 0x94, 0xb6, 0xc7, 0x6e, 0x62, 0x49,
|
||||||
0x76, 0x5d, 0xdb, 0x0d, 0xee, 0x18, 0xeb, 0x29, 0x68, 0xe8, 0xa4, 0x93, 0x26, 0x37, 0x79, 0x6d,
|
0x76, 0x5d, 0xdb, 0x0d, 0xee, 0x18, 0xeb, 0x29, 0x68, 0xe8, 0xa4, 0x93, 0x26, 0x37, 0x79, 0x6d,
|
||||||
0x3d, 0x9c, 0x38, 0x17, 0x3b, 0x2d, 0x88, 0xf1, 0xbf, 0xdf, 0xb3, 0x93, 0x96, 0x16, 0xe8, 0x36,
|
0x3d, 0x9c, 0x38, 0x17, 0x3b, 0x2d, 0x88, 0xf1, 0xbf, 0xdf, 0xb3, 0x93, 0x96, 0x16, 0xe8, 0x36,
|
||||||
@ -238,7 +238,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, 0xdc, 0x2e, 0x40, 0x78,
|
0x92, 0xef, 0x7c, 0x45, 0x3a, 0xbb, 0xdb, 0x2d, 0x0d, 0x32, 0x48, 0x5c, 0xdc, 0x2e, 0x40, 0x78,
|
||||||
0x8d, 0xeb, 0xd2, 0x9e, 0xb1, 0xdb, 0x3e, 0xc6, 0xdd, 0x35, 0x73, 0xaa, 0xeb, 0x54, 0x09, 0x29,
|
0x8d, 0xeb, 0xd2, 0x9e, 0xb1, 0xdb, 0x3e, 0xc6, 0xdd, 0x35, 0x73, 0xaa, 0xeb, 0x54, 0x09, 0x29,
|
||||||
0x01, 0x95, 0x85, 0x44, 0x4b, 0xc2, 0x36, 0x6b, 0xb3, 0xdf, 0xb4, 0xdf, 0xb0, 0x5f, 0xb6, 0x11,
|
0x01, 0x95, 0x85, 0x44, 0x4b, 0xc2, 0x36, 0x6b, 0xb3, 0xdf, 0xb4, 0xdf, 0xb0, 0x5f, 0xb6, 0x11,
|
||||||
@ -708,7 +708,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,
|
||||||
@ -815,7 +815,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 = 3090;
|
const uint16_t PAGE_settings_ui_length = 3090;
|
||||||
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, 0x6b, 0x73, 0xda, 0x48,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xad, 0x59, 0x6b, 0x73, 0xda, 0x48,
|
||||||
0x16, 0xfd, 0xce, 0xaf, 0xe8, 0x74, 0x52, 0x1e, 0x54, 0x56, 0x04, 0x4e, 0x66, 0x6b, 0x13, 0x40,
|
0x16, 0xfd, 0xce, 0xaf, 0xe8, 0x74, 0x52, 0x1e, 0x54, 0x56, 0x04, 0x4e, 0x66, 0x6b, 0x13, 0x40,
|
||||||
0x78, 0x63, 0xc7, 0x93, 0x78, 0xca, 0xd9, 0x64, 0x83, 0xbd, 0x99, 0xad, 0xac, 0xcb, 0x23, 0xa4,
|
0x78, 0x63, 0xc7, 0x93, 0x78, 0xca, 0xd9, 0x64, 0x83, 0xbd, 0x99, 0xad, 0xac, 0xcb, 0x23, 0xa4,
|
||||||
0x06, 0x3a, 0x16, 0x92, 0x46, 0xdd, 0x32, 0x66, 0x09, 0xff, 0x7d, 0xcf, 0xed, 0x96, 0x40, 0x60,
|
0x06, 0x3a, 0x16, 0x92, 0x46, 0xdd, 0x32, 0x66, 0x09, 0xff, 0x7d, 0xcf, 0xed, 0x96, 0x40, 0x60,
|
||||||
@ -1015,7 +1015,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 = 3146;
|
const uint16_t PAGE_settings_sync_length = 3146;
|
||||||
const uint8_t PAGE_settings_sync[] PROGMEM = {
|
const uint8_t PAGE_settings_sync[] PROGMEM = {
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x9d, 0x5a, 0x6d, 0x77, 0xda, 0xb8,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x9d, 0x5a, 0x6d, 0x77, 0xda, 0xb8,
|
||||||
0x12, 0xfe, 0xee, 0x5f, 0xa1, 0xfa, 0xc3, 0x2e, 0x6c, 0x08, 0x18, 0x12, 0xd2, 0x94, 0x60, 0xf7,
|
0x12, 0xfe, 0xee, 0x5f, 0xa1, 0xfa, 0xc3, 0x2e, 0x6c, 0x08, 0x18, 0x12, 0xd2, 0x94, 0x60, 0xf7,
|
||||||
0x86, 0x90, 0x26, 0xec, 0x36, 0x0d, 0x85, 0x64, 0x5f, 0xce, 0xb9, 0xe7, 0xec, 0x11, 0xb6, 0x00,
|
0x86, 0x90, 0x26, 0xec, 0x36, 0x0d, 0x85, 0x64, 0x5f, 0xce, 0xb9, 0xe7, 0xec, 0x11, 0xb6, 0x00,
|
||||||
0x25, 0xb6, 0xe5, 0xb5, 0xe5, 0xbc, 0x9c, 0x6e, 0xff, 0xfb, 0x9d, 0x91, 0x6c, 0x03, 0x06, 0x02,
|
0x25, 0xb6, 0xe5, 0xb5, 0xe5, 0xbc, 0x9c, 0x6e, 0xff, 0xfb, 0x9d, 0x91, 0x6c, 0x03, 0x06, 0x02,
|
||||||
@ -1218,7 +1218,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 = 3302;
|
const uint16_t PAGE_settings_time_length = 3302;
|
||||||
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, 0x3a,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xd5, 0x1a, 0x6b, 0x57, 0xdb, 0x3a,
|
||||||
0xf2, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0xb8, 0xf1, 0xc5, 0x79, 0x42, 0x5a, 0x48, 0x62, 0x77, 0x43,
|
0xf2, 0x7b, 0x7e, 0x85, 0x50, 0x7b, 0xb8, 0xf1, 0xc5, 0x79, 0x42, 0x5a, 0x48, 0x62, 0x77, 0x43,
|
||||||
0x48, 0x0b, 0x2d, 0x09, 0x9c, 0x26, 0xbd, 0xec, 0xf6, 0x71, 0x6e, 0x15, 0x5b, 0x49, 0x0c, 0x8e,
|
0x48, 0x0b, 0x2d, 0x09, 0x9c, 0x26, 0xbd, 0xec, 0xf6, 0x71, 0x6e, 0x15, 0x5b, 0x49, 0x0c, 0x8e,
|
||||||
0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x3b, 0x92, 0x1c, 0xe7, 0x85, 0x81, 0xf6, 0xde, 0xfd,
|
0xe4, 0xb5, 0x65, 0x02, 0x4b, 0xf9, 0xef, 0x3b, 0x92, 0x1c, 0xe7, 0x85, 0x81, 0xf6, 0xde, 0xfd,
|
||||||
@ -1429,166 +1429,166 @@ 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 = 2406;
|
||||||
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,
|
||||||
0x40, 0x52, 0xa9, 0xfb, 0x00, 0xf6, 0xbc, 0x75, 0x4f, 0x3f, 0xdd, 0xfd, 0x74, 0x8f, 0x0f, 0xb7,
|
0x40, 0x52, 0xa9, 0xfb, 0x00, 0xb6, 0x46, 0x33, 0xfd, 0xf2, 0x74, 0xf7, 0xd3, 0x3d, 0x3e, 0xdc,
|
||||||
0x4e, 0x2e, 0x5f, 0x8f, 0xfe, 0x7d, 0x75, 0xca, 0x32, 0x37, 0xcf, 0x07, 0x87, 0xf4, 0x9f, 0xe5,
|
0x3a, 0xb9, 0x7c, 0x3d, 0xfa, 0xf7, 0xd5, 0x29, 0xcb, 0xdc, 0x3c, 0x1f, 0x1c, 0xd2, 0x7f, 0x96,
|
||||||
0xa2, 0x98, 0xc6, 0x5c, 0x16, 0x1c, 0x63, 0x29, 0xd2, 0xc1, 0xe1, 0x5c, 0x3a, 0xc1, 0x0a, 0x31,
|
0x8b, 0x62, 0x1a, 0x73, 0x59, 0x70, 0x3c, 0x4b, 0x91, 0x0e, 0x0e, 0xe7, 0xd2, 0x09, 0x56, 0x88,
|
||||||
0x97, 0x31, 0xbf, 0x55, 0x72, 0x51, 0x6a, 0xe3, 0x38, 0x4b, 0x74, 0xe1, 0x64, 0xe1, 0x62, 0xbe,
|
0xb9, 0x8c, 0xf9, 0xad, 0x92, 0x8b, 0x52, 0x1b, 0xc7, 0x59, 0xa2, 0x0b, 0x27, 0x0b, 0x17, 0xf3,
|
||||||
0x50, 0xa9, 0xcb, 0xe2, 0xbf, 0xf7, 0xfb, 0x7c, 0xd0, 0xa9, 0xb7, 0x76, 0xee, 0xad, 0xa5, 0xf2,
|
0x85, 0x4a, 0x5d, 0x16, 0xff, 0xbd, 0xdf, 0xe7, 0x83, 0x4e, 0xbd, 0xb5, 0x73, 0xef, 0x5d, 0x2a,
|
||||||
0x56, 0x25, 0x72, 0xc7, 0x0f, 0x42, 0x55, 0x28, 0xa7, 0x44, 0xbe, 0x63, 0x13, 0x91, 0xcb, 0x78,
|
0x6f, 0x55, 0x22, 0x77, 0xfc, 0x43, 0xa8, 0x0a, 0xe5, 0x94, 0xc8, 0x77, 0x6c, 0x22, 0x72, 0x19,
|
||||||
0x37, 0x9c, 0x8b, 0x2f, 0x6a, 0x5e, 0xcd, 0x57, 0xe3, 0xca, 0x4a, 0xe3, 0x07, 0x62, 0x8c, 0x71,
|
0xef, 0x86, 0x73, 0xf1, 0x45, 0xcd, 0xab, 0xf9, 0xea, 0xb9, 0xb2, 0xd2, 0xf8, 0x07, 0x31, 0xc6,
|
||||||
0xa1, 0x39, 0xeb, 0xdc, 0x53, 0xdd, 0x5c, 0x28, 0xc9, 0x84, 0xb1, 0x12, 0x4a, 0x2a, 0x37, 0xd9,
|
0x73, 0xa1, 0x39, 0xeb, 0xdc, 0x53, 0xdd, 0x18, 0x94, 0x64, 0xc2, 0x58, 0x09, 0x25, 0x95, 0x9b,
|
||||||
0x79, 0x81, 0x59, 0xa7, 0x5c, 0x2e, 0x07, 0x17, 0xca, 0x26, 0x6c, 0x28, 0x9d, 0x53, 0xc5, 0xd4,
|
0xec, 0xbc, 0xc0, 0xaa, 0x53, 0x2e, 0x97, 0x83, 0x0b, 0x65, 0x13, 0x36, 0x94, 0xce, 0xa9, 0x62,
|
||||||
0x1e, 0x46, 0xf5, 0xe4, 0xa1, 0x4d, 0x8c, 0x2a, 0xdd, 0xa0, 0x73, 0x2b, 0x0c, 0xcb, 0x75, 0xa2,
|
0x6a, 0x0f, 0xa3, 0x7a, 0xf1, 0xd0, 0x26, 0x46, 0x95, 0x6e, 0xd0, 0xb9, 0x15, 0x86, 0xe5, 0x3a,
|
||||||
0xca, 0xd0, 0xa9, 0xb9, 0xd4, 0x95, 0x0b, 0xd3, 0x38, 0xd5, 0x49, 0x35, 0xc7, 0x75, 0x43, 0x2c,
|
0x51, 0x65, 0xe8, 0xd4, 0x5c, 0xea, 0xca, 0x85, 0x69, 0x9c, 0xea, 0xa4, 0x9a, 0xc3, 0xdc, 0x10,
|
||||||
0xc4, 0x5b, 0xbb, 0x07, 0x93, 0xaa, 0x48, 0x9c, 0xd2, 0x05, 0x7b, 0xdb, 0x0d, 0xbe, 0x2e, 0x54,
|
0x2f, 0xe2, 0xad, 0xdd, 0x83, 0x49, 0x55, 0x24, 0x4e, 0xe9, 0x82, 0xbd, 0xed, 0x06, 0x5f, 0x17,
|
||||||
0x91, 0xea, 0x45, 0x4f, 0x97, 0xb2, 0xe8, 0xf2, 0xcc, 0xb9, 0xd2, 0xee, 0x47, 0xd1, 0xac, 0xd0,
|
0xaa, 0x48, 0xf5, 0xa2, 0xa7, 0x4b, 0x59, 0x74, 0x79, 0xe6, 0x5c, 0x69, 0xf7, 0xa3, 0x68, 0x56,
|
||||||
0xbd, 0x45, 0x2e, 0xd3, 0xde, 0x54, 0x46, 0x13, 0x29, 0x5c, 0x65, 0xa4, 0x8d, 0x6c, 0xa3, 0x33,
|
0xe8, 0xde, 0x22, 0x97, 0x69, 0x6f, 0x2a, 0xa3, 0x89, 0x14, 0xae, 0x32, 0xd2, 0x46, 0xb6, 0xd1,
|
||||||
0x7a, 0x62, 0x65, 0x52, 0x19, 0xe5, 0x96, 0x3b, 0xed, 0x14, 0x0f, 0xfe, 0x5a, 0x09, 0x3d, 0xbe,
|
0x19, 0x3d, 0xb1, 0x32, 0xa9, 0x8c, 0x72, 0xcb, 0x9d, 0x76, 0x89, 0x07, 0x7f, 0xad, 0x84, 0x1e,
|
||||||
0x2f, 0x74, 0x75, 0x90, 0x87, 0xfc, 0x93, 0x95, 0xf9, 0x64, 0x73, 0xf7, 0xcd, 0x37, 0xbb, 0xab,
|
0xdf, 0x17, 0xba, 0x3a, 0xc8, 0x43, 0xfe, 0xc9, 0xca, 0x7c, 0xb2, 0xb9, 0xfb, 0xe6, 0x9b, 0xdd,
|
||||||
0x32, 0x15, 0x4e, 0x3e, 0xb4, 0x77, 0x7a, 0x96, 0x76, 0x65, 0xf0, 0xd5, 0x48, 0xdc, 0xa7, 0x60,
|
0x55, 0x99, 0x0a, 0x27, 0x1f, 0xda, 0x3b, 0x3d, 0x4b, 0xbb, 0x32, 0xf8, 0x6a, 0x24, 0xec, 0x29,
|
||||||
0x74, 0x39, 0x77, 0x9a, 0x4b, 0xb2, 0xec, 0x78, 0xe9, 0x97, 0xd6, 0x5b, 0x95, 0xbd, 0x1c, 0x7f,
|
0x18, 0x19, 0xe7, 0x4e, 0x73, 0x49, 0x9e, 0x1d, 0x2f, 0xfd, 0xab, 0xf5, 0x56, 0x65, 0x2f, 0xc7,
|
||||||
0xde, 0xd8, 0x2c, 0xb7, 0xb7, 0xb9, 0x1e, 0x7f, 0x96, 0x89, 0xe3, 0x71, 0xec, 0x96, 0xa5, 0xd4,
|
0x9f, 0x37, 0x36, 0xcb, 0xed, 0x6d, 0xae, 0xc7, 0x9f, 0x65, 0xe2, 0x78, 0x1c, 0xbb, 0x65, 0x29,
|
||||||
0x13, 0x9a, 0xdb, 0x3a, 0x32, 0x46, 0x2c, 0x7b, 0xca, 0xfa, 0xcf, 0x3b, 0x12, 0x72, 0x2d, 0xd2,
|
0xf5, 0x84, 0xd6, 0xb6, 0x8e, 0x8c, 0x11, 0xcb, 0x9e, 0xb2, 0xfe, 0xf3, 0x8e, 0x84, 0x5c, 0x8b,
|
||||||
0x7f, 0x0e, 0xbb, 0x32, 0x74, 0xf1, 0x56, 0x3f, 0xf8, 0x9a, 0x4b, 0xc7, 0x74, 0x9c, 0xf6, 0x12,
|
0xf4, 0x9f, 0xc3, 0xae, 0x0c, 0x5d, 0xbc, 0xd5, 0x0f, 0xbe, 0xe6, 0xd2, 0x31, 0x1d, 0xa7, 0xbd,
|
||||||
0x03, 0x38, 0x64, 0xa3, 0xb6, 0xcb, 0x6b, 0xd8, 0x79, 0x70, 0xa0, 0x7b, 0xb0, 0xf2, 0xc8, 0x39,
|
0xc4, 0x00, 0x0e, 0xd9, 0xa8, 0xed, 0xf2, 0x1a, 0x76, 0x1e, 0x1c, 0xe8, 0x1e, 0xbc, 0x3c, 0x72,
|
||||||
0xa3, 0xc6, 0x95, 0x93, 0x58, 0x30, 0x09, 0x0f, 0x65, 0x10, 0xde, 0x9f, 0x27, 0xdd, 0xb0, 0xcd,
|
0xce, 0xa8, 0x71, 0xe5, 0x24, 0x5e, 0x98, 0x84, 0x87, 0x32, 0x08, 0xef, 0xaf, 0x93, 0x6e, 0xf8,
|
||||||
0xc9, 0x2f, 0x2e, 0xfa, 0x2c, 0x6e, 0x45, 0x2b, 0xe0, 0x9b, 0x8d, 0xc2, 0x2e, 0x0b, 0x88, 0x70,
|
0xe6, 0xe4, 0x17, 0x17, 0x7d, 0x16, 0xb7, 0xa2, 0x15, 0xf0, 0xcd, 0x46, 0x61, 0x97, 0x05, 0x44,
|
||||||
0x41, 0x98, 0xf6, 0xc6, 0x3a, 0x5d, 0xf6, 0x44, 0x09, 0x7c, 0xd2, 0xd7, 0x99, 0xca, 0xd3, 0xae,
|
0xb8, 0x20, 0x4c, 0x7b, 0x63, 0x9d, 0x2e, 0x7b, 0xa2, 0x04, 0x3e, 0xe9, 0xeb, 0x4c, 0xe5, 0x69,
|
||||||
0xa6, 0xfd, 0x22, 0x4d, 0x4f, 0x6f, 0x71, 0x8b, 0x73, 0x65, 0x11, 0x8c, 0xd2, 0x74, 0x39, 0xdd,
|
0x57, 0xd3, 0x7e, 0x91, 0xa6, 0xa7, 0xb7, 0xb0, 0xe2, 0x5c, 0x59, 0x24, 0xa3, 0x34, 0x5d, 0x4e,
|
||||||
0x99, 0x87, 0xdd, 0x20, 0x1e, 0x7c, 0xfd, 0x4d, 0xba, 0xdf, 0xbb, 0x41, 0x08, 0x99, 0xc7, 0xc9,
|
0x36, 0xf3, 0xb0, 0x1b, 0xc4, 0x83, 0xaf, 0xbf, 0x49, 0xf7, 0x7b, 0x37, 0x08, 0x21, 0xf3, 0x38,
|
||||||
0xec, 0x8d, 0xca, 0x25, 0xc5, 0x58, 0x97, 0x10, 0xe4, 0xe3, 0x64, 0x96, 0x4c, 0xa6, 0x3c, 0x78,
|
0x99, 0xbd, 0x51, 0xb9, 0xa4, 0x1c, 0xeb, 0x12, 0x82, 0x7c, 0x9c, 0xcc, 0x92, 0xc9, 0x94, 0x07,
|
||||||
0x74, 0xb5, 0x84, 0xb7, 0xa5, 0x83, 0x53, 0x83, 0xbf, 0x1e, 0xd6, 0x23, 0x8d, 0xd1, 0x06, 0xe6,
|
0x8f, 0xbe, 0x2d, 0x11, 0x6d, 0xe9, 0x10, 0xd4, 0xe0, 0xaf, 0x87, 0xf5, 0x48, 0x63, 0xb4, 0x81,
|
||||||
0x41, 0x0f, 0x32, 0xc1, 0xea, 0x5c, 0xf6, 0x72, 0x3d, 0xed, 0xf2, 0x53, 0x9a, 0x67, 0x0d, 0x78,
|
0x7b, 0xd0, 0x83, 0x4a, 0xb0, 0x3a, 0x97, 0xbd, 0x5c, 0x4f, 0xbb, 0xfc, 0x94, 0xd6, 0x59, 0x03,
|
||||||
0xf0, 0x38, 0x9b, 0x40, 0xb4, 0x87, 0x01, 0xa1, 0x6f, 0x00, 0xd7, 0x79, 0x33, 0x0f, 0xf4, 0x71,
|
0x1e, 0x22, 0xce, 0x26, 0x10, 0xed, 0x61, 0x40, 0xea, 0x1b, 0xc0, 0x75, 0xde, 0xac, 0x03, 0x7d,
|
||||||
0x70, 0xa2, 0xa6, 0x95, 0x11, 0x1e, 0xed, 0x1a, 0x06, 0x36, 0x11, 0x8a, 0xa2, 0xee, 0x3f, 0xc5,
|
0x1c, 0x9c, 0xa8, 0x69, 0x65, 0x84, 0x47, 0xbb, 0x86, 0x81, 0x4d, 0x84, 0xa2, 0xac, 0xfb, 0x4f,
|
||||||
0x59, 0x91, 0xe8, 0x79, 0x09, 0xd0, 0x25, 0x2b, 0xc5, 0x54, 0x32, 0x84, 0x84, 0xd8, 0x42, 0x2c,
|
0x71, 0x56, 0x24, 0x7a, 0x5e, 0x02, 0x74, 0xc9, 0x4a, 0x31, 0x95, 0x0c, 0x29, 0x21, 0xb6, 0x90,
|
||||||
0x6c, 0x38, 0xc8, 0x66, 0x7a, 0x31, 0xd2, 0xc2, 0xba, 0xda, 0x47, 0xbb, 0xc1, 0x57, 0x8a, 0x7d,
|
0x0b, 0x1b, 0x01, 0xb2, 0x99, 0x5e, 0x8c, 0xb4, 0xb0, 0xae, 0x8e, 0xd1, 0x6e, 0xf0, 0x95, 0x72,
|
||||||
0x1d, 0x7b, 0x2b, 0x1c, 0x2d, 0x78, 0xb7, 0xa8, 0x02, 0x57, 0x7e, 0x3b, 0xba, 0x38, 0x8f, 0x25,
|
0x5f, 0xc7, 0xde, 0x0b, 0x47, 0x2f, 0x7c, 0x58, 0x54, 0x01, 0x93, 0xdf, 0x8e, 0x2e, 0xce, 0x63,
|
||||||
0x6c, 0x49, 0x72, 0x61, 0x2d, 0x19, 0x42, 0x56, 0x75, 0xdd, 0xab, 0xc6, 0x94, 0x7d, 0x4e, 0xd2,
|
0x09, 0x5f, 0x92, 0x5c, 0x58, 0x4b, 0x8e, 0x90, 0x57, 0x5d, 0xf7, 0xaa, 0x71, 0x65, 0x9f, 0x93,
|
||||||
0xe0, 0x85, 0x24, 0x97, 0xc2, 0x8c, 0xea, 0xcc, 0xe9, 0x36, 0x19, 0xe4, 0x7d, 0xe3, 0x96, 0x30,
|
0x34, 0x44, 0x21, 0xc9, 0xa5, 0x30, 0xa3, 0xba, 0x72, 0xba, 0x4d, 0x05, 0xf9, 0xd8, 0xb8, 0x25,
|
||||||
0x52, 0x14, 0x6a, 0xee, 0xef, 0x1b, 0xf3, 0x42, 0x17, 0xb0, 0xac, 0xd9, 0x11, 0x03, 0xae, 0xf6,
|
0x9c, 0x14, 0x85, 0x9a, 0x7b, 0x7b, 0x63, 0x5e, 0xe8, 0x02, 0x9e, 0x35, 0x3b, 0x62, 0xc0, 0xd5,
|
||||||
0x50, 0xb7, 0xbd, 0x20, 0x02, 0x7b, 0x53, 0x9f, 0x91, 0x73, 0x7d, 0x4b, 0x81, 0xe1, 0x15, 0x01,
|
0x1e, 0xea, 0xb6, 0x06, 0x22, 0xb1, 0x37, 0xf5, 0x19, 0x39, 0xd7, 0xb7, 0x94, 0x18, 0x5e, 0x11,
|
||||||
0xd8, 0xbd, 0x97, 0xfd, 0xfe, 0x86, 0x39, 0x55, 0x49, 0xa0, 0x91, 0x2f, 0xc8, 0x9e, 0xd6, 0x98,
|
0x80, 0xdd, 0x7b, 0xd9, 0xef, 0x6f, 0xb8, 0x53, 0x95, 0x04, 0x1a, 0xc5, 0x82, 0xfc, 0x69, 0x9d,
|
||||||
0x42, 0x2e, 0xd8, 0xbf, 0x2e, 0xce, 0xdf, 0x22, 0x2f, 0xaf, 0xe5, 0x1f, 0x95, 0xb4, 0xee, 0xe0,
|
0x29, 0xe4, 0x82, 0xfd, 0xeb, 0xe2, 0xfc, 0x2d, 0xea, 0xf2, 0x5a, 0xfe, 0x51, 0x49, 0xeb, 0x0e,
|
||||||
0x3b, 0x8e, 0xdf, 0x50, 0xbd, 0x46, 0xc7, 0x65, 0xca, 0x42, 0xbb, 0x2d, 0xe1, 0x29, 0x39, 0x42,
|
0xbe, 0x13, 0xf8, 0x0d, 0xd5, 0x6b, 0x74, 0x5c, 0xa6, 0x2c, 0xb4, 0xdb, 0x12, 0x91, 0x92, 0x23,
|
||||||
0xdc, 0x85, 0x7e, 0xc6, 0x3a, 0xa4, 0xb5, 0x1d, 0xc4, 0xcf, 0xe9, 0x16, 0xc1, 0x77, 0xfd, 0xbc,
|
0xe4, 0x5d, 0xe8, 0x57, 0xac, 0x43, 0x59, 0xdb, 0x41, 0xfc, 0x9c, 0xac, 0x08, 0xbe, 0x1b, 0xe7,
|
||||||
0x96, 0x2b, 0x37, 0x05, 0x4b, 0x92, 0x91, 0xcc, 0xc2, 0xad, 0x56, 0x40, 0x9d, 0xc0, 0x57, 0x97,
|
0xb5, 0x5c, 0xb9, 0x29, 0x58, 0x92, 0x8c, 0x64, 0x16, 0x6e, 0xb5, 0x02, 0xea, 0x02, 0xbe, 0xba,
|
||||||
0xc3, 0x11, 0x22, 0x3c, 0xaa, 0x0d, 0x82, 0x0f, 0xc8, 0x92, 0xc2, 0x5b, 0xf2, 0x46, 0x9b, 0xf9,
|
0x1c, 0x8e, 0x90, 0xe1, 0x51, 0xed, 0x10, 0x62, 0x40, 0x9e, 0x14, 0xde, 0x93, 0x37, 0xda, 0xcc,
|
||||||
0x09, 0x3c, 0x79, 0xd0, 0x64, 0x65, 0xd1, 0x04, 0x75, 0x97, 0x93, 0x7f, 0x11, 0x28, 0x3d, 0x0a,
|
0x4f, 0x10, 0xc9, 0x83, 0xa6, 0x2a, 0x8b, 0x26, 0xa9, 0xbb, 0x9c, 0xe2, 0x8b, 0x44, 0xe9, 0x51,
|
||||||
0x18, 0xfb, 0xa1, 0xff, 0x31, 0xac, 0x51, 0xa7, 0xb5, 0x22, 0xc0, 0xfc, 0xad, 0xc8, 0x2b, 0x50,
|
0xc2, 0xd8, 0x0f, 0xfd, 0x8f, 0x61, 0x8d, 0x3a, 0xbd, 0x2b, 0x02, 0xac, 0xdf, 0x8a, 0xbc, 0x02,
|
||||||
0x24, 0x0f, 0xb7, 0x76, 0xd7, 0x90, 0x25, 0x99, 0x4c, 0x66, 0xef, 0xaa, 0xf9, 0x3a, 0xcf, 0xb7,
|
0x45, 0xf2, 0x70, 0x6b, 0x77, 0x0d, 0x59, 0x92, 0xc9, 0x64, 0xf6, 0xae, 0x9a, 0xaf, 0xeb, 0x7c,
|
||||||
0xba, 0x5b, 0x92, 0x4c, 0xe8, 0xcd, 0xe4, 0xb2, 0x07, 0x57, 0x25, 0x59, 0x37, 0xfa, 0xd0, 0xdf,
|
0xab, 0xbb, 0x25, 0xc9, 0x85, 0xde, 0x4c, 0x2e, 0x7b, 0x08, 0x55, 0x92, 0x75, 0xa3, 0x0f, 0xfd,
|
||||||
0x79, 0xf9, 0x31, 0x0a, 0x90, 0xec, 0x1f, 0xf8, 0x31, 0xee, 0x6b, 0x4b, 0x91, 0x50, 0x0a, 0x8e,
|
0x9d, 0x97, 0x1f, 0xa3, 0x00, 0xc5, 0xfe, 0x81, 0x1f, 0xc3, 0x5e, 0x5b, 0x8a, 0x84, 0x4a, 0x70,
|
||||||
0xc4, 0x18, 0xff, 0x4f, 0x41, 0xe4, 0x30, 0x91, 0x0f, 0x33, 0x35, 0x71, 0xf8, 0x7c, 0x0d, 0x66,
|
0x24, 0xc6, 0xf8, 0x7f, 0x0a, 0x22, 0x87, 0x8b, 0x7c, 0x98, 0xa9, 0x89, 0xc3, 0xe7, 0x6b, 0x30,
|
||||||
0x37, 0x3a, 0xc7, 0xb7, 0xa3, 0x9c, 0xc6, 0x57, 0x02, 0x7c, 0x4d, 0xf3, 0xa2, 0xb4, 0xe7, 0x3a,
|
0xbb, 0xd1, 0x39, 0xbe, 0x1d, 0xe5, 0xf4, 0x7c, 0x25, 0xc0, 0xd7, 0xb4, 0x2e, 0x4a, 0x7b, 0xae,
|
||||||
0x99, 0xd1, 0x11, 0x90, 0xb7, 0x4f, 0xe2, 0x61, 0x23, 0xe9, 0x0a, 0x11, 0x7a, 0x53, 0x36, 0x5f,
|
0x93, 0x19, 0x1d, 0x01, 0x79, 0xfb, 0x22, 0x1e, 0x36, 0x92, 0xae, 0x90, 0xa1, 0x37, 0x65, 0xf3,
|
||||||
0x4e, 0xf4, 0xa2, 0xf0, 0x72, 0xe1, 0x10, 0xfe, 0x56, 0xcf, 0x69, 0x03, 0xd8, 0x45, 0x2f, 0xce,
|
0xe5, 0x44, 0x2f, 0x0a, 0x2f, 0x17, 0x01, 0xe1, 0x6f, 0xf5, 0x9c, 0x36, 0x80, 0x5d, 0xf4, 0xe2,
|
||||||
0xa5, 0x57, 0xe0, 0xbf, 0xfb, 0xdd, 0xfe, 0xdb, 0xb5, 0x9a, 0x66, 0xab, 0xe9, 0xe6, 0xec, 0x19,
|
0x5c, 0x7a, 0x05, 0xfe, 0xbb, 0xdf, 0xed, 0xbf, 0x5d, 0xab, 0x69, 0xb6, 0x5a, 0x6e, 0xce, 0x9e,
|
||||||
0x1c, 0x65, 0x68, 0xf2, 0x44, 0x52, 0x06, 0xf0, 0x8f, 0x08, 0xe2, 0x24, 0xaf, 0x52, 0x69, 0xbb,
|
0x21, 0x50, 0x86, 0x16, 0x4f, 0x24, 0x55, 0x00, 0xff, 0x88, 0x24, 0x4e, 0xf2, 0x2a, 0x95, 0xb6,
|
||||||
0x2b, 0xeb, 0x82, 0xe0, 0xcf, 0x3f, 0x9b, 0x11, 0xd2, 0x95, 0x3e, 0x4f, 0xe4, 0x44, 0x54, 0xb9,
|
0xbb, 0xf2, 0x2e, 0x08, 0xfe, 0xfc, 0xb3, 0x79, 0x42, 0xb9, 0xd2, 0xe7, 0x89, 0x9c, 0x88, 0x2a,
|
||||||
0x43, 0xd2, 0x23, 0x17, 0x36, 0xd2, 0xe4, 0x6e, 0x8e, 0x03, 0x2a, 0x79, 0x8f, 0x69, 0xc0, 0xbd,
|
0x77, 0x28, 0x7a, 0xd4, 0xc2, 0x46, 0x99, 0xdc, 0xad, 0x71, 0x40, 0x25, 0xef, 0x31, 0x0d, 0xb8,
|
||||||
0x45, 0x1d, 0x40, 0x9c, 0x38, 0xff, 0x13, 0x7f, 0x2a, 0x89, 0x5a, 0x1f, 0xda, 0x11, 0x3c, 0xed,
|
0xb7, 0xa8, 0x13, 0x88, 0x13, 0xe7, 0x7f, 0xe2, 0x4f, 0x25, 0x51, 0xeb, 0x43, 0x3b, 0x82, 0xa7,
|
||||||
0xf2, 0xf7, 0xe7, 0xa7, 0x27, 0x20, 0x51, 0x9b, 0xbe, 0xe2, 0xc8, 0x1b, 0xec, 0xb6, 0x69, 0xb0,
|
0x5d, 0xfe, 0xfe, 0xfc, 0xf4, 0x04, 0x24, 0x6a, 0xd3, 0x57, 0x1c, 0x75, 0x83, 0xdd, 0x36, 0x0d,
|
||||||
0xa1, 0x6f, 0x88, 0xe0, 0xe3, 0xe4, 0xc6, 0x7d, 0x6c, 0x6a, 0x98, 0x1d, 0x75, 0xc7, 0xa7, 0x0d,
|
0x36, 0xf4, 0x0d, 0x91, 0x7c, 0x9c, 0xc2, 0xb8, 0x8f, 0x4d, 0x0d, 0xb3, 0xa3, 0xef, 0xf8, 0xb2,
|
||||||
0xae, 0xaa, 0x9d, 0x4e, 0x74, 0xbe, 0xbd, 0xdd, 0xf5, 0xb5, 0xa8, 0x1f, 0x76, 0x7d, 0xb1, 0x8a,
|
0x81, 0xa9, 0xda, 0xe9, 0x44, 0xe7, 0xdb, 0xdb, 0x5d, 0xdf, 0x8b, 0xfa, 0x61, 0xd7, 0x37, 0xab,
|
||||||
0x69, 0x47, 0x3e, 0x74, 0xda, 0x00, 0x41, 0x52, 0x7e, 0xe6, 0xe4, 0x9c, 0xc2, 0x3a, 0x39, 0x2b,
|
0x98, 0x76, 0xe4, 0x43, 0xa7, 0x0d, 0x10, 0x24, 0xe5, 0x67, 0x4e, 0xce, 0x29, 0xad, 0x93, 0xb3,
|
||||||
0xb9, 0x37, 0xb5, 0xde, 0x86, 0xf3, 0xf3, 0x12, 0x3c, 0x42, 0xe6, 0xb0, 0x0b, 0x9d, 0xca, 0x1e,
|
0x92, 0x7b, 0x57, 0xeb, 0x6d, 0x38, 0x3f, 0x2f, 0xc1, 0x23, 0xe4, 0x0e, 0xbb, 0xd0, 0xa9, 0xec,
|
||||||
0xbb, 0x42, 0xc6, 0x5a, 0xc9, 0x24, 0xf9, 0x91, 0xd1, 0xdd, 0xd8, 0xd9, 0x15, 0x98, 0x22, 0xbc,
|
0xb1, 0x2b, 0x54, 0xac, 0x95, 0x4c, 0x52, 0x1c, 0x19, 0xd9, 0xc6, 0xce, 0xae, 0xc0, 0x14, 0xe1,
|
||||||
0x23, 0xd1, 0xde, 0x95, 0x18, 0x7a, 0x69, 0x41, 0x40, 0xbb, 0x3c, 0xcb, 0x93, 0xf8, 0x57, 0xbe,
|
0x1d, 0x89, 0xf6, 0xae, 0xc4, 0xd0, 0x4b, 0x0b, 0x02, 0xda, 0xe5, 0x59, 0x9e, 0xc4, 0xbf, 0xf2,
|
||||||
0xfa, 0xa1, 0xf8, 0xf1, 0xa7, 0x7e, 0x79, 0x9f, 0xc3, 0xdc, 0x75, 0xf1, 0x8a, 0x6c, 0xef, 0xb3,
|
0xdd, 0x0f, 0xcd, 0x8f, 0x3f, 0xf5, 0xaf, 0xf7, 0x39, 0xdc, 0x5d, 0x37, 0xaf, 0xc8, 0xf6, 0x3e,
|
||||||
0x7d, 0x55, 0xc6, 0xbf, 0x72, 0x8f, 0x6f, 0xe7, 0x30, 0x6a, 0x4a, 0xee, 0xa1, 0xe7, 0x86, 0xc1,
|
0xdb, 0x57, 0x65, 0xfc, 0x2b, 0xf7, 0xf8, 0x76, 0x0e, 0xa3, 0xa6, 0xe5, 0x1e, 0x7a, 0x6e, 0x18,
|
||||||
0x3f, 0xd4, 0x9c, 0x8a, 0x37, 0xab, 0x4c, 0x8e, 0x24, 0xf7, 0x74, 0x91, 0x58, 0x70, 0xe8, 0x01,
|
0xfc, 0x43, 0xcd, 0xa9, 0x79, 0xb3, 0xca, 0xe4, 0x28, 0x72, 0x4f, 0x17, 0x89, 0x05, 0x87, 0x1e,
|
||||||
0x36, 0xfa, 0x0d, 0x87, 0x51, 0xdd, 0x6c, 0x10, 0x99, 0x83, 0x23, 0x49, 0x73, 0xcc, 0x81, 0x16,
|
0x60, 0xa3, 0xdf, 0x70, 0x18, 0xd5, 0xc3, 0x06, 0x91, 0x39, 0x38, 0x92, 0x34, 0xc7, 0x1c, 0x68,
|
||||||
0x0a, 0xfb, 0x04, 0x79, 0xd1, 0x61, 0x0a, 0x63, 0xfa, 0xf6, 0xc9, 0xf2, 0xa6, 0x19, 0x19, 0x4e,
|
0xa1, 0xb1, 0x4f, 0x50, 0x17, 0x1d, 0xa6, 0xf0, 0x4c, 0xdf, 0x3e, 0x59, 0xde, 0x0c, 0x23, 0xc3,
|
||||||
0x38, 0x43, 0x2b, 0x90, 0x69, 0xac, 0x94, 0xda, 0x52, 0x67, 0x90, 0xaa, 0x5b, 0xe6, 0x49, 0x25,
|
0x09, 0x67, 0x18, 0x05, 0x32, 0x8d, 0x37, 0xa5, 0xb6, 0x34, 0x19, 0xa4, 0xea, 0x96, 0x79, 0x52,
|
||||||
0x06, 0xc7, 0x01, 0x8e, 0xc5, 0xdd, 0xb9, 0x4c, 0xe6, 0xe5, 0x31, 0xf5, 0x29, 0x70, 0x9c, 0x83,
|
0x89, 0xc1, 0x71, 0x80, 0x63, 0x71, 0x77, 0x2d, 0x93, 0x79, 0x79, 0x4c, 0x73, 0x0a, 0x02, 0xe7,
|
||||||
0x37, 0xa8, 0xdc, 0xc4, 0xbc, 0x1e, 0x70, 0x68, 0x4d, 0x72, 0x95, 0xcc, 0x62, 0xfe, 0x96, 0xd4,
|
0x10, 0x0d, 0x6a, 0x37, 0x31, 0xaf, 0x1f, 0x38, 0xb4, 0x26, 0xb9, 0x4a, 0x66, 0x31, 0x7f, 0x4b,
|
||||||
0xbe, 0x3a, 0x8c, 0xea, 0x05, 0x5c, 0x0d, 0x22, 0x06, 0x0f, 0x9f, 0xe9, 0xac, 0x0e, 0x1d, 0xd3,
|
0x6a, 0x5f, 0x1d, 0x46, 0xf5, 0x0b, 0x98, 0x06, 0x11, 0x83, 0x87, 0xcf, 0x74, 0x56, 0x87, 0x8e,
|
||||||
0x21, 0xca, 0xa0, 0xf5, 0xb9, 0x3b, 0x27, 0x6c, 0x35, 0x9e, 0x2b, 0xdc, 0x71, 0x28, 0x6e, 0xe5,
|
0xe9, 0x10, 0x55, 0xd0, 0xfa, 0xdc, 0x9d, 0x13, 0xb6, 0x1a, 0xcf, 0x15, 0x6c, 0x1c, 0x8a, 0x5b,
|
||||||
0x7a, 0x4b, 0x66, 0x5a, 0xf1, 0xd9, 0xde, 0xa0, 0x33, 0x6c, 0x3a, 0x07, 0xb6, 0xcd, 0x6e, 0x7c,
|
0xb9, 0xde, 0x92, 0x99, 0x56, 0x7c, 0xb6, 0x37, 0xe8, 0x0c, 0x9b, 0xc9, 0x81, 0x6d, 0xb3, 0x1b,
|
||||||
0x9d, 0xa7, 0xf8, 0xac, 0x4a, 0x60, 0xb3, 0x37, 0x68, 0x7b, 0x1a, 0x76, 0x75, 0xf6, 0x6e, 0x9f,
|
0xdf, 0xe7, 0x29, 0x3f, 0xab, 0x12, 0xd8, 0xec, 0x0d, 0xda, 0x99, 0x86, 0x5d, 0x9d, 0xbd, 0xdb,
|
||||||
0x1d, 0xaa, 0xa2, 0xac, 0x5c, 0x23, 0xba, 0x84, 0x71, 0x0b, 0x6d, 0x52, 0xee, 0x41, 0xc2, 0xfa,
|
0x67, 0x87, 0xaa, 0x28, 0x2b, 0xd7, 0x88, 0x2e, 0xe1, 0xdc, 0x42, 0x9b, 0x94, 0x7b, 0x90, 0xf0,
|
||||||
0xaa, 0x69, 0xf2, 0xdf, 0xad, 0xfa, 0x2f, 0xbe, 0x3e, 0x07, 0x58, 0xe2, 0x0b, 0xe2, 0x7c, 0x8a,
|
0x7e, 0x35, 0x34, 0xf9, 0xef, 0x56, 0xfd, 0x17, 0x5f, 0x9f, 0x03, 0x2c, 0xf1, 0x05, 0x79, 0x3e,
|
||||||
0x96, 0xcc, 0x8f, 0x54, 0xb1, 0x31, 0xd2, 0x05, 0xd2, 0x86, 0x22, 0x39, 0xe6, 0x2b, 0xe2, 0x20,
|
0xc5, 0x48, 0xe6, 0x9f, 0x54, 0xb1, 0xf1, 0xa4, 0x0b, 0x94, 0x0d, 0x65, 0x72, 0xcc, 0x57, 0xc4,
|
||||||
0x26, 0x0c, 0x20, 0xab, 0x14, 0x0e, 0xe1, 0x83, 0x15, 0x4f, 0x16, 0x7f, 0x83, 0x1a, 0x52, 0x3e,
|
0x41, 0x4c, 0x18, 0x40, 0x56, 0x29, 0x1c, 0xd2, 0x07, 0x6f, 0x3c, 0x59, 0xfc, 0x0d, 0x6a, 0x48,
|
||||||
0x47, 0x80, 0x81, 0xe9, 0xd1, 0x3b, 0x19, 0x95, 0x70, 0xe6, 0x3b, 0x2d, 0x68, 0xdc, 0x0c, 0x38,
|
0xf9, 0x1c, 0x09, 0x06, 0xa6, 0xc7, 0xec, 0x64, 0x54, 0xc2, 0x99, 0x9f, 0xb4, 0xa0, 0x71, 0x33,
|
||||||
0xc1, 0x9e, 0xb3, 0x54, 0x4d, 0x95, 0x63, 0xd8, 0x36, 0x06, 0x93, 0x00, 0x13, 0x03, 0xf8, 0xc9,
|
0xe1, 0x04, 0x7b, 0xce, 0x52, 0x35, 0x55, 0x8e, 0x61, 0xdb, 0x18, 0x4c, 0x02, 0x4c, 0x0c, 0xe0,
|
||||||
0x25, 0xde, 0xed, 0x50, 0xa6, 0x73, 0x6d, 0xf6, 0x9f, 0x4c, 0x04, 0xf5, 0x8f, 0xdb, 0x4f, 0x5e,
|
0xa7, 0x90, 0xf8, 0xb0, 0x43, 0x99, 0xce, 0xb5, 0xd9, 0x7f, 0x32, 0x11, 0x34, 0x3f, 0x6e, 0x3f,
|
||||||
0xbe, 0x78, 0xf1, 0xe2, 0x80, 0xdd, 0x14, 0xb2, 0x48, 0xcc, 0xb2, 0x74, 0x32, 0x65, 0xce, 0x88,
|
0x79, 0xf9, 0xe2, 0xc5, 0x8b, 0x03, 0x76, 0x53, 0xc8, 0x22, 0x31, 0xcb, 0xd2, 0xc9, 0x94, 0x39,
|
||||||
0xc2, 0xce, 0x95, 0xb5, 0x94, 0x21, 0xec, 0x18, 0x15, 0xcf, 0x20, 0xd7, 0x0b, 0xc7, 0x16, 0x99,
|
0x23, 0x0a, 0x3b, 0x57, 0xd6, 0x52, 0x85, 0xb0, 0x63, 0x74, 0x3c, 0x83, 0x5a, 0x2f, 0x1c, 0x5b,
|
||||||
0xa4, 0xfc, 0xcd, 0xd1, 0xb5, 0x50, 0xd1, 0x84, 0xa9, 0x21, 0x4b, 0x35, 0x7b, 0x77, 0x39, 0x62,
|
0x64, 0x92, 0xea, 0x37, 0xc7, 0xd4, 0x42, 0x4d, 0x13, 0xae, 0x86, 0x2c, 0xd5, 0xec, 0xdd, 0xe5,
|
||||||
0x20, 0x25, 0xb6, 0xd4, 0x95, 0x61, 0x63, 0x51, 0xcc, 0xb0, 0x48, 0x0b, 0xda, 0x84, 0x6c, 0x78,
|
0x88, 0x81, 0x94, 0xd8, 0x52, 0x57, 0x86, 0x8d, 0x45, 0x31, 0xc3, 0x4b, 0x7a, 0xa1, 0x4d, 0xc8,
|
||||||
0x76, 0x11, 0x32, 0xe9, 0x92, 0x1e, 0x2b, 0x55, 0xb1, 0xd5, 0x69, 0x1d, 0x6b, 0xfc, 0x1f, 0xf1,
|
0x86, 0x67, 0x17, 0x21, 0x93, 0x2e, 0xe9, 0xb1, 0x52, 0x15, 0x5b, 0x9d, 0x36, 0xb0, 0xc6, 0xff,
|
||||||
0x17, 0x5b, 0x28, 0x03, 0x89, 0xd6, 0xb2, 0xee, 0xe5, 0xe8, 0x28, 0x60, 0x56, 0x4f, 0xdc, 0x42,
|
0x11, 0x7f, 0xb1, 0x85, 0x32, 0x90, 0x68, 0x2d, 0xeb, 0x5e, 0x8e, 0x8e, 0x02, 0x66, 0xf5, 0xc4,
|
||||||
0x18, 0xc9, 0xea, 0xb6, 0xeb, 0x1e, 0xee, 0x1e, 0xa8, 0xb1, 0xfe, 0xb2, 0x82, 0xfb, 0xdd, 0x65,
|
0x2d, 0x84, 0x91, 0xac, 0x1e, 0xbb, 0xee, 0xe1, 0xee, 0x81, 0x1a, 0xeb, 0x2f, 0x2b, 0xb8, 0xdf,
|
||||||
0x6d, 0xe1, 0x15, 0x1c, 0x52, 0x66, 0x06, 0x40, 0x3c, 0xea, 0xa9, 0xfa, 0xc0, 0xe5, 0xd5, 0x1d,
|
0x5d, 0xd6, 0x1e, 0x5e, 0x21, 0x20, 0x65, 0x66, 0x00, 0xc4, 0xa3, 0x91, 0xaa, 0x0f, 0x5c, 0x5e,
|
||||||
0xaf, 0x3c, 0xdb, 0x6b, 0x10, 0x1a, 0x69, 0x20, 0x48, 0x1d, 0x30, 0xc3, 0x35, 0x42, 0x86, 0xb8,
|
0xdd, 0x89, 0xca, 0xb3, 0xbd, 0x06, 0xa1, 0x91, 0x06, 0x82, 0x34, 0x01, 0x33, 0x98, 0x11, 0x32,
|
||||||
0x67, 0x6d, 0x57, 0xc9, 0xd0, 0x62, 0x59, 0x14, 0x2b, 0x32, 0x90, 0x15, 0x92, 0x10, 0xd2, 0x4c,
|
0xe4, 0x3d, 0x6b, 0xa7, 0x4a, 0x86, 0x11, 0xcb, 0xa2, 0x59, 0x91, 0x83, 0xac, 0x90, 0x84, 0x90,
|
||||||
0xe4, 0x56, 0x37, 0x98, 0xbb, 0x4c, 0xa2, 0x7b, 0x30, 0x06, 0xb0, 0xb0, 0x56, 0x1d, 0x4c, 0x85,
|
0x66, 0x22, 0xb7, 0xba, 0xc1, 0xdc, 0x65, 0x12, 0xd3, 0x83, 0x31, 0x80, 0x85, 0xb5, 0xea, 0xe0,
|
||||||
0xd4, 0x51, 0x26, 0x57, 0x33, 0xd4, 0x1f, 0x54, 0x79, 0xca, 0xc6, 0x92, 0x1a, 0xe9, 0x62, 0x0a,
|
0x2a, 0xa4, 0x8e, 0x32, 0xb9, 0x5a, 0xa1, 0xf9, 0xa0, 0xca, 0x53, 0x36, 0x96, 0x34, 0x48, 0x17,
|
||||||
0x31, 0x1e, 0x4f, 0xa8, 0x43, 0x77, 0xd8, 0x28, 0x4f, 0x7b, 0x35, 0x36, 0x83, 0xce, 0x89, 0xb2,
|
0x53, 0x88, 0xf1, 0x78, 0x42, 0x1d, 0xa6, 0xc3, 0x46, 0x79, 0xda, 0xab, 0xb1, 0x19, 0x74, 0x4e,
|
||||||
0xed, 0x6d, 0xea, 0x7d, 0x85, 0x76, 0x88, 0x02, 0x02, 0x3a, 0x64, 0x1a, 0x2a, 0xcd, 0x42, 0x01,
|
0x94, 0x6d, 0xad, 0xa9, 0xf7, 0x15, 0xda, 0x21, 0x0b, 0x08, 0xe8, 0x90, 0x69, 0xa8, 0x34, 0x0b,
|
||||||
0x73, 0x51, 0x30, 0x84, 0x0a, 0x72, 0x00, 0xf7, 0x48, 0x30, 0x30, 0x72, 0x82, 0xc4, 0xcb, 0x58,
|
0x05, 0xcc, 0x45, 0xc1, 0x90, 0x2a, 0xa8, 0x01, 0xd8, 0x91, 0xe0, 0xc1, 0xc8, 0x09, 0x0a, 0x2f,
|
||||||
0xfd, 0x02, 0x58, 0xa1, 0x49, 0xc8, 0x8f, 0x6b, 0xdc, 0xd5, 0x3a, 0xae, 0x29, 0x53, 0x10, 0x70,
|
0x63, 0xf5, 0x0d, 0x60, 0x85, 0x26, 0x21, 0x3f, 0xae, 0x71, 0x57, 0xeb, 0xbc, 0xa6, 0x4a, 0x41,
|
||||||
0x75, 0x47, 0x43, 0x98, 0x83, 0x05, 0x96, 0xf5, 0xed, 0xbc, 0x6e, 0x35, 0xf1, 0xea, 0x73, 0x72,
|
0xc2, 0xd5, 0x13, 0x0d, 0x61, 0x0e, 0x16, 0x58, 0xd6, 0xd6, 0x79, 0xdd, 0x6a, 0xe2, 0xd5, 0xe7,
|
||||||
0x13, 0xb6, 0xa5, 0xf5, 0x95, 0xd2, 0xad, 0xc3, 0x48, 0x0d, 0xbc, 0x7d, 0x27, 0xb2, 0x58, 0x32,
|
0x14, 0x26, 0x6c, 0x4b, 0x6b, 0x93, 0xd2, 0xad, 0xc3, 0x48, 0x0d, 0xbc, 0x7f, 0x27, 0xb2, 0x58,
|
||||||
0x91, 0x24, 0xe4, 0x3e, 0x60, 0xf2, 0x5e, 0xbd, 0x51, 0xac, 0xe5, 0x27, 0x3a, 0x4d, 0x27, 0x65,
|
0x32, 0x91, 0x24, 0x14, 0x3e, 0x60, 0xf2, 0x5e, 0xbd, 0x51, 0xac, 0xe5, 0x27, 0x3a, 0x4d, 0x27,
|
||||||
0xfa, 0xa8, 0x0f, 0x1b, 0x8f, 0xbc, 0xe7, 0xb5, 0x34, 0xfa, 0x7b, 0x23, 0x12, 0x50, 0x24, 0x41,
|
0x65, 0xfa, 0x68, 0x0c, 0x9b, 0x88, 0xbc, 0xe7, 0xb5, 0x34, 0xfa, 0x7b, 0x23, 0x12, 0x50, 0x24,
|
||||||
0x0e, 0x39, 0x3f, 0x38, 0x78, 0x3d, 0x6c, 0x7c, 0x77, 0x94, 0xe7, 0x6b, 0xb5, 0xa2, 0x48, 0x59,
|
0x41, 0x0e, 0x39, 0x3f, 0x38, 0x78, 0x3d, 0x6c, 0x62, 0x77, 0x94, 0xe7, 0x6b, 0xb5, 0xa2, 0x48,
|
||||||
0xd3, 0x30, 0x22, 0xb6, 0xb0, 0x02, 0xc0, 0x25, 0x05, 0x46, 0x8b, 0xad, 0x19, 0xfc, 0x1f, 0xd9,
|
0x59, 0x33, 0x30, 0x22, 0xb7, 0xf0, 0x06, 0x80, 0x4b, 0x4a, 0x8c, 0x16, 0x5b, 0x33, 0xf8, 0x3f,
|
||||||
0x70, 0xb4, 0x81, 0xb7, 0x87, 0x0f, 0x18, 0xe3, 0x32, 0x08, 0x0b, 0x07, 0x27, 0xcf, 0xbc, 0x0f,
|
0xaa, 0xe1, 0x68, 0x03, 0x6f, 0x0f, 0x1f, 0x30, 0x86, 0x31, 0x48, 0x0b, 0x87, 0x20, 0xcf, 0x7c,
|
||||||
0x14, 0x45, 0x45, 0x22, 0xa9, 0x7d, 0x04, 0x7b, 0xd6, 0xad, 0x62, 0x1b, 0xf9, 0xc4, 0x3e, 0xd9,
|
0x0c, 0x14, 0x65, 0x45, 0x22, 0x69, 0x7c, 0x04, 0x7b, 0xd6, 0xa3, 0x62, 0x9b, 0xf9, 0xc4, 0x3e,
|
||||||
0xb3, 0xc1, 0xb0, 0x8d, 0xf2, 0x9a, 0x74, 0x40, 0x37, 0xcf, 0x06, 0x3f, 0xa0, 0xc8, 0x1b, 0x62,
|
0xd9, 0xb3, 0xc1, 0xb0, 0xcd, 0xf2, 0x9a, 0x74, 0x40, 0x37, 0xcf, 0x06, 0x3f, 0xa0, 0xc8, 0x1b,
|
||||||
0xbb, 0xce, 0x85, 0x28, 0x2a, 0x91, 0x7b, 0xb7, 0xb4, 0x47, 0x57, 0xdc, 0x67, 0x06, 0xa7, 0x75,
|
0x62, 0xbb, 0xce, 0x85, 0x28, 0x2a, 0x91, 0xfb, 0xb0, 0xb4, 0x47, 0x57, 0xdc, 0x67, 0x06, 0xa7,
|
||||||
0x04, 0x1f, 0x99, 0xb4, 0x52, 0x85, 0xc6, 0xa6, 0x1f, 0xa5, 0xcf, 0x11, 0xa5, 0x4f, 0x73, 0x27,
|
0x75, 0x06, 0x1f, 0x99, 0xb4, 0x52, 0x85, 0xc6, 0xa6, 0x1f, 0x95, 0xcf, 0x11, 0x95, 0x4f, 0x63,
|
||||||
0x62, 0xd2, 0xaa, 0x04, 0x11, 0x5e, 0xa3, 0xab, 0xd3, 0xa6, 0xb9, 0x94, 0x68, 0x99, 0x7c, 0xec,
|
0x13, 0x31, 0x69, 0x55, 0x82, 0x08, 0xaf, 0x31, 0xd5, 0x69, 0xd3, 0x18, 0x25, 0x5a, 0x26, 0x1f,
|
||||||
0xd0, 0x46, 0x17, 0xb3, 0x9a, 0xf1, 0x9a, 0x96, 0x9d, 0x75, 0x32, 0x04, 0x5c, 0xcc, 0xa3, 0x06,
|
0x3b, 0x8c, 0xd1, 0xc5, 0xac, 0x66, 0xbc, 0x66, 0x64, 0x67, 0x9d, 0x0c, 0x09, 0x17, 0xf3, 0xa8,
|
||||||
0x70, 0x54, 0x24, 0xba, 0x73, 0x5b, 0x9e, 0x91, 0x7d, 0x4d, 0xe7, 0xde, 0x0a, 0x6f, 0xc6, 0x87,
|
0x01, 0x1c, 0x1d, 0x89, 0x6c, 0x6e, 0xdb, 0x33, 0xaa, 0xaf, 0x99, 0xdc, 0x5b, 0xe1, 0xcd, 0xf3,
|
||||||
0x91, 0x58, 0x39, 0x62, 0xd0, 0x69, 0xf4, 0xad, 0x16, 0x7d, 0x94, 0x6e, 0xdc, 0xda, 0x37, 0xed,
|
0x61, 0x24, 0x56, 0x81, 0x18, 0x74, 0x1a, 0x7d, 0xab, 0x97, 0x3e, 0x4b, 0x37, 0xac, 0xf6, 0x43,
|
||||||
0x8d, 0xcf, 0x7d, 0x5f, 0xe6, 0x43, 0xae, 0xc4, 0x43, 0xb4, 0xd6, 0x37, 0x60, 0x2d, 0x74, 0x9d,
|
0x7b, 0x13, 0x73, 0x3f, 0x97, 0xf9, 0x94, 0x2b, 0x71, 0x11, 0xad, 0xf5, 0x0d, 0x58, 0x0b, 0x5d,
|
||||||
0x87, 0xb1, 0xfb, 0x65, 0xa3, 0x97, 0x4d, 0x7b, 0xc3, 0x49, 0x8f, 0xa4, 0x84, 0xf7, 0x6e, 0x1d,
|
0xe7, 0x61, 0xec, 0x7e, 0xd9, 0x98, 0x65, 0xd3, 0xde, 0x70, 0xd2, 0x23, 0x29, 0xe1, 0x3d, 0xab,
|
||||||
0xfc, 0x32, 0xb8, 0xf1, 0xdb, 0x56, 0x88, 0xd6, 0x41, 0xb9, 0x66, 0xac, 0x47, 0xa1, 0x68, 0xad,
|
0x83, 0x5f, 0x06, 0x37, 0x7e, 0xdb, 0x0a, 0xd1, 0x3a, 0x29, 0xd7, 0x8c, 0xf5, 0x28, 0x14, 0xad,
|
||||||
0x64, 0x0d, 0x1a, 0x80, 0xa6, 0x41, 0xa2, 0xb3, 0x86, 0x82, 0xf0, 0x6a, 0x61, 0xb8, 0xf3, 0xd6,
|
0x97, 0xac, 0x41, 0x03, 0xd0, 0x34, 0x48, 0x74, 0xd6, 0x50, 0x10, 0x5e, 0x2d, 0x0c, 0x77, 0xee,
|
||||||
0xb8, 0x03, 0x46, 0x8b, 0xc5, 0xdd, 0x1d, 0x6b, 0x44, 0x3a, 0x0f, 0x43, 0xb2, 0xf7, 0x38, 0x26,
|
0x1a, 0x77, 0xc0, 0x68, 0xb1, 0xb8, 0xbb, 0x63, 0x8d, 0x48, 0xe7, 0x61, 0x48, 0xf6, 0x1e, 0xc7,
|
||||||
0x8f, 0x54, 0xcf, 0x07, 0x31, 0xd9, 0x0b, 0x37, 0x2e, 0xff, 0x2d, 0x20, 0x1b, 0x78, 0x50, 0x06,
|
0xe4, 0x91, 0xee, 0xf9, 0x20, 0x26, 0x7b, 0xe1, 0x86, 0xf1, 0xdf, 0x02, 0xb2, 0x81, 0x07, 0x55,
|
||||||
0x75, 0xbe, 0x97, 0x42, 0xb5, 0x21, 0x54, 0x26, 0x1a, 0x74, 0xa2, 0xbb, 0x0f, 0x2c, 0x9f, 0x9a,
|
0x50, 0xe7, 0x7b, 0x25, 0x54, 0x3b, 0x42, 0x6d, 0xa2, 0x41, 0x27, 0xba, 0x7b, 0xc1, 0xf2, 0xa5,
|
||||||
0x97, 0xbf, 0x9f, 0x5e, 0xbf, 0xbf, 0x3e, 0x1b, 0x9d, 0xd6, 0xb5, 0x03, 0x74, 0x6b, 0xa8, 0xce,
|
0x79, 0xf9, 0xfb, 0xe9, 0xf5, 0xfb, 0xeb, 0xb3, 0xd1, 0x69, 0xdd, 0x3b, 0x40, 0xb7, 0x86, 0xfa,
|
||||||
0x3c, 0x78, 0xa2, 0xe7, 0xdd, 0xd1, 0xa1, 0x87, 0x58, 0x4d, 0xb5, 0x77, 0xe5, 0xcd, 0x05, 0x91,
|
0xcc, 0x83, 0x27, 0x7a, 0x3e, 0x1c, 0x1d, 0xba, 0x88, 0xd5, 0x54, 0x7b, 0x57, 0xde, 0x5c, 0x10,
|
||||||
0xc6, 0x1f, 0x15, 0xaa, 0x09, 0x8a, 0xe0, 0x64, 0x93, 0x46, 0x18, 0xb8, 0xdc, 0xc8, 0x1d, 0x4f,
|
0x69, 0xfc, 0x51, 0xa1, 0x9b, 0xa0, 0x09, 0x4e, 0x36, 0x69, 0x84, 0x81, 0xcb, 0x8d, 0xdc, 0xf1,
|
||||||
0x8c, 0xcd, 0x63, 0xcf, 0xab, 0x3b, 0x1d, 0x5e, 0xf5, 0x9a, 0xbc, 0x7c, 0xf3, 0x00, 0xdd, 0x87,
|
0xc4, 0xd8, 0x5c, 0xf6, 0xbc, 0xba, 0xd3, 0xe1, 0x55, 0xaf, 0xa9, 0xcb, 0x37, 0x0f, 0xd0, 0x7d,
|
||||||
0x2b, 0xea, 0xb6, 0x9e, 0x1c, 0x89, 0x80, 0xc7, 0x94, 0xf9, 0x29, 0x6a, 0x53, 0xaf, 0xcd, 0x9a,
|
0xb8, 0xa2, 0x6e, 0xeb, 0xc9, 0x91, 0x08, 0x78, 0x4c, 0x95, 0x9f, 0xa2, 0x37, 0xf5, 0xda, 0xaa,
|
||||||
0xa3, 0x31, 0x1e, 0x59, 0x6d, 0xaa, 0x34, 0xe9, 0xd0, 0xfe, 0x6a, 0x81, 0x32, 0x9c, 0x55, 0xe3,
|
0x39, 0x1a, 0xe3, 0x92, 0xd5, 0x96, 0x4a, 0x53, 0x0e, 0xed, 0xaf, 0x16, 0x68, 0xc3, 0x59, 0x35,
|
||||||
0x1e, 0x5e, 0x8e, 0xd1, 0x91, 0x32, 0x89, 0xd6, 0x7a, 0xa6, 0x64, 0x44, 0x3d, 0x61, 0x84, 0xea,
|
0xee, 0xe1, 0xe6, 0x18, 0x1d, 0x29, 0x93, 0x68, 0xad, 0x67, 0x4a, 0x46, 0x34, 0x13, 0x46, 0xe8,
|
||||||
0x2d, 0xcc, 0x94, 0x7e, 0x4c, 0xf9, 0x34, 0xce, 0x51, 0x32, 0xf9, 0x80, 0xa6, 0x29, 0x14, 0x3a,
|
0xde, 0xc2, 0x4c, 0xe9, 0xc7, 0x94, 0x4f, 0xe3, 0x1c, 0x2d, 0x93, 0x0f, 0x68, 0x99, 0x52, 0xa1,
|
||||||
0xec, 0x56, 0x1a, 0x22, 0x1b, 0xd6, 0xef, 0xed, 0x3e, 0xef, 0xf5, 0x77, 0xc6, 0xfd, 0x15, 0x6f,
|
0xc3, 0x6e, 0xa5, 0x21, 0xb2, 0x61, 0xfd, 0xde, 0xee, 0xf3, 0x5e, 0x7f, 0x67, 0x9c, 0xf7, 0x57,
|
||||||
0xfd, 0x8c, 0x86, 0x85, 0x9a, 0xa9, 0xc8, 0xbf, 0x1e, 0xa8, 0x69, 0xd6, 0xc6, 0xee, 0x80, 0x19,
|
0xc4, 0xf5, 0x33, 0x2a, 0x16, 0x6a, 0xa6, 0x22, 0x7f, 0x7d, 0xa0, 0xa9, 0x59, 0x1b, 0xbb, 0x03,
|
||||||
0x77, 0x12, 0x23, 0x53, 0x45, 0xa1, 0xda, 0xb9, 0xaf, 0x7f, 0x73, 0x2b, 0xaa, 0xb7, 0xa4, 0x77,
|
0x6a, 0xdc, 0x49, 0x8c, 0x4c, 0x15, 0xe5, 0x6a, 0xe7, 0xbe, 0x01, 0x9b, 0x5b, 0xd1, 0xbe, 0x25,
|
||||||
0x10, 0x58, 0x50, 0xc9, 0x9a, 0x52, 0x6d, 0x29, 0x13, 0x05, 0xe6, 0x71, 0xa8, 0x0e, 0xb3, 0x55,
|
0x5d, 0x84, 0x40, 0x83, 0x4a, 0xd6, 0x9c, 0x6a, 0x4b, 0x99, 0x28, 0x50, 0x8f, 0x43, 0x7b, 0x98,
|
||||||
0x02, 0x77, 0x8e, 0x58, 0x56, 0xa1, 0x78, 0xf8, 0x59, 0x5f, 0x1f, 0x51, 0x06, 0xd0, 0xfd, 0x9b,
|
0xad, 0x2a, 0xb8, 0x73, 0xc4, 0xb2, 0x0a, 0xdd, 0xc3, 0xaf, 0xfa, 0x06, 0x89, 0x3e, 0x80, 0xf1,
|
||||||
0x25, 0x9e, 0xa3, 0xa8, 0x5b, 0x9a, 0x51, 0x03, 0x08, 0xc4, 0x40, 0x91, 0xf5, 0x2f, 0x15, 0xbe,
|
0xdf, 0x2c, 0x71, 0x1f, 0x45, 0xe3, 0xd2, 0x8c, 0x26, 0x40, 0x40, 0x06, 0x8e, 0xac, 0x7f, 0xaa,
|
||||||
0x25, 0xde, 0x6a, 0x2d, 0xea, 0x74, 0x93, 0x80, 0xed, 0xf5, 0x77, 0x7f, 0xdd, 0xd9, 0xeb, 0xef,
|
0xf0, 0x33, 0xf1, 0x56, 0xeb, 0x51, 0xa7, 0x9b, 0x04, 0x6c, 0xaf, 0xbf, 0xfb, 0xeb, 0xce, 0x5e,
|
||||||
0xed, 0xb1, 0xd7, 0x99, 0xc1, 0x5b, 0x4f, 0x81, 0x43, 0x87, 0x49, 0xb6, 0xa0, 0x97, 0x72, 0x53,
|
0x7f, 0x6f, 0x8f, 0xbd, 0xce, 0x0c, 0x2e, 0x7b, 0x0a, 0x24, 0x3a, 0x4c, 0xb2, 0x05, 0x5d, 0x95,
|
||||||
0xb2, 0xce, 0x51, 0xcc, 0xf0, 0x08, 0x01, 0xf2, 0xb8, 0x54, 0x5d, 0x71, 0x7f, 0x0a, 0x8c, 0x71,
|
0x9b, 0x9e, 0x75, 0x8e, 0x6e, 0x86, 0x5b, 0x08, 0xa0, 0x87, 0x51, 0x75, 0xcb, 0xfd, 0x29, 0x30,
|
||||||
0xae, 0xc7, 0xd1, 0x1c, 0x8f, 0x44, 0x69, 0xa2, 0xf3, 0xb3, 0xd7, 0xa7, 0xef, 0x86, 0xa7, 0xdf,
|
0xc6, 0xb9, 0x1e, 0x47, 0x73, 0xdc, 0x12, 0xa5, 0x89, 0xce, 0xcf, 0x5e, 0x9f, 0xbe, 0x1b, 0x9e,
|
||||||
0x7a, 0xa0, 0x73, 0x71, 0x36, 0x62, 0x79, 0xad, 0xc9, 0x1b, 0x88, 0x32, 0xd7, 0x5e, 0x74, 0x28,
|
0x7e, 0x1b, 0x82, 0xce, 0xc5, 0xd9, 0x88, 0xe5, 0xb5, 0x26, 0xef, 0x20, 0xfa, 0x5c, 0x6b, 0xe8,
|
||||||
0x0d, 0xac, 0x82, 0x19, 0xd6, 0xa2, 0x58, 0x82, 0x56, 0xf1, 0x6a, 0x2b, 0x5a, 0x3e, 0xb0, 0xaa,
|
0x50, 0x1a, 0x78, 0x05, 0x37, 0xac, 0x45, 0xb7, 0x04, 0xaf, 0xe2, 0xda, 0x56, 0xb4, 0x84, 0x60,
|
||||||
0xe4, 0x94, 0xb9, 0xfe, 0x45, 0xcb, 0xfc, 0x23, 0x95, 0x08, 0x9f, 0xb6, 0xd4, 0xec, 0x4a, 0xd9,
|
0x55, 0xc9, 0xa9, 0x74, 0xfd, 0x95, 0x96, 0xf9, 0x5b, 0x2a, 0x31, 0x3e, 0x6d, 0xa9, 0xe9, 0x95,
|
||||||
0x42, 0x5c, 0x51, 0xff, 0x0a, 0xf0, 0xdd, 0xf6, 0xf6, 0xdb, 0xee, 0xb6, 0xf3, 0x53, 0xed, 0x6d,
|
0xca, 0x85, 0xc8, 0xa2, 0xfe, 0x19, 0xe0, 0xbb, 0xf3, 0xed, 0xb7, 0xe3, 0x6d, 0xe7, 0xa7, 0xe6,
|
||||||
0x44, 0x35, 0x07, 0x1f, 0xd4, 0xd5, 0x53, 0x8b, 0x4f, 0xbf, 0x32, 0xfe, 0x0f, 0xf4, 0xde, 0xf4,
|
0xdb, 0x88, 0x9a, 0x0e, 0x3e, 0x68, 0xac, 0xa7, 0x19, 0x9f, 0x7e, 0x66, 0xfc, 0x1f, 0xe4, 0x1f,
|
||||||
0x46, 0x75, 0x14, 0x00, 0x00
|
0xd8, 0x7d, 0x76, 0x14, 0x00, 0x00
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// 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 = 2639;
|
const uint16_t PAGE_settings_um_length = 2639;
|
||||||
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, 0x6b, 0x6f, 0xdb, 0x38,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcd, 0x59, 0x6b, 0x6f, 0xdb, 0x38,
|
||||||
0x16, 0xfd, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0x33, 0x8b, 0x8e, 0x6d,
|
0x16, 0xfd, 0x9e, 0x5f, 0xa1, 0xb0, 0x41, 0x22, 0xc1, 0x8a, 0xec, 0xb4, 0x33, 0x8b, 0x8e, 0x6d,
|
||||||
0x3a, 0xdb, 0xa6, 0x2f, 0x6f, 0x1f, 0x09, 0xe0, 0xce, 0x0c, 0x16, 0xd9, 0xa0, 0x91, 0x2d, 0xda,
|
0x3a, 0xdb, 0xa6, 0x2f, 0x6f, 0x1f, 0x09, 0xe0, 0xce, 0x0c, 0x16, 0xd9, 0xa0, 0x91, 0x2d, 0xda,
|
||||||
0x66, 0x23, 0x93, 0x5a, 0x91, 0xca, 0x63, 0x1d, 0xff, 0xf7, 0x3d, 0x97, 0x92, 0xfc, 0x48, 0x9d,
|
0x66, 0x23, 0x93, 0x5a, 0x91, 0xca, 0x63, 0x1d, 0xff, 0xf7, 0x3d, 0x97, 0x92, 0xfc, 0x48, 0x9d,
|
||||||
@ -1759,7 +1759,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 = 1754;
|
const uint16_t PAGE_settings_2D_length = 1754;
|
||||||
const uint8_t PAGE_settings_2D[] PROGMEM = {
|
const uint8_t PAGE_settings_2D[] PROGMEM = {
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x8d, 0x58, 0x6d, 0x73, 0xdb, 0x36,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x8d, 0x58, 0x6d, 0x73, 0xdb, 0x36,
|
||||||
0x12, 0xfe, 0xce, 0x5f, 0x01, 0x63, 0x3a, 0x2d, 0xd9, 0x50, 0x94, 0xe4, 0xde, 0x75, 0x3a, 0x16,
|
0x12, 0xfe, 0xce, 0x5f, 0x01, 0x63, 0x3a, 0x2d, 0xd9, 0x50, 0x94, 0xe4, 0xde, 0x75, 0x3a, 0x16,
|
||||||
0x49, 0x37, 0x6e, 0xdc, 0xda, 0x1d, 0x7b, 0xe2, 0x89, 0x72, 0xce, 0xdc, 0x5c, 0x3a, 0x29, 0x44,
|
0x49, 0x37, 0x6e, 0xdc, 0xda, 0x1d, 0x7b, 0xe2, 0x89, 0x72, 0xce, 0xdc, 0x5c, 0x3a, 0x29, 0x44,
|
||||||
0xae, 0x44, 0xc4, 0x24, 0xc0, 0x01, 0x20, 0xd9, 0xae, 0xe2, 0xff, 0x7e, 0x0b, 0x90, 0x12, 0x25,
|
0xae, 0x44, 0xc4, 0x24, 0xc0, 0x01, 0x20, 0xd9, 0xae, 0xe2, 0xff, 0x7e, 0x0b, 0x90, 0x12, 0x25,
|
||||||
@ -1875,7 +1875,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,
|
||||||
|
2917
wled00/html_ui.h
2917
wled00/html_ui.h
File diff suppressed because it is too large
Load Diff
@ -309,7 +309,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
|||||||
receiveNotifications = udpn["recv"] | receiveNotifications;
|
receiveNotifications = udpn["recv"] | receiveNotifications;
|
||||||
if ((bool)udpn[F("nn")]) callMode = CALL_MODE_NO_NOTIFY; //send no notification just for this request
|
if ((bool)udpn[F("nn")]) callMode = CALL_MODE_NO_NOTIFY; //send no notification just for this request
|
||||||
|
|
||||||
unsigned long timein = root[F("time")] | UINT32_MAX; //backup time source if NTP not synced
|
unsigned long timein = root["time"] | UINT32_MAX; //backup time source if NTP not synced
|
||||||
if (timein != UINT32_MAX) {
|
if (timein != UINT32_MAX) {
|
||||||
setTimeFromAPI(timein);
|
setTimeFromAPI(timein);
|
||||||
if (presetsModifiedTime == 0) presetsModifiedTime = timein;
|
if (presetsModifiedTime == 0) presetsModifiedTime = timein;
|
||||||
@ -396,10 +396,11 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
|||||||
// b) preset ID only or preset that does not change state (use embedded cycling limits if they exist in getVal())
|
// b) preset ID only or preset that does not change state (use embedded cycling limits if they exist in getVal())
|
||||||
presetCycCurr = ps;
|
presetCycCurr = ps;
|
||||||
presetId = ps;
|
presetId = ps;
|
||||||
root.remove(F("v")); // may be added in UI call
|
root.remove("v"); // may be added in UI call
|
||||||
root.remove(F("time")); // may be added in UI call
|
root.remove("time"); // may be added in UI call
|
||||||
root.remove("ps");
|
root.remove("ps");
|
||||||
if (root.size() == 0) {
|
if (root.size() == 0) {
|
||||||
|
unloadPlaylist(); // we need to unload playlist
|
||||||
applyPreset(ps, callMode); // async load (only preset ID was specified)
|
applyPreset(ps, callMode); // async load (only preset ID was specified)
|
||||||
return stateResponse;
|
return stateResponse;
|
||||||
}
|
}
|
||||||
@ -481,7 +482,7 @@ void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, b
|
|||||||
root["mp12"] = seg.map1D2D;
|
root["mp12"] = seg.map1D2D;
|
||||||
}
|
}
|
||||||
|
|
||||||
void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segmentBounds)
|
void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segmentBounds, bool selectedSegmentsOnly)
|
||||||
{
|
{
|
||||||
if (includeBri) {
|
if (includeBri) {
|
||||||
root["on"] = (bri > 0);
|
root["on"] = (bri > 0);
|
||||||
@ -517,11 +518,10 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
|
|||||||
|
|
||||||
root[F("mainseg")] = strip.getMainSegmentId();
|
root[F("mainseg")] = strip.getMainSegmentId();
|
||||||
|
|
||||||
bool selectedSegmentsOnly = root[F("sc")] | false;
|
|
||||||
JsonArray seg = root.createNestedArray("seg");
|
JsonArray seg = root.createNestedArray("seg");
|
||||||
for (size_t s = 0; s < strip.getMaxSegments(); s++) {
|
for (size_t s = 0; s < strip.getMaxSegments(); s++) {
|
||||||
if (s >= strip.getSegmentsNum()) {
|
if (s >= strip.getSegmentsNum()) {
|
||||||
if (forPreset && segmentBounds) { //disable segments not part of preset
|
if (forPreset && segmentBounds && !selectedSegmentsOnly) { //disable segments not part of preset
|
||||||
JsonObject seg0 = seg.createNestedObject();
|
JsonObject seg0 = seg.createNestedObject();
|
||||||
seg0["stop"] = 0;
|
seg0["stop"] = 0;
|
||||||
continue;
|
continue;
|
||||||
@ -529,7 +529,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Segment &sg = strip.getSegment(s);
|
Segment &sg = strip.getSegment(s);
|
||||||
if (!forPreset && selectedSegmentsOnly && !sg.isSelected()) continue;
|
if (forPreset && selectedSegmentsOnly && !sg.isSelected()) continue;
|
||||||
if (sg.isActive()) {
|
if (sg.isActive()) {
|
||||||
JsonObject seg0 = seg.createNestedObject();
|
JsonObject seg0 = seg.createNestedObject();
|
||||||
serializeSegment(seg0, sg, s, forPreset, segmentBounds);
|
serializeSegment(seg0, sg, s, forPreset, segmentBounds);
|
||||||
|
@ -149,3 +149,19 @@ void handlePlaylist() {
|
|||||||
applyPreset(playlistEntries[playlistIndex].preset);
|
applyPreset(playlistEntries[playlistIndex].preset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void serializePlaylist(JsonObject sObj) {
|
||||||
|
JsonObject playlist = sObj.createNestedObject(F("playlist"));
|
||||||
|
JsonArray ps = playlist.createNestedArray("ps");
|
||||||
|
JsonArray dur = playlist.createNestedArray("dur");
|
||||||
|
JsonArray transition = playlist.createNestedArray(F("transition"));
|
||||||
|
playlist[F("repeat")] = playlistRepeat;
|
||||||
|
playlist["end"] = playlistEndPreset;
|
||||||
|
playlist["r"] = playlistOptions & PL_OPTION_SHUFFLE;
|
||||||
|
for (int i=0; i<playlistLen; i++) {
|
||||||
|
ps.add(playlistEntries[i].preset);
|
||||||
|
dur.add(playlistEntries[i].dur);
|
||||||
|
transition.add(playlistEntries[i].tr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -10,6 +10,70 @@ static char *tmpRAMbuffer = nullptr;
|
|||||||
|
|
||||||
static volatile byte presetToApply = 0;
|
static volatile byte presetToApply = 0;
|
||||||
static volatile byte callModeToApply = 0;
|
static volatile byte callModeToApply = 0;
|
||||||
|
static volatile byte presetToSave = 0;
|
||||||
|
static char quickLoad[3];
|
||||||
|
static char saveName[33];
|
||||||
|
static bool includeBri = true, segBounds = true, selectedOnly = false, playlistSave = false;;
|
||||||
|
|
||||||
|
static const char *getName(bool persist = true) {
|
||||||
|
return persist ? "/presets.json" : "/tmp.json";
|
||||||
|
}
|
||||||
|
|
||||||
|
static void doSaveState() {
|
||||||
|
bool persist = (presetToSave < 251);
|
||||||
|
const char *filename = getName(persist);
|
||||||
|
|
||||||
|
if (!requestJSONBufferLock(10)) return; // will set fileDoc
|
||||||
|
|
||||||
|
JsonObject sObj = doc.to<JsonObject>();
|
||||||
|
|
||||||
|
DEBUG_PRINTLN(F("Serialize current state"));
|
||||||
|
if (playlistSave) {
|
||||||
|
serializePlaylist(sObj);
|
||||||
|
if (includeBri) sObj["on"] = true;
|
||||||
|
} else {
|
||||||
|
serializeState(sObj, true, includeBri, segBounds, selectedOnly);
|
||||||
|
}
|
||||||
|
sObj["n"] = saveName;
|
||||||
|
if (quickLoad[0]) sObj[F("ql")] = quickLoad;
|
||||||
|
/*
|
||||||
|
#ifdef WLED_DEBUG
|
||||||
|
DEBUG_PRINTLN(F("Serialized preset"));
|
||||||
|
serializeJson(doc,Serial);
|
||||||
|
DEBUG_PRINTLN();
|
||||||
|
#endif
|
||||||
|
*/
|
||||||
|
#if defined(ARDUINO_ARCH_ESP32)
|
||||||
|
if (!persist) {
|
||||||
|
if (tmpRAMbuffer!=nullptr) free(tmpRAMbuffer);
|
||||||
|
size_t len = measureJson(*fileDoc) + 1;
|
||||||
|
DEBUG_PRINTLN(len);
|
||||||
|
// if possible use SPI RAM on ESP32
|
||||||
|
#ifdef WLED_USE_PSRAM
|
||||||
|
if (psramFound())
|
||||||
|
tmpRAMbuffer = (char*) ps_malloc(len);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
tmpRAMbuffer = (char*) malloc(len);
|
||||||
|
if (tmpRAMbuffer!=nullptr) {
|
||||||
|
serializeJson(*fileDoc, tmpRAMbuffer, len);
|
||||||
|
} else {
|
||||||
|
writeObjectToFileUsingId(filename, presetToSave, fileDoc);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
writeObjectToFileUsingId(filename, presetToSave, fileDoc);
|
||||||
|
|
||||||
|
if (persist) presetsModifiedTime = toki.second(); //unix time
|
||||||
|
releaseJSONBufferLock();
|
||||||
|
updateFSInfo();
|
||||||
|
|
||||||
|
// clean up
|
||||||
|
presetToSave = 0;
|
||||||
|
saveName[0] = '\0';
|
||||||
|
quickLoad[0] = '\0';
|
||||||
|
playlistSave = false;
|
||||||
|
}
|
||||||
|
|
||||||
bool applyPreset(byte index, byte callMode)
|
bool applyPreset(byte index, byte callMode)
|
||||||
{
|
{
|
||||||
@ -17,16 +81,16 @@ bool applyPreset(byte index, byte callMode)
|
|||||||
DEBUG_PRINTLN(index);
|
DEBUG_PRINTLN(index);
|
||||||
presetToApply = index;
|
presetToApply = index;
|
||||||
callModeToApply = callMode;
|
callModeToApply = callMode;
|
||||||
/*
|
|
||||||
// the following is needed in case of HTTP JSON API call to return correct state to the caller
|
|
||||||
// fromJson is true in case when deserializeState() was called with presetId==0
|
|
||||||
if (fromJson) handlePresets(true); // force immediate processing
|
|
||||||
*/
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void handlePresets()
|
void handlePresets()
|
||||||
{
|
{
|
||||||
|
if (presetToSave) {
|
||||||
|
doSaveState();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
bool changePreset = false;
|
bool changePreset = false;
|
||||||
uint8_t tmpPreset = presetToApply; // store temporary since deserializeState() may call applyPreset()
|
uint8_t tmpPreset = presetToApply; // store temporary since deserializeState() may call applyPreset()
|
||||||
uint8_t tmpMode = callModeToApply;
|
uint8_t tmpMode = callModeToApply;
|
||||||
@ -34,60 +98,8 @@ void handlePresets()
|
|||||||
if (tmpPreset == 0 || (fileDoc /*&& !force*/)) return; // JSON buffer already allocated and not force apply or no preset waiting
|
if (tmpPreset == 0 || (fileDoc /*&& !force*/)) return; // JSON buffer already allocated and not force apply or no preset waiting
|
||||||
|
|
||||||
JsonObject fdo;
|
JsonObject fdo;
|
||||||
const char *filename = tmpPreset < 255 ? "/presets.json" : "/tmp.json";
|
const char *filename = getName(tmpPreset < 255);
|
||||||
|
|
||||||
/*
|
|
||||||
* The following code is no longer needed as handlePreset() is never run from
|
|
||||||
* network callback.
|
|
||||||
* **************************************************************************
|
|
||||||
*
|
|
||||||
//crude way to determine if this was called by a network request
|
|
||||||
uint8_t core = 1;
|
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
|
||||||
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
|
|
||||||
// this does not make sense on single core
|
|
||||||
core = xPortGetCoreID();
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
//only allow use of fileDoc from the core responsible for network requests (AKA HTTP JSON API)
|
|
||||||
//do not use active network request doc from preset called by main loop (playlist, schedule, ...)
|
|
||||||
if (fileDoc && core && force && tmpPreset < 255) {
|
|
||||||
DEBUG_PRINT(F("Force applying preset: "));
|
|
||||||
DEBUG_PRINTLN(presetToApply);
|
|
||||||
|
|
||||||
presetToApply = 0; //clear request for preset
|
|
||||||
callModeToApply = 0;
|
|
||||||
|
|
||||||
// this will overwrite doc with preset content but applyPreset() is the last in such case and content of doc is no longer needed
|
|
||||||
errorFlag = readObjectFromFileUsingId(filename, tmpPreset, fileDoc) ? ERR_NONE : ERR_FS_PLOAD;
|
|
||||||
|
|
||||||
JsonObject fdo = fileDoc->as<JsonObject>();
|
|
||||||
|
|
||||||
//HTTP API commands
|
|
||||||
const char* httpwin = fdo["win"];
|
|
||||||
if (httpwin) {
|
|
||||||
String apireq = "win"; // reduce flash string usage
|
|
||||||
apireq += F("&IN&"); // internal call
|
|
||||||
apireq += httpwin;
|
|
||||||
handleSet(nullptr, apireq, false); // may call applyPreset() via PL=
|
|
||||||
setValuesFromFirstSelectedSeg(); // fills legacy values
|
|
||||||
changePreset = true;
|
|
||||||
} else {
|
|
||||||
if (!fdo["seg"].isNull()) unloadPlaylist(); // if preset contains "seg" we must unload playlist
|
|
||||||
if (!fdo["seg"].isNull() || !fdo["on"].isNull() || !fdo["bri"].isNull() || !fdo["ps"].isNull() || !fdo[F("playlist")].isNull()) changePreset = true;
|
|
||||||
fdo.remove("ps"); //remove load request for presets to prevent recursive crash
|
|
||||||
|
|
||||||
deserializeState(fdo, tmpMode, tmpPreset); // may call applyPreset() which will overwrite presetToApply
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!errorFlag && changePreset) presetCycCurr = currentPreset = tmpPreset;
|
|
||||||
|
|
||||||
colorUpdated(tmpMode);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (force) return; // something went wrong with force option (most likely WS request), quit and wait for async load
|
|
||||||
*/
|
|
||||||
// allocate buffer
|
// allocate buffer
|
||||||
if (!requestJSONBufferLock(9)) return; // will also assign fileDoc
|
if (!requestJSONBufferLock(9)) return; // will also assign fileDoc
|
||||||
|
|
||||||
@ -138,72 +150,53 @@ void handlePresets()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//called from handleSet(PS=) [network callback (fileDoc==nullptr), IR (irrational), deserializeState, UDP] and deserializeState() [network callback (filedoc!=nullptr)]
|
//called from handleSet(PS=) [network callback (fileDoc==nullptr), IR (irrational), deserializeState, UDP] and deserializeState() [network callback (filedoc!=nullptr)]
|
||||||
void savePreset(byte index, const char* pname, JsonObject saveobj)
|
void savePreset(byte index, const char* pname, JsonObject sObj)
|
||||||
{
|
{
|
||||||
if (index == 0 || (index > 250 && index < 255)) return;
|
if (index == 0 || (index > 250 && index < 255)) return;
|
||||||
char tmp[12];
|
if (pname) strlcpy(saveName, pname, 33);
|
||||||
JsonObject sObj = saveobj;
|
else {
|
||||||
bool bufferAllocated = false;
|
if (sObj["n"].is<const char*>()) strlcpy(saveName, sObj["n"].as<const char*>(), 33);
|
||||||
|
else sprintf_P(saveName, PSTR("Preset %d"), index);
|
||||||
bool persist = (index != 255);
|
|
||||||
const char *filename = persist ? "/presets.json" : "/tmp.json";
|
|
||||||
|
|
||||||
if (!fileDoc) {
|
|
||||||
// called from handleSet() HTTP API
|
|
||||||
if (!requestJSONBufferLock(10)) return;
|
|
||||||
sObj = fileDoc->to<JsonObject>();
|
|
||||||
bufferAllocated = true;
|
|
||||||
}
|
}
|
||||||
if (sObj["n"].isNull() && pname == nullptr) {
|
|
||||||
sprintf_P(tmp, PSTR("Preset %d"), index);
|
|
||||||
sObj["n"] = tmp;
|
|
||||||
} else if (pname) sObj["n"] = pname;
|
|
||||||
|
|
||||||
sObj.remove(F("psave"));
|
DEBUG_PRINT(F("Saving preset (")); DEBUG_PRINT(index); DEBUG_PRINT(F(") ")); DEBUG_PRINTLN(saveName);
|
||||||
sObj.remove(F("v"));
|
|
||||||
|
|
||||||
if (!sObj["o"]) {
|
presetToSave = index;
|
||||||
DEBUGFS_PRINTLN(F("Serialize current state"));
|
playlistSave = false;
|
||||||
if (sObj["ib"].isNull() && sObj["sb"].isNull()) serializeState(sObj, true);
|
if (sObj[F("ql")].is<const char*>()) strlcpy(quickLoad, sObj[F("ql")].as<const char*>(), 3); // only 2 chars for QL
|
||||||
else serializeState(sObj, true, sObj["ib"], sObj["sb"]);
|
sObj.remove("v");
|
||||||
if (persist) currentPreset = index;
|
sObj.remove("time");
|
||||||
}
|
|
||||||
sObj.remove("o");
|
|
||||||
sObj.remove("ib");
|
|
||||||
sObj.remove("sb");
|
|
||||||
sObj.remove(F("sc"));
|
|
||||||
sObj.remove(F("error"));
|
sObj.remove(F("error"));
|
||||||
sObj.remove(F("time"));
|
sObj.remove(F("psave"));
|
||||||
|
if (sObj["o"].isNull()) { // "o" marks a playlist or manually entered API
|
||||||
#if defined(ARDUINO_ARCH_ESP32)
|
includeBri = sObj["ib"].as<bool>() || index==255; // temporary preset needs brightness
|
||||||
if (index==255) {
|
segBounds = sObj["sb"].as<bool>() || index==255; // temporary preset needs bounds
|
||||||
if (tmpRAMbuffer!=nullptr) free(tmpRAMbuffer);
|
selectedOnly = sObj[F("sc")].as<bool>();
|
||||||
size_t len = measureJson(*fileDoc) + 1;
|
sObj.remove("ib");
|
||||||
DEBUG_PRINTLN(len);
|
sObj.remove("sb");
|
||||||
// if possible use SPI RAM on ESP32
|
sObj.remove(F("sc"));
|
||||||
#ifdef WLED_USE_PSRAM
|
} else {
|
||||||
if (psramFound())
|
// this is a playlist or API
|
||||||
tmpRAMbuffer = (char*) ps_malloc(len);
|
sObj.remove("o");
|
||||||
else
|
if (sObj[F("playlist")].isNull()) {
|
||||||
#endif
|
presetToSave = 0; // we will save API immediately
|
||||||
tmpRAMbuffer = (char*) malloc(len);
|
if (index < 251 && fileDoc) {
|
||||||
if (tmpRAMbuffer!=nullptr) {
|
if (sObj["n"].isNull()) sObj["n"] = saveName;
|
||||||
serializeJson(*fileDoc, tmpRAMbuffer, len);
|
writeObjectToFileUsingId(getName(index), index, fileDoc);
|
||||||
|
presetsModifiedTime = toki.second(); //unix time
|
||||||
|
updateFSInfo();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
writeObjectToFileUsingId(filename, index, fileDoc);
|
// store playlist
|
||||||
|
includeBri = true; // !sObj["on"].isNull();
|
||||||
|
playlistSave = true;
|
||||||
}
|
}
|
||||||
} else
|
}
|
||||||
#endif
|
|
||||||
writeObjectToFileUsingId(filename, index, fileDoc);
|
|
||||||
|
|
||||||
if (persist) presetsModifiedTime = toki.second(); //unix time
|
|
||||||
if (bufferAllocated) releaseJSONBufferLock();
|
|
||||||
updateFSInfo();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void deletePreset(byte index) {
|
void deletePreset(byte index) {
|
||||||
StaticJsonDocument<24> empty;
|
StaticJsonDocument<24> empty;
|
||||||
writeObjectToFileUsingId("/presets.json", index, &empty);
|
writeObjectToFileUsingId(getName(), index, &empty);
|
||||||
presetsModifiedTime = toki.second(); //unix time
|
presetsModifiedTime = toki.second(); //unix time
|
||||||
updateFSInfo();
|
updateFSInfo();
|
||||||
}
|
}
|
@ -158,9 +158,9 @@ bool oappend(const char* txt)
|
|||||||
|
|
||||||
void prepareHostname(char* hostname)
|
void prepareHostname(char* hostname)
|
||||||
{
|
{
|
||||||
|
sprintf_P(hostname, "wled-%*s", 6, escapedMac.c_str() + 6);
|
||||||
const char *pC = serverDescription;
|
const char *pC = serverDescription;
|
||||||
uint8_t pos = 5;
|
uint8_t pos = 5; // keep "wled-"
|
||||||
|
|
||||||
while (*pC && pos < 24) { // while !null and not over length
|
while (*pC && pos < 24) { // while !null and not over length
|
||||||
if (isalnum(*pC)) { // if the current char is alpha-numeric append it to the hostname
|
if (isalnum(*pC)) { // if the current char is alpha-numeric append it to the hostname
|
||||||
hostname[pos] = *pC;
|
hostname[pos] = *pC;
|
||||||
@ -169,18 +169,14 @@ void prepareHostname(char* hostname)
|
|||||||
hostname[pos] = '-';
|
hostname[pos] = '-';
|
||||||
pos++;
|
pos++;
|
||||||
}
|
}
|
||||||
// else do nothing - no leading hyphens and do not include hyphens for all other characters.
|
// else do nothing - no leading hyphens and do not include hyphens for all other characters.
|
||||||
pC++;
|
pC++;
|
||||||
}
|
}
|
||||||
// if the hostname is left blank, use the mac address/default mdns name
|
//last character must not be hyphen
|
||||||
if (pos < 6) {
|
if (pos > 5) {
|
||||||
sprintf(hostname + 5, "%*s", 6, escapedMac.c_str() + 6);
|
while (pos > 4 && hostname[pos -1] == '-') pos--;
|
||||||
} else { //last character must not be hyphen
|
hostname[pos] = '\0'; // terminate string (leave at least "wled")
|
||||||
while (pos > 0 && hostname[pos -1] == '-') {
|
}
|
||||||
hostname[pos -1] = 0;
|
|
||||||
pos--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -634,7 +634,7 @@ void WLED::initConnection()
|
|||||||
DEBUG_PRINTLN("...");
|
DEBUG_PRINTLN("...");
|
||||||
|
|
||||||
// convert the "serverDescription" into a valid DNS hostname (alphanumeric)
|
// convert the "serverDescription" into a valid DNS hostname (alphanumeric)
|
||||||
char hostname[25] = "wled-";
|
char hostname[25];
|
||||||
prepareHostname(hostname);
|
prepareHostname(hostname);
|
||||||
|
|
||||||
#ifdef ESP8266
|
#ifdef ESP8266
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2209201
|
#define VERSION 2210101
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
|
@ -367,12 +367,7 @@ void getSettingsJS(byte subPage, char* dest)
|
|||||||
|
|
||||||
// set limits
|
// set limits
|
||||||
oappend(SET_F("bLimits("));
|
oappend(SET_F("bLimits("));
|
||||||
#if defined(ESP32) && defined(USERMOD_AUDIOREACTIVE) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C3)
|
|
||||||
// requested by @softhack007 https://github.com/blazoncek/WLED/issues/33
|
|
||||||
oappend(itoa(WLED_MAX_BUSSES-2,nS,10)); oappend(","); // prevent use of I2S buses if audio installed. ESP32-S3 currently does not support these busses.
|
|
||||||
#else
|
|
||||||
oappend(itoa(WLED_MAX_BUSSES,nS,10)); oappend(",");
|
oappend(itoa(WLED_MAX_BUSSES,nS,10)); oappend(",");
|
||||||
#endif
|
|
||||||
oappend(itoa(MAX_LEDS_PER_BUS,nS,10)); oappend(",");
|
oappend(itoa(MAX_LEDS_PER_BUS,nS,10)); oappend(",");
|
||||||
oappend(itoa(MAX_LED_MEMORY,nS,10)); oappend(",");
|
oappend(itoa(MAX_LED_MEMORY,nS,10)); oappend(",");
|
||||||
oappend(itoa(MAX_LEDS,nS,10));
|
oappend(itoa(MAX_LEDS,nS,10));
|
||||||
|
Loading…
Reference in New Issue
Block a user