Fixed #16 - Curve is not working well with actual LED strips

Finished calibration page - untested!
This commit is contained in:
Mark van Renswoude 2018-02-03 15:44:44 +01:00
parent 1bea7ea157
commit ce26beffec
14 changed files with 2913 additions and 2613 deletions

View File

@ -109,8 +109,28 @@ app.post('/api/system', function(req, res)
});
var steps = {
count: 14,
useCurve: true,
ranges: [
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 },
{ start: 0, end: 4095 }
]
};
var steps = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
app.get('/api/steps', function(req, res)
{
@ -118,12 +138,28 @@ app.get('/api/steps', function(req, res)
});
app.post('/api/steps', function(req, res)
{
steps = req.body;
res.sendStatus(200);
});
var stepsValues = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
app.get('/api/steps/values', function(req, res)
{
res.send(stepsValues);
});
app.post('/api/steps/values', function(req, res)
{
var body = req.body;
if (body && body.hasOwnProperty('values'))
{
for (var i = 0; i < Math.min(steps.length, body.values.length); i++)
steps[i] = parseInt(body.values[i], 10) || 0;
for (var i = 0; i < Math.min(stepsValues.length, body.values.length); i++)
stepsValues[i] = parseInt(body.values[i], 10) || 0;
res.sendStatus(200);
}

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -4,10 +4,10 @@
const uint8_t VersionMajor = 2;
const uint8_t VersionMinor = 0;
const uint8_t VersionPatch = 0;
const uint8_t VersionMetadata = 33;
const uint8_t VersionMetadata = 34;
const char VersionBranch[] = "release/2.0";
const char VersionSemVer[] = "2.0.0-beta.1";
const char VersionFullSemVer[] = "2.0.0-beta.1+33";
const char VersionCommitDate[] = "2018-01-31";
const char VersionFullSemVer[] = "2.0.0-beta.1+34";
const char VersionCommitDate[] = "2018-02-03";
#endif

View File

@ -12,21 +12,29 @@
StepsSettings::StepsSettings()
{
for (uint8_t i = 0; i < MaxStepCount; i++)
mCurveShift[i] = 0;
{
mRange[i].start = 0;
mRange[i].end = 4095;
}
}
void StepsSettings::toJson(Print &print)
{
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(16) + JSON_OBJECT_SIZE(3));
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(16) + JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(2));
JsonObject& root = jsonBuffer.createObject();
root["count"] = count();
root["useCurve"] = useCurve();
JsonArray& jsonCurveShift = root.createNestedArray("curveShift");
JsonArray& jsonRanges = root.createNestedArray("ranges");
for (uint8_t step = 0; step < MaxStepCount; step++)
jsonCurveShift.add(curveShift(step));
{
JsonObject& jsonRange = jsonBuffer.createObject();
jsonRange["start"] = rangeStart(step);
jsonRange["end"] = rangeEnd(step);
jsonRanges.add(jsonRange);
}
root.printTo(print);
}
@ -57,18 +65,23 @@ bool StepsSettings::fromJson(char* data, bool* changed)
}
JsonArray& jsonCurveShift = root["curveShift"];
uint8_t stepCount = jsonCurveShift.size();
JsonArray& jsonRanges = root["ranges"];
uint8_t stepCount = jsonRanges.size();
if (stepCount >= MaxStepCount)
stepCount = MaxStepCount - 1;
for (uint8_t step = 0; step < stepCount; step++)
{
uint16_t value = jsonCurveShift[step];
JsonObject& jsonRange = jsonRanges[step];
if (value != curveShift(step))
uint16_t start = jsonRange["start"];
uint16_t end = jsonRange["end"];
if (start != rangeStart(step) || end != rangeEnd(step))
{
curveShift(step, value);
rangeStart(step, start);
rangeEnd(step, end);
if (changed != nullptr)
*changed = true;
}

View File

@ -14,12 +14,21 @@
#define MaxStepCount 16
struct StepRange
{
uint16_t start;
uint16_t end;
};
class StepsSettings : public AbstractJsonSettings
{
private:
uint8_t mCount = MaxStepCount;
bool mUseCurve = true;
uint16_t mCurveShift[MaxStepCount];
StepRange mRange[MaxStepCount];
protected:
virtual const char* getFilename() { return StepsSettingsFile; };
@ -38,8 +47,11 @@ class StepsSettings : public AbstractJsonSettings
bool useCurve() { return mUseCurve; }
void useCurve(bool value) { mUseCurve = value; }
uint16_t curveShift(uint8_t step) { return step < MaxStepCount ? mCurveShift[step] : 0; }
uint16_t curveShift(uint8_t step, uint16_t value) { if (step < MaxStepCount) mCurveShift[step] = value; }
uint16_t rangeStart(uint8_t step) { return step < MaxStepCount ? mRange[step].start : 0; }
uint16_t rangeStart(uint8_t step, uint16_t value) { if (step < MaxStepCount) mRange[step].start = value; }
uint16_t rangeEnd(uint8_t step) { return step < MaxStepCount ? mRange[step].end : 0; }
uint16_t rangeEnd(uint8_t step, uint16_t value) { if (step < MaxStepCount) mRange[step].end = value; }
};
#endif

View File

@ -6,27 +6,8 @@
const uint16_t PWMCurve[] =
{
0, 10, 11, 12, 12, 13, 13, 14, 15, 16, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 29, 30, 32, 33, 35, 36, 38, 40, 42, 44,
46, 48, 51, 53, 56, 58, 61, 64, 67, 70, 74, 77, 81, 85, 89, 93,
97, 102, 107, 112, 117, 123, 129, 135, 141, 148, 155, 162, 169, 177, 186, 194,
203, 213, 222, 233, 243, 254, 266, 278, 291, 304, 318, 332, 347, 362, 378, 395,
412, 430, 449, 468, 488, 509, 531, 553, 576, 600, 625, 651, 677, 704, 733, 762,
792, 823, 854, 887, 920, 955, 990, 1026, 1063, 1101, 1140, 1180, 1220, 1261, 1303, 1346,
1389, 1433, 1478, 1523, 1569, 1615, 1662, 1709, 1757, 1805, 1853, 1901, 1950, 1999, 2048, 2096,
2145, 2194, 2242, 2290, 2338, 2386, 2433, 2480, 2526, 2572, 2617, 2662, 2706, 2749, 2792, 2834,
2875, 2915, 2955, 2994, 3032, 3069, 3105, 3140, 3175, 3208, 3241, 3272, 3303, 3333, 3362, 3391,
3418, 3444, 3470, 3495, 3519, 3542, 3564, 3586, 3607, 3627, 3646, 3665, 3683, 3700, 3717, 3733,
3748, 3763, 3777, 3791, 3804, 3817, 3829, 3841, 3852, 3862, 3873, 3882, 3892, 3901, 3909, 3918,
3926, 3933, 3940, 3947, 3954, 3960, 3966, 3972, 3978, 3983, 3988, 3993, 3998, 4002, 4006, 4010,
4014, 4018, 4021, 4025, 4028, 4031, 4034, 4037, 4039, 4042, 4044, 4047, 4049, 4051, 4053, 4055,
4057, 4059, 4060, 4062, 4063, 4065, 4066, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 4076,
4077, 4078, 4079, 4079, 4080, 4081, 4082, 4082, 4083, 4083, 4084, 4084, 4085, 4085, 4090, 4095
};
const float LinearFactor = 4095.0f / 255.0f;
const static float CurveFactor = log10(2) / log10(4095);
const static float LinearFactor = 4095.0f / 255.0f;
void Stairs::init(PCA9685* pwmDriver)
@ -67,6 +48,16 @@ inline void Stairs::applyCurrentValue(uint8_t step)
void Stairs::tick()
{
if (stepsSettingsChanged)
{
// Re-apply all values in case the PWM value changed
for (uint8_t step = 0; step < stepsSettings->count(); step++)
applyCurrentValue(step);
stepsSettingsChanged = false;
}
if (!mTick) return;
uint32_t elapsedTime = mLastTransitionTime != 0 ? currentTime - mLastTransitionTime : 0;
@ -209,15 +200,20 @@ uint16_t Stairs::getPWMValue(uint8_t step, uint8_t brightness)
}
uint16_t pwmValue;
uint16_t rangeStart = stepsSettings->rangeStart(step);
uint16_t rangeEnd = stepsSettings->rangeEnd(step);
if (stepsSettings->useCurve())
{
//_dln("Stairs :: Using curve");
pwmValue = PWMCurve[brightness] + stepsSettings->curveShift(step);
float factor = ((rangeEnd - rangeStart) + 1) * CurveFactor;
brightness = pow(2, ((brightness * LinearFactor) / factor)) - 1 + rangeStart;
}
else
{
//_dln("Stairs :: Not using curve");
pwmValue = brightness * LinearFactor;
float factor = ((rangeEnd - rangeStart) + 1) * LinearFactor;
pwmValue = (brightness * factor) + rangeStart;
}
//_d("Stairs :: Output: "); _dln(pwmValue);

View File

@ -65,6 +65,59 @@ function startApp()
}
});
Vue.component('range', {
template: '<div>' +
'<div class="start">' +
'<span class="value">{{ value.start }}</span>' +
'<div class="slidercontainer">' +
'<input type="range" min="0" max="4094" class="slider" v-model.number="value.start">' +
'</div>' +
'</div>' +
'<div class="end">' +
'<span class="value">{{ value.end }}</span>' +
'<div class="slidercontainer">' +
'<input type="range" min="1" max="4095" class="slider" v-model.number="value.end">' +
'</div>' +
'</div>' +
'</div>',
props: ['value'],
mounted: function()
{
this.oldValue = { start: this.value.start, end: this.value.end };
},
watch: {
value: {
handler: function(newValue)
{
if (newValue.start != this.oldValue.start)
{
if (newValue.start > newValue.end)
{
newValue.end = newValue.start + 1;
this.$emit('input', newValue);
}
}
else if (newValue.end != this.oldValue.end)
{
if (newValue.end < newValue.start)
{
newValue.start = newValue.end - 1;
this.$emit('input', newValue);
}
}
this.oldValue.start = newValue.start;
this.oldValue.end = newValue.end;
},
deep: true
}
}
});
var i18n = new VueI18n({
locale: navigator.language,
fallbackLocale: 'en',
@ -84,6 +137,7 @@ function startApp()
savingSteps: false,
loadingIndicator: '|',
uploadProgress: false,
savingCalibration: false,
activeTab: 'status',
@ -179,6 +233,7 @@ function startApp()
self.disableStepsChanged = false;
self.savingStepsTimer = false;
self.savingCalibrationTimer = false;
var fixedTimes = [];
var relativeTimes = [];
@ -599,6 +654,9 @@ function startApp()
{
var self = this;
if (self.savingSteps)
self.savingStepsTimer = setTimeout(function() { self.updateSteps(); }, 200);
self.savingSteps = true;
self.savingStepsTimer = false;
@ -792,13 +850,21 @@ function startApp()
startCalibration: function()
{
var self = this;
self.calibration = {
wizardStep: 0,
stepCount: self.steps.length,
steps: []
};
// TODO load step settings
axios.get('/api/steps')
.then(function(response)
{
if (typeof response.data == 'object')
{
self.calibration = {
wizardStep: 0,
count: response.data.count,
useCurve: response.data.useCurve,
ranges: response.data.ranges
};
}
})
.catch(self.handleAPIError.bind(self, 'error.loadSteps'));
},
stopCalibration: function()
@ -808,10 +874,8 @@ function startApp()
applyCalibration: function()
{
var self = this;
// TODO applyCalibration
self.stopCalibration();
// All the changes are already applied
this.stopCalibration();
},
hasNextCalibrationStep: function()
@ -822,11 +886,69 @@ function startApp()
nextCalibrationStep: function()
{
var self = this;
self.calibration.wizardStep++;
if (self.calibration.wizardStep == 0)
{
if (self.calibration.count < 1)
self.calibration.count = 1;
else if (self.calibration.count > 16)
self.calibration.count = 16;
// Update ranges with possible new count
if (self.calibration.ranges.length > self.calibration.count)
{
self.calibration.ranges.splice(self.calibration.count);
}
else
{
while (self.calibration.ranges.length < self.calibration.count)
self.calibration.ranges.push({ start: 0, end: 4095 });
}
}
self.calibration.wizardStep++;
if (self.calibration.wizardStep == 2)
self.applyCalibration();
}
},
calibrationChanged: function()
{
var self = this;
if (self.loadingCalibration || self.calibration === null) return;
if (self.savingCalibrationTimer === false)
self.savingCalibrationTimer = setTimeout(function() { self.updateCalibration(); }, 200);
},
updateCalibration: function()
{
var self = this;
if (self.calibration === null)
return;
if (self.savingCalibration)
self.savingStepsTimer = setTimeout(function() { self.updateCalibration(); }, 200);
self.savingCalibration = true;
self.savingCalibrationTimer = false;
axios.post('/api/steps', {
count: self.calibration.count,
useCurve: self.calibration.useCurve,
ranges: self.calibration.ranges
})
.then(function(response)
{
})
.catch(self.handleAPIError.bind(self, 'error.updateCalibration'))
.then(function()
{
self.savingCalibration = false;
});
},
},
watch: {
@ -850,6 +972,11 @@ function startApp()
activeTab: function(newValue)
{
window.location.hash = '#' + newValue;
},
calibration: {
handler: function() { this.calibrationChanged(); },
deep: true
}
}
});

2
web/dist/bundle.css vendored

File diff suppressed because one or more lines are too long

2
web/dist/bundle.js vendored

File diff suppressed because one or more lines are too long

View File

@ -382,12 +382,22 @@
<h3>{{ $t('calibration.title') }}</h3>
<div class="horizontal">
<label for="stepCount">{{ $t('calibration.stepCount') }}</label>
<input type="number" id="stepCount" v-model.number="calibration.stepCount">
<label for="stepCount">{{ $t('calibration.count') }}</label>
<input type="number" id="stepCount" v-model.number="calibration.count" min="1" max="16" :disabled="calibration.wizardStep >= 1">
</div>
<div v-if="calibration.wizardStep >= 1">
step 2
<h4>{{ $t('calibration.allStepsValue') }}</h4>
<div class="slidercontainer">
<input type="range" min="0" max="255" class="slider" v-model.number="allStepsValue">
</div>
<check v-model.boolean="calibration.useCurve" :title="$t('calibration.useCurve')" class="form-control"></check>
<h4>{{ $t('calibration.ranges') }}</h4>
<div class="range" v-for="(step, index) in calibration.ranges">
<range v-model="step"></range>
</div>
</div>
<div class="buttons">

View File

@ -146,15 +146,20 @@ var messages = {
updateSteps: 'Could not apply new step values',
searchLocation: 'Could not look up location coordinates',
applyTimeTriggers: 'Could not save time trigger settings',
applyMotionTriggers: 'Could not save motion trigger settings'
applyMotionTriggers: 'Could not save motion trigger settings',
loadSteps: 'Could not load calibration settings',
updateCalibration: 'Could not save calibration settings'
},
calibration: {
title: 'Calibration wizard',
backButton: 'Back',
stepCount: 'Number of steps',
count: 'Number of steps',
nextButton: 'Next',
applyButton: 'Apply'
applyButton: 'Complete',
allStepsValue: 'Intensity for all steps',
ranges: 'Min / max values per step',
useCurve: 'Use logarithmic curve for intensity (recommended for LEDs)'
}
},
@ -305,15 +310,20 @@ var messages = {
updateSteps: 'Kan trap instellingen niet opslaan',
searchLocation: 'Kan locatie coordinaten niet bepalen',
applyTimeTriggers: 'Kan tijd trigger instellingen niet opslaan',
applyMotionTriggers: 'Kan beweging trigger instellingen niet opslaan'
applyMotionTriggers: 'Kan beweging trigger instellingen niet opslaan',
loadSteps: 'Kan kalibratie instellingen niet ophalen',
updateCalibration: 'Kan kalibratie instellingen niet opslaan'
},
calibration: {
title: 'Kalibratie wizard',
backButton: 'Terug',
stepCount: 'Aantal treden',
count: 'Aantal treden',
nextButton: 'Volgende',
applyButton: 'Toepassen'
applyButton: 'Voltooien',
allStepsValue: 'Intensiteit voor alle treden',
ranges: 'Min / max waarden per trede',
useCurve: 'Gebruik logaritmische curve voor intensiteit (aangeraden voor LEDs)'
}
}
}

View File

@ -122,6 +122,12 @@ a
}
button, input
{
font-family: 'Verdana', 'Arial', sans-serif;
}
button, .button, input[type=submit]
{
@extend %outset;
@ -409,7 +415,7 @@ input[disabled]
label
{
display: block;
margin-top: 1em;
margin-top: .5em;
margin-bottom: .5em;
}
@ -426,6 +432,8 @@ label
{
.horizontal
{
clear: both;
label
{
display: inline-block;
@ -469,6 +477,7 @@ label
.buttons
{
clear: both;
text-align: center;
}
@ -638,4 +647,56 @@ label
.fade-enter, .fade-leave-to
{
opacity: 0;
}
.range
{
clear: both;
.start
{
position: relative;
display: inline-block;
width: 49%;
.slidercontainer
{
margin-right: 4em;
}
.value
{
position: absolute;
right: 0;
top: 1.5rem;
color: $sliderValueColor;
}
}
.end
{
position: relative;
display: inline-block;
float: right;
width: 50%;
.slidercontainer
{
margin-left: 4em;
}
.value
{
position: absolute;
left: 0;
top: 1.5rem;
color: $sliderValueColor;
}
}
&:after
{
clear: both;
}
}