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

Removed experimental v2 segment API.

Browse Source 
Bugfix for white value.
This commit is contained in:
Blaz Kristan 2021-10-21 21:33:26 +02:00
parent 7acc537c7a
commit 1cf793233f
5 changed files with 158 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wled00/bus_manager.h
View File

@ -277,11 +277,12 @@ class BusPwm : public Bus {
case TYPE_ANALOG_2CH: //warm white + cold white case TYPE_ANALOG_2CH: //warm white + cold white
// perhaps a non-linear adjustment would be in order. need to test // perhaps a non-linear adjustment would be in order. need to test
_data[1] = (w * cct) / 255; _data[1] = (w * cct) / 255;
_data[0] = 255 - _data[1]; // or (w * (255-cct)) / 255; _data[0] = (w * (255-cct)) / 255;
break; break;
case TYPE_ANALOG_5CH: //RGB + warm white + cold white case TYPE_ANALOG_5CH: //RGB + warm white + cold white
// perhaps a non-linear adjustment would be in order. need to test // perhaps a non-linear adjustment would be in order. need to test
_data[4] = (w * cct) / 255; w = 255 - w; // or (w * (255-cct)) / 255; _data[4] = (w * cct) / 255;
w = (w * (255-cct)) / 255;
case TYPE_ANALOG_4CH: //RGBW case TYPE_ANALOG_4CH: //RGBW
_data[3] = w; _data[3] = w;
case TYPE_ANALOG_3CH: //standard dumb RGB case TYPE_ANALOG_3CH: //standard dumb RGB

7
wled00/data/index.js
View File

@ -1856,12 +1856,13 @@ function fromRgb()
setColor(0); setColor(0);
} }
// sets color from picker: 0=all, 1=leaving picker/HSV, 2=ignore white channel
function setColor(sr) function setColor(sr)
{ {
var cd = gId('csl').children; var cd = gId('csl').children; // color slots
if (sr == 1 && cd[csel].style.backgroundColor == 'rgb(0, 0, 0)') cpick.color.setChannel('hsv', 'v', 100); if (sr == 1 && cd[csel].style.backgroundColor == 'rgb(0,0,0)') cpick.color.setChannel('hsv', 'v', 100);
cd[csel].style.backgroundColor = cpick.color.rgbString; cd[csel].style.backgroundColor = cpick.color.rgbString;
if (sr != 2) whites[csel] = gId('sliderW').value; if (sr != 2) whites[csel] = parseInt(gId('sliderW').value);
var col = cpick.color.rgb; var col = cpick.color.rgb;
var obj = {"seg": {"col": [[col.r, col.g, col.b, whites[csel]],[],[]]}}; var obj = {"seg": {"col": [[col.r, col.g, col.b, whites[csel]],[],[]]}};
if (csel == 1) { if (csel == 1) {

240
wled00/html_ui.h
View File

@ -7,7 +7,7 @@
*/ */
// Autogenerated from wled00/data/index.htm, do not edit!! // Autogenerated from wled00/data/index.htm, do not edit!!
const uint16_t PAGE_index_L = 34999; const uint16_t PAGE_index_L = 35000;
const uint8_t PAGE_index[] PROGMEM = { const uint8_t PAGE_index[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcc, 0x7d, 0x79, 0x7f, 0xe2, 0xb8, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xcc, 0x7d, 0x79, 0x7f, 0xe2, 0xb8,
0xb2, 0xe8, 0xff, 0xf9, 0x14, 0x34, 0x3d, 0xd3, 0x83, 0x1b, 0x03, 0x66, 0xdf, 0xda, 0x93, 0x4b, 0xb2, 0xe8, 0xff, 0xf9, 0x14, 0x34, 0x3d, 0xd3, 0x83, 0x1b, 0x03, 0x66, 0xdf, 0xda, 0x93, 0x4b,
@ -2078,123 +2078,123 @@ const uint8_t PAGE_index[] PROGMEM = {
0x74, 0x76, 0x8a, 0x18, 0x49, 0x66, 0xe7, 0x5e, 0xe5, 0x83, 0x2c, 0x80, 0x09, 0x8c, 0xc5, 0xdf, 0x74, 0x76, 0x8a, 0x18, 0x49, 0x66, 0xe7, 0x5e, 0xe5, 0x83, 0x2c, 0x80, 0x09, 0x8c, 0xc5, 0xdf,
0xaf, 0x8d, 0xc9, 0x5c, 0xfa, 0xb6, 0xa5, 0xf6, 0xcb, 0xb0, 0x6d, 0xa1, 0xfd, 0x22, 0x6c, 0x5b, 0xaf, 0x8d, 0xc9, 0x5c, 0xfa, 0xb6, 0xa5, 0xf6, 0xcb, 0xb0, 0x6d, 0xa1, 0xfd, 0x22, 0x6c, 0x5b,
0xe6, 0x61, 0x1d, 0x50, 0x19, 0xcb, 0x4e, 0xa9, 0xe0, 0x71, 0xa9, 0xec, 0x9d, 0xad, 0xc1, 0x45, 0xe6, 0x61, 0x1d, 0x50, 0x19, 0xcb, 0x4e, 0xa9, 0xe0, 0x71, 0xa9, 0xec, 0x9d, 0xad, 0xc1, 0x45,
0x5d, 0x68, 0x1b, 0xf8, 0xd6, 0xc8, 0x48, 0x9f, 0x33, 0x22, 0xb3, 0x17, 0x76, 0xe0, 0x3b, 0xf8, 0x5d, 0x68, 0x1b, 0xf8, 0xd6, 0xc8, 0x48, 0x9f, 0x33, 0x22, 0xb3, 0x17, 0x76, 0xc0, 0x06, 0xa2,
0xcf, 0xa3, 0x5d, 0xf7, 0xe8, 0x9e, 0xdf, 0xde, 0xae, 0x81, 0xf5, 0x66, 0x1e, 0x11, 0x3d, 0x4c, 0xb4, 0xe7, 0x1e, 0xdd, 0xf1, 0xdb, 0xdb, 0x35, 0xa0, 0xde, 0xcc, 0x23, 0xa2, 0x86, 0x29, 0x2d,
0x69, 0x01, 0x8b, 0x6b, 0xd7, 0x77, 0xe9, 0x1f, 0xc7, 0xdf, 0x7b, 0xb4, 0x91, 0xfa, 0xc6, 0x10, 0x5f, 0x71, 0xed, 0xfa, 0x2e, 0xfd, 0xe3, 0xe8, 0x7b, 0x8f, 0x36, 0x52, 0xdf, 0x16, 0x02, 0xd1,
0xa8, 0xe6, 0xef, 0x73, 0x0a, 0x65, 0x7b, 0xbe, 0xdb, 0x28, 0x8c, 0x62, 0x86, 0x6b, 0xad, 0xf8, 0xfc, 0x7d, 0x4e, 0xa0, 0xdc, 0x69, 0x5f, 0xfa, 0x36, 0x42, 0xa3, 0x43, 0x2f, 0xd6, 0xda, 0xf3,
0x99, 0xd4, 0x73, 0x51, 0xc9, 0xe0, 0xe4, 0xa4, 0xa0, 0x7d, 0x55, 0xd0, 0x16, 0x2a, 0x7a, 0x13, 0x33, 0xa9, 0xef, 0xa2, 0x92, 0xc1, 0xc9, 0x49, 0x41, 0xfb, 0xab, 0xa0, 0xad, 0x54, 0xf4, 0x26,
0xdf, 0x6c, 0xf2, 0xd4, 0x3f, 0xc1, 0x7f, 0xa7, 0xab, 0x15, 0xc6, 0x8f, 0xa2, 0xb1, 0xfd, 0x22, 0xbe, 0xd9, 0xf8, 0xa9, 0x7f, 0x82, 0xff, 0x4e, 0x57, 0x2b, 0xcc, 0x03, 0x8a, 0xc6, 0xf6, 0x8b,
0x3d, 0x7d, 0xec, 0x5d, 0x7a, 0x71, 0xb0, 0x2f, 0x5e, 0x64, 0xaf, 0xd8, 0xda, 0xab, 0x8f, 0xbd, 0xf4, 0xf4, 0xb1, 0x77, 0xe9, 0xc5, 0xc1, 0xbe, 0x78, 0x91, 0xbd, 0x63, 0x6b, 0xaf, 0x3e, 0xf6,
0x0d, 0x1d, 0xc9, 0x3a, 0x8a, 0x68, 0x1d, 0x91, 0x59, 0x4d, 0x42, 0x8c, 0x52, 0x5c, 0x39, 0xb7, 0x36, 0x74, 0x25, 0xeb, 0x28, 0xa3, 0x75, 0x54, 0x66, 0x35, 0x49, 0x31, 0x4a, 0x71, 0xf5, 0xdc,
0xeb, 0x52, 0xa6, 0xd3, 0xb2, 0x2e, 0xca, 0x63, 0x7a, 0xe6, 0x53, 0x93, 0xb2, 0x22, 0x7e, 0xc4, 0xae, 0x53, 0x99, 0x4e, 0xcb, 0xba, 0x48, 0x8f, 0xe9, 0x99, 0x4f, 0x4d, 0x0a, 0x8b, 0x38, 0x12,
0x5f, 0x7f, 0x44, 0xe4, 0x10, 0xa1, 0x7b, 0xc5, 0xef, 0x0e, 0xbb, 0xee, 0x21, 0x62, 0xc8, 0x45, 0x7f, 0xfd, 0x11, 0x11, 0x44, 0x84, 0x0e, 0x16, 0xbf, 0x3b, 0xec, 0xc2, 0x87, 0xc8, 0x21, 0x17,
0x52, 0xce, 0xaf, 0x26, 0x50, 0x02, 0xee, 0xbd, 0x4e, 0x96, 0xd3, 0x3c, 0xcf, 0x3f, 0x25, 0xf1, 0x49, 0x39, 0xbf, 0x9a, 0x40, 0x19, 0xb8, 0xf7, 0x3a, 0x59, 0x4e, 0xf3, 0x3c, 0xff, 0x94, 0xc4,
0x1e, 0x22, 0xad, 0xec, 0xdd, 0x24, 0x48, 0xb2, 0xb4, 0x92, 0x12, 0xe1, 0x92, 0xe6, 0xdf, 0x4a, 0x7b, 0x88, 0xb8, 0xb2, 0x77, 0x93, 0x20, 0xd9, 0xd2, 0x4a, 0x4a, 0x86, 0x4b, 0x5a, 0x00, 0x2b,
0x30, 0xaf, 0x5c, 0xcd, 0x3a, 0x9d, 0xf9, 0xb4, 0x1b, 0xf6, 0x5f, 0x7a, 0xa3, 0x03, 0xce, 0x0e, 0xd1, 0xbc, 0x72, 0x39, 0xeb, 0x74, 0xe6, 0xd3, 0x6e, 0xd8, 0x7f, 0xe9, 0x8d, 0x0e, 0x38, 0x4b,
0x8e, 0xde, 0x3d, 0x7f, 0x3e, 0x1d, 0xed, 0xab, 0x9f, 0x07, 0x01, 0xb6, 0xec, 0xb3, 0x67, 0x61, 0x38, 0x7a, 0xf7, 0xfc, 0xf9, 0x74, 0xb4, 0xaf, 0x7e, 0x1e, 0x04, 0xd8, 0xba, 0xcf, 0x9e, 0x85,
0x38, 0x9f, 0x72, 0x49, 0x37, 0x3c, 0x40, 0x49, 0xf0, 0xd2, 0x28, 0xa1, 0x06, 0x14, 0xad, 0xc1, 0xe1, 0x7c, 0xca, 0x25, 0xdd, 0xf0, 0x00, 0x25, 0xc1, 0x4b, 0xa3, 0x84, 0x1a, 0x50, 0x34, 0x07,
0xbd, 0x84, 0x67, 0x1d, 0xc3, 0x67, 0xf3, 0x02, 0xb7, 0x40, 0xf3, 0xe9, 0xca, 0x77, 0xe0, 0x6a, 0xf7, 0x13, 0x9e, 0x75, 0x1c, 0x9f, 0xcd, 0x0b, 0xdc, 0x06, 0xcd, 0xa7, 0x2b, 0xdf, 0x81, 0xcb,
0xe6, 0x3b, 0xcf, 0x83, 0xbf, 0x20, 0x5a, 0x99, 0xe7, 0xbf, 0xea, 0xcb, 0x40, 0x3b, 0x74, 0xae, 0x99, 0xef, 0x3c, 0x0f, 0xfe, 0x82, 0xa8, 0x65, 0x9e, 0xff, 0xaa, 0x2f, 0x03, 0xee, 0xd0, 0xf9,
0x2e, 0x2d, 0x37, 0x70, 0x2a, 0xf8, 0x85, 0x45, 0x49, 0x11, 0xe0, 0x02, 0xcf, 0xad, 0x2d, 0xca, 0xba, 0xb4, 0xdc, 0xc1, 0xa9, 0xe0, 0x17, 0x16, 0x29, 0x45, 0xa0, 0x0b, 0x3c, 0xb7, 0xb6, 0x2a,
0x87, 0x3e, 0x47, 0xd7, 0xd6, 0x59, 0xc1, 0xd7, 0x9f, 0xfd, 0xb1, 0x79, 0xf6, 0xbf, 0xc9, 0x33, 0x1f, 0xfe, 0x1c, 0x65, 0x5b, 0x67, 0x07, 0x5f, 0xcf, 0x03, 0xc4, 0x26, 0x0f, 0xf0, 0x26, 0xcf,
0x92, 0x31, 0x2e, 0x9d, 0x5f, 0xe2, 0x49, 0x9e, 0x4b, 0x06, 0xab, 0x23, 0xfa, 0xa7, 0x9d, 0xd8, 0x48, 0xd6, 0xb8, 0x74, 0x7e, 0x89, 0x27, 0x79, 0x2e, 0x19, 0xad, 0x8e, 0xe8, 0x9f, 0x76, 0x64,
0x88, 0xbb, 0x42, 0x9c, 0x69, 0xe8, 0xee, 0x09, 0x2e, 0x7d, 0xa5, 0x40, 0x3d, 0xb6, 0x5d, 0xd6, 0x23, 0xfe, 0x0a, 0x71, 0xa8, 0xa1, 0xbb, 0x27, 0xb8, 0xf5, 0x95, 0x02, 0xf5, 0xd8, 0x76, 0x5d,
0x11, 0x6d, 0xdc, 0xa6, 0x20, 0x32, 0xf2, 0xf7, 0x50, 0xc1, 0x7e, 0xec, 0x7d, 0x21, 0x94, 0xa2, 0x47, 0xd4, 0x71, 0x9b, 0x92, 0xc8, 0x08, 0xe0, 0x43, 0x05, 0xfb, 0xb1, 0xf7, 0x85, 0x50, 0x8a,
0xe3, 0x0a, 0xc8, 0x63, 0x8e, 0x4d, 0xa4, 0x60, 0xf0, 0xd7, 0x34, 0x77, 0x5e, 0x6f, 0x8e, 0xe7, 0x8e, 0x2b, 0x20, 0x8f, 0x39, 0x46, 0x91, 0x82, 0xc1, 0x5f, 0xd3, 0xdc, 0x79, 0xbd, 0x39, 0x9e,
0x52, 0xeb, 0x43, 0x55, 0xf6, 0x6e, 0xa1, 0x72, 0xbf, 0x97, 0x09, 0x2b, 0x84, 0x8a, 0x53, 0x79, 0x4b, 0xad, 0x17, 0x55, 0x59, 0xbc, 0x85, 0xea, 0xfd, 0x5e, 0x26, 0xae, 0x10, 0xaa, 0x4e, 0xe5,
0xc5, 0xb0, 0x7a, 0x9c, 0x04, 0x12, 0x43, 0x21, 0x8f, 0xfc, 0xec, 0xb1, 0x54, 0xc8, 0xc7, 0x75, 0x1d, 0xc3, 0x6a, 0x72, 0x12, 0x4c, 0x0c, 0xc5, 0x3c, 0xf2, 0xb4, 0xc7, 0x52, 0x31, 0x1f, 0xd7,
0x85, 0xbc, 0x50, 0x8f, 0xae, 0x57, 0xc7, 0x9b, 0x19, 0x6f, 0x11, 0xd9, 0xd5, 0x74, 0xee, 0xb7, 0x15, 0xf3, 0x42, 0x4d, 0xba, 0x5e, 0x2d, 0x6f, 0x66, 0xbe, 0x45, 0x84, 0x57, 0xd3, 0xc9, 0xdf,
0xa2, 0xc0, 0x8a, 0x89, 0x92, 0x10, 0x3e, 0x92, 0x99, 0x33, 0x4a, 0x6f, 0x5d, 0xe9, 0xf2, 0x80, 0x8a, 0x06, 0x2b, 0x26, 0x4a, 0x42, 0xf8, 0x48, 0x86, 0xce, 0x28, 0xbd, 0x75, 0xa5, 0xeb, 0x03,
0xd3, 0x84, 0xbe, 0x74, 0xac, 0xc0, 0x37, 0xa5, 0x08, 0xbb, 0x76, 0x9d, 0xcc, 0xc2, 0x2a, 0xbe, 0x4e, 0x15, 0xfa, 0xd2, 0xb1, 0x02, 0xe0, 0x94, 0x22, 0xfc, 0xda, 0x75, 0x32, 0x0b, 0xab, 0x38,
0x17, 0x52, 0x80, 0xa9, 0xf4, 0xc6, 0x46, 0xa7, 0x21, 0xd2, 0x90, 0xf3, 0x1c, 0x8b, 0x7c, 0x6f, 0x5f, 0x48, 0x05, 0xa6, 0xd2, 0x1c, 0x1b, 0x9d, 0x86, 0x48, 0x47, 0xce, 0x73, 0x2c, 0xf2, 0xbe,
0x66, 0x36, 0x6d, 0xab, 0xde, 0xfd, 0x0a, 0x49, 0xbe, 0xac, 0x71, 0x04, 0xbe, 0xb9, 0xb1, 0x1e, 0x99, 0x59, 0xb5, 0xad, 0x7a, 0xf7, 0x2b, 0x24, 0xfb, 0xb2, 0xc6, 0x11, 0xf8, 0xe6, 0xc6, 0x7a,
0xc9, 0x9f, 0x08, 0x80, 0xeb, 0x29, 0x14, 0xef, 0x17, 0x03, 0xb3, 0x7d, 0x9f, 0xe0, 0x1b, 0x98, 0x24, 0x8f, 0x22, 0x00, 0xae, 0xa7, 0x52, 0xbc, 0x5f, 0x0c, 0xcc, 0xf6, 0x7d, 0x82, 0x6f, 0x60,
0xc0, 0x22, 0xb6, 0xdc, 0x53, 0xb9, 0x84, 0xeb, 0x00, 0xb1, 0x70, 0xb2, 0x71, 0x2e, 0xe1, 0xdb, 0x02, 0x8b, 0x18, 0x73, 0x4f, 0xe5, 0x14, 0xae, 0x03, 0xc4, 0x42, 0xca, 0xc6, 0x39, 0x85, 0x6f,
0x31, 0xe4, 0xad, 0x90, 0x8e, 0x5e, 0x3b, 0x60, 0xf7, 0x1f, 0x08, 0x02, 0xf0, 0x05, 0xde, 0xff, 0xc7, 0x90, 0xbb, 0x42, 0x3a, 0x82, 0xed, 0xc0, 0xdd, 0x7f, 0x20, 0x18, 0xc0, 0x17, 0x44, 0x01,
0x45, 0x38, 0xba, 0xb7, 0x26, 0xba, 0x99, 0x58, 0xde, 0x9c, 0x26, 0x92, 0x59, 0xa8, 0x8d, 0xc3, 0x28, 0xc2, 0xd1, 0xbd, 0x35, 0xd1, 0xcd, 0x04, 0xf3, 0xe6, 0x34, 0x91, 0xec, 0x42, 0x6d, 0x1c,
0xa2, 0x77, 0x39, 0x36, 0xa6, 0xc6, 0x5c, 0x87, 0xc6, 0xa4, 0x74, 0x49, 0x56, 0x02, 0xc9, 0x21, 0x16, 0xbd, 0xcb, 0xb1, 0x31, 0x35, 0xe6, 0x3a, 0x34, 0x26, 0xa5, 0x4b, 0x32, 0x13, 0x48, 0x0e,
0x1e, 0x71, 0x50, 0x76, 0xfe, 0x78, 0x50, 0xf0, 0x22, 0x46, 0x46, 0x32, 0x8e, 0xc2, 0x53, 0x65, 0xf1, 0x8a, 0x83, 0xb2, 0xf3, 0xc7, 0x83, 0x83, 0x17, 0x31, 0x32, 0x93, 0x71, 0x34, 0x9e, 0x2a,
0xd3, 0xee, 0x65, 0xf1, 0xad, 0xf2, 0x3c, 0x39, 0x4e, 0x26, 0x29, 0xad, 0x72, 0xfd, 0x32, 0xcd, 0xab, 0x76, 0x2f, 0x8b, 0x6f, 0x95, 0x07, 0xca, 0x71, 0x32, 0x49, 0x69, 0x95, 0xeb, 0x97, 0x6a,
0xdd, 0x0a, 0x55, 0x84, 0xce, 0xfa, 0x55, 0x9e, 0x36, 0x6c, 0x07, 0x09, 0x29, 0xbd, 0x96, 0xe8, 0xee, 0x56, 0xa8, 0x22, 0x75, 0xd6, 0xaf, 0xf4, 0xb4, 0x81, 0x3b, 0x48, 0x48, 0xe9, 0xb5, 0x44,
0xcd, 0x66, 0xd0, 0xe6, 0x04, 0x6e, 0xb6, 0x95, 0xe3, 0x52, 0xa2, 0x1c, 0x97, 0x48, 0x04, 0x3e, 0x71, 0x36, 0x83, 0x37, 0x27, 0x70, 0xb7, 0xad, 0x1c, 0x98, 0x12, 0xe5, 0xc0, 0x44, 0xa2, 0xf0,
0x49, 0x4e, 0x11, 0x79, 0xb8, 0x35, 0x7e, 0x33, 0x47, 0x6d, 0x95, 0x8a, 0x8b, 0x8f, 0x04, 0x2d, 0x49, 0x72, 0x8a, 0x08, 0xc4, 0xad, 0x71, 0x9c, 0x39, 0x7a, 0xab, 0x54, 0x60, 0x7c, 0x24, 0x68,
0x71, 0x8c, 0xbf, 0x2e, 0x16, 0xf1, 0xf2, 0x0d, 0xc9, 0x37, 0x24, 0x60, 0x66, 0xf5, 0xc8, 0x78, 0x89, 0x73, 0xfc, 0x75, 0xb1, 0x88, 0x97, 0x6f, 0x48, 0xce, 0x21, 0x41, 0x33, 0xab, 0x47, 0xc8,
0x5a, 0x23, 0x22, 0x81, 0xb6, 0xeb, 0x43, 0x2b, 0xc3, 0x36, 0xdf, 0xe2, 0x7a, 0xcf, 0x70, 0x6d, 0xd3, 0x9a, 0x11, 0x09, 0xb4, 0x5d, 0x1f, 0xda, 0x19, 0xb6, 0xfd, 0x16, 0xd7, 0x7c, 0x86, 0x8b,
0x41, 0x2c, 0x86, 0x4c, 0xc4, 0x1a, 0x6d, 0xbb, 0x4e, 0x1c, 0xaa, 0x28, 0xaf, 0x2a, 0xcf, 0xbb, 0x0b, 0x62, 0x32, 0x64, 0x22, 0xe6, 0x68, 0xdb, 0xb5, 0xe2, 0x50, 0x45, 0x7b, 0x55, 0xf9, 0xde,
0x3d, 0x6b, 0xc3, 0xb2, 0xa7, 0xdc, 0x58, 0x49, 0xfa, 0x3a, 0xcf, 0xa7, 0x57, 0x90, 0xd3, 0x4b, 0xed, 0x59, 0x1b, 0x96, 0x3d, 0xe5, 0xce, 0x4a, 0x52, 0xd8, 0x79, 0x3e, 0xbd, 0x82, 0xbc, 0x5e,
0x6e, 0x04, 0xcb, 0xf6, 0x16, 0xcc, 0x6a, 0x07, 0x81, 0x1f, 0xc4, 0x37, 0x97, 0x55, 0xcf, 0xae, 0x72, 0x23, 0x58, 0xb6, 0xb7, 0x60, 0x5a, 0x3b, 0x08, 0x00, 0x21, 0xbe, 0xb9, 0xac, 0x82, 0x76,
0xb9, 0x40, 0x70, 0x80, 0x8e, 0xca, 0xd7, 0xcb, 0x8a, 0x97, 0xe2, 0x0c, 0x8d, 0x95, 0x57, 0x13, 0xcd, 0x05, 0x82, 0x23, 0x74, 0x54, 0xbe, 0x5e, 0x56, 0x3c, 0x15, 0x67, 0x6a, 0xac, 0xbc, 0x9b,
0x68, 0xb3, 0x1d, 0x93, 0x27, 0x86, 0x15, 0x87, 0xa7, 0xa6, 0x91, 0x7f, 0x0d, 0x05, 0x6f, 0x99, 0x40, 0x9b, 0xed, 0xd8, 0x3c, 0x31, 0xac, 0x39, 0x3c, 0x35, 0x8d, 0xfc, 0x6b, 0x28, 0x78, 0xcc,
0x71, 0xcc, 0xcd, 0x90, 0x59, 0x24, 0x2e, 0x0f, 0x4f, 0xb2, 0xd3, 0x95, 0xa0, 0x39, 0xfc, 0x5b, 0x8c, 0x63, 0x6f, 0x86, 0xcc, 0x2c, 0x71, 0x79, 0x78, 0x92, 0x9d, 0xae, 0x04, 0xcd, 0xe1, 0xdf,
0x36, 0xea, 0x1d, 0x16, 0x9e, 0x9d, 0x72, 0xa2, 0xd8, 0x2d, 0x39, 0xe1, 0x84, 0xa8, 0x25, 0x52, 0xb2, 0x51, 0xef, 0xb0, 0xf0, 0xec, 0xd4, 0x13, 0xc5, 0x6e, 0xc9, 0x89, 0x27, 0x44, 0x2d, 0x91,
0xeb, 0x0a, 0x63, 0x91, 0xdd, 0xfe, 0xa9, 0xd7, 0x0a, 0x44, 0x65, 0x4d, 0x40, 0xb0, 0x00, 0x8e, 0x62, 0x57, 0x18, 0x8d, 0xec, 0xf6, 0x4f, 0xbd, 0x56, 0x20, 0x2a, 0xab, 0x02, 0x82, 0x05, 0x70,
0xaa, 0xc0, 0x06, 0x07, 0x86, 0x06, 0xe6, 0x53, 0x0b, 0x28, 0xc3, 0xa9, 0xc6, 0x86, 0xad, 0x0e, 0x54, 0x05, 0x36, 0x38, 0x30, 0x38, 0x30, 0x9f, 0x5a, 0x40, 0x19, 0xce, 0x35, 0x36, 0x6c, 0x75,
0x97, 0x51, 0x51, 0x82, 0x67, 0xda, 0x82, 0x00, 0xca, 0x6a, 0x52, 0x95, 0xd9, 0x96, 0x8d, 0xab, 0xb8, 0x8c, 0x8a, 0x12, 0x3c, 0xd3, 0x26, 0x04, 0x50, 0x56, 0x93, 0xaa, 0xcc, 0xb7, 0x6c, 0x5c,
0xc2, 0xfb, 0x4a, 0x3a, 0xa0, 0x21, 0x5a, 0x8a, 0x79, 0xb9, 0x66, 0xfc, 0x80, 0x5a, 0xa6, 0x16, 0x15, 0x5e, 0x58, 0xd2, 0x11, 0x0d, 0x51, 0x53, 0xcc, 0x4b, 0x36, 0xe3, 0x07, 0xd4, 0x33, 0xb5,
0xcd, 0xad, 0x7a, 0xd8, 0x1a, 0xad, 0x11, 0x89, 0xd7, 0xd0, 0x72, 0x33, 0x92, 0x9d, 0xf9, 0xe2, 0xa8, 0x6e, 0xd5, 0xc3, 0xd6, 0xa8, 0x8d, 0x48, 0xc0, 0x86, 0x96, 0x9b, 0x11, 0xed, 0xcc, 0x17,
0x32, 0xe7, 0x08, 0x1d, 0xfd, 0x97, 0x08, 0xe0, 0x0b, 0xe7, 0x76, 0x59, 0x20, 0x7e, 0xfa, 0x66, 0x97, 0x39, 0x47, 0xea, 0xe8, 0xbf, 0x44, 0x20, 0x5f, 0x38, 0xb9, 0xcb, 0x02, 0xf1, 0xd3, 0x37,
0x5d, 0xb4, 0x1a, 0x1f, 0xd2, 0x3a, 0x8e, 0xb5, 0x27, 0xe5, 0x60, 0xbd, 0x9d, 0x86, 0xaa, 0x59, 0xeb, 0xa2, 0xd5, 0xf8, 0x90, 0xd6, 0x71, 0xac, 0x3d, 0x2a, 0x07, 0xeb, 0xed, 0x35, 0x54, 0xcd,
0x46, 0x77, 0x93, 0x1c, 0xde, 0xca, 0xda, 0x80, 0x61, 0xb0, 0x61, 0x43, 0x90, 0xd2, 0xd7, 0xb7, 0x32, 0xba, 0x9b, 0xe4, 0xf0, 0x5a, 0xd6, 0x86, 0x0c, 0x83, 0x0d, 0x1b, 0x82, 0xb4, 0xbe, 0xbe,
0xe2, 0xc7, 0x23, 0xc6, 0x29, 0x85, 0x71, 0xbb, 0xf4, 0xc3, 0x54, 0x14, 0x67, 0x08, 0x68, 0xda, 0x15, 0x3f, 0x1e, 0x31, 0x4e, 0x29, 0x8c, 0xdb, 0xa5, 0x1f, 0xa6, 0xc2, 0x38, 0x43, 0x60, 0xd3,
0x12, 0x6c, 0x57, 0x8c, 0xc8, 0x15, 0xfa, 0xe9, 0xb0, 0xa8, 0x4e, 0x7a, 0xcf, 0x4c, 0x96, 0x9c, 0x96, 0xa0, 0xbb, 0x62, 0x44, 0xae, 0xd0, 0x53, 0x87, 0x45, 0x75, 0xd2, 0x7b, 0x66, 0xd2, 0xe4,
0x79, 0x63, 0x65, 0xa3, 0x92, 0x91, 0x38, 0x26, 0xbf, 0x68, 0x75, 0x8f, 0x5f, 0xed, 0x10, 0x5d, 0xcc, 0x1b, 0x2b, 0x5b, 0x95, 0x8c, 0x78, 0x73, 0xf9, 0x45, 0xab, 0x7d, 0xfc, 0x6a, 0x87, 0xe8,
0x0b, 0x51, 0xd6, 0x80, 0x60, 0xba, 0x40, 0xba, 0xce, 0x78, 0x95, 0xb9, 0x8b, 0x2e, 0x0b, 0x2b, 0x5a, 0x88, 0xb6, 0x06, 0x04, 0xd3, 0x05, 0xd2, 0x85, 0xc6, 0xab, 0xcc, 0x5e, 0x74, 0x59, 0x58,
0xc7, 0xb4, 0x8c, 0xdd, 0x56, 0xcc, 0x1a, 0x1c, 0x74, 0xa6, 0xde, 0x16, 0x22, 0x5d, 0x58, 0x0d, 0x39, 0xa8, 0x65, 0xec, 0xbe, 0x62, 0xd6, 0xe0, 0xe0, 0x33, 0xf5, 0xb6, 0x10, 0xf1, 0xc2, 0x6a,
0xc1, 0x55, 0x88, 0x83, 0x7e, 0x57, 0xac, 0x8a, 0x30, 0x3e, 0xc9, 0x98, 0xfc, 0x1a, 0xe6, 0x26, 0x08, 0x2e, 0x43, 0x1c, 0xfc, 0xbb, 0x62, 0x55, 0x84, 0x11, 0x4a, 0xc6, 0xe4, 0xd7, 0x30, 0x3b,
0x19, 0xe2, 0xbc, 0x35, 0xab, 0x79, 0x43, 0x15, 0x91, 0x77, 0x91, 0xfc, 0x9d, 0x78, 0xdc, 0xcc, 0xc9, 0x10, 0xef, 0xad, 0x59, 0xcd, 0x1b, 0xaa, 0xc8, 0xbc, 0x8b, 0xe4, 0xef, 0xc4, 0xe3, 0x66,
0x1b, 0x56, 0x73, 0x67, 0xe8, 0xb5, 0xc3, 0xd4, 0x47, 0xb8, 0xdd, 0xa6, 0x7a, 0x57, 0x06, 0x93, 0xde, 0xb0, 0x9a, 0x3b, 0x43, 0xbf, 0x1d, 0xa6, 0x3e, 0xc2, 0xee, 0x36, 0xd5, 0xbc, 0x32, 0xa8,
0x12, 0x2f, 0xd4, 0xb4, 0xf2, 0x7c, 0x43, 0x21, 0xcc, 0x36, 0x32, 0x79, 0x3d, 0x6d, 0x82, 0xe0, 0x94, 0x78, 0xa1, 0xa6, 0x9d, 0xe7, 0x9b, 0x0a, 0x61, 0xbe, 0x91, 0xc9, 0x6b, 0x6a, 0x13, 0x04,
0xba, 0xd0, 0xd6, 0x72, 0xd4, 0x64, 0x49, 0xbc, 0x36, 0xb6, 0xdf, 0xb1, 0xb0, 0x57, 0xd8, 0xf2, 0xd7, 0x85, 0xd6, 0x96, 0xa3, 0x27, 0x4b, 0xe2, 0xb5, 0xb1, 0x1d, 0x8f, 0x85, 0xbd, 0xc2, 0xa6,
0x18, 0xe1, 0x64, 0x0d, 0x25, 0x41, 0xc6, 0xa4, 0xef, 0x98, 0xe5, 0xa8, 0x42, 0xbb, 0x00, 0x1b, 0xc7, 0x08, 0x2b, 0x6b, 0x28, 0x0b, 0x32, 0x26, 0x7d, 0xc7, 0x2c, 0x48, 0x15, 0xda, 0x15, 0xd8,
0x77, 0x4a, 0x93, 0xf4, 0x6a, 0xd9, 0x69, 0x0d, 0x7a, 0xd5, 0x7c, 0x62, 0x5e, 0xf3, 0x88, 0xa7, 0xb8, 0x5b, 0x9a, 0xa4, 0x57, 0xcb, 0x4e, 0x6b, 0xf0, 0xab, 0xe6, 0x13, 0xf3, 0xba, 0x47, 0x3c,
0x2b, 0x11, 0xde, 0xfe, 0x5f, 0x6f, 0x9a, 0xf7, 0x70, 0x3d, 0x44, 0x04, 0x8f, 0x92, 0x0c, 0x71, 0x5d, 0x89, 0x30, 0xf7, 0xff, 0x7a, 0xd3, 0xbc, 0x8f, 0xeb, 0x21, 0x32, 0x78, 0x94, 0x64, 0x88,
0x24, 0xfd, 0x0f, 0xe1, 0x33, 0x0e, 0x7e, 0x7f, 0xe3, 0x27, 0x0c, 0x4b, 0x18, 0xf8, 0xb7, 0x81, 0x27, 0xe9, 0x7f, 0x08, 0x9f, 0x71, 0x10, 0xfc, 0x1b, 0x3f, 0x61, 0x58, 0xc2, 0xc0, 0xbf, 0x0d,
0x88, 0xc3, 0x23, 0x86, 0x7c, 0xcc, 0xd9, 0x32, 0xc5, 0xa4, 0x19, 0x9c, 0xf1, 0x55, 0x26, 0x42, 0x44, 0x3c, 0x1e, 0x31, 0xe4, 0x63, 0xce, 0x9a, 0x29, 0x26, 0xcd, 0xe0, 0x8c, 0xaf, 0x32, 0x11,
0x12, 0xe9, 0x28, 0x8c, 0x3d, 0x61, 0x4a, 0x39, 0xfb, 0x98, 0x5f, 0xd1, 0x24, 0x17, 0xe3, 0x7a, 0x9a, 0x48, 0x47, 0x63, 0xec, 0x09, 0x93, 0xca, 0xd9, 0xc7, 0xfc, 0x8a, 0x26, 0xb9, 0x18, 0xd7,
0xc1, 0x49, 0x70, 0x3a, 0x30, 0x55, 0x14, 0x51, 0xf1, 0x6e, 0x99, 0xb3, 0x03, 0x27, 0x5a, 0xd1, 0x0b, 0x4e, 0x82, 0xd3, 0x81, 0xa9, 0xaa, 0x88, 0x8a, 0x77, 0xcb, 0x9c, 0x1d, 0x39, 0xd1, 0x8a,
0xb9, 0x0a, 0x9a, 0xa1, 0x84, 0xf9, 0xf8, 0xe5, 0xb0, 0x70, 0x46, 0xda, 0x59, 0x7a, 0x57, 0x2b, 0xce, 0x59, 0xd0, 0x0c, 0x29, 0xcc, 0xc7, 0x2f, 0x87, 0x87, 0x33, 0xd2, 0xcf, 0xd2, 0xbb, 0x5a,
0xf0, 0x89, 0x95, 0x55, 0x31, 0xf2, 0x4c, 0xa6, 0x74, 0xfa, 0x49, 0xaa, 0xae, 0xb6, 0x16, 0x53, 0x91, 0x4f, 0xac, 0xac, 0x8a, 0x95, 0x67, 0x32, 0xa5, 0xd3, 0x4f, 0x52, 0x85, 0xb5, 0xb5, 0x98,
0x84, 0xb3, 0xa9, 0xc2, 0x8f, 0xcb, 0x08, 0xd9, 0x7a, 0xf3, 0xf1, 0xe9, 0x61, 0x85, 0xcd, 0x56, 0x22, 0xac, 0x4d, 0x15, 0x86, 0x5c, 0x46, 0xca, 0xd6, 0x9b, 0x8f, 0x4f, 0x0f, 0x2b, 0x7c, 0xb6,
0xab, 0xae, 0xab, 0xd0, 0xa9, 0x25, 0x67, 0xad, 0xe8, 0x68, 0x33, 0x70, 0xef, 0xe1, 0xc1, 0x1c, 0x5a, 0x75, 0x5d, 0x85, 0x4e, 0x2d, 0x39, 0x6b, 0x45, 0x47, 0x9b, 0x83, 0x7b, 0x0f, 0x0f, 0xe6,
0x46, 0x59, 0xfb, 0x5d, 0xd0, 0xef, 0x0e, 0x4d, 0xa6, 0x9a, 0x2a, 0x6a, 0x0d, 0xc1, 0xc8, 0xff, 0x30, 0xca, 0xda, 0xef, 0x82, 0x7e, 0x77, 0x68, 0x32, 0xd5, 0x54, 0x51, 0x6b, 0x08, 0x4a, 0xfe,
0xa1, 0x27, 0x56, 0x46, 0x53, 0x2e, 0xa3, 0x89, 0x8a, 0xd1, 0xee, 0x9d, 0x88, 0x55, 0x38, 0x95, 0x0f, 0x3d, 0xb1, 0x32, 0xaa, 0x72, 0x19, 0x4d, 0x54, 0xac, 0x76, 0xef, 0x44, 0xac, 0xc2, 0xa9,
0xf8, 0xf6, 0x31, 0x5f, 0xf8, 0xff, 0x7a, 0xd3, 0x16, 0x93, 0x5b, 0x22, 0xdd, 0x56, 0x47, 0xad, 0xc4, 0xb7, 0x8f, 0xf9, 0xc2, 0xff, 0xd7, 0x9b, 0xb6, 0xd8, 0xdc, 0x12, 0xe9, 0xb6, 0x3a, 0x6a,
0x4d, 0xe0, 0x59, 0xfe, 0xa7, 0x82, 0xc8, 0xf1, 0xf8, 0x45, 0x8d, 0xed, 0xed, 0xda, 0x3c, 0x34, 0x6d, 0x02, 0xcf, 0xf2, 0x43, 0x15, 0x44, 0x8e, 0xc7, 0x2f, 0x6a, 0x6c, 0x6f, 0xd7, 0xe6, 0xa1,
0xc1, 0x0a, 0xcb, 0xdd, 0x5b, 0xc4, 0xf1, 0x63, 0x05, 0x1c, 0x73, 0x67, 0x85, 0x47, 0xdc, 0x46, 0x09, 0x56, 0x58, 0xee, 0xde, 0x22, 0x9e, 0x1f, 0x2b, 0xe2, 0x98, 0x3b, 0x2b, 0x3c, 0xe2, 0x36,
0xb7, 0x93, 0x7d, 0x53, 0xec, 0xdd, 0x54, 0xa9, 0x69, 0xf7, 0xbd, 0x61, 0xb0, 0x15, 0x22, 0xe4, 0xba, 0x9d, 0xec, 0x9b, 0x62, 0xef, 0xa6, 0x4a, 0x51, 0xbb, 0xef, 0x0d, 0x83, 0xad, 0x10, 0xa1,
0x86, 0x80, 0x76, 0x14, 0xb0, 0x63, 0x9b, 0xa7, 0x0b, 0x0e, 0x0f, 0xa8, 0x80, 0xa3, 0x59, 0xa7, 0x37, 0x04, 0xb4, 0xa3, 0x80, 0x1d, 0xdc, 0x3c, 0x5d, 0x70, 0x78, 0x40, 0x05, 0x1c, 0xd5, 0x3a,
0xa3, 0x5e, 0x7f, 0x7f, 0x7b, 0x7b, 0xa3, 0x91, 0x12, 0xb9, 0x13, 0x13, 0x43, 0xed, 0xd0, 0xa0, 0x1d, 0xf5, 0xfa, 0xfb, 0xdb, 0xdb, 0x1b, 0x8d, 0x94, 0xc8, 0x9d, 0x98, 0x18, 0x6a, 0x87, 0x06,
0xc5, 0xb9, 0xc0, 0x37, 0x8f, 0x24, 0x1b, 0x2f, 0xcb, 0xbb, 0x8e, 0xbb, 0xbb, 0x9b, 0xb8, 0x12, 0x2d, 0xce, 0x05, 0xbe, 0x81, 0x24, 0xd9, 0x78, 0x59, 0xde, 0x75, 0xdc, 0xdd, 0xdd, 0xc4, 0x95,
0x4f, 0x77, 0xc3, 0x0c, 0xb0, 0xf5, 0x77, 0x53, 0x15, 0x51, 0x38, 0x02, 0x7b, 0xf1, 0xa9, 0x90, 0x78, 0xba, 0x1b, 0x66, 0x80, 0xad, 0xbf, 0x9b, 0xaa, 0xc8, 0xc2, 0x11, 0xd8, 0x8b, 0x4f, 0x85,
0x20, 0x10, 0x77, 0xbd, 0xae, 0x8d, 0x73, 0xe4, 0xcb, 0xdd, 0x74, 0x5a, 0xfb, 0xd4, 0x90, 0xdc, 0x04, 0x81, 0xb8, 0xeb, 0x75, 0x6d, 0x9c, 0x23, 0x6f, 0xee, 0xa6, 0xd3, 0xda, 0xa7, 0x86, 0xe4,
0x10, 0xc6, 0xec, 0x1a, 0xc1, 0x2b, 0xef, 0x5b, 0x82, 0xab, 0xac, 0x09, 0x41, 0x9c, 0xcd, 0xa6, 0x86, 0x30, 0x66, 0xd7, 0x08, 0x62, 0x79, 0xdf, 0x12, 0x64, 0x65, 0x4d, 0x28, 0xe2, 0x6c, 0x36,
0xac, 0xce, 0xbb, 0x19, 0x7d, 0xfb, 0xea, 0xdb, 0x87, 0x87, 0x9b, 0xd1, 0xf3, 0x83, 0x57, 0xdb, 0x65, 0xb5, 0xde, 0xcd, 0xe8, 0xdb, 0x57, 0xdf, 0x3e, 0x3c, 0xdc, 0x8c, 0x9e, 0x1f, 0xbc, 0xda,
0xdb, 0x37, 0x87, 0xdf, 0xee, 0x07, 0xde, 0xda, 0x78, 0xa7, 0x22, 0x2c, 0xce, 0xfd, 0x8d, 0xb2, 0xde, 0xbe, 0x39, 0xfc, 0x76, 0x3f, 0xf0, 0xd6, 0xc6, 0x3d, 0x15, 0xe1, 0x71, 0xee, 0x6f, 0x94,
0xd1, 0x62, 0x2a, 0xf5, 0x1b, 0xcc, 0x4d, 0xcd, 0x10, 0x9a, 0x43, 0x43, 0x42, 0xe5, 0xf3, 0x47, 0xad, 0x16, 0x53, 0xa9, 0xdf, 0x60, 0x76, 0x6a, 0x86, 0xd2, 0x1c, 0x1a, 0x12, 0x2a, 0x9f, 0x3f,
0xae, 0xea, 0x8f, 0x31, 0x3c, 0xa4, 0x86, 0xc5, 0x9b, 0x3c, 0xc5, 0xd0, 0x39, 0x11, 0x72, 0xd7, 0x72, 0x55, 0x7f, 0x8c, 0xe1, 0x29, 0x35, 0x2c, 0xde, 0xe4, 0x29, 0x86, 0xce, 0x09, 0x91, 0xbb,
0x5d, 0xdc, 0x22, 0xc9, 0x90, 0x2c, 0x9b, 0xcc, 0x55, 0x80, 0x98, 0xbc, 0xac, 0xbd, 0x27, 0x6b, 0xee, 0xe2, 0x16, 0xc9, 0x86, 0x64, 0xd9, 0x64, 0xae, 0x02, 0xc5, 0xe4, 0x65, 0xed, 0x3d, 0x59,
0x8a, 0xd8, 0x3e, 0x1d, 0x9a, 0xf3, 0x67, 0xd5, 0x6b, 0xe5, 0xa2, 0x6a, 0x4a, 0xc6, 0xaf, 0x62, 0x53, 0xc4, 0xf8, 0xe9, 0xd0, 0x9c, 0x3f, 0xab, 0x5e, 0x2b, 0x17, 0x55, 0x53, 0x32, 0x8e, 0x15,
0xf4, 0x6a, 0x86, 0xf0, 0x91, 0xe5, 0xc2, 0x9b, 0x1f, 0xea, 0x24, 0x81, 0x87, 0xaf, 0x43, 0x89, 0xa3, 0x57, 0x33, 0x94, 0x8f, 0x2c, 0x17, 0x5e, 0xfd, 0x50, 0x2c, 0x09, 0x3c, 0x7c, 0x1d, 0x4a,
0x90, 0xaf, 0xd7, 0xa4, 0xa6, 0x5f, 0x4c, 0x2f, 0x5d, 0x5f, 0x56, 0xf1, 0xe4, 0x97, 0x50, 0xff, 0x84, 0x7c, 0xbd, 0x26, 0x45, 0xfd, 0x62, 0x7a, 0xe9, 0xfa, 0xb2, 0x8a, 0x27, 0xbf, 0x84, 0xfa,
0xbe, 0x39, 0xec, 0xef, 0x23, 0xf0, 0xbf, 0x6c, 0xe4, 0xe1, 0x61, 0x8b, 0x35, 0x55, 0xb2, 0x14, 0xf7, 0xcd, 0x61, 0x7f, 0x1f, 0x09, 0x00, 0x64, 0x23, 0x0f, 0x0f, 0x5b, 0xac, 0xb3, 0x92, 0xa5,
0x73, 0x2e, 0xbe, 0x63, 0x9e, 0x43, 0xa3, 0x50, 0xfc, 0xc0, 0xd6, 0x84, 0xc6, 0x85, 0xb0, 0x46, 0x98, 0x73, 0xf1, 0x1d, 0xf3, 0x1c, 0x1a, 0x85, 0xe2, 0x07, 0xb6, 0x26, 0x34, 0x2e, 0x84, 0x35,
0x98, 0x43, 0xca, 0xf6, 0xc6, 0xb2, 0x9b, 0xad, 0xfe, 0x40, 0xf6, 0x84, 0x90, 0xe3, 0x1a, 0xe6, 0xc2, 0x2c, 0x52, 0xb6, 0x37, 0x96, 0xdd, 0x6c, 0xf5, 0x07, 0xb2, 0x27, 0x84, 0x1e, 0xd7, 0x30,
0xaa, 0xfb, 0x1a, 0xd2, 0x05, 0x9e, 0x19, 0x64, 0xe7, 0x88, 0x20, 0x37, 0x43, 0xec, 0x88, 0xb7, 0x57, 0xdd, 0xd7, 0x90, 0x2e, 0xf0, 0xcc, 0x60, 0x3b, 0x47, 0x04, 0xb9, 0x19, 0x6a, 0x47, 0xbc,
0x5a, 0x82, 0x75, 0xe7, 0x95, 0x46, 0x65, 0xce, 0x33, 0x2e, 0xab, 0x52, 0xa7, 0xda, 0x06, 0x8c, 0xd5, 0x12, 0xb4, 0x3b, 0xaf, 0x34, 0x2a, 0x73, 0x9e, 0x71, 0x59, 0x95, 0x3a, 0xd5, 0xb6, 0x60,
0xa6, 0x81, 0xea, 0x8d, 0xdd, 0x00, 0x02, 0xda, 0x55, 0x99, 0xbb, 0x9f, 0xb1, 0x72, 0x7a, 0x0b, 0x34, 0x0d, 0x54, 0x6f, 0xec, 0x06, 0x10, 0xd0, 0xae, 0xca, 0xdc, 0xfd, 0x8c, 0x95, 0xd3, 0x5b,
0x08, 0xfb, 0x64, 0x05, 0x07, 0x74, 0x35, 0xd4, 0xda, 0x33, 0xfc, 0xe1, 0x70, 0x6b, 0x84, 0x5d, 0x40, 0xd8, 0x29, 0x2b, 0x38, 0xa0, 0xab, 0xa1, 0xd6, 0x9e, 0xe1, 0x0f, 0x87, 0x5d, 0x23, 0xec,
0xc6, 0xb2, 0x25, 0x85, 0x90, 0xd1, 0x4c, 0xf2, 0xbe, 0xbd, 0xed, 0xe6, 0x5c, 0x08, 0x75, 0x24, 0x32, 0x96, 0x2d, 0x29, 0x84, 0x8c, 0x66, 0x92, 0xf7, 0xed, 0x6d, 0x37, 0xe7, 0x42, 0x28, 0x26,
0x49, 0x8b, 0x48, 0x29, 0x43, 0x50, 0xd6, 0x18, 0x5c, 0xd3, 0xe6, 0x3f, 0x26, 0x7a, 0xfa, 0x7d, 0x49, 0x5a, 0x44, 0x6a, 0x19, 0x82, 0xb2, 0xc6, 0xe0, 0x9a, 0xb6, 0xff, 0x31, 0xd1, 0xd3, 0xef,
0x1c, 0x2f, 0x88, 0xa5, 0xec, 0xf5, 0x7a, 0xe2, 0x56, 0x6d, 0x4b, 0x5d, 0x8c, 0x68, 0xa5, 0xc9, 0xe3, 0x78, 0x41, 0x2c, 0x65, 0xaf, 0xd7, 0x13, 0xb7, 0x6b, 0x5b, 0xea, 0x82, 0x44, 0x2b, 0x4d,
0x50, 0x9c, 0x53, 0x08, 0x18, 0xab, 0x92, 0x08, 0x51, 0x3d, 0x03, 0x82, 0xed, 0x6d, 0xfd, 0xa3, 0x86, 0xe2, 0x9c, 0x42, 0xe0, 0x58, 0x95, 0x4c, 0x88, 0xea, 0x19, 0x10, 0x6c, 0x6f, 0xeb, 0x1f,
0xf0, 0xaa, 0x14, 0xe7, 0x0e, 0x6c, 0x52, 0x9c, 0xc2, 0xab, 0x1e, 0xc2, 0xcd, 0x7d, 0xcc, 0x27, 0x85, 0x57, 0xa5, 0x3a, 0x77, 0x60, 0x9b, 0xe2, 0x14, 0x5e, 0xf5, 0x10, 0xee, 0xee, 0x63, 0x3e,
0xc5, 0xc3, 0x83, 0x2d, 0x63, 0x92, 0xfc, 0x4b, 0xa5, 0x7c, 0x75, 0xe5, 0x1b, 0x60, 0x51, 0x99, 0x29, 0x1e, 0x1e, 0x6c, 0x19, 0x93, 0xe4, 0x5f, 0x2a, 0xe5, 0x2b, 0x2c, 0xdf, 0x00, 0x8b, 0xca,
0xcf, 0x6f, 0x79, 0x83, 0xd6, 0xfa, 0x6c, 0xe5, 0xaf, 0x95, 0x50, 0x8d, 0xf1, 0xac, 0xc4, 0xce, 0x7c, 0x7e, 0xcb, 0x1b, 0xb4, 0xd6, 0x67, 0x6b, 0x7f, 0xad, 0x84, 0x6a, 0x8c, 0x67, 0x25, 0x76,
0x5c, 0x4b, 0x66, 0x32, 0xd7, 0xa7, 0xed, 0x22, 0x77, 0x2d, 0x31, 0x8b, 0x2c, 0xce, 0x80, 0xda, 0xe6, 0x5a, 0x32, 0x93, 0xb9, 0x3e, 0x6d, 0x17, 0xb9, 0x6b, 0x89, 0x59, 0x64, 0x71, 0x06, 0xd4,
0x20, 0x3d, 0x09, 0xab, 0xb9, 0xe8, 0x7d, 0x97, 0xc3, 0x5e, 0xf9, 0x60, 0xa9, 0xa8, 0x9d, 0x66, 0x06, 0x69, 0x4a, 0x58, 0xcd, 0x45, 0xef, 0xbb, 0x1c, 0xfe, 0xca, 0x07, 0x4b, 0x45, 0xed, 0x34,
0xad, 0xcb, 0x1c, 0x06, 0x0b, 0xf9, 0x0d, 0x35, 0x06, 0xf2, 0xb0, 0xbe, 0x62, 0x89, 0x53, 0x56, 0x6b, 0x5d, 0xe6, 0x30, 0x5c, 0xc8, 0x6f, 0xa8, 0x31, 0x90, 0x87, 0xf5, 0x15, 0x4b, 0x9c, 0xb2,
0xf0, 0x1b, 0x4f, 0xd4, 0xe4, 0x26, 0x49, 0xa8, 0x76, 0x7d, 0x9c, 0x11, 0x4f, 0xd4, 0xbb, 0x5a, 0x82, 0xdf, 0x78, 0xa2, 0x26, 0x37, 0x49, 0x42, 0xb5, 0xeb, 0xe3, 0x8c, 0x78, 0xa2, 0xde, 0xd5,
0x3c, 0x55, 0x8d, 0x3b, 0x26, 0x6e, 0xaf, 0xaa, 0xf7, 0xbf, 0x0e, 0xf7, 0x88, 0x90, 0x27, 0x8b, 0xe2, 0xa9, 0x6a, 0xdc, 0x31, 0x71, 0x7b, 0x55, 0xbd, 0xff, 0x75, 0xb8, 0x47, 0x84, 0x3c, 0x59,
0x72, 0xe4, 0x1c, 0xee, 0x21, 0x6a, 0x20, 0xfe, 0xce, 0xcb, 0xcb, 0x74, 0xe4, 0xfc, 0x3f, 0xb0, 0x94, 0x23, 0xe7, 0x70, 0x0f, 0xd1, 0x03, 0xf1, 0x77, 0x5e, 0x5e, 0xa6, 0x23, 0xe7, 0xff, 0x01,
0x4c, 0x4b, 0x56, 0x86, 0x9a, 0x01, 0x00 0x20, 0x6f, 0xed, 0x74, 0x8e, 0x9a, 0x01, 0x00
}; };

70
wled00/json.cpp
View File

@ -83,49 +83,39 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
{ {
int rgbw[] = {0,0,0,0}; int rgbw[] = {0,0,0,0};
bool colValid = false; bool colValid = false;
if (colarr[i].is<unsigned long>()) { JsonArray colX = colarr[i];
// unsigned long RGBW (@blazoncek v2 experimental API implementation) if (colX.isNull()) {
uint32_t colX = colarr[i]; byte brgbw[] = {0,0,0,0};
rgbw[0] = (colX >> 16) & 0xFF; const char* hexCol = colarr[i];
rgbw[1] = (colX >> 8) & 0xFF; if (hexCol == nullptr) { //Kelvin color temperature (or invalid), e.g 2400
rgbw[2] = (colX ) & 0xFF; int kelvin = colarr[i] | -1;
rgbw[3] = (colX >> 24) & 0xFF; //kelvin = map(seg.cct, 0, 255, 2800, 10200)
colValid = true; if (kelvin < 0) continue;
} else { if (kelvin == 0) seg.setColor(i, 0, id);
JsonArray colX = colarr[i]; if (kelvin > 0) colorKtoRGB(kelvin, brgbw);
if (colX.isNull()) {
byte brgbw[] = {0,0,0,0};
const char* hexCol = colarr[i];
if (hexCol == nullptr) { //Kelvin color temperature (or invalid), e.g 2400
int kelvin = colarr[i] | -1;
//kelvin = map(seg.cct, 0, 255, 2800, 10200)
if (kelvin < 0) continue;
if (kelvin == 0) seg.setColor(i, 0, id);
if (kelvin > 0) colorKtoRGB(kelvin, brgbw);
colValid = true;
} else { //HEX string, e.g. "FFAA00"
colValid = colorFromHexString(brgbw, hexCol);
}
for (uint8_t c = 0; c < 4; c++) rgbw[c] = brgbw[c];
} else { //Array of ints (RGB or RGBW color), e.g. [255,160,0]
byte sz = colX.size();
if (sz == 0) continue; //do nothing on empty array
byte cp = copyArray(colX, rgbw, 4);
if (cp == 1 && rgbw[0] == 0)
seg.setColor(i, 0, id);
colValid = true; colValid = true;
} else { //HEX string, e.g. "FFAA00"
colValid = colorFromHexString(brgbw, hexCol);
} }
for (uint8_t c = 0; c < 4; c++) rgbw[c] = brgbw[c];
} else { //Array of ints (RGB or RGBW color), e.g. [255,160,0]
byte sz = colX.size();
if (sz == 0) continue; //do nothing on empty array
if (!colValid) continue; byte cp = copyArray(colX, rgbw, 4);
if (id == strip.getMainSegmentId() && i < 2) //temporary, to make transition work on main segment if (cp == 1 && rgbw[0] == 0)
{ seg.setColor(i, 0, id);
if (i == 0) {col[0] = rgbw[0]; col[1] = rgbw[1]; col[2] = rgbw[2]; col[3] = rgbw[3];} colValid = true;
if (i == 1) {colSec[0] = rgbw[0]; colSec[1] = rgbw[1]; colSec[2] = rgbw[2]; colSec[3] = rgbw[3];} }
} else { //normal case, apply directly to segment
seg.setColor(i, ((rgbw[3] << 24) | ((rgbw[0]&0xFF) << 16) | ((rgbw[1]&0xFF) << 8) | ((rgbw[2]&0xFF))), id); if (!colValid) continue;
if (seg.mode == FX_MODE_STATIC) strip.trigger(); //instant refresh if (id == strip.getMainSegmentId() && i < 2) //temporary, to make transition work on main segment
} {
if (i == 0) {col[0] = rgbw[0]; col[1] = rgbw[1]; col[2] = rgbw[2]; col[3] = rgbw[3];}
if (i == 1) {colSec[0] = rgbw[0]; colSec[1] = rgbw[1]; colSec[2] = rgbw[2]; colSec[3] = rgbw[3];}
} else { //normal case, apply directly to segment
seg.setColor(i, ((rgbw[3] << 24) | ((rgbw[0]&0xFF) << 16) | ((rgbw[1]&0xFF) << 8) | ((rgbw[2]&0xFF))), id);
if (seg.mode == FX_MODE_STATIC) strip.trigger(); //instant refresh
} }
} }
} }

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2110171 #define VERSION 2110211
//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