Electronics/Stairs
Electronics/Stairs
1
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Fixed #22: Option to only enable motion triggers during nighttime

Browse Source 
Also added missing setting for motion turn off delay
This commit is contained in:
Mark van Renswoude 2018-02-16 22:02:55 +01:00
parent 7010e83554
commit 676a3586dd
15 changed files with 2531 additions and 2453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
API.md
View File

@ -270,6 +270,7 @@ enabled: whether or not this trigger is enabled
{ {
"enabled": true, "enabled": true,
"enabledDuringTimeTrigger": true, "enabledDuringTimeTrigger": true,
"enabledDuringDay": false,
"transitionTime": 1000, "transitionTime": 1000,
"delay": 30000, "delay": 30000,
"triggers": [ "triggers": [

12
devserver.js
View File

@ -208,6 +208,7 @@ app.post('/api/triggers/time', function(req, res)
var motionTriggers = { var motionTriggers = {
enabled: true, enabled: true,
enabledDuringTimeTrigger: false, enabledDuringTimeTrigger: false,
enabledDuringDay: true,
transitionTime: 1000, transitionTime: 1000,
delay: 30000, delay: 30000,
triggers: [ triggers: [
@ -237,6 +238,17 @@ app.post('/api/triggers/motion', function(req, res)
}); });
app.get('/api/stacktrace/get', function(req, res)
{
res.send("Nothing to see here, move along!");
});
app.get('/api/stacktrace/delete', function(req, res)
{
res.sendStatus(200);
});
app.listen(3000, function() app.listen(3000, function()
{ {
console.log('Development server listening on port 3000') console.log('Development server listening on port 3000')

192
src/assets/css.h
View File

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

340
src/assets/html.h
View File

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

4336
src/assets/js.h
View File

File diff suppressed because it is too large Load Diff

6
src/assets/version.h
View File

@ -4,10 +4,10 @@
const uint8_t VersionMajor = 2; const uint8_t VersionMajor = 2;
const uint8_t VersionMinor = 0; const uint8_t VersionMinor = 0;
const uint8_t VersionPatch = 0; const uint8_t VersionPatch = 0;
const uint8_t VersionMetadata = 42; const uint8_t VersionMetadata = 43;
const char VersionBranch[] = "release/2.0"; const char VersionBranch[] = "release/2.0";
const char VersionSemVer[] = "2.0.0-beta.1"; const char VersionSemVer[] = "2.0.0-beta.1";
const char VersionFullSemVer[] = "2.0.0-beta.1+42"; const char VersionFullSemVer[] = "2.0.0-beta.1+43";
const char VersionCommitDate[] = "2018-02-13"; const char VersionCommitDate[] = "2018-02-16";
#endif #endif

65
src/main.triggers.h
View File

@ -202,6 +202,49 @@ void updateNTPClient()
} }
uint32_t lastTimeElementsChecked = 0;
uint32_t epochTime = 0;
tmElements_t timeElements;
bool isDayTime = true;
tmElements_t* getTimeElements()
{
if (ntpClient == nullptr || !hasTimezone)
return nullptr;
if (lastTimeElementsChecked != 0 && currentTime - lastTimeElementsChecked < 10000)
return epochTime > 0 ? &timeElements : nullptr;
lastTimeElementsChecked = currentTime;
epochTime = ntpClient->getEpochTime();
if (epochTime == 0)
{
_dln("Triggers:: time not synchronised yet");
return nullptr;
}
_dln("Triggers:: updating time elements");
breakTime(epochTime + timezoneOffset, timeElements);
// TODO this is a copy of what is in time.cpp. This code, and probably a lot more
// in this file, could use some cleanup.
Dusk2Dawn location(systemSettings->latitude(), systemSettings->longitude(), timezoneOffset / 3600.0f);
// DST is always hardcoded as false, since it is already included in timezoneOffset
int16_t sunriseMinutes = location.sunrise(timeElements.Year, timeElements.Month, timeElements.Day, false);
int16_t sunsetMinutes = location.sunset(timeElements.Year, timeElements.Month, timeElements.Day, false);
int16_t timeMinutes = (timeElements.Hour * 60) + timeElements.Minute;
isDayTime = timeMinutes >= sunriseMinutes && timeMinutes <= sunsetMinutes;
_d("Triggers:: isDayTime = "); _dln(isDayTime);
return &timeElements;
}
void updateTimeTrigger() void updateTimeTrigger()
{ {
if (ntpClient == nullptr || !hasTimezone || !timeTriggerSettings->enabled()) if (ntpClient == nullptr || !hasTimezone || !timeTriggerSettings->enabled())
@ -221,20 +264,14 @@ void updateTimeTrigger()
lastTimeTriggerChecked = currentTime; lastTimeTriggerChecked = currentTime;
_dln("Triggers:: updating time trigger"); tmElements_t* time = getTimeElements();
if (time == nullptr)
uint32_t epochTime = ntpClient->getEpochTime();
if (epochTime == 0)
{ {
activeTimeTrigger = nullptr; activeTimeTrigger = nullptr;
_dln("Triggers:: time not synchronised yet");
return; return;
} }
tmElements_t time; activeTimeTrigger = timeTriggerSettings->getActiveTrigger(*time);
breakTime(epochTime + timezoneOffset, time);
activeTimeTrigger = timeTriggerSettings->getActiveTrigger(time);
#ifdef SerialDebug #ifdef SerialDebug
_d("Triggers:: active time trigger: "); _d("Triggers:: active time trigger: ");
@ -256,6 +293,7 @@ void updateTimeTrigger()
} }
uint32_t activeMotionStart = 0; uint32_t activeMotionStart = 0;
uint16_t activeMotionBrightness = 0; uint16_t activeMotionBrightness = 0;
MotionDirection activeMotionDirection = Nondirectional; MotionDirection activeMotionDirection = Nondirectional;
@ -270,6 +308,13 @@ void updateMotionTrigger()
return; return;
} }
if (!motionTriggerSettings->enabledDuringDay() && isDayTime)
{
activeMotionStart = 0;
return;
}
for (uint8_t i = 0; i < motionTriggerSettings->triggerCount(); i++) for (uint8_t i = 0; i < motionTriggerSettings->triggerCount(); i++)
{ {
MotionTrigger* trigger = motionTriggerSettings->trigger(i); MotionTrigger* trigger = motionTriggerSettings->trigger(i);
@ -286,7 +331,7 @@ void updateMotionTrigger()
} }
} }
if (currentTime - activeMotionStart >= motionTriggerSettings->delay()) if (activeMotionStart != 0 && currentTime - activeMotionStart >= motionTriggerSettings->delay())
activeMotionStart = 0; activeMotionStart = 0;
} }

2
src/settings/triggers/motion.cpp
View File

@ -18,6 +18,7 @@ void MotionTriggerSettings::toJson(Print &print)
JsonObject& root = jsonBuffer.createObject(); JsonObject& root = jsonBuffer.createObject();
root["enabled"] = enabled(); root["enabled"] = enabled();
root["enabledDuringTimeTrigger"] = enabledDuringTimeTrigger(); root["enabledDuringTimeTrigger"] = enabledDuringTimeTrigger();
root["enabledDuringDay"] = enabledDuringDay();
root["transitionTime"] = transitionTime(); root["transitionTime"] = transitionTime();
root["delay"] = delay(); root["delay"] = delay();
@ -52,6 +53,7 @@ bool MotionTriggerSettings::fromJson(char* data, bool* changed)
enabled(root["enabled"]); enabled(root["enabled"]);
enabledDuringTimeTrigger(root["enabledDuringTimeTrigger"]); enabledDuringTimeTrigger(root["enabledDuringTimeTrigger"]);
enabledDuringDay(root["enabledDuringDay"]);
transitionTime(root["transitionTime"]); transitionTime(root["transitionTime"]);
delay(root["delay"]); delay(root["delay"]);

8
src/settings/triggers/motion.h
View File

@ -34,8 +34,9 @@ class MotionTriggerSettings : public AbstractJsonSettings
private: private:
bool mEnabled = false; bool mEnabled = false;
bool mEnabledDuringTimeTrigger = false; bool mEnabledDuringTimeTrigger = false;
uint16_t mTransitionTime = 0; bool mEnabledDuringDay = false;
uint32_t mDelay = 0; uint16_t mTransitionTime = 500;
uint32_t mDelay = 30000;
uint8_t mTriggerCount = 0; uint8_t mTriggerCount = 0;
MotionTrigger* mTriggers = nullptr; MotionTrigger* mTriggers = nullptr;
@ -54,6 +55,9 @@ class MotionTriggerSettings : public AbstractJsonSettings
bool enabledDuringTimeTrigger() { return mEnabledDuringTimeTrigger; } bool enabledDuringTimeTrigger() { return mEnabledDuringTimeTrigger; }
void enabledDuringTimeTrigger(bool value) { mEnabledDuringTimeTrigger = value; } void enabledDuringTimeTrigger(bool value) { mEnabledDuringTimeTrigger = value; }
bool enabledDuringDay() { return mEnabledDuringDay; }
void enabledDuringDay(bool value) { mEnabledDuringDay = value; }
uint16_t transitionTime() { return mTransitionTime; } uint16_t transitionTime() { return mTransitionTime; }
void transitionTime(uint16_t value) { mTransitionTime = value; } void transitionTime(uint16_t value) { mTransitionTime = value; }

1
web/app.js
View File

@ -174,6 +174,7 @@ function startApp()
motion: { motion: {
enabled: false, enabled: false,
enabledDuringTimeTrigger: false, enabledDuringTimeTrigger: false,
enabledDuringDay: false,
transitionTime: null, transitionTime: null,
delay: null, delay: null,
triggers: [] triggers: []

2
web/dist/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

2
web/dist/bundle.js vendored
View File

File diff suppressed because one or more lines are too long

5
web/index.html
View File

@ -178,11 +178,16 @@
<check v-model.boolean="triggers.motion.enabled" :title="$t('triggers.motionEnabled')"></check> <check v-model.boolean="triggers.motion.enabled" :title="$t('triggers.motionEnabled')"></check>
<div v-if="triggers.motion.enabled"> <div v-if="triggers.motion.enabled">
<check v-model.boolean="triggers.motion.enabledDuringDay" :title="$t('triggers.motionEnabledDuringDay')"></check>
<check v-model.boolean="triggers.motion.enabledDuringTimeTrigger" :title="$t('triggers.motionEnabledDuringTimeTrigger')"></check> <check v-model.boolean="triggers.motion.enabledDuringTimeTrigger" :title="$t('triggers.motionEnabledDuringTimeTrigger')"></check>
<label for="motionTransitionTime">{{ $t('triggers.motionTransitionTime') }}</label> <label for="motionTransitionTime">{{ $t('triggers.motionTransitionTime') }}</label>
<input type="number" id="motionTransitionTime" v-model.number="triggers.motion.transitionTime"> <input type="number" id="motionTransitionTime" v-model.number="triggers.motion.transitionTime">
<label for="motionDelay">{{ $t('triggers.motionDelay') }}</label>
<input type="number" id="motionDelay" v-model.number="triggers.motion.delay">
<h4>Regels</h4> <h4>Regels</h4>
<div v-if="triggers.motion.triggers.length"> <div v-if="triggers.motion.triggers.length">
<div v-for="(trigger, index) in triggers.motion.triggers" class="panel" :class="{ active: trigger.enabled }"> <div v-for="(trigger, index) in triggers.motion.triggers" class="panel" :class="{ active: trigger.enabled }">

6
web/lang.js
View File

@ -68,7 +68,9 @@ var messages = {
motionEnabled: 'Enable motion triggers', motionEnabled: 'Enable motion triggers',
motionEnabledDuringTimeTrigger: 'Activate even if a time trigger is already active', motionEnabledDuringTimeTrigger: 'Activate even if a time trigger is already active',
motionEnabledDuringDay: 'Activate during the day (between sunrise and sunset)',
motionTransitionTime: 'Transition time in milliseconds', motionTransitionTime: 'Transition time in milliseconds',
motionDelay: 'Keep on time in milliseconds',
motionTriggerEnabled: 'Enabled', motionTriggerEnabled: 'Enabled',
motionAdd: 'Add', motionAdd: 'Add',
@ -188,7 +190,7 @@ var messages = {
loading: 'Een ogenblik geduld, bezig met laden van configuratie...', loading: 'Een ogenblik geduld, bezig met laden van configuratie...',
rebootPending: 'Het systeem wordt opnieuw opgestart, ververse deze pagina nadien', rebootPending: 'Het systeem wordt opnieuw opgestart, ververse deze pagina nadien',
applyButton: 'Toepassen', applyButton: 'Opslaan',
applyButtonSaving: 'Bezig met opslaan...', applyButtonSaving: 'Bezig met opslaan...',
deviceTime: 'Tijd: ', deviceTime: 'Tijd: ',
@ -249,7 +251,9 @@ var messages = {
motionEnabled: 'Beweging triggers inschakelen', motionEnabled: 'Beweging triggers inschakelen',
motionEnabledDuringTimeTrigger: 'Ook inschakelen als er al een tijd trigger actief is', motionEnabledDuringTimeTrigger: 'Ook inschakelen als er al een tijd trigger actief is',
motionEnabledDuringDay: 'Ook overdag inschakelen (tussen zonsopgang en zonsondergang)',
motionTransitionTime: 'Transitie tijd in milliseconden', motionTransitionTime: 'Transitie tijd in milliseconden',
motionDelay: 'Tijd aan in milliseconden',
motionTriggerEnabled: 'Actief', motionTriggerEnabled: 'Actief',
motionAdd: 'Toevoegen', motionAdd: 'Toevoegen',

4
web/site.scss
View File

@ -479,6 +479,7 @@ label
{ {
clear: both; clear: both;
text-align: center; text-align: center;
margin-top: 1rem;
} }
@ -588,12 +589,9 @@ label
color: $panelHeaderTextColor; color: $panelHeaderTextColor;
.actions .actions
{
@media #{$mediumScreen}
{ {
float: right; float: right;
} }
}
a, .label a, .label
{ {