From 14d820a7e57136e7582c53fc7a3d0e090da009a9 Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Sun, 29 Apr 2018 11:01:43 +0200 Subject: [PATCH] Fixed #27 DST not taken into account Fixed issues with #26 Setting for motion triggers only during an active time trigger --- src/assets/css.h | 189 ++++++++--------- src/assets/html.h | 351 ++++++++++++++++--------------- src/assets/version.h | 4 +- src/main.debug.h | 3 + src/main.triggers.h | 12 +- src/settings/triggers/motion.cpp | 1 + web/dist/bundle.css | 2 +- web/index.html | 4 +- web/site.scss | 5 + 9 files changed, 295 insertions(+), 276 deletions(-) diff --git a/src/assets/css.h b/src/assets/css.h index 03a19aa..5e17de4 100644 --- a/src/assets/css.h +++ b/src/assets/css.h @@ -7,99 +7,100 @@ const uint8_t EmbeddedBundleCSS[] PROGMEM = { 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xad,0x59,0xdd,0x6e,0xa3,0x38,0x14,0x7e,0x95,0x48, 0xd5,0x48,0xd3,0x15,0x20,0x92,0x94,0xb4,0x05,0xcd,0x6a,0x57,0xfb,0x06,0x7b,0xb1,0x37,0xa3,0x5e,0x18, 0x30,0xc1,0x2a,0xc1,0xc8,0x76,0x9a,0xb6,0x88,0x77,0xdf,0x63,0x1b,0x13,0x1b,0x9c,0x4c,0x66,0x34,0x42, - 0x6d,0x82,0x7d,0x7c,0xfe,0x7c,0x7e,0x3e,0x3b,0xb5,0x38,0x34,0x7d,0x4e,0xdf,0x43,0x4e,0x3e,0x49,0xbb, - 0x4f,0x73,0xca,0x4a,0xcc,0x42,0x18,0xc9,0x2a,0xda,0x0a,0x39,0x8c,0xd3,0xdd,0x26,0x4a,0xbe,0x0c,0x7f, - 0x04,0x29,0xaa,0x04,0x66,0x41,0x9a,0xe3,0x8a,0x32,0x6c,0x2f,0x23,0x6d,0x8d,0x19,0x11,0x43,0x4e,0xcb, - 0x8f,0x3e,0x47,0xc5,0xeb,0x9e,0xd1,0x63,0x5b,0x86,0x05,0x6d,0x28,0x4b,0xef,0xe2,0x38,0xce,0xc6,0xaf, - 0x55,0x55,0x69,0xce,0x15,0x3a,0x90,0xe6,0x23,0xfd,0x0f,0xb3,0x12,0xb5,0x28,0xf8,0x9b,0x11,0xd4,0x04, - 0x1c,0xb5,0x3c,0xe4,0xc0,0xaa,0xb2,0xc4,0xaf,0xa3,0x2d,0x3e,0xe8,0xf7,0x13,0x26,0xfb,0x5a,0xa4,0x5b, - 0xe0,0xd7,0x60,0x01,0xca,0x84,0xbc,0x43,0x85,0xd4,0x20,0x8a,0xd7,0x40,0xd4,0x90,0x16,0x87,0xb5,0x26, - 0x82,0x65,0x59,0x87,0xca,0x12,0x66,0xc1,0x1e,0x21,0xe8,0x21,0xdd,0x32,0x7c,0x18,0xfe,0x3a,0xe0,0x92, - 0xa0,0x15,0x2f,0x18,0xc6,0xed,0x0a,0xb5,0xe5,0xea,0xeb,0x81,0xb4,0xe1,0x89,0x94,0xa2,0x4e,0x1f,0x77, - 0x4f,0xdd,0xfb,0x7d,0xaf,0xec,0x30,0x8b,0x05,0xed,0xf4,0xca,0x01,0xf5,0x02,0xbf,0x8b,0xb0,0xc4,0x05, - 0x65,0x48,0x10,0xda,0xa6,0x2d,0x6d,0xf1,0xf0,0xfd,0x2d,0x2c,0x1a,0x8a,0x5e,0x5f,0xfa,0x92,0xf0,0xae, - 0x41,0x1f,0x7a,0xf8,0xae,0x00,0x95,0x11,0x68,0xc4,0x2c,0x97,0xa4,0x77,0x9b,0x58,0x3e,0xd9,0x01,0xb1, - 0x3d,0x88,0x95,0xcc,0x37,0xc0,0xdc,0xa8,0x9a,0xae,0xe5,0x8b,0x72,0x6d,0x8d,0x4a,0x7a,0x4a,0xe3,0x55, - 0xbc,0x4a,0xe2,0xee,0x7d,0x75,0x57,0x15,0xd5,0xae,0xa8,0x32,0xbd,0x45,0x29,0xa7,0x0d,0x29,0x57,0x6b, - 0x39,0x01,0xee,0xbd,0xc9,0x2a,0x4b,0x21,0x6b,0xdc,0x68,0xd2,0xe0,0x4a,0xa4,0xe8,0x28,0xa8,0x19,0x60, - 0xca,0x8d,0x72,0x64,0x18,0xa2,0x1a,0x23,0x90,0xda,0x77,0x94,0x13,0x65,0x38,0xc3,0x0d,0x78,0xe0,0x0d, - 0x9b,0x99,0x15,0x39,0xec,0xfb,0x0a,0xbc,0x20,0x52,0xc9,0xc8,0xe5,0xb1,0xbe,0xe4,0x77,0xf4,0x3e,0x69, - 0xf8,0x28,0x35,0x34,0xcc,0xa2,0x13,0xa9,0x08,0x17,0x48,0x1c,0x79,0x5f,0x34,0x18,0x31,0x08,0x4c,0x51, - 0xdb,0x3e,0xd3,0x1b,0x72,0x8b,0xd5,0x3e,0x9e,0x93,0x19,0x28,0x07,0x3f,0x1e,0x05,0xce,0xb4,0xa2,0x71, - 0x26,0x79,0xc7,0x93,0xbd,0xf6,0xa2,0x55,0x44,0xda,0x92,0x14,0x48,0x50,0x36,0xed,0x33,0x69,0x55,0xc4, - 0xe5,0x0d,0x2d,0x5e,0x33,0x2d,0x55,0xed,0x9f,0x09,0x41,0xbd,0x97,0x2a,0xa5,0x18,0x2a,0xc9,0x91,0xa7, - 0x49,0xfc,0xc5,0xf5,0x4d,0x94,0x48,0x4b,0xae,0xcb,0xfb,0x5e,0x22,0x81,0x42,0x3d,0xfc,0x0d,0x36,0xb1, - 0xc5,0x85,0xc0,0xe5,0x8b,0x27,0xd3,0xb6,0xcf,0xbb,0x9f,0xe1,0x05,0x76,0xd8,0xec,0xe6,0x91,0xb5,0x67, - 0xf8,0xe3,0x17,0x54,0x83,0x30,0xf6,0xe9,0x56,0x3d,0x6f,0x7f,0x86,0x19,0x66,0x8c,0x32,0x1f,0x9f,0x02, - 0xc2,0x3d,0xca,0x8f,0x90,0xd1,0x6d,0x10,0x15,0x35,0x2e,0x5e,0x57,0x91,0x8c,0x6c,0x46,0x9b,0x20,0x6a, - 0xa9,0x00,0xce,0x85,0xca,0xce,0x20,0xea,0x50,0x8b,0x9b,0x95,0xfe,0x08,0x65,0x52,0xcf,0x86,0xb4,0x36, - 0x41,0x24,0x37,0x87,0x5a,0x5c,0x4e,0x88,0xb5,0x60,0x45,0x30,0x4a,0xa9,0xb7,0x01,0x69,0xbb,0xa3,0xf8, - 0x2e,0x3e,0x3a,0xfc,0x8d,0x1f,0xf3,0x03,0x11,0x2f,0x01,0xc7,0x0d,0x18,0x6b,0xbc,0x26,0xfd,0xa5,0x3d, - 0x77,0xb7,0x5e,0xaf,0x67,0xbb,0xbe,0x85,0x34,0xb3,0x72,0x9a,0xb4,0x1c,0x0b,0xc8,0x6b,0xb9,0x86,0xed, - 0x73,0xf4,0x75,0x93,0x24,0x81,0xf9,0x8b,0xd6,0xf7,0x81,0x21,0x08,0x25,0xc5,0xd6,0x50,0xc5,0x81,0x7c, - 0xa2,0xed,0x79,0x3e,0xbe,0xc8,0x24,0x7e,0xba,0x0f,0xf4,0xdc,0x66,0xb6,0x7c,0x9d,0xdc,0x1b,0xf7,0x45, - 0xa8,0x90,0x39,0x1c,0x8c,0xaf,0xe9,0xf8,0xea,0x4e,0xba,0x73,0x96,0x1f,0xda,0xe3,0x21,0xc7,0xec,0xc5, - 0x1e,0xea,0x10,0xe7,0x27,0xb0,0xfc,0xc5,0xe3,0xaf,0x68,0xc9,0x61,0x9c,0xf1,0xf0,0x96,0x75,0xf6,0x25, - 0x90,0xff,0x11,0xc3,0xe8,0xba,0x8f,0xcf,0x4d,0x46,0x0d,0x9b,0x39,0xaf,0xb7,0xe7,0xce,0xd8,0x24,0xc6, - 0x4d,0x5e,0x17,0x0e,0x63,0x00,0x28,0xcd,0xfa,0x5b,0xfa,0xd6,0xa0,0x49,0xa1,0x53,0xe5,0xaf,0x44,0x84, - 0xa8,0xeb,0xa0,0x7a,0xa1,0xb6,0xc0,0xaa,0x27,0x64,0xe1,0x81,0x7e,0x2e,0x06,0x67,0xef,0x53,0x70,0xdb, - 0xc2,0x1d,0x87,0xf9,0xeb,0x8f,0xe9,0x20,0x60,0x0f,0x98,0x69,0x1a,0x6e,0x59,0x96,0x99,0xdd,0x7e,0x1e, - 0x62,0xf9,0x64,0xc5,0x91,0x71,0x98,0xee,0x28,0x69,0xa1,0x8d,0x3a,0x8d,0x53,0x95,0x56,0x13,0x21,0x15, - 0x2d,0x8e,0x7c,0x0a,0x10,0xf7,0xad,0xa6,0x6f,0x90,0x3c,0x0e,0xa1,0x43,0xe7,0x90,0x79,0x02,0x42,0x53, - 0x79,0xe2,0xe1,0xe2,0x84,0x62,0xd5,0x5f,0xb0,0x2c,0x89,0xe5,0x93,0xd1,0xa3,0x90,0xd6,0xa4,0xf1,0xef, - 0x89,0xf2,0x5b,0xa3,0xd7,0x68,0x55,0x14,0x85,0xa3,0xd5,0xe6,0x49,0x3e,0x46,0x97,0xb0,0x63,0x04,0xca, - 0xff,0x87,0x6f,0x53,0x9d,0x55,0x9b,0x5d,0x82,0xd6,0xf3,0x55,0xee,0x6e,0x98,0xd1,0xd4,0x3f,0xfa,0xdb, - 0xdd,0xee,0xe8,0xb7,0x7b,0xdc,0xe4,0xbb,0x01,0x8d,0x42,0xfd,0xb8,0x28,0x6a,0xd1,0x1b,0xd9,0xab,0x81, - 0x6b,0x5d,0x3c,0x12,0xd0,0x85,0xff,0x34,0x9c,0x6c,0x34,0x22,0xcb,0xdf,0xac,0x92,0xc6,0x2e,0x79,0x5a, - 0x11,0xc6,0x45,0x58,0xd4,0xa4,0x29,0x9d,0xa5,0xf1,0xb2,0x02,0xab,0x6a,0x09,0x9f,0x33,0x0e,0x0d,0x9a, - 0x18,0xcc,0x44,0xa9,0xca,0xab,0x16,0xce,0x85,0x4a,0x47,0x2d,0xb1,0x50,0xf6,0x19,0x42,0x2b,0xc3,0xef, - 0x29,0x6c,0x1c,0x38,0x8c,0x2b,0xbb,0x55,0x54,0xc8,0x46,0x6a,0x21,0xda,0xa7,0x4e,0x64,0xca,0x63,0xa8, - 0x21,0xfb,0x36,0x2d,0xb0,0xca,0xc1,0x19,0x22,0x1c,0x9c,0x5e,0xf6,0xcf,0x04,0xdd,0x26,0xb1,0x15,0x79, - 0xc7,0x65,0x36,0x01,0x48,0x23,0x7c,0xb7,0xdb,0xdd,0x86,0x8b,0xfc,0xec,0x35,0x4d,0xa2,0x4a,0x88,0xf2, - 0x24,0x20,0x96,0xc1,0xd5,0xc5,0x8d,0x84,0xe7,0x47,0x94,0x3f,0xcd,0x11,0xeb,0x3a,0x1e,0x81,0xa9,0x8d, - 0xfb,0x67,0x35,0xc7,0xd4,0xab,0x28,0x01,0xed,0x47,0xe3,0x47,0xa0,0xae,0x11,0xf1,0x02,0x6b,0xfe,0xb4, - 0x59,0xbd,0x0e,0xa3,0xa5,0x09,0xab,0xe8,0x80,0x39,0x47,0x7b,0xdc,0x9f,0x6a,0x22,0xb0,0x3a,0x46,0xe0, - 0xb4,0x63,0xd8,0x25,0x8b,0x14,0x08,0x71,0xec,0x7d,0x7e,0xdc,0xa2,0x2d,0xe4,0xb3,0x02,0x1e,0x23,0x72, - 0xf0,0xd7,0xe3,0x99,0xb9,0x47,0x2e,0x8f,0x2b,0x0a,0x33,0xe8,0xb2,0x6f,0x4b,0x6e,0xe9,0x89,0xa1,0xce, - 0x0e,0x01,0x8f,0x57,0xe4,0xd0,0xb0,0x40,0x3c,0x2e,0x76,0xe9,0x3d,0xb5,0xfe,0x1a,0x5a,0xdd,0xc1,0x36, - 0x1b,0xb4,0x2a,0xbf,0x7b,0x00,0xfe,0x28,0xb0,0x41,0x39,0x3e,0x8b,0x53,0x6f,0x7e,0xbb,0xed,0x34,0x54, - 0x56,0x40,0x2e,0x08,0x70,0x68,0x33,0x86,0x3b,0x58,0x37,0x32,0xd5,0xff,0x71,0x39,0xb7,0x66,0x31,0xee, - 0x58,0xb5,0x8b,0xe5,0x63,0x58,0x80,0x0a,0x28,0x6f,0x70,0x69,0x96,0x9a,0xf7,0x7e,0x74,0x3f,0x6c,0x27, - 0xc8,0x6d,0xe8,0x09,0x97,0xc3,0x02,0xe7,0xb9,0xef,0x12,0x89,0xaa,0xd3,0xda,0x1c,0xb1,0xcf,0x17,0x1a, - 0x42,0xeb,0x78,0xbb,0x3c,0x51,0xc8,0x4d,0x7c,0x30,0x49,0x24,0xbf,0x68,0x8f,0x5b,0x0e,0xdf,0xc9,0x5a, - 0xe4,0x37,0x78,0x52,0xc5,0xb2,0x5b,0x75,0x16,0x3b,0xcd,0xd6,0x33,0x30,0x23,0x81,0x9d,0x1b,0x1d,0x86, - 0x8d,0x5f,0xbb,0xe4,0xaa,0x76,0xaa,0x52,0xfa,0xb7,0xc9,0x75,0xd4,0x78,0x60,0x58,0x02,0xa8,0xa7,0x7b, - 0x53,0x84,0x35,0x73,0x59,0x18,0x36,0x1a,0x84,0x65,0x02,0xf0,0x0e,0xaf,0x28,0x3b,0xa4,0x8c,0x02,0xde, - 0xc7,0x5f,0xc3,0x87,0xa4,0xc4,0xfb,0x7b,0xdb,0x42,0x85,0x7e,0x63,0x17,0xaf,0x39,0x70,0xcd,0xb2,0x5b, - 0xb2,0x0a,0x4d,0xb4,0x58,0x69,0xb4,0x86,0x94,0xf9,0x05,0xcc,0x3a,0xc7,0x9f,0x1e,0x00,0x75,0xae,0x6b, - 0x4e,0x21,0x1b,0xf3,0x2a,0x86,0xa8,0x31,0x07,0x84,0xab,0x8b,0x6f,0xba,0x0c,0xb1,0x25,0xd8,0xe6,0x80, - 0x13,0xf7,0xf8,0xc5,0xb1,0x97,0x2d,0xca,0x86,0x3a,0x7d,0xd7,0xeb,0xfe,0xdc,0x7f,0x36,0x67,0x22,0x68, - 0xa8,0xf5,0x66,0x0c,0x64,0x4e,0x1a,0x48,0x55,0xe7,0xe6,0x65,0x46,0xb9,0xb5,0xfb,0xd9,0x12,0xe5,0x2c, - 0x97,0x9e,0x15,0x57,0x4a,0x3c,0xf4,0x36,0xc5,0x03,0x9b,0xac,0x31,0x59,0xfb,0xe2,0x49,0xdb,0xec,0x92, - 0xcc,0x9d,0x7c,0x06,0xb7,0x12,0x39,0x25,0xe8,0x6a,0x1d,0x55,0xeb,0x42,0x5d,0xb9,0x7a,0xe7,0x48,0xbe, - 0xb9,0xf5,0x9a,0x28,0xaa,0x29,0x23,0x9f,0xb2,0x75,0x36,0x16,0xc0,0x19,0xac,0xe1,0xd5,0xe5,0x3a,0xe9, - 0x90,0x79,0x42,0xf4,0xc2,0xf4,0x39,0x5c,0x2f,0x10,0xe8,0xd0,0xb5,0x27,0xa7,0x30,0xf6,0x96,0x6b,0x7d, - 0x69,0xa3,0x2c,0x1f,0x83,0x57,0x55,0xbc,0xf3,0x7a,0x7d,0xed,0x67,0x1b,0x08,0xb3,0xd0,0xd3,0x66,0x3e, - 0x77,0xe1,0x8d,0xb5,0x67,0xb3,0x68,0x1c,0x2f,0x3c,0x40,0xaa,0x8c,0x8c,0x7e,0x86,0x06,0x97,0xb8,0x68, - 0x88,0x00,0x86,0xd2,0x4e,0x96,0x2f,0xee,0x40,0xbc,0xc4,0x3a,0xa7,0x38,0xd7,0x44,0x57,0xa1,0x95,0xca, - 0x86,0x88,0x43,0xc5,0x02,0x84,0xd6,0x2f,0x30,0x17,0x17,0xb8,0x73,0xa4,0x6c,0xad,0x84,0x62,0xd3,0xf9, - 0xc8,0xd7,0x27,0xe5,0xd2,0xd5,0xc8,0xf9,0x7c,0xd3,0xe6,0x2c,0x7d,0x30,0x22,0x56,0xd1,0x1b,0x6a,0x8e, - 0xf8,0x07,0x17,0x51,0x91,0xca,0xe6,0xb3,0x2b,0x87,0x4b,0xdc,0xe7,0x86,0x5d,0x3c,0x7f,0x9e,0xab,0x93, - 0x29,0xf3,0x6a,0x3b,0x66,0x60,0x19,0x8e,0xc5,0x6a,0x70,0x59,0xb8,0xac,0xc3,0x95,0x96,0x94,0xa6,0x46, - 0x94,0x7e,0x0f,0x45,0x0d,0xf1,0x7b,0x51,0xbe,0x5f,0x9f,0x8d,0x75,0x67,0xb6,0xf1,0xdf,0x99,0xd9,0xba, - 0x8c,0x17,0xa1,0x2e,0xbe,0xb2,0x14,0x92,0x67,0x6c,0x55,0x19,0x47,0x65,0x7e,0xa7,0x90,0xf1,0x66,0xc8, - 0x03,0x09,0x7f,0x88,0x67,0x17,0x7b,0xd5,0x52,0x79,0xdf,0x65,0x97,0x54,0x4f,0xf0,0xab,0xb8,0x76,0xaa, - 0x8b,0xba,0xba,0xea,0x7d,0x80,0xd9,0x5c,0x00,0x0c,0xbe,0x5b,0xae,0x7e,0x79,0x20,0x1a,0x0f,0x45,0xd9, - 0x74,0xeb,0x2f,0x79,0x99,0x66,0xed,0xda,0x73,0xb5,0x89,0x79,0xe5,0x8d,0xa5,0xcf,0x2a,0xf8,0xd2,0x66, - 0x1f,0xa1,0x3a,0x5b,0xcb,0x1c,0xb6,0x4a,0xd1,0x05,0xca,0x11,0x84,0xfa,0xe6,0x8c,0x23,0x3d,0x0a,0xe9, - 0x9f,0x25,0x66,0x87,0xbb,0xe9,0x78,0xe7,0xd8,0xb6,0x8d,0xe5,0x33,0xd9,0xae,0x8b,0x82,0xe2,0x32,0xde, - 0x00,0xcc,0x9d,0x6a,0xaf,0xcd,0x1f,0x50,0xf2,0xe4,0xf8,0x65,0x6c,0x2f,0x57,0x10,0xb8,0xba,0x5f,0x8f, - 0x4e,0x18,0xbf,0x96,0xe8,0x83,0x2f,0x13,0xda,0xcc,0x18,0xc8,0xad,0x57,0x3d,0xc9,0xa9,0x0a,0x34,0x08, - 0x55,0x98,0x84,0xe6,0x8a,0x43,0x0d,0x41,0xac,0xbc,0xe1,0x71,0xa8,0x57,0x40,0x4b,0xd7,0x18,0x2a,0x7f, - 0x2b,0x11,0x1f,0xab,0x28,0xe1,0xf6,0x62,0x67,0x95,0xa0,0xfd,0x48,0x26,0xc3,0x48,0x65,0x91,0x13,0x7c, - 0x6a,0x04,0xaa,0x1c,0x34,0x14,0xe1,0x39,0x01,0x5f,0x31,0xf4,0xe1,0xf9,0x8b,0xbb,0xfc,0x96,0x5a,0xe9, - 0xd2,0xdf,0x52,0x33,0x75,0x7f,0x71,0x8a,0xe6,0xc8,0x04,0xb7,0xe5,0xad,0x1a,0x5f,0xe8,0x89,0x67,0x46, - 0x17,0x75,0xd7,0x78,0xda,0x52,0x5d,0x11,0x5f,0x52,0x7c,0xbc,0xaa,0xb8,0xa6,0xf7,0xb2,0xfb,0x46,0x0c, - 0x73,0x2c,0xfe,0xc5,0x88,0xcf,0xae,0x4b,0x36,0x20,0xf6,0x7f,0x06,0x43,0x57,0xc1,0xd1,0x1b,0x00,0x00}; + 0x6d,0x82,0xed,0xf3,0xeb,0xf3,0xf3,0xd9,0xa9,0xc5,0xa1,0xe9,0x73,0xfa,0x1e,0x72,0xf2,0x49,0xda,0x7d, + 0x9a,0x53,0x56,0x62,0x16,0xc2,0x48,0x56,0xd1,0x56,0xc8,0x61,0x9c,0xee,0x36,0x51,0xf2,0x65,0xf8,0x23, + 0x48,0x51,0x25,0x30,0x0b,0xd2,0x1c,0x57,0x94,0x61,0x9b,0x8c,0xb4,0x35,0x66,0x44,0x0c,0x39,0x2d,0x3f, + 0xfa,0x1c,0x15,0xaf,0x7b,0x46,0x8f,0x6d,0x19,0x16,0xb4,0xa1,0x2c,0xbd,0x8b,0xe3,0x38,0x1b,0xbf,0x56, + 0x55,0xa5,0x39,0x57,0xe8,0x40,0x9a,0x8f,0xf4,0x3f,0xcc,0x4a,0xd4,0xa2,0xe0,0x6f,0x46,0x50,0x13,0x70, + 0xd4,0xf2,0x90,0x03,0xab,0xca,0x12,0xbf,0x8e,0xb6,0xf8,0xa0,0xdf,0x4f,0x98,0xec,0x6b,0x91,0x6e,0x81, + 0x5f,0x83,0x05,0x28,0x13,0xf2,0x0e,0x15,0x52,0x83,0x28,0x5e,0xc3,0xa2,0x86,0xb4,0x38,0xac,0xf5,0x22, + 0x20,0xcb,0x3a,0x54,0x96,0x30,0x0b,0xf6,0x08,0x41,0x0f,0xe9,0x96,0xe1,0xc3,0xf0,0xd7,0x01,0x97,0x04, + 0xad,0x78,0xc1,0x30,0x6e,0x57,0xa8,0x2d,0x57,0x5f,0x0f,0xa4,0x0d,0x4f,0xa4,0x14,0x75,0xfa,0xb8,0x7b, + 0xea,0xde,0xef,0x7b,0x65,0x87,0x21,0x16,0xb4,0xd3,0x94,0x03,0xea,0x05,0x7e,0x17,0x61,0x89,0x0b,0xca, + 0x90,0x20,0xb4,0x4d,0x5b,0xda,0xe2,0xe1,0xfb,0x5b,0x58,0x34,0x14,0xbd,0xbe,0xf4,0x25,0xe1,0x5d,0x83, + 0x3e,0xf4,0xf0,0x5d,0x01,0x2a,0x23,0xd0,0x88,0x59,0x2e,0x49,0xef,0x36,0xb1,0x7c,0xb2,0x03,0x62,0x7b, + 0x10,0x2b,0x99,0x6f,0x80,0xb9,0x51,0x35,0x5d,0xcb,0x17,0xe5,0xda,0x1a,0x95,0xf4,0x94,0xc6,0xab,0x78, + 0x95,0xc4,0xdd,0xfb,0xea,0xae,0x2a,0xaa,0x5d,0x51,0x65,0x7a,0x8b,0x52,0x4e,0x1b,0x52,0xae,0xd6,0x72, + 0x02,0xdc,0x7b,0x93,0x55,0x96,0x42,0xd6,0xb8,0xd1,0xa4,0xc1,0x95,0x48,0xd1,0x51,0x50,0x33,0xc0,0x94, + 0x1b,0xe5,0xc8,0x30,0x44,0x35,0x46,0x20,0xb5,0xef,0x28,0x27,0xca,0x70,0x86,0x1b,0xf0,0xc0,0x1b,0x36, + 0x33,0x2b,0x72,0xd8,0xf7,0x15,0x78,0x41,0xa4,0x92,0x91,0xcb,0x63,0x7d,0xc9,0xef,0xe8,0x7d,0xd2,0xf0, + 0x51,0x6a,0x68,0x98,0x45,0x27,0x52,0x11,0x2e,0x90,0x38,0xf2,0xbe,0x68,0x30,0x62,0x10,0x98,0xa2,0xb6, + 0x7d,0xa6,0x37,0xe4,0x16,0xab,0x7d,0x3c,0x27,0x33,0x50,0x0e,0x7e,0x3c,0x0a,0x9c,0x69,0x45,0xe3,0x4c, + 0xf2,0x8e,0x27,0x7b,0x6d,0xa2,0x55,0x44,0xda,0x92,0x14,0x48,0x50,0x36,0xed,0x33,0x69,0x55,0xc4,0xe5, + 0x0d,0x2d,0x5e,0x33,0x2d,0x55,0xed,0x9f,0x09,0x41,0xbd,0x97,0x2a,0xa5,0x18,0x2a,0xc9,0x91,0xa7,0x49, + 0xfc,0xc5,0xf5,0x4d,0x94,0x48,0x4b,0xae,0xcb,0xfb,0x5e,0x22,0x81,0x42,0x3d,0xfc,0x0d,0x36,0xb1,0xc5, + 0x85,0xc0,0xe5,0x8b,0x27,0xd3,0xb6,0xcf,0xbb,0x9f,0xe1,0x05,0x76,0xd8,0xec,0xe6,0x91,0xb5,0x67,0xf8, + 0xe3,0x17,0x54,0x83,0x30,0xf6,0xe9,0x56,0x3d,0x6f,0x7f,0x86,0x19,0x66,0x8c,0x32,0x1f,0x9f,0x02,0xc2, + 0x3d,0xca,0x8f,0x90,0xd1,0x6d,0x10,0x15,0x35,0x2e,0x5e,0x57,0x91,0x8c,0x6c,0x46,0x9b,0x20,0x6a,0xa9, + 0x00,0xce,0x85,0xca,0xce,0x20,0xea,0x50,0x8b,0x9b,0x95,0xfe,0x08,0x65,0x52,0xcf,0x86,0xb4,0x36,0x41, + 0x24,0x37,0x87,0x5a,0x5c,0x4e,0x88,0xb5,0x60,0x45,0x30,0x4a,0xa9,0xb7,0x01,0x69,0xbb,0xa3,0xf8,0x2e, + 0x3e,0x3a,0xfc,0x8d,0x1f,0xf3,0x03,0x11,0x2f,0x01,0xc7,0x0d,0x18,0x6b,0xbc,0x26,0xfd,0xa5,0x3d,0x77, + 0xb7,0x5e,0xaf,0x67,0xbb,0xbe,0x85,0x34,0xb3,0x72,0x9a,0xb4,0x1c,0x0b,0xc8,0x6b,0x49,0xc3,0xf6,0x39, + 0xfa,0xba,0x49,0x92,0xc0,0xfc,0x45,0xeb,0xfb,0xc0,0x2c,0x08,0xe5,0x8a,0xad,0x59,0x15,0x07,0xf2,0x89, + 0xb6,0xe7,0xf9,0xf8,0x22,0x93,0xf8,0xe9,0x3e,0xd0,0x73,0x9b,0x19,0xf9,0x3a,0xb9,0x37,0xee,0x8b,0x50, + 0x21,0x73,0x38,0x18,0x5f,0xd3,0xf1,0xd5,0x9d,0x74,0xe7,0x2c,0x3f,0xb4,0xc7,0x43,0x8e,0xd9,0x8b,0x3d, + 0xd4,0x21,0xce,0x4f,0x60,0xf9,0x8b,0xc7,0x5f,0xd1,0x92,0xc3,0x38,0xe3,0xe1,0x2d,0xeb,0xec,0x4b,0x20, + 0xff,0x23,0x86,0xd1,0x75,0x1f,0x9f,0x9b,0x8c,0x1a,0x36,0x73,0x5e,0x6f,0xcf,0x9d,0xb1,0x49,0x8c,0x9b, + 0xbc,0x2e,0x1c,0xc6,0x00,0x50,0x9a,0xf5,0xb7,0xf4,0xad,0x41,0x2f,0x85,0x4e,0x95,0xbf,0x12,0x11,0xa2, + 0xae,0x83,0xea,0x85,0xda,0x02,0xab,0x9e,0x90,0x85,0x07,0xfa,0xb9,0x18,0x9c,0xbd,0x4f,0xc1,0x6d,0x0b, + 0x77,0x1c,0xe6,0xaf,0x3f,0xa6,0x83,0x80,0x3d,0x60,0xa6,0x69,0xb8,0x65,0x59,0x66,0x76,0xfb,0x79,0x88, + 0xe5,0x93,0x15,0x47,0xc6,0x61,0xba,0xa3,0xa4,0x85,0x36,0xea,0x34,0x4e,0x55,0x5a,0x4d,0x84,0x54,0xb4, + 0x38,0xf2,0x29,0x40,0xdc,0xb7,0x9a,0xbe,0x41,0xf2,0x38,0x0b,0x9d,0x75,0xce,0x32,0x4f,0x40,0xe8,0x55, + 0x9e,0x78,0xb8,0x38,0xa1,0x58,0xf5,0x17,0x2c,0x4b,0x62,0xf9,0x64,0xf4,0x28,0xa4,0x35,0x69,0xfc,0x7b, + 0xa2,0xfc,0xd6,0xe8,0x35,0x5a,0x15,0x45,0xe1,0x68,0xb5,0x79,0x92,0x8f,0xd1,0x25,0xec,0x18,0x81,0xf2, + 0xff,0xe1,0xdb,0x54,0x87,0x6a,0xb3,0x4b,0xd0,0x7a,0x4e,0xe5,0xee,0x86,0x19,0x4d,0xfd,0xa3,0xbf,0xdd, + 0xed,0x8e,0x7e,0xbb,0xc7,0x4d,0xbe,0x1b,0xd0,0x28,0xd4,0x8f,0x8b,0xa2,0x16,0xbd,0x91,0xbd,0x1a,0xb8, + 0xd6,0xc5,0x23,0x01,0x5d,0xf8,0x4f,0xc3,0xc9,0x46,0x23,0xb2,0xfc,0xcd,0x2a,0x69,0xec,0x2e,0x4f,0x2b, + 0xc2,0xb8,0x08,0x8b,0x9a,0x34,0xa5,0x43,0x1a,0x2f,0x2b,0xb0,0xaa,0x96,0xf0,0x39,0xe3,0xd0,0xa0,0x89, + 0xc1,0x4c,0x94,0xaa,0xbc,0x8a,0x70,0x2e,0x54,0x3a,0x6a,0x89,0x85,0xb2,0xcf,0x10,0x5a,0x19,0x7e,0x4f, + 0x61,0xe3,0xc0,0x61,0x5c,0xd9,0xad,0xa2,0x42,0x36,0x52,0x0b,0xd1,0x3e,0x75,0x22,0x53,0x1e,0x43,0x0d, + 0xd9,0xb7,0x69,0x81,0x55,0x0e,0xce,0x10,0xe1,0xe0,0xf4,0xb2,0x7f,0x26,0xe8,0x36,0x89,0xad,0xc8,0x3b, + 0x2e,0xb3,0x09,0x40,0x1a,0xe1,0xbb,0xdd,0xee,0x36,0x5c,0xe4,0x67,0xaf,0xd7,0x24,0xaa,0x84,0x28,0x4f, + 0x02,0x62,0x19,0x5c,0x5d,0xdc,0x48,0x78,0x7e,0x44,0xf9,0xd3,0x1c,0xb1,0xae,0xe3,0x11,0x98,0xda,0xb8, + 0x7f,0x56,0x73,0x4c,0xbd,0x8a,0x12,0xd0,0x7e,0x34,0x7e,0x04,0xea,0x1a,0x11,0x2f,0xb0,0xe6,0x4f,0x9b, + 0xd5,0xeb,0x30,0x5a,0x9a,0xb0,0x8a,0x0e,0x98,0x73,0xb4,0xc7,0xfd,0xa9,0x26,0x02,0xab,0x63,0x04,0x4e, + 0x3b,0x86,0xdd,0x65,0x91,0x02,0x21,0x8e,0xbd,0xcf,0x8f,0x5b,0xb4,0x85,0x7c,0x56,0xc0,0x63,0x44,0x0e, + 0xfe,0x7a,0x3c,0x33,0xf7,0xc8,0xe5,0x71,0x45,0x61,0x06,0x5d,0xf6,0x6d,0xc9,0x2d,0x3d,0x31,0xd4,0xd9, + 0x21,0xe0,0xf1,0x8a,0x1c,0x1a,0x16,0x88,0xc7,0xc5,0x2e,0xbd,0xa7,0xd6,0x5f,0x43,0xab,0x3b,0xd8,0x66, + 0x83,0x56,0xe5,0x77,0x0f,0xc0,0x1f,0x05,0x36,0x28,0xc7,0x67,0x71,0xea,0xcd,0x6f,0xb7,0x9d,0x86,0xca, + 0x0a,0xc8,0x05,0x01,0x0e,0x6d,0xc6,0x70,0x07,0xeb,0x46,0xa6,0xfa,0x3f,0x2e,0xe7,0xd6,0x2c,0xc6,0x1d, + 0xab,0x76,0xb1,0x7c,0x0c,0x0b,0x50,0x01,0xe5,0x0d,0x2e,0x0d,0xa9,0x79,0xef,0x47,0xf7,0xc3,0x76,0x82, + 0xdc,0x86,0x9e,0x70,0x39,0x27,0x71,0x6d,0x9a,0x0f,0x5b,0xa9,0x3b,0x2c,0x00,0xa2,0xfb,0x2e,0x21,0xac, + 0x3a,0xe6,0xcd,0xa1,0xfe,0x9c,0xd0,0x2c,0xb4,0xce,0xc5,0xcb,0xa3,0x88,0xdc,0xfd,0x07,0x93,0x7d,0xf2, + 0x8b,0xde,0x2a,0x6b,0xa7,0x76,0xb2,0x88,0xf9,0x3d,0x35,0xa9,0x62,0x39,0x4c,0xb5,0x24,0x3b,0x3f,0xd7, + 0x33,0x14,0x24,0x11,0xa1,0x1b,0x56,0x86,0x8d,0x5f,0xbb,0xe4,0xaa,0x76,0xaa,0xc4,0xfa,0xf7,0xd7,0x75, + 0xd4,0x78,0xd2,0x58,0x22,0xaf,0xa7,0x7b,0x53,0xbd,0x35,0x73,0x59,0x51,0x36,0x1a,0xbd,0x65,0x02,0x80, + 0x12,0xaf,0x28,0x3b,0xa4,0x8c,0xc2,0x41,0x01,0x7f,0x0d,0x1f,0x92,0x12,0xef,0xef,0x6d,0x0b,0x15,0x6c, + 0x8e,0x5d,0xa0,0xe7,0xe0,0x3c,0xcb,0x6e,0xc9,0x2a,0x34,0x61,0x66,0xe5,0xdf,0x1a,0x72,0xed,0x17,0xc0, + 0xee,0x1c,0xb8,0x7a,0x90,0xd7,0xb9,0x20,0x3a,0x15,0x70,0x4c,0xc8,0x18,0xa2,0xc6,0x9c,0x2c,0xae,0x12, + 0xdf,0x74,0x8b,0x62,0x4b,0xb0,0xcd,0x01,0x27,0xee,0xf1,0x8b,0x63,0x2f,0x5b,0xd4,0x1b,0x75,0x6c,0xaf, + 0xd7,0xfd,0xb9,0x71,0x6d,0xce,0x8b,0xa0,0x13,0xd7,0x9b,0x31,0x90,0x39,0x69,0x20,0xc7,0x9d,0x2b,0x9b, + 0xd9,0xca,0xad,0xdd,0x08,0x97,0xf0,0x68,0x49,0x7a,0x56,0x5c,0x29,0xf1,0xd0,0xdb,0x2b,0x1e,0xd8,0x64, + 0x8d,0x49,0xda,0x17,0x4f,0xbe,0x67,0x97,0x64,0xee,0xe4,0x33,0xb8,0x25,0xcc,0xa9,0x5d,0x57,0x0b,0xb0, + 0xa2,0x0b,0x75,0xc9,0xeb,0x9d,0xb3,0xfc,0xe6,0xd6,0xfb,0xa5,0xa8,0xa6,0x8c,0x7c,0xca,0x9e,0xdb,0x58, + 0xc8,0x68,0xb0,0x86,0x57,0x97,0x0b,0xac,0xb3,0xcc,0x13,0xa2,0x17,0xa6,0xcf,0xe1,0x7a,0x61,0x81,0x0e, + 0x5d,0x7b,0x72,0x0a,0x63,0x6f,0x9d,0xd7,0xb7,0x3d,0xca,0xf2,0x31,0x78,0x55,0xc5,0x3b,0xd3,0xeb,0xfb, + 0x42,0xdb,0x40,0x98,0x85,0x66,0x38,0xf3,0xb9,0x8b,0x8b,0xac,0x3d,0x9b,0x45,0xe3,0x78,0x53,0x02,0x52, + 0x65,0x64,0xf4,0x33,0x18,0xb9,0x04,0x54,0x43,0x04,0xf8,0x95,0x76,0xb2,0x7c,0x71,0x07,0x1b,0x26,0xd6, + 0x01,0xc7,0xb9,0x5f,0xba,0x8a,0xc9,0x54,0x36,0x44,0x1c,0x2a,0x16,0x40,0xbb,0x7e,0x01,0xd6,0xb8,0xc0, + 0x9d,0x23,0x65,0x6b,0x25,0x14,0x9b,0x0e,0x56,0xbe,0x06,0x2b,0x49,0x57,0x23,0xe7,0xf3,0x15,0x9d,0x43, + 0xfa,0x60,0x44,0xac,0xa2,0x37,0xd4,0x1c,0xf1,0x0f,0x6e,0xb0,0x22,0x95,0xcd,0x76,0x03,0xbb,0xc0,0x7d, + 0x6e,0xd8,0xc5,0x83,0xeb,0xb9,0x3a,0x99,0x32,0xaf,0xb6,0x63,0x86,0xb2,0xe1,0x3c,0xad,0x06,0x97,0x85, + 0xcb,0x3a,0x95,0x69,0x49,0x69,0x6a,0x44,0xe9,0xf7,0x50,0xd4,0x10,0xbf,0x17,0xe5,0xfb,0xf5,0xd9,0x58, + 0x97,0x6d,0x1b,0xff,0x65,0x9b,0xad,0xcb,0x78,0x83,0xea,0x02,0x33,0x4b,0x21,0x79,0x38,0x57,0x95,0x71, + 0x54,0xe6,0x77,0x0a,0x19,0xaf,0x94,0x3c,0x58,0xf2,0x87,0x40,0x78,0xb1,0x57,0x2d,0x95,0x17,0x65,0x76, + 0x49,0xf5,0x04,0xbf,0x8a,0x6b,0xa7,0xba,0xa8,0x3b,0xaf,0xde,0x87,0xb4,0xcd,0xcd,0xc1,0xe0,0xbb,0x1e, + 0xeb,0x97,0x27,0xa9,0xf1,0x34,0x95,0x4d,0x3f,0x17,0x48,0x5e,0xa6,0x59,0xbb,0xf6,0x5c,0x6d,0x62,0x5e, + 0x79,0x63,0xe9,0xb3,0x0a,0xbe,0xb4,0xd9,0xb7,0x50,0x1d,0xca,0x65,0x0e,0x5b,0xa5,0xe8,0xc2,0xca,0x11, + 0xe9,0xf9,0xe6,0x8c,0x23,0x3d,0x0a,0xe9,0xdf,0x33,0x66,0xa7,0xc2,0xe9,0x5c,0xe8,0xd8,0xb6,0x8d,0xe5, + 0x33,0xd9,0xae,0x8b,0x82,0xe2,0x32,0x5e,0x1d,0xcc,0x9d,0x6a,0xd3,0xe6,0x0f,0x28,0x79,0x72,0xfc,0x32, + 0xb6,0x97,0x2b,0xd0,0x5d,0x5d,0xcc,0x47,0x27,0x8c,0x5f,0x4b,0xf4,0xc1,0x97,0x09,0x6d,0x66,0x0c,0x9c, + 0xd5,0x54,0x4f,0x72,0xaa,0x02,0x0d,0x42,0x15,0x26,0xa1,0xb9,0x1b,0x51,0x43,0x10,0x2b,0x6f,0x78,0x1c, + 0xea,0x15,0xd0,0xd2,0x35,0x86,0xca,0x1f,0x59,0xc4,0xc7,0x2a,0x4a,0xb8,0x4d,0xec,0x50,0x09,0xda,0x8f, + 0xcb,0x64,0x18,0xa9,0x2c,0x72,0x82,0x4f,0x8d,0x40,0x95,0x83,0x86,0x22,0x3c,0x47,0xe7,0x2b,0x86,0x3e, + 0x3c,0x7f,0x71,0xc9,0x6f,0xa9,0x95,0xee,0xfa,0x5b,0x6a,0xa6,0xee,0x2f,0x99,0x8b,0xfa,0x15,0x13,0xdc, + 0x96,0xb7,0x6a,0x7c,0xa1,0x27,0x9e,0x19,0x5d,0xd4,0x5d,0xe3,0x69,0x4b,0x75,0xb5,0xf8,0x92,0xe2,0xe3, + 0x1d,0xc7,0x35,0xbd,0x97,0xdd,0x37,0x62,0x98,0x63,0xf1,0x2f,0x46,0x7c,0x76,0xcf,0xb2,0x01,0xb1,0xff, + 0x03,0xb4,0x53,0x9f,0xac,0x0a,0x1c,0x00,0x00}; #endif diff --git a/src/assets/html.h b/src/assets/html.h index 35ece92..1615f64 100644 --- a/src/assets/html.h +++ b/src/assets/html.h @@ -4,180 +4,181 @@ #include const uint8_t EmbeddedIndex[] PROGMEM = { - 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xed,0x5b,0x6b,0x57,0xe3,0x38,0x12,0xfd,0x2b,0x26, - 0xb3,0x3b,0xd0,0xdb,0xcd,0x23,0x90,0x66,0x1a,0x06,0x98,0x09,0x79,0x40,0x80,0x84,0x90,0x84,0xe7,0x97, - 0x3d,0x8a,0xad,0xc4,0x02,0xc7,0x36,0x92,0x9d,0x90,0x9e,0xe9,0xff,0xbe,0x7a,0xf8,0x21,0xdb,0xb2,0x93, - 0xb0,0xbd,0xa7,0x67,0xce,0xd9,0xfe,0xd0,0xc1,0xaa,0xd2,0xd5,0x55,0xa9,0x54,0x2a,0xc9,0xf2,0xd1,0x5a, - 0xfd,0xba,0x36,0x78,0xec,0x36,0x34,0xd3,0x9b,0x58,0x27,0x47,0xc1,0xff,0x10,0x18,0x27,0x47,0x13,0xe8, - 0x01,0x4d,0x37,0x01,0x26,0xd0,0x3b,0x2e,0xdd,0x0e,0x9a,0x9b,0x5f,0x4a,0x27,0x47,0x1e,0xf2,0x2c,0x78, - 0x72,0xb4,0x1d,0xfc,0x72,0x25,0x1b,0x4c,0xe0,0x71,0xc9,0x33,0xe1,0x04,0x6e,0xea,0x8e,0xe5,0xe0,0x92, - 0xa6,0x3b,0xb6,0x07,0x6d,0x5a,0xef,0xa7,0x1d,0xfe,0xaf,0x94,0x50,0x9d,0x22,0x38,0x73,0x1d,0xec,0x49, - 0x7a,0x33,0x64,0x78,0xe6,0xb1,0x01,0xa7,0x48,0x87,0x9b,0xfc,0xe1,0x13,0xb2,0x91,0x87,0x80,0xb5,0x49, - 0x74,0x60,0xc1,0xe3,0x32,0x85,0xb0,0x90,0xfd,0xa2,0x61,0x68,0x1d,0x97,0x88,0x37,0xb7,0x20,0x31,0x21, - 0xa4,0x18,0x26,0x86,0xa3,0xe3,0xd2,0xd0,0xb7,0x0d,0x0b,0x6e,0xe9,0x84,0x50,0x45,0xa2,0x63,0xe4,0x7a, - 0x1a,0xc1,0x7a,0x24,0x78,0x66,0xe5,0xdb,0x42,0x40,0xff,0x10,0x7d,0x1c,0x3a,0xc6,0xfc,0xe4,0xc8,0x40, - 0x53,0x0d,0x19,0xc7,0x25,0xe0,0xba,0x25,0xf1,0x34,0xdd,0xd4,0x2d,0x07,0xbc,0x88,0x07,0xdd,0x02,0x84, - 0x1c,0x97,0x6c,0xc7,0x43,0x23,0xa4,0x03,0x0f,0x39,0x76,0x8d,0xd2,0x06,0xc8,0x86,0xb8,0x94,0xab,0x52, - 0xd2,0x0e,0x83,0xd2,0x3f,0x34,0x88,0xb1,0x83,0x0f,0x35,0x59,0xac,0xad,0x1d,0x6b,0xb6,0x6f,0x59,0xda, - 0xcf,0x3f,0x27,0xca,0xb7,0xb8,0xae,0xf6,0xad,0x44,0x39,0xa0,0x51,0x12,0x32,0xac,0x53,0xd2,0x7e,0xd7, - 0x2d,0xa4,0xbf,0x6c,0xb9,0x18,0x4e,0xb9,0xf5,0x4c,0x64,0xc0,0x8e,0xdc,0x38,0x35,0x81,0x0b,0xec,0x90, - 0xd7,0x04,0x12,0x02,0xc6,0xb0,0x74,0xf2,0xc7,0x1f,0xc9,0xc6,0x02,0x81,0xf6,0xed,0x1b,0x35,0x0d,0xad, - 0x40,0x0d,0x43,0xbb,0x13,0xfe,0x1f,0xda,0x45,0x57,0xf7,0x96,0x99,0x90,0x97,0xa1,0xc9,0x58,0x98,0xda, - 0x00,0x1e,0x38,0x44,0x13,0x8a,0xb8,0xed,0xda,0xe3,0x5f,0x87,0x80,0xc0,0xfd,0xca,0x27,0x74,0x77,0x7a, - 0xdd,0x9b,0xed,0x5c,0x9e,0x8d,0x9d,0x2a,0xfd,0xd7,0xe9,0xdf,0x9a,0x8d,0xdb,0x31,0xfd,0xab,0xce,0x1e, - 0xab,0xb3,0x5a,0xf5,0x91,0xfe,0x9c,0x3e,0x54,0xa7,0x93,0x73,0x56,0x70,0xf6,0xd0,0x6b,0xde,0x9f,0xf7, - 0x06,0xc3,0xdd,0xa7,0x1d,0x63,0xb7,0x39,0x7f,0xba,0x39,0x3d,0x7d,0x3a,0x3b,0x40,0x4f,0xfd,0xd3,0x8b, - 0xe1,0x7d,0xd3,0x7e,0xba,0xbb,0xb0,0x1e,0xef,0x7b,0x9f,0x75,0xdd,0xb2,0xba,0xac,0xc2,0xc3,0xe9,0x45, - 0xaf,0xd1,0xbc,0x85,0x1d,0x4c,0xee,0x8d,0x46,0x67,0xfc,0x5c,0xbd,0xb9,0xd2,0x1f,0x4f,0xf5,0x6a,0x57, - 0xaf,0xd6,0x8c,0x9b,0x4e,0xa5,0xda,0xd9,0x6d,0xd7,0x2a,0xe3,0x1e,0x79,0xbc,0x38,0x68,0x74,0x8c,0x6a, - 0xf7,0xb1,0x5a,0x07,0xd5,0x3a,0x74,0x8d,0x5b,0xb3,0x5d,0x7e,0x6d,0x3e,0xfb,0x78,0xec,0x1e,0xf4,0xf5, - 0xf6,0xf9,0xd8,0xf8,0xa5,0xbc,0x77,0xb7,0x37,0xf2,0x6e,0xdd,0xcf,0xf0,0x7c,0xdc,0x6e,0x96,0x31,0x3e, - 0x6b,0x00,0x7f,0xff,0xee,0xbc,0xbe,0x7b,0xde,0x1e,0x9e,0x7f,0x7e,0xbd,0xb8,0xbe,0x3a,0xc7,0xe0,0xe3, - 0xe8,0xe5,0xeb,0x90,0x3c,0xf6,0x88,0xd9,0xfe,0xe2,0x5e,0x0d,0xc6,0xb7,0xad,0x71,0x7f,0x3c,0xf5,0xdb, - 0x6d,0xe7,0x71,0xf6,0x11,0xb5,0x1f,0x07,0x78,0xff,0xc6,0xec,0x3c,0xb6,0x71,0x07,0x75,0xe6,0xb3,0xd6, - 0x95,0x35,0xbf,0xbb,0x34,0xf4,0xf9,0xbc,0x4b,0x26,0x7a,0x8f,0xcc,0x6f,0x3f,0xef,0xbc,0x8c,0xcf,0xbd, - 0x9b,0x1b,0x7f,0xb7,0x6a,0x74,0x2e,0x9a,0x6e,0xfd,0xa5,0x7a,0x59,0x69,0x6d,0x5f,0xb5,0xee,0xdb,0xc3, - 0xdd,0x2a,0x69,0x9d,0xea,0xaf,0x3b,0xa8,0x77,0x06,0x6f,0xce,0xba,0x83,0xa7,0xd1,0xdd,0xfe,0x4d,0x63, - 0xe7,0xe3,0xb8,0x7e,0xd6,0xdc,0xc5,0x0e,0x39,0x6b,0x8c,0xdb,0x37,0x6f,0xad,0xaa,0x69,0x3f,0x55,0x51, - 0xb7,0xf3,0xa5,0xe2,0xbb,0xbd,0xd1,0xce,0xf6,0xb5,0xe5,0x92,0xab,0xda,0xa9,0xbb,0x37,0x7f,0xdd,0xd1, - 0xcd,0xb1,0x57,0xbb,0xbd,0x7d,0xc2,0xbd,0xd9,0xfe,0x4d,0xfd,0x7a,0xaf,0x71,0x7f,0xde,0x7f,0x6d,0x1e, - 0x78,0x00,0x3f,0x81,0xfe,0xe5,0xc5,0x03,0xbc,0xa8,0x1b,0xc3,0x1b,0x8b,0x34,0x76,0x2e,0xeb,0xfb,0x17, - 0x9d,0xed,0x4b,0xa7,0x47,0xce,0xcc,0xb7,0x87,0xcb,0x9a,0x55,0xbb,0x3c,0xbf,0x68,0x8d,0x5e,0x06,0xe6, - 0xac,0x7d,0x6f,0x56,0xf7,0x8d,0xd3,0xbe,0x63,0xf5,0xd0,0xf3,0xcb,0xc5,0xb5,0x51,0x7e,0xba,0x9d,0x1e, - 0xcc,0x6f,0x0e,0xae,0xdd,0xd7,0xe1,0xb9,0x8b,0xc0,0xed,0x1d,0x68,0x0c,0x9f,0x1a,0xbf,0x78,0xad,0xd6, - 0xb3,0x73,0x7a,0xf9,0x30,0x27,0x0e,0x29,0xeb,0x95,0xbb,0x2f,0x70,0x78,0xd5,0x30,0x86,0xd3,0xdd,0xa1, - 0xde,0x26,0x8d,0x5f,0xc6,0xcf,0xfe,0xa9,0x31,0x7d,0xe8,0xf5,0x2f,0x2a,0xcd,0x8f,0xdb,0xb3,0xd7,0xd6, - 0xc3,0x03,0x6e,0x9d,0xcd,0x26,0x0f,0x7b,0x5f,0x67,0x40,0xbf,0xaa,0x9b,0xb0,0x73,0x7d,0x50,0xbe,0x7e, - 0xbe,0xba,0xb9,0x34,0xca,0x95,0xbb,0x76,0xbd,0x66,0x3f,0x8e,0x6b,0x6f,0x77,0xcf,0xad,0xbd,0xce,0x00, - 0x96,0x27,0x7d,0xa7,0x5b,0xaf,0x1c,0xbc,0x55,0xfa,0x98,0x3a,0xc7,0xc1,0x6b,0xd7,0xae,0x40,0x67,0x5a, - 0x6b,0x73,0xef,0x69,0x58,0xcd,0xc1,0x4b,0xdf,0xbf,0x99,0xd4,0x6a,0xd4,0x13,0xcd,0x32,0x73,0xf1,0x7f, - 0x78,0x1b,0xeb,0x3c,0x3e,0xad,0x7f,0xe0,0x9e,0x4d,0x4b,0x8f,0xcc,0x5d,0x26,0x21,0x1e,0xf0,0x7c,0xb2, - 0x45,0xe6,0xc4,0x83,0x93,0x56,0x9d,0x4e,0xa8,0x60,0x16,0xfe,0xc6,0x2b,0x85,0xe5,0xb4,0xde,0x47,0x6d, - 0xfd,0x50,0x5b,0xa7,0x3f,0xe9,0x2a,0xb4,0x74,0x5d,0xa0,0xee,0x26,0x66,0xc3,0x8c,0xce,0x2a,0xa1,0x9b, - 0x9c,0x25,0x74,0xf2,0xd8,0x50,0x0f,0x26,0xa5,0x54,0x8e,0x6c,0x83,0xcd,0x42,0x16,0x2c,0x0f,0xd9,0xbc, - 0xd9,0x14,0x95,0x05,0x50,0x5f,0x34,0x0a,0xdc,0x2d,0x68,0x83,0xa1,0x05,0x0d,0x4a,0x70,0x3d,0x40,0x82, - 0xc6,0x3a,0x23,0x61,0x20,0x12,0x17,0x94,0x82,0x29,0x1b,0x74,0x5e,0x86,0xd0,0x75,0x3a,0xc7,0x5d,0x07, - 0xd9,0xde,0x56,0x6c,0x13,0x8d,0x2a,0xe6,0xb5,0x93,0x2c,0x47,0x2e,0x6d,0xac,0x00,0x93,0xd2,0xe0,0x15, - 0x03,0x53,0x47,0x71,0xe3,0xbd,0xbd,0x1f,0x43,0xef,0x1e,0x35,0x79,0x4b,0xb4,0x92,0x68,0x70,0xe3,0x43, - 0x7e,0xff,0x88,0x50,0x9c,0x38,0x06,0x4c,0xf5,0x4f,0x85,0x34,0x80,0x6f,0xde,0xc6,0xbb,0x99,0x26,0x88, - 0xca,0xf6,0x4f,0xd1,0x13,0xab,0xd8,0x00,0x4d,0x04,0x19,0xc1,0xa5,0x1e,0x15,0xc6,0xcd,0xa7,0x83,0xad, - 0x08,0xf9,0x74,0xe5,0x31,0x90,0x3d,0x2e,0x85,0x0c,0xc2,0xe7,0x10,0x3e,0x78,0x8e,0x3a,0x1a,0x3c,0xb7, - 0x42,0xa2,0xc9,0xee,0x09,0xcc,0xb5,0x40,0x89,0x2d,0x37,0x74,0x39,0x45,0x43,0x2c,0x56,0x94,0xe3,0x60, - 0x02,0x24,0xfb,0x3c,0x03,0xd8,0xe6,0x0c,0x44,0x65,0x13,0x90,0x1e,0xa4,0x59,0x40,0x83,0x2d,0x4d,0x54, - 0xd3,0x0d,0x99,0xf0,0xb5,0x6a,0x0b,0x47,0xb2,0xc0,0x09,0x5c,0xaa,0x12,0x42,0x71,0x61,0x0f,0x02,0xc2, - 0xec,0x9a,0xad,0x26,0x24,0x5b,0xd2,0x44,0x93,0x8a,0x25,0x34,0x41,0x84,0x44,0x63,0xae,0xbf,0x0c,0x30, - 0xd0,0x61,0x0a,0x32,0x16,0xc4,0x4c,0x62,0x1b,0x28,0x6a,0x1f,0x81,0x90,0xe7,0xd0,0xf7,0x3c,0x6a,0x0f, - 0xf1,0xb3,0xe9,0x62,0xba,0x8a,0xe1,0x79,0x98,0x5b,0x6c,0x03,0x17,0x6d,0xf3,0x7a,0x1e,0xab,0xb7,0x4d, - 0x87,0x33,0xb7,0xe5,0xba,0x33,0xb3,0x99,0xb1,0x03,0x06,0xe0,0x44,0x4b,0x37,0x12,0x2e,0xdf,0xd4,0x87, - 0xa0,0x05,0x3d,0xd8,0x5f,0xdc,0x9d,0x3a,0x57,0x8c,0x20,0x33,0x8e,0x13,0xe6,0x1f,0x60,0x8a,0xc6,0x62, - 0x60,0x3d,0x30,0x24,0xd9,0xfe,0xc9,0x49,0xc9,0x3a,0xa0,0xde,0x3e,0x85,0x34,0xcc,0x89,0x3f,0x06,0x60, - 0x48,0xdd,0x41,0x5b,0x17,0x66,0x5a,0x67,0x29,0x48,0xc8,0x53,0x52,0x88,0xe4,0x11,0xd7,0xc0,0xac,0xb4, - 0xc1,0x81,0x14,0x73,0xc1,0xbb,0xda,0xf6,0x30,0x1a,0x8f,0x21,0x2e,0x68,0x3d,0xd2,0x88,0xda,0x0f,0x4b, - 0xbe,0x0f,0x83,0x38,0x0c,0xe4,0x73,0x90,0x74,0x22,0x16,0x71,0xd9,0xf7,0xe1,0x21,0xd6,0x9b,0x82,0x51, - 0x10,0xf2,0x78,0x14,0xf8,0xb3,0xa2,0xed,0x74,0x24,0x50,0x0e,0x36,0x5b,0x3a,0xf7,0xd2,0x03,0x2a,0xaf, - 0xa0,0x7b,0x1c,0xe2,0xe4,0x08,0xd3,0x28,0xe2,0x68,0x87,0x5c,0x76,0x5c,0x92,0xb4,0x81,0x65,0xf5,0x3d, - 0xe8,0x92,0x01,0xf6,0x69,0x25,0x16,0x39,0x58,0x48,0xa6,0x99,0x7a,0x28,0xa0,0x9d,0x66,0xb9,0xa4,0x47, - 0xe5,0x2c,0x5c,0x72,0x20,0x89,0xdd,0x12,0xd0,0x4d,0x60,0x91,0x42,0xec,0x11,0x53,0x50,0x81,0x87,0xe6, - 0x27,0x16,0xcd,0x93,0x71,0x6a,0x81,0xa6,0x76,0x73,0xc3,0x48,0x17,0x01,0x26,0xf3,0xe7,0x29,0xb0,0x7c, - 0x31,0x39,0xdb,0xc0,0x33,0xb7,0x46,0x96,0xe3,0xe0,0x8d,0x50,0xf7,0x8e,0x09,0xb5,0x6d,0x6d,0xf7,0xf3, - 0x67,0xed,0x5f,0x5a,0x79,0x67,0x87,0x99,0xec,0x9f,0x61,0x3e,0x9d,0x69,0x5d,0x4e,0xa6,0x91,0xed,0xfa, - 0x9e,0xe6,0xcd,0x5d,0xda,0x61,0x0c,0x6c,0x9a,0xa1,0x6b,0x13,0x64,0x1f,0x97,0x76,0xe8,0x2f,0x78,0x3b, - 0x2e,0x51,0xc8,0x52,0xb2,0x76,0xd4,0xf9,0x2d,0xdb,0x9f,0x0c,0x21,0x8e,0x29,0xdf,0x09,0x8e,0x79,0xa1, - 0x41,0xee,0xe5,0x5a,0x6c,0xb7,0xe9,0xe6,0xc8,0xa1,0x20,0x1b,0x4c,0xfc,0x49,0xa3,0x6b,0x1d,0x7c,0xfb, - 0x40,0x7f,0x34,0xb2,0xac,0x15,0x98,0xe2,0xd6,0xf4,0xc7,0x9a,0x20,0xe6,0x90,0xea,0xbf,0x7a,0x7d,0xcd, - 0x09,0x39,0xb4,0x2e,0xb5,0xc5,0x44,0xfb,0x9d,0xf8,0xc3,0x09,0xf2,0xe2,0xcd,0x15,0xdd,0x16,0x5a,0x73, - 0xb6,0x70,0x0f,0x02,0xd5,0xc4,0x6c,0x89,0xc3,0x0f,0xd3,0x48,0xcd,0x19,0xdd,0x84,0xfa,0x4b,0xc4,0x77, - 0xe8,0x38,0x16,0x04,0x36,0x9b,0x04,0x52,0x9d,0x30,0xf5,0x2a,0x25,0x7c,0x3f,0xa1,0xd2,0xb0,0x83,0x1c, - 0x8b,0xf5,0x8f,0x63,0xca,0xfd,0x51,0xa3,0x15,0x2d,0xe8,0x6b,0xd9,0x04,0x2a,0x4a,0x00,0xff,0xfc,0x53, - 0x53,0x48,0xc5,0x54,0x64,0x1b,0xd0,0x3d,0x45,0xe0,0xa5,0xed,0xb6,0xe8,0x3e,0x1e,0xdb,0xd0,0x93,0xf3, - 0x40,0x0b,0x0c,0xa1,0xa5,0x71,0x07,0xe3,0xc6,0xa1,0xe3,0x4b,0x10,0x83,0x63,0xc6,0x54,0xc3,0x24,0x75, - 0x02,0x30,0x8e,0x93,0x74,0x15,0x31,0xf4,0x25,0xbe,0x3d,0x55,0x60,0x67,0x5c,0x24,0x69,0x23,0x2f,0xc5, - 0xe4,0xc8,0xac,0x9c,0xf4,0xe0,0x18,0x5a,0x84,0x0e,0x5b,0x25,0xdf,0xb6,0xd1,0x93,0x05,0xed,0xb1,0x67, - 0x46,0x87,0x05,0x62,0x0e,0x05,0x52,0x79,0x1a,0xa9,0xab,0x47,0x0e,0x4d,0xa7,0x07,0xb4,0xe4,0xd5,0x40, - 0xb8,0xe6,0x61,0x58,0x2f,0x1a,0x94,0x6f,0xc9,0xe1,0xe4,0xf5,0x36,0xa3,0xfd,0x77,0xb1,0x97,0x2d,0xe1, - 0x5f,0x81,0x63,0xab,0xdc,0x4c,0x0e,0x00,0x80,0xaf,0x6f,0x22,0xad,0x10,0x89,0xd1,0x4f,0xd9,0xa3,0x08, - 0x91,0xd3,0x48,0xd3,0x65,0x43,0x98,0x43,0x3d,0xde,0x99,0xc4,0x26,0x13,0x32,0x74,0xda,0x19,0x9c,0x1f, - 0xd7,0x84,0x29,0xd8,0x39,0x0e,0x8b,0x56,0x14,0x4d,0xf7,0xf2,0x06,0x3f,0xb4,0xff,0x80,0x7a,0x50,0x29, - 0x4e,0xef,0x2d,0x1a,0x89,0x68,0x5d,0xc7,0xe5,0x79,0x13,0x0f,0x23,0x2c,0xfc,0x28,0xe9,0x36,0xd1,0x1b, - 0x34,0x24,0xcf,0x14,0x95,0xd2,0x95,0xcb,0xea,0xca,0x7d,0xdf,0xc6,0x88,0x14,0x57,0xdd,0xcd,0xad,0x4a, - 0xa2,0xb9,0x15,0xd6,0xdc,0x16,0xdd,0x5d,0xd8,0xed,0x51,0x48,0x3a,0xdd,0xe9,0xa4,0x8f,0xcb,0xe6,0x61, - 0x91,0x71,0x47,0x32,0xca,0x66,0x34,0x89,0x99,0x57,0x47,0x80,0x6c,0xe1,0x0d,0x88,0x7b,0xe1,0x94,0x66, - 0x5b,0x1d,0x44,0x5c,0x0b,0xf0,0x90,0xb9,0xc1,0xca,0x3f,0x69,0x7c,0x65,0x7e,0x1f,0x7b,0x0c,0x2d,0xc0, - 0xe3,0xb5,0xba,0x03,0x74,0xce,0xc2,0x3c,0x9e,0x72,0xd5,0xa5,0xa9,0xb2,0x04,0x25,0x87,0xa9,0x1c,0x50, - 0x21,0x7c,0x31,0xc0,0x9c,0x2c,0x9e,0x7d,0x13,0xc7,0xa6,0x8a,0x05,0x93,0xaf,0xcd,0x15,0x12,0x93,0x6e, - 0x01,0xa4,0xe7,0x43,0x52,0x8c,0x39,0x10,0x1a,0xab,0x80,0xce,0xa0,0x61,0x2f,0x82,0xbd,0x0f,0x75,0x56, - 0x62,0x6b,0xfa,0x78,0x11,0xdd,0x40,0x65,0x15,0xd8,0x11,0x46,0xc5,0xa0,0x4d,0xae,0xb0,0x0a,0x24,0xa1, - 0x6b,0x1c,0x2e,0x06,0xed,0x07,0x2a,0x2b,0xc1,0xfa,0x0b,0x3c,0xa0,0xef,0x67,0x3c,0x40,0x9d,0xbf,0x2d, - 0x91,0x8f,0x85,0x8d,0x0e,0xe9,0xaf,0xe9,0xd1,0xd1,0x22,0x3f,0x2e,0x2f,0xcb,0x72,0x29,0xc8,0xcf,0xe4, - 0x2c,0x8d,0x4d,0xea,0xf8,0x4c,0x9d,0x1d,0xbb,0xa8,0xc3,0x62,0xc7,0xa9,0x53,0x59,0xce,0xd1,0x93,0xd8, - 0x6b,0xb1,0x26,0x83,0xbd,0xfd,0x61,0x78,0x56,0x45,0x19,0xd3,0x8d,0x32,0x4b,0x87,0xd2,0x8b,0x17,0x30, - 0x0c,0x69,0xe5,0x52,0x37,0x5a,0x35,0xc2,0xbd,0xbd,0xc0,0xcd,0x5d,0x9a,0x62,0x02,0xb2,0x31,0x45,0x76, - 0x59,0x52,0xb1,0x09,0x03,0x94,0x78,0x0e,0xce,0x24,0x79,0xf6,0x79,0xca,0xa1,0xfa,0xbc,0x9c,0x36,0x7e, - 0x98,0x96,0xac,0x7f,0x88,0x2d,0xcb,0x92,0xd8,0xc2,0x54,0xb6,0xed,0xf0,0xcc,0xa7,0x30,0x99,0x9d,0x08, - 0x9d,0x15,0xd3,0x59,0x51,0x6b,0x41,0xc2,0x21,0x94,0x96,0x4c,0x69,0x53,0x88,0x89,0x9c,0x32,0x01,0x54, - 0xf7,0x31,0xb5,0x4d,0xe1,0xe0,0x15,0xeb,0x27,0x73,0xcd,0xe4,0xa2,0x94,0x4b,0x28,0xdb,0x2a,0xcf,0x48, - 0x17,0x31,0x5b,0x9c,0x6c,0x14,0x23,0x74,0xe8,0x70,0xe2,0x55,0x53,0x90,0x62,0xc8,0xaa,0x35,0xa3,0xcb, - 0xd9,0xaa,0xb9,0x49,0x31,0xe6,0xb5,0x6d,0xcd,0xf3,0x72,0x96,0xd5,0x5c,0x49,0x40,0xd7,0x73,0xa3,0xa8, - 0x82,0x47,0x3d,0x15,0x51,0x33,0x8e,0xb3,0x68,0x3b,0xa2,0xd2,0x5a,0x6e,0x43,0xa2,0xc4,0xcf,0xdf,0x92, - 0x04,0x5d,0xcd,0x6c,0x4a,0x32,0x8c,0x69,0xb2,0x4c,0x2d,0x90,0x43,0x94,0x0b,0x57,0xe1,0x27,0xd0,0x16, - 0xd2,0x32,0x44,0xa3,0x4b,0x6c,0x91,0xa2,0x7e,0xbc,0x77,0x93,0x94,0x02,0xf8,0x4b,0x6d,0x93,0x26,0x72, - 0xd0,0xfc,0x8e,0x1b,0xa5,0x44,0x30,0xce,0xdd,0x2a,0x45,0x23,0xf6,0x1d,0x37,0x4b,0xc2,0xbd,0x0e,0xf9, - 0xb0,0xac,0x8b,0x06,0xd8,0x31,0x3c,0xa7,0xc0,0x5e,0x7f,0xfd,0xdb,0x45,0xb6,0xe2,0x94,0x55,0x68,0x76, - 0xa9,0x6c,0xa1,0xaf,0xf1,0x43,0xb9,0x7c,0xe8,0xdc,0x7c,0x81,0x4a,0x97,0xe1,0x67,0x20,0x9c,0x3e,0x85, - 0x4d,0x1b,0x2c,0xd2,0x50,0x05,0xf7,0x7c,0x7a,0x12,0x72,0x2e,0xc9,0x48,0x27,0x13,0xce,0x73,0x63,0x6f, - 0x44,0xa7,0x23,0xfd,0x0d,0xac,0xf7,0x05,0xdd,0x08,0x60,0xe0,0xb8,0xec,0x9d,0x43,0x21,0x8a,0xe2,0xd0, - 0x26,0x85,0x72,0xea,0xd0,0x3c,0x62,0x72,0xeb,0xe6,0xc5,0xeb,0xff,0xa7,0xa2,0xf9,0xa9,0xa8,0x30,0xe5, - 0xff,0x22,0x19,0x4d,0x44,0x87,0xbc,0x86,0xff,0x1e,0x09,0x69,0xf1,0x29,0x6c,0xe2,0x95,0x4a,0x51,0xf2, - 0x5a,0x93,0x5f,0xd3,0xc6,0x89,0xab,0xfc,0xfa,0x65,0xb9,0xa4,0x55,0xaa,0x21,0xbd,0xcf,0x4e,0x46,0x7f, - 0xb5,0x4e,0x6e,0xd8,0x37,0x19,0x80,0x82,0x91,0x54,0xf7,0x9c,0xd7,0x97,0xee,0xdb,0x2c,0x66,0x17,0x1c, - 0xc1,0xe6,0x32,0x93,0xde,0x80,0xaf,0xcc,0x4c,0xaa,0x9b,0x61,0x26,0xa5,0x1f,0x84,0x20,0x43,0x59,0x9d, - 0x96,0xe7,0x2f,0x03,0x1e,0x7c,0xf3,0x44,0xc2,0xc1,0xeb,0xc7,0xc9,0x74,0x0a,0x21,0xe1,0x7a,0x6b,0x8a, - 0x9e,0x27,0xb8,0xb8,0xb4,0x43,0x33,0x07,0x2b,0xf9,0x84,0xb2,0x7c,0x4e,0x51,0x6d,0xce,0x2b,0x7e,0x52, - 0x71,0x8b,0xa5,0x0b,0xf9,0x2d,0x1e,0x45,0xc3,0xd4,0xdd,0x85,0x40,0x79,0x43,0xcc,0x2a,0xb3,0x17,0x5f, - 0xc1,0x68,0xb2,0xe9,0xb1,0xc9,0x22,0x24,0x76,0xac,0x15,0x07,0x9c,0x21,0x65,0x46,0x5a,0x8e,0xbe,0xfe, - 0x50,0x84,0x7e,0x92,0xb4,0x3a,0x72,0x55,0x68,0xc8,0xa5,0x31,0x0a,0x53,0xdf,0x5e,0xc6,0x09,0x90,0xab, - 0x36,0x33,0x5a,0x68,0x17,0xf6,0x4e,0x22,0x6d,0xca,0xa4,0x7f,0xfa,0x43,0x1b,0x7a,0x13,0x40,0x5e,0x94, - 0x5e,0x1a,0x49,0x97,0xf2,0xd5,0x18,0x4b,0xed,0xb1,0x92,0xfc,0xbf,0xa4,0x3d,0x06,0x1e,0x9c,0x49,0x19, - 0xbd,0xa4,0x1c,0x88,0x96,0x21,0x1c,0xa2,0x28,0xd9,0x46,0xc2,0xf7,0x50,0xcd,0xbc,0xc5,0x31,0x1d,0xe2, - 0xb1,0x1b,0x9c,0x2a,0xc6,0xa1,0x6c,0x11,0xe5,0x43,0xd7,0x02,0x3a,0x34,0x1d,0xcb,0x60,0xeb,0x72,0x0e, - 0x48,0x37,0xd6,0x61,0x7e,0xcf,0xba,0x19,0xb5,0xad,0xec,0x67,0x2c,0x5d,0x38,0x57,0xff,0x1e,0x0b,0x62, - 0xf4,0x7e,0x3f,0x67,0x31,0xf4,0x5d,0x76,0xc9,0xa4,0x89,0xf0,0x64,0x06,0x30,0x4c,0xbe,0xbf,0x17,0x57, - 0x01,0x46,0x81,0x2c,0x7d,0x88,0x23,0x77,0x75,0x84,0x2c,0x28,0xcc,0x1b,0x6a,0x37,0x59,0xc9,0x5f,0xc0, - 0x48,0xb1,0x5d,0x44,0x4f,0xbb,0xd8,0x19,0xb3,0x48,0xc3,0xaf,0xec,0x05,0x2f,0xfa,0x69,0x7f,0x53,0x42, - 0x9e,0x52,0xca,0x46,0xce,0x58,0x25,0xbc,0xfc,0x94,0x31,0x4b,0x6e,0xf4,0x4c,0x57,0x2c,0x0a,0x9f,0xb1, - 0xad,0x16,0x5d,0x2c,0x4a,0x27,0x7b,0xd4,0x3f,0xb1,0x57,0x8b,0x6f,0x66,0xe5,0x36,0x1f,0x5a,0x2a,0x79, - 0xbf,0xa3,0x20,0x63,0xea,0x73,0x00,0x95,0x87,0xd8,0x9e,0x9b,0xb6,0xc2,0x0f,0x7f,0x67,0x2c,0xdf,0x2f, - 0x76,0x30,0xfa,0xca,0xf6,0x01,0x56,0x32,0x6c,0x52,0xda,0x7d,0x88,0xa7,0x52,0x42,0x1c,0xf7,0x47,0x08, - 0x96,0x09,0x9b,0x31,0x4a,0x1c,0x50,0xd2,0x38,0x25,0x45,0x12,0x5d,0xc0,0x8a,0xf7,0x67,0xca,0x04,0x19, - 0x5e,0xa1,0x68,0xb9,0x03,0x1a,0x19,0x4b,0xc5,0x2e,0x6e,0x68,0x79,0x7e,0x16,0xc8,0xb8,0x34,0x45,0xba, - 0x02,0xde,0x32,0xc6,0x62,0x95,0x33,0x44,0x38,0xe2,0x0a,0x04,0xa4,0x2b,0x8c,0x12,0x81,0xe0,0x22,0xe3, - 0x22,0x02,0xc2,0x11,0x53,0x04,0x18,0xa2,0xe2,0x55,0x49,0x4e,0x0e,0x63,0x39,0xe1,0xcd,0xfc,0xf0,0x62, - 0x25,0x93,0x6d,0x86,0x6f,0x80,0xb3,0xd4,0x02,0xfd,0xa5,0xf8,0x45,0xd8,0x11,0xc9,0xa8,0xe8,0x44,0x0b, - 0x37,0x7d,0x99,0x49,0x0f,0x01,0xd6,0xcd,0xab,0xa8,0xae,0x1c,0x4c,0xb9,0x88,0xce,0xbf,0x48,0x9a,0x4f, - 0xb0,0xcf,0x75,0x95,0x7b,0xc0,0xcc,0x9c,0x77,0x91,0x4d,0x0a,0x26,0x7d,0xde,0xe0,0xd1,0x6a,0x57,0x8d, - 0x7a,0xb5,0x9b,0x66,0x11,0x96,0x2f,0xe7,0xd7,0x11,0x4a,0xf6,0x0a,0x4f,0xcc,0x6e,0x8b,0xf6,0x9f,0x35, - 0xb4,0xbc,0x67,0x09,0xd8,0xfe,0xa0,0xaa,0x66,0x47,0x05,0xab,0xd0,0x63,0x38,0x8b,0xf8,0xf1,0xb6,0x56, - 0x22,0x58,0xed,0x8a,0xc0,0xad,0xa0,0x18,0x8a,0x96,0x26,0x19,0x61,0x15,0xd2,0x04,0x6e,0xd8,0xe2,0x4a, - 0x44,0xbb,0xf7,0xed,0x3a,0xa6,0x89,0x08,0xee,0xd7,0x55,0xf6,0x94,0xc5,0x4b,0x13,0x4e,0x60,0x16,0x92, - 0x76,0x67,0x13,0xde,0xee,0x3b,0x29,0xd7,0xae,0x0a,0x29,0xd7,0xae,0xde,0x41,0x99,0x62,0x2e,0xa4,0xcc, - 0xda,0x5d,0x81,0xf2,0x6c,0x52,0x15,0xfb,0xa6,0x0c,0xdb,0x48,0xb2,0x24,0xd1,0x18,0x29,0x97,0xa3,0xd4, - 0xd8,0x4a,0x14,0x9b,0x18,0xbe,0xfa,0xd0,0xd6,0xe7,0x0a,0x92,0x91,0x6c,0x69,0x9a,0x31,0x5a,0x01,0x51, - 0xa9,0xc9,0xbc,0xf8,0x35,0x01,0x6e,0x26,0x7e,0xc9,0x2f,0x4a,0xa8,0xb8,0xda,0x6d,0x5d,0xc2,0x0c,0xeb, - 0x58,0xb2,0x4c,0x3c,0x97,0x70,0xf2,0xf8,0xca,0x4d,0x69,0x0b,0xd3,0xc7,0x58,0xdb,0x5c,0x2a,0x7f,0xfc, - 0x61,0x1b,0x92,0x65,0xbf,0x1c,0x58,0x53,0x7e,0x39,0x10,0xdf,0x40,0x57,0x5d,0x3e,0xcf,0x26,0xbd,0x8e, - 0x9b,0xc8,0x79,0x7f,0xb6,0xc0,0xab,0xef,0xfc,0xaa,0x85,0xdb,0xcb,0x58,0xb6,0x35,0x04,0xfa,0x8b,0x3a, - 0xf7,0x95,0x4e,0x01,0x25,0x7d,0xc5,0xf5,0xe5,0x45,0x4e,0xcf,0x0e,0xb6,0x6b,0x8e,0x2f,0x9f,0x9c,0x48, - 0x80,0x3a,0x93,0x2c,0xe7,0xef,0x31,0x50,0xc6,0x79,0x32,0x88,0xc1,0x61,0x76,0x39,0x38,0xcc,0x2e,0xef, - 0x27,0xc6,0x59,0x56,0x9f,0xa1,0xaf,0x00,0x1b,0xec,0xe2,0xae,0x76,0x72,0xac,0x95,0x15,0x5b,0xa5,0x62, - 0x6d,0xb3,0xa2,0xea,0x56,0xe2,0xfe,0x70,0x68,0xaf,0xca,0x0f,0xbb,0xb8,0x9c,0x77,0x92,0x26,0x31,0xf6, - 0x09,0xac,0xf9,0x34,0x3d,0x4f,0x1d,0x97,0x29,0x34,0x16,0x9f,0x99,0xa9,0x6d,0xc2,0xbb,0x44,0xd4,0xc6, - 0x08,0xba,0x9b,0x77,0x71,0x3a,0x0b,0x53,0x62,0x57,0xdb,0xe9,0x1f,0x52,0xfa,0x2a,0x5e,0xa0,0x6c,0xf3, - 0xe2,0x25,0x4e,0xeb,0x57,0xdd,0x4b,0xda,0x34,0x8c,0x49,0xd3,0xaa,0xcf,0x9b,0x13,0xdd,0x34,0x01,0xe9, - 0x64,0xa5,0x1b,0x1f,0xf8,0xf7,0x65,0x12,0x75,0x06,0x11,0xcc,0x36,0xf6,0xb1,0x59,0xc2,0x61,0xe4,0x18, - 0xb2,0xe0,0x83,0x14,0xfe,0x3e,0x72,0x84,0xde,0xf2,0x5f,0x49,0xd2,0x15,0x96,0xc8,0xd9,0xad,0xee,0xb8, - 0x73,0xfe,0x8e,0x46,0x60,0x0f,0xb1,0xf4,0xd9,0x5e,0xa0,0x9b,0xfe,0x6a,0x2f,0x3c,0xba,0xb8,0x13,0x62, - 0xfe,0xf1,0x5e,0xaa,0x46,0xf4,0xd1,0x5e,0xe6,0x2d,0x4f,0xf0,0xa5,0xb0,0x45,0x87,0xc2,0x07,0x63,0xea, - 0x4b,0xcf,0x60,0x0a,0x44,0x61,0xe9,0x84,0x6f,0xca,0xab,0x2e,0xb5,0x8f,0xf4,0xe5,0xb0,0xf8,0x66,0x78, - 0x9b,0x7f,0x2a,0xfd,0x1f,0xfc,0xb1,0x4d,0xc6,0x40,0x3d,0x00,0x00}; + 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0xed,0x5b,0x6b,0x57,0xe3,0x38,0x12,0xfd,0x2b,0xee, + 0xcc,0xee,0x40,0x6f,0x0f,0x8f,0x00,0xcd,0x34,0x0c,0xb0,0x13,0xf2,0x80,0x00,0x09,0x21,0x09,0xcf,0x2f, + 0x7b,0x14,0x5b,0x89,0x05,0x8e,0x6d,0x24,0x3b,0x21,0x3d,0xd3,0xff,0x7d,0xf5,0xf0,0x43,0xb6,0x65,0xc7, + 0x61,0x7b,0x4f,0xcf,0x9e,0xb3,0xfd,0xa1,0x83,0x55,0xa5,0xab,0xab,0x52,0xa9,0x54,0x92,0xe5,0xa3,0x0f, + 0x8d,0xeb,0xfa,0xf0,0xb1,0xd7,0xd4,0x4c,0x6f,0x6a,0x9d,0x1c,0x05,0xff,0x43,0x60,0x9c,0x1c,0x4d,0xa1, + 0x07,0x34,0xdd,0x04,0x98,0x40,0xef,0xb8,0x72,0x3b,0x6c,0x6d,0x7c,0xa9,0x9c,0x1c,0x79,0xc8,0xb3,0xe0, + 0xc9,0xd1,0x56,0xf0,0xcb,0x95,0x6c,0x30,0x85,0xc7,0x15,0xcf,0x84,0x53,0xb8,0xa1,0x3b,0x96,0x83,0x2b, + 0x9a,0xee,0xd8,0x1e,0xb4,0x69,0xbd,0x9f,0xb6,0xf9,0xbf,0x4a,0x42,0x75,0x86,0xe0,0xdc,0x75,0xb0,0x27, + 0xe9,0xcd,0x91,0xe1,0x99,0xc7,0x06,0x9c,0x21,0x1d,0x6e,0xf0,0x87,0x5f,0x90,0x8d,0x3c,0x04,0xac,0x0d, + 0xa2,0x03,0x0b,0x1e,0x57,0x29,0x84,0x85,0xec,0x17,0x0d,0x43,0xeb,0xb8,0x42,0xbc,0x85,0x05,0x89,0x09, + 0x21,0xc5,0x30,0x31,0x1c,0x1f,0x57,0x46,0xbe,0x6d,0x58,0x70,0x53,0x27,0x84,0x2a,0x12,0x1d,0x23,0xd7, + 0xd3,0x08,0xd6,0x23,0xc1,0x33,0x2b,0xdf,0x12,0x02,0xfa,0x87,0xe8,0xe3,0xc8,0x31,0x16,0x27,0x47,0x06, + 0x9a,0x69,0xc8,0x38,0xae,0x00,0xd7,0xad,0x88,0xa7,0xd9,0x86,0x6e,0x39,0xe0,0x45,0x3c,0xe8,0x16,0x20, + 0xe4,0xb8,0x62,0x3b,0x1e,0x1a,0x23,0x1d,0x78,0xc8,0xb1,0xeb,0x94,0x36,0x40,0x36,0xc4,0x95,0x5c,0x95, + 0x8a,0x76,0x18,0x94,0xfe,0xa1,0x41,0x8c,0x1d,0x7c,0xa8,0xc9,0x62,0xed,0xc3,0xb1,0x66,0xfb,0x96,0xa5, + 0xfd,0xfc,0x73,0xa2,0x7c,0x93,0xeb,0x6a,0xdf,0x2a,0x94,0x03,0x1a,0x27,0x21,0xc3,0x3a,0x15,0xed,0x77, + 0xdd,0x42,0xfa,0xcb,0xa6,0x8b,0xe1,0x8c,0x5b,0xcf,0x44,0x06,0xec,0xca,0x8d,0x53,0x13,0xb8,0xc0,0x0e, + 0x79,0x4d,0x21,0x21,0x60,0x02,0x2b,0x27,0x7f,0xfc,0x91,0x6c,0x2c,0x10,0x68,0xdf,0xbe,0x51,0xd3,0xd0, + 0x0a,0xd4,0x30,0xb4,0x3b,0xe1,0xff,0xa1,0x5d,0x74,0x75,0x6f,0x99,0x09,0x79,0x19,0x9a,0x4e,0x84,0xa9, + 0x0d,0xe0,0x81,0x43,0x34,0xa5,0x88,0x5b,0xae,0x3d,0xf9,0x6d,0x04,0x08,0xdc,0xdf,0xfb,0x05,0xdd,0x9d, + 0x5e,0xf7,0xe7,0xdb,0x97,0x67,0x13,0xa7,0x46,0xff,0x75,0x07,0xb7,0x66,0xf3,0x76,0x42,0xff,0x6a,0xb0, + 0xc7,0xda,0xbc,0x5e,0x7b,0xa4,0x3f,0xa7,0x0f,0xb5,0xd9,0xf4,0x9c,0x15,0x9c,0x3d,0xf4,0x5b,0xf7,0xe7, + 0xfd,0xe1,0x68,0xe7,0x69,0xdb,0xd8,0x69,0x2d,0x9e,0x6e,0x4e,0x4f,0x9f,0xce,0x0e,0xd0,0xd3,0xe0,0xf4, + 0x62,0x74,0xdf,0xb2,0x9f,0xee,0x2e,0xac,0xc7,0xfb,0xfe,0x67,0x5d,0xb7,0xac,0x1e,0xab,0xf0,0x70,0x7a, + 0xd1,0x6f,0xb6,0x6e,0x61,0x17,0x93,0x7b,0xa3,0xd9,0x9d,0x3c,0xd7,0x6e,0xae,0xf4,0xc7,0x53,0xbd,0xd6, + 0xd3,0x6b,0x75,0xe3,0xa6,0xbb,0x57,0xeb,0xee,0x74,0xea,0x7b,0x93,0x3e,0x79,0xbc,0x38,0x68,0x76,0x8d, + 0x5a,0xef,0xb1,0xd6,0x00,0xb5,0x06,0x74,0x8d,0x5b,0xb3,0x53,0x7d,0x6d,0x3d,0xfb,0x78,0xe2,0x1e,0x0c, + 0xf4,0xce,0xf9,0xc4,0xf8,0xb5,0xba,0x7b,0xb7,0x3b,0xf6,0x6e,0xdd,0xcf,0xf0,0x7c,0xd2,0x69,0x55,0x31, + 0x3e,0x6b,0x02,0x7f,0xff,0xee,0xbc,0xb1,0x73,0xde,0x19,0x9d,0x7f,0x7e,0xbd,0xb8,0xbe,0x3a,0xc7,0xe0, + 0xd3,0xf8,0xe5,0xeb,0x88,0x3c,0xf6,0x89,0xd9,0xf9,0xe2,0x5e,0x0d,0x27,0xb7,0xed,0xc9,0x60,0x32,0xf3, + 0x3b,0x1d,0xe7,0x71,0xfe,0x09,0x75,0x1e,0x87,0x78,0xff,0xc6,0xec,0x3e,0x76,0x70,0x17,0x75,0x17,0xf3, + 0xf6,0x95,0xb5,0xb8,0xbb,0x34,0xf4,0xc5,0xa2,0x47,0xa6,0x7a,0x9f,0x2c,0x6e,0x3f,0x6f,0xbf,0x4c,0xce, + 0xbd,0x9b,0x1b,0x7f,0xa7,0x66,0x74,0x2f,0x5a,0x6e,0xe3,0xa5,0x76,0xb9,0xd7,0xde,0xba,0x6a,0xdf,0x77, + 0x46,0x3b,0x35,0xd2,0x3e,0xd5,0x5f,0xb7,0x51,0xff,0x0c,0xde,0x9c,0xf5,0x86,0x4f,0xe3,0xbb,0xfd,0x9b, + 0xe6,0xf6,0xa7,0x49,0xe3,0xac,0xb5,0x83,0x1d,0x72,0xd6,0x9c,0x74,0x6e,0xde,0xda,0x35,0xd3,0x7e,0xaa, + 0xa1,0x5e,0xf7,0xcb,0x9e,0xef,0xf6,0xc7,0xdb,0x5b,0xd7,0x96,0x4b,0xae,0xea,0xa7,0xee,0xee,0xe2,0x75, + 0x5b,0x37,0x27,0x5e,0xfd,0xf6,0xf6,0x09,0xf7,0xe7,0xfb,0x37,0x8d,0xeb,0xdd,0xe6,0xfd,0xf9,0xe0,0xb5, + 0x75,0xe0,0x01,0xfc,0x04,0x06,0x97,0x17,0x0f,0xf0,0xa2,0x61,0x8c,0x6e,0x2c,0xd2,0xdc,0xbe,0x6c,0xec, + 0x5f,0x74,0xb7,0x2e,0x9d,0x3e,0x39,0x33,0xdf,0x1e,0x2e,0xeb,0x56,0xfd,0xf2,0xfc,0xa2,0x3d,0x7e,0x19, + 0x9a,0xf3,0xce,0xbd,0x59,0xdb,0x37,0x4e,0x07,0x8e,0xd5,0x47,0xcf,0x2f,0x17,0xd7,0x46,0xf5,0xe9,0x76, + 0x76,0xb0,0xb8,0x39,0xb8,0x76,0x5f,0x47,0xe7,0x2e,0x02,0xb7,0x77,0xa0,0x39,0x7a,0x6a,0xfe,0xea,0xb5, + 0xdb,0xcf,0xce,0xe9,0xe5,0xc3,0x82,0x38,0xa4,0xaa,0xef,0xdd,0x7d,0x81,0xa3,0xab,0xa6,0x31,0x9a,0xed, + 0x8c,0xf4,0x0e,0x69,0xfe,0x3a,0x79,0xf6,0x4f,0x8d,0xd9,0x43,0x7f,0x70,0xb1,0xd7,0xfa,0xb4,0x35,0x7f, + 0x6d,0x3f,0x3c,0xe0,0xf6,0xd9,0x7c,0xfa,0xb0,0xfb,0x75,0x0e,0xf4,0xab,0x86,0x09,0xbb,0xd7,0x07,0xd5, + 0xeb,0xe7,0xab,0x9b,0x4b,0xa3,0xba,0x77,0xd7,0x69,0xd4,0xed,0xc7,0x49,0xfd,0xed,0xee,0xb9,0xbd,0xdb, + 0x1d,0xc2,0xea,0x74,0xe0,0xf4,0x1a,0x7b,0x07,0x6f,0x7b,0x03,0x4c,0x9d,0xe3,0xe0,0xb5,0x67,0xef,0x41, + 0x67,0x56,0xef,0x70,0xef,0x69,0x5a,0xad,0xe1,0xcb,0xc0,0xbf,0x99,0xd6,0xeb,0xd4,0x13,0xcd,0x2a,0x73, + 0xf1,0xbf,0x79,0xeb,0x6b,0x3c,0x3e,0xad,0x7d,0xe4,0x9e,0x4d,0x4b,0x8f,0xcc,0x1d,0x26,0x21,0x1e,0xf0, + 0x7c,0xb2,0x49,0x16,0xc4,0x83,0xd3,0x76,0x83,0x4e,0xa8,0x60,0x16,0xfe,0x93,0x57,0x0a,0xcb,0x69,0xbd, + 0x4f,0xda,0xda,0xa1,0xb6,0x46,0x7f,0xd2,0x55,0x68,0xe9,0x9a,0x40,0xdd,0x49,0xcc,0x86,0x39,0x9d,0x55, + 0x42,0x37,0x39,0x4b,0xe8,0xe4,0xb1,0xa1,0x1e,0x4c,0x4a,0xa9,0x1c,0xd9,0x06,0x9b,0x85,0x2c,0x58,0x1e, + 0xb2,0x79,0xb3,0x21,0x2a,0x0b,0xa0,0x81,0x68,0x14,0xb8,0x9b,0xd0,0x06,0x23,0x0b,0x1a,0x94,0xe0,0x5a, + 0x80,0x04,0x8d,0x35,0x46,0xc2,0x40,0x24,0x2e,0xa8,0x04,0x53,0x36,0xe8,0xbc,0x0c,0xa1,0xeb,0x74,0x8e, + 0xbb,0x0e,0xb2,0xbd,0xcd,0xd8,0x26,0x1a,0x55,0xcc,0x6b,0x27,0x59,0x8e,0x5c,0xda,0x58,0x01,0x26,0xa5, + 0xc1,0x2b,0x06,0xa6,0x8e,0xe2,0xc6,0x7b,0x7b,0x3f,0x81,0xde,0x3d,0x6a,0xf1,0x96,0x68,0x25,0xd1,0xe0, + 0xfa,0xc7,0xfc,0xfe,0x11,0xa1,0x38,0x75,0x0c,0x98,0xea,0x9f,0x0a,0x69,0x08,0xdf,0xbc,0xf5,0x77,0x33, + 0x4d,0x10,0x95,0xed,0x9f,0xa2,0x27,0x56,0xb1,0x21,0x9a,0x0a,0x32,0x82,0x4b,0x23,0x2a,0x8c,0x9b,0x4f, + 0x07,0x5b,0x11,0xf2,0xe9,0xca,0x63,0x20,0x7b,0x52,0x09,0x19,0x84,0xcf,0x21,0x7c,0xf0,0x1c,0x75,0x34, + 0x78,0x6e,0x87,0x44,0x93,0xdd,0x13,0x98,0x1f,0x02,0x25,0xb6,0xdc,0xd0,0xe5,0x14,0x8d,0xb0,0x58,0x51, + 0x8e,0x83,0x09,0x90,0xec,0xf3,0x1c,0x60,0x9b,0x33,0x10,0x95,0x4d,0x40,0xfa,0x90,0x66,0x01,0x4d,0xb6, + 0x34,0x51,0x4d,0x37,0x64,0xc2,0xd7,0xaa,0x4d,0x1c,0xc9,0x02,0x27,0x70,0xa9,0x4a,0x08,0xc5,0x85,0x7d, + 0x08,0x08,0xb3,0x6b,0xb6,0x9a,0x90,0x6c,0x4a,0x13,0x4d,0x2a,0x96,0xd0,0x04,0x11,0x12,0x8d,0xb9,0xfe, + 0x32,0xc4,0x40,0x87,0x29,0xc8,0x58,0x10,0x33,0x89,0x6d,0xa0,0xa8,0x7d,0x04,0x42,0x9e,0x23,0xdf,0xf3, + 0xa8,0x3d,0xc4,0xcf,0x86,0x8b,0xe9,0x2a,0x86,0x17,0x61,0x6e,0xb1,0x05,0x5c,0xb4,0xc5,0xeb,0x79,0xac, + 0xde,0x16,0x1d,0xce,0xdc,0x96,0x1b,0xce,0xdc,0x66,0xc6,0x0e,0x18,0x80,0x13,0x2d,0xdd,0x48,0xb8,0x7c, + 0x53,0x1f,0x82,0x16,0xf4,0xe0,0x60,0x79,0x77,0x1a,0x5c,0x31,0x82,0xcc,0x38,0x4e,0x98,0x7f,0x80,0x19, + 0x9a,0x88,0x81,0xf5,0xc0,0x88,0x64,0xfb,0x27,0x27,0x25,0x6b,0x80,0x7a,0xfb,0x0c,0xd2,0x30,0x27,0xfe, + 0x18,0x82,0x11,0x75,0x07,0x6d,0x4d,0x98,0x69,0x8d,0xa5,0x20,0x21,0x4f,0x49,0x21,0x92,0x47,0x5c,0x03, + 0xb3,0xd2,0x06,0x87,0x52,0xcc,0x05,0xef,0x6a,0xdb,0xc3,0x68,0x32,0x81,0xb8,0xa0,0xf5,0x48,0x23,0x6a, + 0x3f,0x2c,0xf9,0x3e,0x0c,0xe2,0x30,0x90,0xcf,0x41,0xd2,0x89,0x58,0xc4,0x65,0xdf,0x87,0x87,0x58,0x6f, + 0x0a,0x46,0x41,0xc8,0xe3,0x51,0xe0,0xcf,0x8a,0xb6,0xd3,0x91,0x40,0x39,0xd8,0x6c,0xe9,0xdc,0x4d,0x0f, + 0xa8,0xbc,0x82,0xee,0x72,0x88,0x93,0x23,0x4c,0xa3,0x88,0xa3,0x1d,0x72,0xd9,0x71,0x45,0xd2,0x06,0x96, + 0x35,0xf0,0xa0,0x4b,0x86,0xd8,0xa7,0x95,0x58,0xe4,0x60,0x21,0x99,0x66,0xea,0xa1,0x80,0x76,0x9a,0xe5, + 0x92,0x1e,0x95,0xb3,0x70,0xc9,0x81,0x24,0x76,0x25,0xa0,0x5b,0xc0,0x22,0x85,0xd8,0x63,0xa6,0xa0,0x02, + 0x0f,0xcd,0x4f,0x2c,0x9a,0x27,0xe3,0xd4,0x02,0x4d,0xed,0xe6,0x86,0x91,0x2e,0x02,0x4c,0xe6,0xcf,0x33, + 0x60,0xf9,0x62,0x72,0x76,0x80,0x67,0x6e,0x8e,0x2d,0xc7,0xc1,0xeb,0xa1,0xee,0x1d,0x13,0x6a,0x5b,0xda, + 0xce,0xe7,0xcf,0xda,0x3f,0xb4,0xea,0xf6,0x36,0x33,0xd9,0xdf,0xc3,0x7c,0x3a,0xd3,0xba,0x9c,0x4c,0x23, + 0xdb,0xf5,0x3d,0xcd,0x5b,0xb8,0xb4,0xc3,0x18,0xd8,0x34,0x43,0xd7,0xa6,0xc8,0x3e,0xae,0x6c,0xd3,0x5f, + 0xf0,0x76,0x5c,0xa1,0x90,0x95,0x64,0xed,0xa8,0xf3,0x9b,0xb6,0x3f,0x1d,0x41,0x1c,0x53,0xbe,0x13,0x1c, + 0xf3,0x42,0x83,0xdc,0xcb,0x0f,0xb1,0xdd,0x66,0x1b,0x63,0x87,0x82,0xac,0x33,0xf1,0x2f,0x1a,0x5d,0xeb, + 0xe0,0xdb,0x47,0xfa,0xa3,0x91,0xb2,0x56,0x60,0x8a,0x9b,0xb3,0x1f,0x6b,0x82,0x98,0x43,0xaa,0xff,0xea, + 0xf5,0x35,0x27,0xe4,0xd0,0xba,0xd4,0x16,0x53,0xed,0x77,0xe2,0x8f,0xa6,0xc8,0x8b,0x37,0x57,0x74,0x5b, + 0x68,0x2d,0xd8,0xc2,0x3d,0x0c,0x54,0x13,0xb3,0x25,0x0e,0x3f,0x4c,0x23,0x35,0x67,0x74,0x13,0xea,0x2f, + 0x11,0xdf,0x91,0xe3,0x58,0x10,0xd8,0x6c,0x12,0x48,0x75,0xc2,0xd4,0xab,0x92,0xf0,0xfd,0x84,0x4a,0xd3, + 0x0e,0x72,0x2c,0xd6,0x3f,0x8e,0x29,0xf7,0x47,0x8d,0x56,0xb4,0xa0,0x7f,0xc8,0x26,0x50,0x51,0x02,0xf8, + 0xe7,0x9f,0x9a,0x42,0x2a,0xa6,0x22,0xdb,0x80,0xee,0x2a,0x02,0x2f,0x6d,0xb7,0x4d,0xf7,0xf1,0xd8,0x86, + 0x9e,0x9c,0x07,0x5a,0x60,0x04,0x2d,0x8d,0x3b,0x18,0x37,0x0e,0x1d,0x5f,0x82,0x18,0x1c,0x33,0xa6,0x1a, + 0x26,0xa9,0x13,0x80,0x71,0x9c,0xa4,0xab,0x88,0xa1,0xaf,0xf0,0xed,0xa9,0x02,0x3b,0xe3,0x22,0x49,0x1b, + 0x79,0x29,0x26,0x47,0xe6,0xde,0x49,0x1f,0x4e,0xa0,0x45,0xe8,0xb0,0xed,0xe5,0xdb,0x36,0x7a,0xb2,0xa0, + 0x3d,0xf1,0xcc,0xe8,0xb0,0x40,0xcc,0xa1,0x40,0x2a,0x4f,0x23,0x75,0xf5,0xc8,0xa1,0xe9,0xf4,0x80,0x96, + 0xbc,0x1a,0x08,0xd7,0x3c,0x0c,0xeb,0x45,0x83,0xf2,0x2d,0x39,0x9c,0xbc,0xde,0x46,0xb4,0xff,0x2e,0xf6, + 0xb2,0x12,0xfe,0x15,0x38,0xb6,0xca,0xcd,0xe4,0x00,0x00,0xf8,0xfa,0x26,0xd2,0x0a,0x91,0x18,0xfd,0x94, + 0x3d,0x8a,0x10,0x39,0x8d,0x34,0x5d,0xd6,0x85,0x39,0xd4,0xe3,0x9d,0x49,0x6c,0x32,0x21,0x43,0xa7,0x9d, + 0xc1,0xf9,0x71,0x4d,0x98,0x82,0x9d,0xe3,0xb0,0x68,0x45,0xd1,0x74,0x2f,0x6f,0xf0,0x43,0xfb,0x0f,0xa9, + 0x07,0x55,0xe2,0xf4,0xde,0xa2,0x91,0x88,0xd6,0x75,0x5c,0x9e,0x37,0xf1,0x30,0xc2,0xc2,0x8f,0x92,0x6e, + 0x0b,0xbd,0x41,0x43,0xf2,0x4c,0x51,0x29,0x5d,0xb9,0xaa,0xae,0x3c,0xf0,0x6d,0x8c,0x48,0x71,0xd5,0x9d, + 0xdc,0xaa,0x24,0x9a,0x5b,0x61,0xcd,0x2d,0xd1,0xdd,0xa5,0xdd,0x1e,0x87,0xa4,0xd3,0x9d,0x4e,0xfa,0xb8, + 0x6c,0x1e,0x16,0x19,0xb7,0x25,0xa3,0x6c,0x44,0x93,0x98,0x79,0x75,0x04,0xc8,0x16,0xde,0x80,0xb8,0x17, + 0x4e,0x69,0xb6,0xd5,0x41,0xc4,0xb5,0x00,0x0f,0x99,0xeb,0xac,0xfc,0x17,0x8d,0xaf,0xcc,0xef,0x63,0x8f, + 0xa1,0x05,0x78,0xbc,0x56,0x77,0x80,0xce,0x59,0x98,0xc7,0x53,0xae,0x5a,0x9a,0x2a,0x4b,0x50,0x72,0x98, + 0xca,0x01,0x15,0xc2,0x17,0x03,0x2c,0xc8,0xf2,0xd9,0x37,0x75,0x6c,0xaa,0x58,0x30,0xf9,0x3a,0x5c,0x21, + 0x31,0xe9,0x96,0x40,0x7a,0x3e,0x24,0xc5,0x98,0x43,0xa1,0xb1,0x0a,0xe8,0x1c,0x1a,0xf6,0x32,0xd8,0xfb, + 0x50,0x67,0x25,0xb6,0xa6,0x8f,0x97,0xd1,0x0d,0x54,0x56,0x81,0x1d,0x63,0x54,0x0c,0xda,0xe2,0x0a,0xab, + 0x40,0x12,0xba,0xc6,0xe1,0x62,0xd0,0x41,0xa0,0xb2,0x12,0xac,0xbf,0xc4,0x03,0x06,0x7e,0xc6,0x03,0xd4, + 0xf9,0x5b,0x89,0x7c,0x2c,0x6c,0x74,0x44,0x7f,0x4d,0x8f,0x8e,0x16,0xf9,0x71,0x79,0x59,0x96,0x4b,0x41, + 0x7e,0x26,0x67,0x69,0x6c,0x52,0xc7,0x67,0xea,0xec,0xd8,0x45,0x1d,0x16,0xbb,0x4e,0x83,0xca,0x72,0x8e, + 0x9e,0xc4,0x5e,0x8b,0x35,0x19,0xec,0xed,0x0f,0xc3,0xb3,0x2a,0xca,0x98,0x6e,0x94,0x59,0x3a,0x94,0x5e, + 0xbc,0x80,0x61,0x48,0x2b,0x97,0xba,0xd1,0x9a,0x11,0xee,0xed,0x05,0x6e,0xee,0xd2,0x14,0x13,0x90,0x8d, + 0x29,0xb2,0xcb,0x8a,0x8a,0x4d,0x18,0xa0,0xc4,0x73,0x70,0x26,0xc9,0xb3,0xcf,0x53,0x0e,0x35,0xe0,0xe5, + 0xb4,0xf1,0xc3,0xb4,0x64,0xed,0x63,0x6c,0x59,0x96,0xc4,0x16,0xa6,0xb2,0x1d,0x87,0x67,0x3e,0x85,0xc9, + 0xec,0x54,0xe8,0xac,0x98,0xce,0x8a,0x5a,0x4b,0x12,0x0e,0xa1,0x54,0x32,0xa5,0x4d,0x21,0x26,0x72,0xca, + 0x04,0x50,0xc3,0xc7,0xd4,0x36,0x85,0x83,0x57,0xac,0x9f,0xcc,0x35,0x93,0x8b,0x52,0x2e,0xa1,0x6c,0xab, + 0x3c,0x23,0x5d,0xc6,0x6c,0x79,0xb2,0x51,0x8c,0xd0,0xa5,0xc3,0x89,0x57,0x4d,0x41,0x8a,0x21,0x6b,0xd6, + 0x9c,0x2e,0x67,0xab,0xe6,0x26,0xc5,0x98,0xd7,0xb6,0xb5,0xc8,0xcb,0x59,0xb8,0xaf,0xae,0xe6,0x4f,0x02, + 0xbf,0xc1,0x43,0x69,0x3c,0x79,0xca,0x8e,0x0c,0x4b,0x69,0x76,0xca,0xb8,0x64,0xd4,0x8c,0x22,0x20,0x67, + 0xbc,0x6f,0xd9,0x9e,0x46,0xa5,0x55,0x6e,0x57,0xa3,0xc4,0xcf,0xdf,0xd7,0x04,0xbd,0xcf,0xec,0x6c,0x32, + 0x8c,0x69,0xc6,0x4d,0x2d,0x98,0x43,0x94,0x0b,0x57,0xe1,0x27,0xd0,0x96,0xd2,0x32,0x44,0xa3,0x25,0xf6, + 0x59,0x51,0x3f,0xde,0xbb,0xd3,0x4a,0x01,0xfc,0xa5,0xf6,0x5a,0x53,0x39,0xf2,0x7e,0xc7,0xdd,0x56,0x22, + 0xa2,0xe7,0xee,0xb7,0xa2,0x11,0xfb,0x8e,0x3b,0x2e,0xe1,0x5e,0x87,0x7c,0x58,0xd6,0x44,0x03,0xec,0x2c, + 0x9f,0x53,0x60,0xef,0xd0,0xfe,0xe5,0x22,0x5b,0x71,0x54,0x2b,0x34,0x7b,0x54,0xb6,0xd4,0xd7,0xf8,0xc9, + 0x5e,0x3e,0x74,0x6e,0xd2,0x41,0xa5,0x65,0xf8,0x19,0x08,0xa7,0x8f,0x72,0xd3,0x06,0x8b,0x34,0x54,0x2b, + 0x44,0x3e,0x3d,0x09,0x39,0x97,0x64,0xa4,0x93,0x59,0x13,0x72,0x03,0x78,0x44,0xa7,0x2b,0xfd,0x0d,0xac, + 0xf7,0x45,0xee,0x08,0x60,0xe8,0xb8,0xec,0xc5,0x45,0x21,0x8a,0xe2,0xe4,0x27,0x85,0x72,0xea,0xd0,0x64, + 0x64,0x7a,0xeb,0x16,0x04,0xfd,0xff,0xe7,0xb3,0x39,0xf9,0xac,0x30,0xe5,0x7f,0x23,0xa3,0x4d,0x44,0x87, + 0xbc,0x86,0xff,0x37,0xb2,0xda,0xe2,0xa3,0xdc,0xc4,0x7b,0x99,0xa2,0x0c,0xb8,0x2e,0xbf,0xeb,0x8d,0xb3, + 0x5f,0xf9,0x1d,0x4e,0xb9,0xcc,0x57,0xaa,0x21,0xbd,0x14,0x4f,0x46,0x7f,0xb5,0x4e,0x6e,0xd8,0x37,0x19, + 0x80,0x82,0x91,0x54,0xf7,0x9c,0xd7,0x97,0x2e,0xed,0x2c,0x67,0x17,0x9c,0xe3,0xe6,0x32,0x93,0x5e,0xa3, + 0xaf,0xcc,0x4c,0xaa,0x9b,0x61,0x26,0xa5,0x1f,0x84,0x20,0x43,0x59,0x9d,0x96,0xe7,0x2f,0x03,0x1e,0x7c, + 0xf3,0x44,0xc2,0xc1,0xeb,0xc7,0x19,0x79,0x0a,0x21,0xe1,0x7a,0x1f,0x14,0x3d,0x4f,0x70,0x71,0x69,0x87, + 0xe6,0x0e,0x56,0xf2,0x09,0x65,0xf9,0x9c,0xa2,0xda,0x9c,0x57,0xfc,0xa4,0xe2,0x16,0x4b,0x97,0xf2,0x5b, + 0x3e,0x8a,0x86,0xa9,0xbb,0x4b,0x81,0xf2,0x86,0x98,0x55,0x66,0x6f,0xcf,0x82,0xd1,0x64,0xd3,0x63,0x83, + 0x45,0x48,0xec,0x58,0x2b,0x0e,0x38,0x43,0xca,0x8c,0xb4,0x1c,0x7d,0xfd,0x91,0x08,0xfd,0x24,0x69,0x75, + 0xe4,0xaa,0xd0,0x90,0x4b,0x63,0x14,0xa6,0xbe,0x5d,0xc6,0x09,0x90,0xab,0x36,0x33,0x5a,0x6a,0x17,0xf6, + 0x62,0x23,0x6d,0xca,0xa4,0x7f,0xfa,0x23,0x1b,0x7a,0x53,0x40,0x5e,0x94,0x5e,0x1a,0x49,0x4b,0xf9,0x6a, + 0x8c,0xa5,0xf6,0x58,0x49,0xfe,0x1f,0xd2,0x9e,0x00,0x0f,0xce,0xa5,0x8c,0x5e,0x52,0x0e,0x44,0x65,0x08, + 0x87,0x28,0x4a,0xb6,0x91,0xf0,0x3d,0x54,0x33,0x1b,0x27,0xd3,0x21,0x1e,0xbb,0x06,0xaa,0x62,0x1c,0xca, + 0x96,0x51,0x3e,0x74,0x2d,0xa0,0x43,0xd3,0xb1,0x0c,0xb6,0x2e,0xe7,0x80,0xf4,0x62,0x1d,0xe6,0xf7,0xac, + 0x9b,0x51,0xdb,0xca,0x7e,0xc6,0xd2,0xa5,0x73,0xf5,0x7f,0x63,0x41,0x8c,0x2e,0x09,0xe4,0x2c,0x86,0xbe, + 0xcb,0x6e,0xaa,0xb4,0x10,0x9e,0xce,0x01,0x86,0xc9,0x4b,0x00,0xe2,0x3e,0xc1,0x38,0x90,0xa5,0x4f,0x82, + 0xe4,0xae,0x8e,0x91,0x05,0x85,0x79,0x43,0xed,0x16,0x2b,0xf9,0x0b,0x18,0x29,0xb6,0x8b,0xe8,0x69,0x0f, + 0x3b,0x13,0x16,0x69,0xf8,0xbd,0xbf,0xe0,0xb6,0x00,0xed,0x6f,0x4a,0xc8,0x53,0x4a,0xd9,0xc8,0x19,0xab, + 0x84,0x37,0xa8,0x32,0x66,0xc9,0x8d,0x9e,0xe9,0x8a,0x45,0xe1,0x33,0xb6,0xd5,0xb2,0xdb,0x49,0xe9,0x64, + 0x8f,0xfa,0x27,0xf6,0xea,0xf1,0xf5,0xae,0xdc,0xe6,0x43,0x4b,0x25,0x2f,0x89,0x14,0x64,0x4c,0x03,0x0e, + 0xa0,0xf2,0x10,0xdb,0x73,0xd3,0x56,0xf8,0xe1,0x2f,0x9e,0xe5,0x4b,0xca,0x0e,0x46,0x5f,0xd9,0x3e,0xc0, + 0x4a,0x86,0x4d,0x4a,0x7b,0x00,0xf1,0x4c,0x4a,0x88,0xe3,0xfe,0x08,0x41,0x99,0xb0,0x19,0xa3,0xc4,0x01, + 0x25,0x8d,0x53,0x51,0x24,0xd1,0x05,0xac,0x78,0x7f,0x66,0x4c,0x90,0xe1,0x15,0x8a,0xca,0x1d,0xd0,0xc8, + 0x58,0x2a,0x76,0x71,0x43,0xe5,0xf9,0x59,0x20,0xe3,0xd2,0x14,0xe9,0x0a,0x78,0x65,0x8c,0xc5,0x2a,0x67, + 0x88,0x70,0xc4,0x15,0x08,0x48,0xf7,0x20,0x25,0x02,0xc1,0x6d,0xc8,0x65,0x04,0x84,0x23,0xa6,0x08,0x30, + 0x44,0xc5,0xfb,0x96,0x9c,0x1c,0xc6,0x72,0xc2,0xeb,0xfd,0xe1,0xed,0x4c,0x26,0xdb,0x08,0x5f,0x23,0x67, + 0xa9,0x05,0xfa,0xa5,0xf8,0x45,0xd8,0x11,0xc9,0xa8,0xe8,0x44,0x0b,0x37,0x7d,0x99,0x49,0x0f,0x01,0xd6, + 0xcd,0xab,0xa8,0xae,0x1c,0x4c,0xb9,0x88,0xce,0xbf,0x48,0x9a,0x4f,0x70,0xc0,0x75,0x95,0x7b,0xc0,0xcc, + 0x9c,0x77,0x91,0x4d,0x0a,0x26,0x7d,0xde,0xe0,0xd1,0x6a,0x57,0xcd,0x46,0xad,0x97,0x66,0x11,0x96,0x97, + 0xf3,0xeb,0x08,0x25,0x7b,0x0f,0x28,0x66,0xb7,0x49,0xfb,0xcf,0x1a,0x2a,0xef,0x59,0x02,0x76,0x30,0xac, + 0xa9,0xd9,0x51,0xc1,0x2a,0xf4,0x18,0xce,0x32,0x7e,0xbc,0xad,0x95,0x08,0xd6,0x7a,0x22,0x70,0x2b,0x28, + 0x86,0xa2,0xd2,0x24,0x23,0xac,0x42,0x9a,0xc0,0x0d,0x5b,0x5c,0x89,0x68,0xef,0xbe,0xd3,0xc0,0x34,0x11, + 0xc1,0x83,0x86,0xca,0x9e,0xb2,0xb8,0x34,0xe1,0x04,0x66,0x21,0x69,0x77,0x3e,0xe5,0xed,0xbe,0x93,0x72, + 0xfd,0xaa,0x90,0x72,0xfd,0xea,0x1d,0x94,0x29,0xe6,0x52,0xca,0xac,0xdd,0x15,0x28,0xcf,0xa7,0x35,0xb1, + 0x6f,0xca,0xb0,0x8d,0x24,0x25,0x89,0xc6,0x48,0xb9,0x1c,0xa5,0xc6,0x56,0xa2,0xd8,0xc2,0xf0,0xd5,0x87, + 0xb6,0xbe,0x50,0x90,0x8c,0x64,0xa5,0x69,0xc6,0x68,0x05,0x44,0xa5,0x26,0xf3,0xe2,0xd7,0x14,0xb8,0x99, + 0xf8,0x25,0xbf,0x28,0xa1,0xe2,0x5a,0xaf,0x7d,0x09,0x33,0xac,0x63,0x49,0x99,0x78,0x2e,0xe1,0xe4,0xf1, + 0x95,0x9b,0xd2,0x96,0xa6,0x8f,0xb1,0xb6,0x59,0x2a,0x7f,0xfc,0x61,0x1b,0x92,0xb2,0x9f,0x1f,0x7c,0x50, + 0x7e,0x7e,0x10,0x5f,0x63,0x57,0xdd,0x60,0xcf,0x26,0xbd,0x8e,0x9b,0xc8,0x79,0x7f,0xb6,0xc0,0xab,0xef, + 0xfc,0xa6,0x85,0xdb,0xcb,0x58,0xb6,0x39,0x02,0xfa,0x8b,0x3a,0xf7,0x95,0x4e,0x01,0x25,0x7d,0xc5,0x1d, + 0xe8,0x65,0x4e,0xcf,0x0e,0xb6,0xeb,0x8e,0x2f,0x9f,0x9c,0x48,0x80,0x3a,0x93,0x94,0xf3,0xf7,0x18,0x28, + 0xe3,0x3c,0x19,0xc4,0xe0,0x30,0xbb,0x1a,0x1c,0x66,0x57,0xf7,0x13,0xe3,0x2c,0xab,0xcf,0xd1,0x57,0x80, + 0x0d,0x76,0xfb,0x57,0x3b,0x39,0xd6,0xaa,0x8a,0xad,0x52,0xb1,0xb6,0xb9,0xa7,0xea,0x56,0xe2,0x12,0x72, + 0x68,0xaf,0xbd,0x1f,0x76,0xfb,0x39,0xef,0x24,0x4d,0x62,0xec,0x13,0x58,0xf7,0x69,0x7a,0x9e,0x3a,0x2e, + 0x53,0x68,0x2c,0x3f,0x33,0x53,0xdb,0x84,0x77,0x89,0xa8,0x8d,0x11,0x74,0x37,0xef,0xf6,0x75,0x16,0xa6, + 0xc2,0xee,0xc7,0xd3,0x3f,0xa4,0xf4,0x55,0xbc,0x40,0xd9,0xe2,0xc5,0x25,0x4e,0xeb,0x57,0xdd,0x4b,0xda, + 0x34,0x8c,0x49,0xd3,0x6a,0xc0,0x9b,0x13,0xdd,0x34,0x01,0xe9,0x66,0xa5,0xeb,0x1f,0xf9,0x47,0x6a,0x12, + 0x75,0x06,0x11,0xcc,0x36,0xf6,0xc5,0x5a,0xc2,0x61,0xe4,0x18,0xb2,0xe4,0xab,0x16,0xfe,0x3e,0x72,0x8c, + 0xde,0xf2,0x5f,0x49,0xd2,0x15,0x96,0xc8,0xd9,0xad,0xee,0xb8,0x0b,0xfe,0x8e,0x46,0x60,0x8f,0xb0,0xf4, + 0xed,0x5f,0xa0,0x9b,0xfe,0xf4,0x2f,0x3c,0xba,0xb8,0x13,0x62,0xfe,0x05,0x60,0xaa,0x46,0xf4,0xe5,0x5f, + 0xe6,0x2d,0x4f,0xf0,0xb9,0xb1,0x45,0x87,0xc2,0x07,0x13,0xea,0x4b,0xcf,0x60,0x06,0x44,0x61,0xe5,0x84, + 0x6f,0xca,0x6b,0x2e,0xb5,0x8f,0xf4,0xf9,0xb1,0xf8,0xf0,0x78,0x8b,0x7f,0x6f,0xfd,0x6f,0x98,0x74,0xa6, + 0x4d,0x85,0x3d,0x00,0x00}; #endif diff --git a/src/assets/version.h b/src/assets/version.h index f43427e..de5e299 100644 --- a/src/assets/version.h +++ b/src/assets/version.h @@ -4,10 +4,10 @@ const uint8_t VersionMajor = 2; const uint8_t VersionMinor = 1; const uint8_t VersionPatch = 0; -const uint8_t VersionMetadata = 1; +const uint8_t VersionMetadata = 2; const char VersionBranch[] = "release/2.1"; const char VersionSemVer[] = "2.1.0-beta.1"; -const char VersionFullSemVer[] = "2.1.0-beta.1+1"; +const char VersionFullSemVer[] = "2.1.0-beta.1+2"; const char VersionCommitDate[] = "2018-04-29"; #endif diff --git a/src/main.debug.h b/src/main.debug.h index e0fb467..850c1ba 100644 --- a/src/main.debug.h +++ b/src/main.debug.h @@ -41,6 +41,9 @@ void wifiEvent(WiFiEvent_t event) case WIFI_EVENT_SOFTAPMODE_STADISCONNECTED: _dln("WiFi:: soft AP mode: station disconnected"); break; + + default: + break; } } diff --git a/src/main.triggers.h b/src/main.triggers.h index 3f9cc36..c79d54a 100644 --- a/src/main.triggers.h +++ b/src/main.triggers.h @@ -66,7 +66,8 @@ void parseResponse() return; } - timezoneOffset = root["rawOffset"]; + timezoneOffset = root["rawOffset"].as() + root["dstOffset"].as(); + hasTimezone = true; } @@ -284,6 +285,7 @@ void updateTimeTrigger() { case RelativeToSunrise: _d("sunrise "); break; case RelativeToSunset: _d("sunset "); break; + default: break; } _dln(activeTimeTrigger->time); } @@ -373,14 +375,18 @@ void checkTriggers() } } - bool motionChanged = (activeMotionStart > 0) != lastMotion; - lastMotion = (activeMotionStart > 0); + bool motionChanged = inMotionTrigger != lastMotion; + lastMotion = inMotionTrigger; if (!motionChanged && !timeTriggerChanged) return; + _d("Triggers :: motionChanged = "); _dln(motionChanged); + _d("Triggers :: timeTriggerChanged = "); _dln(timeTriggerChanged); + + if (motionChanged) { if (inMotionTrigger) diff --git a/src/settings/triggers/motion.cpp b/src/settings/triggers/motion.cpp index 8842c1b..26ab815 100644 --- a/src/settings/triggers/motion.cpp +++ b/src/settings/triggers/motion.cpp @@ -52,6 +52,7 @@ bool MotionTriggerSettings::fromJson(char* data, bool* changed) enabled(root["enabled"]); + enabledDuringDay(root["enabledDuringDay"]); JsonVariant jsonEnabledDuringTimeTrigger = root["enabledDuringTimeTrigger"]; if (jsonEnabledDuringTimeTrigger.success()) diff --git a/web/dist/bundle.css b/web/dist/bundle.css index dd26d4a..626541d 100644 --- a/web/dist/bundle.css +++ b/web/dist/bundle.css @@ -1 +1 @@ -html{box-sizing:border-box;font-size:62.5%}*,:after,:before{box-sizing:inherit}body{background-color:#000;color:#fff;font-family:Verdana,Arial,sans-serif;font-size:1.3em;font-weight:300;letter-spacing:.01em;line-height:1.3;padding-bottom:3rem}@media screen and (min-width:768px){body{padding-top:3rem}}a{text-decoration:none}[v-cloak]{display:none}#container{background:#202020;margin-top:2rem;padding:1rem;box-shadow:0 0 50px #fcf6cf;border:solid 1px #000}@media screen and (min-width:768px){#container{width:768px;margin-left:auto;margin-right:auto}}.header{position:relative}.header img{float:left;margin-right:1rem}@media screen and (max-width:767px){.header .wifistatus{clear:both;margin-top:3rem}}@media screen and (min-width:768px){.header .wifistatus{position:absolute;right:0;top:0}}.header .wifistatus .indicator{display:inline-block;width:1rem;height:1rem;border-radius:50%;margin-right:.5rem}.header .wifistatus .indicator[data-status=connected]{background-color:#396}.header .wifistatus .indicator[data-status=disconnected]{border:solid 1px grey}.header .wifistatus .indicator[data-status=connecting]{background-color:#f93}.header .wifistatus .indicator[data-status=error]{background-color:#c00}.button,.check .control,.notification,.panel .panel-body,.panel .panel-header,.radio .control,.warning,button,h3,input[type=submit],select{border:1px solid #111;border-radius:3px;box-shadow:inset 0 1px rgba(255,255,255,.1),inset 0 -1px 3px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.08),0 1px 2px rgba(0,0,0,.15)}.button.active,.button:active,button.active,button:active,input[type=number],input[type=password],input[type=submit].active,input[type=submit]:active,input[type=text],textarea{border:1px solid #111;border-color:#000 #111 #111;box-shadow:inset 0 1px 2px rgba(0,0,0,.25),0 1px rgba(255,255,255,.08)}button,input{font-family:Verdana,Arial,sans-serif}input{-webkit-appearance:none;-moz-appearance:none;appearance:none}.button,button,input[type=submit]{display:inline-block;padding:0 12px;color:#ddd;background:#404040;cursor:pointer;line-height:3rem}.button.focus,.button:focus,.button:hover,button.focus,button:focus,button:hover,input[type=submit].focus,input[type=submit]:focus,input[type=submit]:hover{color:#ddd;background:#505050;outline:0}.button.active,.button:active,button.active,button:active,input[type=submit].active,input[type=submit]:active{color:#ccc;background:#282828}.button-primary,input[type=submit]{background:#2265a1}.button-primary.focus,.button-primary:focus,.button-primary:hover,input[type=submit].focus,input[type=submit]:focus,input[type=submit]:hover{background:#2672b6}a.button{text-decoration:none}.navigation{clear:both;margin-top:3rem}.tabs>.button{margin-left:-1px;border-radius:0}.tabs>.button:first-child{margin-left:0;border-radius:3px 0 0 3px}.tabs>.button:last-child{border-radius:0 3px 3px 0}.tabs>.button:focus{position:relative;z-index:1}.version{color:grey;font-size:8pt;text-align:center;margin-top:2rem}.notificationContainer{position:fixed;top:2rem;z-index:666}@media screen and (min-width:768px){.notificationContainer{width:512px;left:50%}}.notification{background:#297ab8;box-shadow:0 0 10px #000;color:#fff;cursor:pointer;padding:.5em;margin-bottom:2rem;position:relative}@media screen and (min-width:768px){.notification{left:-50%}}.notification .message{white-space:pre}.notification.error{background:#973a38}.check,.radio{display:inline-block;cursor:pointer;user-select:none;white-space:nowrap;margin-top:.5em;margin-bottom:.5em}.check .control,.radio .control{background:#404040;display:inline-block;width:16px;height:16px;position:relative}.check .label,.radio .label{display:inline-block;margin-left:.5em;vertical-align:top}.check.checked .control,.radio.checked .control{background:#606060}.check.disabled,.radio.disabled{cursor:not-allowed}.radio .control,.radio .control .inner{border-radius:50%}.radio .control .inner{color:#000;position:absolute;top:4px;left:4px;width:6px;height:6px}.radio.checked .control .inner{background:#ccc;box-shadow:0 1px rgba(0,0,0,.5)}.check .control .inner{position:absolute;top:5px;left:4px;width:6px;height:3px}.check.checked .control .inner{border:solid rgba(255,255,255,.8);border-width:0 0 2px 2px;transform:rotate(-45deg);box-shadow:-1px 0 rgba(0,0,0,.2),0 1px rgba(0,0,0,.5)}.form-control{margin-top:1em}input[type=number],input[type=password],input[type=text],textarea{background:#404040;color:#fff;padding:.5em;width:100%}select{background:#404040;color:#fff;font-family:Verdana,Arial,sans-serif;padding:.5em}input[type=range]{margin-top:1rem;margin-bottom:1rem}h1{font-size:2rem;margin:0}h2{color:silver;font-size:1.2rem;margin:0}h3{color:grey;background:#282828;font-size:1.2rem;padding:.5rem}h4{font-size:1.4rem}input[disabled]{cursor:not-allowed;color:grey;background:#262626}label{display:block;margin-top:.5em;margin-bottom:.5em}.label-inline{margin-right:2rem}@media screen and (min-width:768px){.horizontal{clear:both}.horizontal label{display:inline-block}.horizontal input[type=number],.horizontal input[type=password],.horizontal input[type=text],.horizontal textarea{display:inline-block;float:right;width:50%}.horizontal:after{clear:both}}.hint{display:block;font-size:8pt;color:grey;margin-bottom:1.5rem}.loading{margin-top:3rem;text-align:center}.suboptions{margin-left:5rem}.buttons{clear:both;text-align:center;margin-top:1rem}.sliders{margin-top:2rem}.step{margin-left:3rem;margin-right:3rem;position:relative}.step .slidercontainer{margin-right:4em}.step .value{position:absolute;right:0;top:.1rem;color:grey}.slidercontainer{margin-top:1rem}.slider{-webkit-appearance:none;width:100%;height:.5rem;border-radius:.25rem;background:#404040;outline:0}.slider::-webkit-slider-thumb{-webkit-appearance:none;appearance:none;width:2rem;height:2rem;border-radius:50%;background:#fcf6cf;cursor:pointer}.slider::-moz-range-thumb{width:2rem;height:2rem;border-radius:50%;background:#fcf6cf;cursor:pointer}.warning{background:#973a38;padding:.5em;margin-bottom:2rem;margin-top:1rem}.nodata{color:grey;text-align:center}.clear{clear:both}.panel{margin-bottom:2rem;padding:0}.panel .panel-header{border-radius:3px 3px 0 0;border-bottom-width:0;padding:.5em;background:#404040;color:#fff}.panel .panel-header label{font-size:1em}.panel .panel-header .actions{float:right}.panel .panel-header .label,.panel .panel-header a{color:#fff}.panel .panel-body{border-radius:0 0 3px 3px;background:#303030;padding:2rem}.panel.active .panel-header{background:#3b4a58;color:#fff}.inline{display:inline-block;width:auto}.weekdays{margin-top:1rem}.weekdays .label{width:8em}.fade-enter-active,.fade-leave-active{transition:opacity .5s}.fade-enter,.fade-leave-to{opacity:0}.range{clear:both}.range .start{position:relative;display:inline-block;width:49%}.range .start .slidercontainer{margin-right:4em}.range .start .value{position:absolute;right:0;top:1.5rem;color:grey}.range .end{position:relative;display:inline-block;float:right;width:50%}.range .end .slidercontainer{margin-left:4em}.range .end .value{position:absolute;left:0;top:1.5rem;color:grey}.range:after{clear:both}.resetReason{margin-left:2em} \ No newline at end of file +html{box-sizing:border-box;font-size:62.5%}*,:after,:before{box-sizing:inherit}body{background-color:#000;color:#fff;font-family:Verdana,Arial,sans-serif;font-size:1.3em;font-weight:300;letter-spacing:.01em;line-height:1.3;padding-bottom:3rem}@media screen and (min-width:768px){body{padding-top:3rem}}a{text-decoration:none}[v-cloak]{display:none}#container{background:#202020;margin-top:2rem;padding:1rem;box-shadow:0 0 50px #fcf6cf;border:solid 1px #000}@media screen and (min-width:768px){#container{width:768px;margin-left:auto;margin-right:auto}}.header{position:relative}.header img{float:left;margin-right:1rem}@media screen and (max-width:767px){.header .wifistatus{clear:both;margin-top:3rem}}@media screen and (min-width:768px){.header .wifistatus{position:absolute;right:0;top:0}}.header .wifistatus .indicator{display:inline-block;width:1rem;height:1rem;border-radius:50%;margin-right:.5rem}.header .wifistatus .indicator[data-status=connected]{background-color:#396}.header .wifistatus .indicator[data-status=disconnected]{border:solid 1px grey}.header .wifistatus .indicator[data-status=connecting]{background-color:#f93}.header .wifistatus .indicator[data-status=error]{background-color:#c00}.button,.check .control,.notification,.panel .panel-body,.panel .panel-header,.radio .control,.warning,button,h3,input[type=submit],select{border:1px solid #111;border-radius:3px;box-shadow:inset 0 1px rgba(255,255,255,.1),inset 0 -1px 3px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.08),0 1px 2px rgba(0,0,0,.15)}.button.active,.button:active,button.active,button:active,input[type=number],input[type=password],input[type=submit].active,input[type=submit]:active,input[type=text],textarea{border:1px solid #111;border-color:#000 #111 #111;box-shadow:inset 0 1px 2px rgba(0,0,0,.25),0 1px rgba(255,255,255,.08)}button,input{font-family:Verdana,Arial,sans-serif}input{-webkit-appearance:none;-moz-appearance:none;appearance:none}.button,button,input[type=submit]{display:inline-block;padding:0 12px;color:#ddd;background:#404040;cursor:pointer;line-height:3rem}.button.focus,.button:focus,.button:hover,button.focus,button:focus,button:hover,input[type=submit].focus,input[type=submit]:focus,input[type=submit]:hover{color:#ddd;background:#505050;outline:0}.button.active,.button:active,button.active,button:active,input[type=submit].active,input[type=submit]:active{color:#ccc;background:#282828}.button-primary,input[type=submit]{background:#2265a1}.button-primary.focus,.button-primary:focus,.button-primary:hover,input[type=submit].focus,input[type=submit]:focus,input[type=submit]:hover{background:#2672b6}a.button{text-decoration:none}.navigation{clear:both;margin-top:3rem}.tabs>.button{margin-left:-1px;border-radius:0}.tabs>.button:first-child{margin-left:0;border-radius:3px 0 0 3px}.tabs>.button:last-child{border-radius:0 3px 3px 0}.tabs>.button:focus{position:relative;z-index:1}.version{color:grey;font-size:8pt;text-align:center;margin-top:2rem}.notificationContainer{position:fixed;top:2rem;z-index:666}@media screen and (min-width:768px){.notificationContainer{width:512px;left:50%}}.notification{background:#297ab8;box-shadow:0 0 10px #000;color:#fff;cursor:pointer;padding:.5em;margin-bottom:2rem;position:relative}@media screen and (min-width:768px){.notification{left:-50%}}.notification .message{white-space:pre}.notification.error{background:#973a38}.check,.radio{display:inline-block;cursor:pointer;user-select:none;white-space:nowrap;margin-top:.5em;margin-bottom:.5em}.check .control,.radio .control{background:#404040;display:inline-block;width:16px;height:16px;position:relative}.check .label,.radio .label{display:inline-block;margin-left:.5em;vertical-align:top}.check.checked .control,.radio.checked .control{background:#606060}.check.disabled,.radio.disabled{cursor:not-allowed}.check.disabled .label,.radio.disabled .label{color:grey}.radio .control,.radio .control .inner{border-radius:50%}.radio .control .inner{color:#000;position:absolute;top:4px;left:4px;width:6px;height:6px}.radio.checked .control .inner{background:#ccc;box-shadow:0 1px rgba(0,0,0,.5)}.check .control .inner{position:absolute;top:5px;left:4px;width:6px;height:3px}.check.checked .control .inner{border:solid rgba(255,255,255,.8);border-width:0 0 2px 2px;transform:rotate(-45deg);box-shadow:-1px 0 rgba(0,0,0,.2),0 1px rgba(0,0,0,.5)}.form-control{margin-top:1em}input[type=number],input[type=password],input[type=text],textarea{background:#404040;color:#fff;padding:.5em;width:100%}select{background:#404040;color:#fff;font-family:Verdana,Arial,sans-serif;padding:.5em}input[type=range]{margin-top:1rem;margin-bottom:1rem}h1{font-size:2rem;margin:0}h2{color:silver;font-size:1.2rem;margin:0}h3{color:grey;background:#282828;font-size:1.2rem;padding:.5rem}h4{font-size:1.4rem}input[disabled]{cursor:not-allowed;color:grey;background:#262626}label{display:block;margin-top:.5em;margin-bottom:.5em}.label-inline{margin-right:2rem}@media screen and (min-width:768px){.horizontal{clear:both}.horizontal label{display:inline-block}.horizontal input[type=number],.horizontal input[type=password],.horizontal input[type=text],.horizontal textarea{display:inline-block;float:right;width:50%}.horizontal:after{clear:both}}.hint{display:block;font-size:8pt;color:grey;margin-bottom:1.5rem}.loading{margin-top:3rem;text-align:center}.suboptions{margin-left:5rem}.buttons{clear:both;text-align:center;margin-top:1rem}.sliders{margin-top:2rem}.step{margin-left:3rem;margin-right:3rem;position:relative}.step .slidercontainer{margin-right:4em}.step .value{position:absolute;right:0;top:.1rem;color:grey}.slidercontainer{margin-top:1rem}.slider{-webkit-appearance:none;width:100%;height:.5rem;border-radius:.25rem;background:#404040;outline:0}.slider::-webkit-slider-thumb{-webkit-appearance:none;appearance:none;width:2rem;height:2rem;border-radius:50%;background:#fcf6cf;cursor:pointer}.slider::-moz-range-thumb{width:2rem;height:2rem;border-radius:50%;background:#fcf6cf;cursor:pointer}.warning{background:#973a38;padding:.5em;margin-bottom:2rem;margin-top:1rem}.nodata{color:grey;text-align:center}.clear{clear:both}.panel{margin-bottom:2rem;padding:0}.panel .panel-header{border-radius:3px 3px 0 0;border-bottom-width:0;padding:.5em;background:#404040;color:#fff}.panel .panel-header label{font-size:1em}.panel .panel-header .actions{float:right}.panel .panel-header .label,.panel .panel-header a{color:#fff}.panel .panel-body{border-radius:0 0 3px 3px;background:#303030;padding:2rem}.panel.active .panel-header{background:#3b4a58;color:#fff}.inline{display:inline-block;width:auto}.weekdays{margin-top:1rem}.weekdays .label{width:8em}.fade-enter-active,.fade-leave-active{transition:opacity .5s}.fade-enter,.fade-leave-to{opacity:0}.range{clear:both}.range .start{position:relative;display:inline-block;width:49%}.range .start .slidercontainer{margin-right:4em}.range .start .value{position:absolute;right:0;top:1.5rem;color:grey}.range .end{position:relative;display:inline-block;float:right;width:50%}.range .end .slidercontainer{margin-left:4em}.range .end .value{position:absolute;left:0;top:1.5rem;color:grey}.range:after{clear:both}.resetReason{margin-left:2em} \ No newline at end of file diff --git a/web/index.html b/web/index.html index f0597a0..5b27b93 100644 --- a/web/index.html +++ b/web/index.html @@ -185,7 +185,9 @@ - +
+ +
diff --git a/web/site.scss b/web/site.scss index 1a54297..4584672 100644 --- a/web/site.scss +++ b/web/site.scss @@ -312,6 +312,11 @@ a.button &.disabled { cursor: not-allowed; + + .label + { + color: $inputDisabledTextColor; + } } }