Fixed #21: Sunrise and sunset times are way off
Fixed #18: Time triggers fail if the time is earlier than the first trigger of a day Sometimes I really really dislike C++ and it's lack of helpful warnings, like signed-unsigned comparisons and allowing switch without case. Too easy to miss.
This commit is contained in:
parent
1df8c7fc0d
commit
7b823b7cff
@ -18,4 +18,5 @@ lib_deps =
|
|||||||
ESP Async WebServer
|
ESP Async WebServer
|
||||||
NTPClient
|
NTPClient
|
||||||
Time
|
Time
|
||||||
|
Dusk2Dawn
|
||||||
build_flags = !platformio-buildflags.bat
|
build_flags = !platformio-buildflags.bat
|
||||||
@ -7,7 +7,7 @@ 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,0xb6,0xc0,0xb1,0x8d,0x64,0x27,0xa4,0x67,0xfa,0x7f,0x5f,0x1d,0x3e,0x64,0x5b,0xce,0xc1,
|
||||||
0xf6,0xbe,0x9e,0x79,0x6f,0xfb,0x43,0x07,0xab,0x0e,0xfd,0xaa,0x54,0x2a,0x95,0x64,0xf9,0x68,0xad,0x7e,
|
0xf6,0xbe,0x9e,0x79,0x6f,0xfb,0x43,0x07,0xab,0x0e,0xfd,0x54,0xaa,0x2a,0x95,0x64,0xf9,0x68,0xad,0x7e,
|
||||||
0x5d,0x1b,0x3c,0x76,0x1b,0x9a,0xe5,0x8f,0xed,0x93,0xa3,0xf0,0x7f,0x08,0x8c,0x93,0xa3,0x31,0xf4,0x81,
|
0x5d,0x1b,0x3c,0x76,0x1b,0x9a,0xe5,0x8f,0xed,0x93,0xa3,0xf0,0x7f,0x08,0x8c,0x93,0xa3,0x31,0xf4,0x81,
|
||||||
0xa6,0x5b,0x00,0x13,0xe8,0x1f,0x97,0x6e,0x07,0xcd,0xcd,0x2f,0xa5,0x93,0x23,0x1f,0xf9,0x36,0x3c,0x39,
|
0xa6,0x5b,0x00,0x13,0xe8,0x1f,0x97,0x6e,0x07,0xcd,0xcd,0x2f,0xa5,0x93,0x23,0x1f,0xf9,0x36,0x3c,0x39,
|
||||||
0xda,0x0e,0x7f,0x39,0x93,0x03,0xc6,0xf0,0xb8,0xe4,0x5b,0x70,0x0c,0x37,0x75,0xd7,0x76,0x71,0x49,0xd3,
|
0xda,0x0e,0x7f,0x39,0x93,0x03,0xc6,0xf0,0xb8,0xe4,0x5b,0x70,0x0c,0x37,0x75,0xd7,0x76,0x71,0x49,0xd3,
|
||||||
@ -15,165 +15,165 @@ const uint8_t EmbeddedIndex[] PROGMEM = {
|
|||||||
0x14,0x19,0xbe,0x75,0x6c,0xc0,0x09,0xd2,0xe1,0x26,0x7f,0xf8,0x84,0x1c,0xe4,0x23,0x60,0x6f,0x12,0x1d,
|
0x14,0x19,0xbe,0x75,0x6c,0xc0,0x09,0xd2,0xe1,0x26,0x7f,0xf8,0x84,0x1c,0xe4,0x23,0x60,0x6f,0x12,0x1d,
|
||||||
0xd8,0xf0,0xb8,0x4c,0x55,0xd8,0xc8,0x79,0xd1,0x30,0xb4,0x8f,0x4b,0xc4,0x9f,0xd9,0x90,0x58,0x10,0x52,
|
0xd8,0xf0,0xb8,0x4c,0x55,0xd8,0xc8,0x79,0xd1,0x30,0xb4,0x8f,0x4b,0xc4,0x9f,0xd9,0x90,0x58,0x10,0x52,
|
||||||
0x1d,0x16,0x86,0xa3,0xe3,0xd2,0x30,0x70,0x0c,0x1b,0x6e,0xe9,0x84,0x50,0x46,0xa2,0x63,0xe4,0xf9,0x1a,
|
0x1d,0x16,0x86,0xa3,0xe3,0xd2,0x30,0x70,0x0c,0x1b,0x6e,0xe9,0x84,0x50,0x46,0xa2,0x63,0xe4,0xf9,0x1a,
|
||||||
0xc1,0x7a,0x4c,0x78,0x66,0xed,0xdb,0x82,0x40,0xff,0x10,0x36,0x0e,0x5d,0x63,0x76,0x72,0x64,0xa0,0x89,
|
0xc1,0x7a,0x4c,0x78,0x66,0xed,0xdb,0x82,0x40,0xff,0x10,0x63,0x1c,0xba,0xc6,0xec,0xe4,0xc8,0x40,0x13,
|
||||||
0x86,0x8c,0xe3,0x12,0xf0,0xbc,0x92,0x78,0x9a,0x6c,0xea,0xb6,0x0b,0x5e,0xc4,0x83,0x6e,0x03,0x42,0x8e,
|
0x0d,0x19,0xc7,0x25,0xe0,0x79,0x25,0xf1,0x34,0xd9,0xd4,0x6d,0x17,0xbc,0x88,0x07,0xdd,0x06,0x84,0x1c,
|
||||||
0x4b,0x8e,0xeb,0xa3,0x11,0xd2,0x81,0x8f,0x5c,0xa7,0x46,0x61,0x03,0xe4,0x40,0x5c,0x2a,0x64,0x29,0x69,
|
0x97,0x1c,0xd7,0x47,0x23,0xa4,0x03,0x1f,0xb9,0x4e,0x8d,0xc2,0x06,0xc8,0x81,0xb8,0x54,0xc8,0x52,0xd2,
|
||||||
0x87,0x61,0xeb,0x1f,0x1a,0xc4,0xd8,0xc5,0x87,0x9a,0x4c,0xd6,0xd6,0x8e,0x35,0x27,0xb0,0x6d,0xed,0xe7,
|
0x0e,0xc3,0xd6,0x3f,0x34,0x88,0xb1,0x8b,0x0f,0x35,0x99,0xac,0xad,0x1d,0x6b,0x4e,0x60,0xdb,0xda,0xcf,
|
||||||
0x9f,0x53,0xed,0x5b,0x9c,0x57,0xfb,0x56,0xa2,0x18,0xd0,0x28,0xad,0x32,0x92,0x29,0x69,0xbf,0xeb,0x36,
|
0x3f,0xa7,0xda,0xb7,0x38,0xaf,0xf6,0xad,0x44,0x31,0xa0,0x51,0x5a,0x65,0x24,0x53,0xd2,0x7e,0xd7,0x6d,
|
||||||
0xd2,0x5f,0xb6,0x3c,0x0c,0x27,0xdc,0x7b,0x16,0x32,0x60,0x47,0xee,0x9c,0xba,0xc0,0x03,0x4e,0x84,0x6b,
|
0xa4,0xbf,0x6c,0x79,0x18,0x4e,0xb8,0xf5,0x2c,0x64,0xc0,0x8e,0xdc,0x39,0x35,0x81,0x07,0x9c,0x08,0xd7,
|
||||||
0x0c,0x09,0x01,0x26,0x2c,0x9d,0xfc,0xf1,0x47,0xba,0xb3,0x90,0xa0,0x7d,0xfb,0x46,0x5d,0x43,0x05,0xa8,
|
0x18,0x12,0x02,0x4c,0x58,0x3a,0xf9,0xe3,0x8f,0x74,0x67,0x21,0x41,0xfb,0xf6,0x8d,0x9a,0x86,0x0a,0x50,
|
||||||
0x63,0xa8,0x39,0xd1,0xff,0x91,0x5f,0x74,0xb5,0xb5,0xcc,0x85,0xbc,0x0d,0x8d,0x4d,0xe1,0x6a,0x03,0xf8,
|
0xc3,0xd0,0xe1,0x44,0xff,0x47,0x76,0xd1,0xd5,0xa3,0x65,0x26,0xe4,0x6d,0x68,0x6c,0x0a,0x53,0x1b,0xc0,
|
||||||
0xe0,0x10,0x8d,0xa9,0xc6,0x6d,0xcf,0x31,0x7f,0x1d,0x02,0x02,0xf7,0x2b,0x9f,0xd0,0xdd,0xe9,0x75,0x6f,
|
0x07,0x87,0x68,0x4c,0x35,0x6e,0x7b,0x8e,0xf9,0xeb,0x10,0x10,0xb8,0x5f,0xf9,0x84,0xee,0x4e,0xaf,0x7b,
|
||||||
0xba,0x73,0x79,0x66,0xba,0x55,0xfa,0xaf,0xd3,0xbf,0xb5,0x1a,0xb7,0x26,0xfd,0xab,0xce,0x1e,0xab,0xd3,
|
0xd3,0x9d,0xcb,0x33,0xd3,0xad,0xd2,0x7f,0x9d,0xfe,0xad,0xd5,0xb8,0x35,0xe9,0x5f,0x75,0xf6,0x58,0x9d,
|
||||||
0x5a,0xf5,0x91,0xfe,0x9c,0x3e,0x54,0x27,0xe3,0x73,0xd6,0x70,0xf6,0xd0,0x6b,0xde,0x9f,0xf7,0x06,0xc3,
|
0xd6,0xaa,0x8f,0xf4,0xe7,0xf4,0xa1,0x3a,0x19,0x9f,0xb3,0x86,0xb3,0x87,0x5e,0xf3,0xfe,0xbc,0x37,0x18,
|
||||||
0xdd,0xa7,0x1d,0x63,0xb7,0x39,0x7b,0xba,0x39,0x3d,0x7d,0x3a,0x3b,0x40,0x4f,0xfd,0xd3,0x8b,0xe1,0x7d,
|
0xee,0x3e,0xed,0x18,0xbb,0xcd,0xd9,0xd3,0xcd,0xe9,0xe9,0xd3,0xd9,0x01,0x7a,0xea,0x9f,0x5e,0x0c,0xef,
|
||||||
0xd3,0x79,0xba,0xbb,0xb0,0x1f,0xef,0x7b,0x9f,0x75,0xdd,0xb6,0xbb,0x4c,0xe0,0xe1,0xf4,0xa2,0xd7,0x68,
|
0x9b,0xce,0xd3,0xdd,0x85,0xfd,0x78,0xdf,0xfb,0xac,0xeb,0xb6,0xdd,0x65,0x02,0x0f,0xa7,0x17,0xbd,0x46,
|
||||||
0xde,0xc2,0x0e,0x26,0xf7,0x46,0xa3,0x63,0x3e,0x57,0x6f,0xae,0xf4,0xc7,0x53,0xbd,0xda,0xd5,0xab,0x35,
|
0xf3,0x16,0x76,0x30,0xb9,0x37,0x1a,0x1d,0xf3,0xb9,0x7a,0x73,0xa5,0x3f,0x9e,0xea,0xd5,0xae,0x5e,0xad,
|
||||||
0xe3,0xa6,0x53,0xa9,0x76,0x76,0xdb,0xb5,0x8a,0xd9,0x23,0x8f,0x17,0x07,0x8d,0x8e,0x51,0xed,0x3e,0x56,
|
0x19,0x37,0x9d,0x4a,0xb5,0xb3,0xdb,0xae,0x55,0xcc,0x1e,0x79,0xbc,0x38,0x68,0x74,0x8c,0x6a,0xf7,0xb1,
|
||||||
0xeb,0xa0,0x5a,0x87,0x9e,0x71,0x6b,0xb5,0xcb,0xaf,0xcd,0xe7,0x00,0x9b,0xde,0x41,0x5f,0x6f,0x9f,0x9b,
|
0x5a,0x07,0xd5,0x3a,0xf4,0x8c,0x5b,0xab,0x5d,0x7e,0x6d,0x3e,0x07,0xd8,0xf4,0x0e,0xfa,0x7a,0xfb,0xdc,
|
||||||
0xc6,0x2f,0xe5,0xbd,0xbb,0xbd,0x91,0x7f,0xeb,0x7d,0x86,0xe7,0x66,0xbb,0x59,0xc6,0xf8,0xac,0x01,0x82,
|
0x34,0x7e,0x29,0xef,0xdd,0xed,0x8d,0xfc,0x5b,0xef,0x33,0x3c,0x37,0xdb,0xcd,0x32,0xc6,0x67,0x0d,0x10,
|
||||||
0xfd,0xbb,0xf3,0xfa,0xee,0x79,0x7b,0x78,0xfe,0xf9,0xf5,0xe2,0xfa,0xea,0x1c,0x83,0x8f,0xa3,0x97,0xaf,
|
0xec,0xdf,0x9d,0xd7,0x77,0xcf,0xdb,0xc3,0xf3,0xcf,0xaf,0x17,0xd7,0x57,0xe7,0x18,0x7c,0x1c,0xbd,0x7c,
|
||||||
0x43,0xf2,0xd8,0x23,0x56,0xfb,0x8b,0x77,0x35,0x30,0x6f,0x5b,0x66,0xdf,0x9c,0x04,0xed,0xb6,0xfb,0x38,
|
0x1d,0x92,0xc7,0x1e,0xb1,0xda,0x5f,0xbc,0xab,0x81,0x79,0xdb,0x32,0xfb,0xe6,0x24,0x68,0xb7,0xdd,0xc7,
|
||||||
0xfd,0x88,0xda,0x8f,0x03,0xbc,0x7f,0x63,0x75,0x1e,0xdb,0xb8,0x83,0x3a,0xb3,0x69,0xeb,0xca,0x9e,0xdd,
|
0xe9,0x47,0xd4,0x7e,0x1c,0xe0,0xfd,0x1b,0xab,0xf3,0xd8,0xc6,0x1d,0xd4,0x99,0x4d,0x5b,0x57,0xf6,0xec,
|
||||||
0x5d,0x1a,0xfa,0x6c,0xd6,0x25,0x63,0xbd,0x47,0x66,0xb7,0x9f,0x77,0x5e,0xcc,0x73,0xff,0xe6,0x26,0xd8,
|
0xee,0xd2,0xd0,0x67,0xb3,0x2e,0x19,0xeb,0x3d,0x32,0xbb,0xfd,0xbc,0xf3,0x62,0x9e,0xfb,0x37,0x37,0xc1,
|
||||||
0xad,0x1a,0x9d,0x8b,0xa6,0x57,0x7f,0xa9,0x5e,0x56,0x5a,0xdb,0x57,0xad,0xfb,0xf6,0x70,0xb7,0x4a,0x5a,
|
0x6e,0xd5,0xe8,0x5c,0x34,0xbd,0xfa,0x4b,0xf5,0xb2,0xd2,0xda,0xbe,0x6a,0xdd,0xb7,0x87,0xbb,0x55,0xd2,
|
||||||
0xa7,0xfa,0xeb,0x0e,0xea,0x9d,0xc1,0x9b,0xb3,0xee,0xe0,0x69,0x74,0xb7,0x7f,0xd3,0xd8,0xf9,0x68,0xd6,
|
0x3a,0xd5,0x5f,0x77,0x50,0xef,0x0c,0xde,0x9c,0x75,0x07,0x4f,0xa3,0xbb,0xfd,0x9b,0xc6,0xce,0x47,0xb3,
|
||||||
0xcf,0x9a,0xbb,0xd8,0x25,0x67,0x0d,0xb3,0x7d,0xf3,0xd6,0xaa,0x5a,0xce,0x53,0x15,0x75,0x3b,0x5f,0x2a,
|
0x7e,0xd6,0xdc,0xc5,0x2e,0x39,0x6b,0x98,0xed,0x9b,0xb7,0x56,0xd5,0x72,0x9e,0xaa,0xa8,0xdb,0xf9,0x52,
|
||||||
0x81,0xd7,0x1b,0xed,0x6c,0x5f,0xdb,0x1e,0xb9,0xaa,0x9d,0x7a,0x7b,0xb3,0xd7,0x1d,0xdd,0x32,0xfd,0xda,
|
0x09,0xbc,0xde,0x68,0x67,0xfb,0xda,0xf6,0xc8,0x55,0xed,0xd4,0xdb,0x9b,0xbd,0xee,0xe8,0x96,0xe9,0xd7,
|
||||||
0xed,0xed,0x13,0xee,0x4d,0xf7,0x6f,0xea,0xd7,0x7b,0x8d,0xfb,0xf3,0xfe,0x6b,0xf3,0xc0,0x07,0xf8,0x09,
|
0x6e,0x6f,0x9f,0x70,0x6f,0xba,0x7f,0x53,0xbf,0xde,0x6b,0xdc,0x9f,0xf7,0x5f,0x9b,0x07,0x3e,0xc0,0x4f,
|
||||||
0xf4,0x2f,0x2f,0x1e,0xe0,0x45,0xdd,0x18,0xde,0xd8,0xa4,0xb1,0x73,0x59,0xdf,0xbf,0xe8,0x6c,0x5f,0xba,
|
0xa0,0x7f,0x79,0xf1,0x00,0x2f,0xea,0xc6,0xf0,0xc6,0x26,0x8d,0x9d,0xcb,0xfa,0xfe,0x45,0x67,0xfb,0xd2,
|
||||||
0x3d,0x72,0x66,0xbd,0x3d,0x5c,0xd6,0xec,0xda,0xe5,0xf9,0x45,0x6b,0xf4,0x32,0xb0,0xa6,0xed,0x7b,0xab,
|
0xed,0x91,0x33,0xeb,0xed,0xe1,0xb2,0x66,0xd7,0x2e,0xcf,0x2f,0x5a,0xa3,0x97,0x81,0x35,0x6d,0xdf,0x5b,
|
||||||
0xba,0x6f,0x9c,0xf6,0x5d,0xbb,0x87,0x9e,0x5f,0x2e,0xae,0x8d,0xf2,0xd3,0xed,0xe4,0x60,0x76,0x73,0x70,
|
0xd5,0x7d,0xe3,0xb4,0xef,0xda,0x3d,0xf4,0xfc,0x72,0x71,0x6d,0x94,0x9f,0x6e,0x27,0x07,0xb3,0x9b,0x83,
|
||||||
0xed,0xbd,0x0e,0xcf,0x3d,0x04,0x6e,0xef,0x40,0x63,0xf8,0xd4,0xf8,0xc5,0x6f,0xb5,0x9e,0xdd,0xd3,0xcb,
|
0x6b,0xef,0x75,0x78,0xee,0x21,0x70,0x7b,0x07,0x1a,0xc3,0xa7,0xc6,0x2f,0x7e,0xab,0xf5,0xec,0x9e,0x5e,
|
||||||
0x87,0x19,0x71,0x49,0x59,0xaf,0xdc,0x7d,0x81,0xc3,0xab,0x86,0x31,0x9c,0xec,0x0e,0xf5,0x36,0x69,0xfc,
|
0x3e,0xcc,0x88,0x4b,0xca,0x7a,0xe5,0xee,0x0b,0x1c,0x5e,0x35,0x8c,0xe1,0x64,0x77,0xa8,0xb7,0x49,0xe3,
|
||||||
0x62,0x3e,0x07,0xa7,0xc6,0xe4,0xa1,0xd7,0xbf,0xa8,0x34,0x3f,0x6e,0x4f,0x5f,0x5b,0x0f,0x0f,0xb8,0x75,
|
0x17,0xf3,0x39,0x38,0x35,0x26,0x0f,0xbd,0xfe,0x45,0xa5,0xf9,0x71,0x7b,0xfa,0xda,0x7a,0x78,0xc0,0xad,
|
||||||
0x36,0x1d,0x3f,0xec,0x7d,0x9d,0x02,0xfd,0xaa,0x6e,0xc1,0xce,0xf5,0x41,0xf9,0xfa,0xf9,0xea,0xe6,0xd2,
|
0xb3,0xe9,0xf8,0x61,0xef,0xeb,0x14,0xe8,0x57,0x75,0x0b,0x76,0xae,0x0f,0xca,0xd7,0xcf,0x57,0x37,0x97,
|
||||||
0x28,0x57,0xee,0xda,0xf5,0x9a,0xf3,0x68,0xd6,0xde,0xee,0x9e,0x5b,0x7b,0x9d,0x01,0x2c,0x8f,0xfb,0x6e,
|
0x46,0xb9,0x72,0xd7,0xae,0xd7,0x9c,0x47,0xb3,0xf6,0x76,0xf7,0xdc,0xda,0xeb,0x0c,0x60,0x79,0xdc,0x77,
|
||||||
0xb7,0x5e,0x39,0x78,0xab,0xf4,0x31,0x0d,0x8e,0x83,0xd7,0xae,0x53,0x81,0xee,0xa4,0xd6,0xe6,0xd1,0xd3,
|
0xbb,0xf5,0xca,0xc1,0x5b,0xa5,0x8f,0xa9,0x73,0x1c,0xbc,0x76,0x9d,0x0a,0x74,0x27,0xb5,0x36,0xf7,0x9e,
|
||||||
0xb0,0x9b,0x83,0x97,0x7e,0x70,0x33,0xae,0xd5,0x68,0x24,0x5a,0x65,0x16,0xe2,0xff,0xf0,0x37,0xd6,0x79,
|
0x86,0xdd,0x1c,0xbc,0xf4,0x83,0x9b,0x71,0xad,0x46,0x3d,0xd1,0x2a,0x33,0x17,0xff,0x87,0xbf,0xb1,0xce,
|
||||||
0x7e,0x5a,0xff,0xc0,0x23,0x9b,0xb6,0x1e,0x59,0xbb,0x8c,0x42,0x7c,0xe0,0x07,0x64,0x8b,0xcc,0x88,0x0f,
|
0xf3,0xd3,0xfa,0x07,0xee,0xd9,0xb4,0xf5,0xc8,0xda,0x65,0x14,0xe2,0x03,0x3f,0x20,0x5b,0x64,0x46,0x7c,
|
||||||
0xc7,0xad,0x3a,0x9d,0x50,0xe1,0x2c,0xfc,0x8d,0x0b,0x45,0xed,0x54,0xee,0xa3,0xb6,0x7e,0xa8,0xad,0xd3,
|
0x38,0x6e,0xd5,0x69,0x40,0x85,0x51,0xf8,0x1b,0x17,0x8a,0xda,0xa9,0xdc,0x47,0x6d,0xfd,0x50,0x5b,0xa7,
|
||||||
0x9f,0xac,0x08,0x6d,0x5d,0x17,0x5a,0x77,0x53,0xb3,0x61,0x4a,0x67,0x95,0xe0,0x4d,0xcf,0x12,0x3a,0x79,
|
0x3f,0x59,0x11,0xda,0xba,0x2e,0xb4,0xee,0xa6,0xa2,0x61,0x4a,0xa3,0x4a,0xf0,0xa6,0xa3,0x84,0x06,0x8f,
|
||||||
0x1c,0xa8,0x87,0x93,0x52,0x6a,0x47,0x8e,0xc1,0x66,0x21,0x4b,0x96,0x87,0x6c,0xde,0x6c,0x0a,0x61,0xa1,
|
0x03,0xf5,0x30,0x28,0xa5,0x76,0xe4,0x18,0x2c,0x0a,0x59,0xb2,0x3c,0x64,0x71,0xb3,0x29,0x84,0x85,0xa2,
|
||||||
0xa8,0x2f,0x3a,0x05,0xde,0x16,0x74,0xc0,0xd0,0x86,0x06,0x05,0xb8,0x1e,0x6a,0x82,0xc6,0x3a,0x03,0x61,
|
0xbe,0xe8,0x14,0x78,0x5b,0xd0,0x01,0x43,0x1b,0x1a,0x14,0xe0,0x7a,0xa8,0x09,0x1a,0xeb,0x0c,0x84,0x81,
|
||||||
0x20,0x92,0x34,0x94,0xc2,0x29,0x1b,0x1a,0x2f,0xab,0xd0,0x75,0x3a,0xc7,0x3d,0x17,0x39,0xfe,0x56,0xe2,
|
0x48,0xd2,0x50,0x0a,0x43,0x36,0x1c,0xbc,0xac,0x42,0xd7,0x69,0x8c,0x7b,0x2e,0x72,0xfc,0xad,0xc4,0x26,
|
||||||
0x13,0x8d,0x32,0x16,0xf5,0x93,0x6e,0x47,0x1e,0xed,0x6c,0x8e,0x4e,0x0a,0x83,0x0b,0x86,0xae,0x8e,0xf3,
|
0x1a,0x65,0x2c,0xea,0x27,0xdd,0x8e,0x3c,0xda,0xd9,0x1c,0x9d,0x14,0x06,0x17,0x0c,0x4d,0x1d,0xe7,0x8d,
|
||||||
0xc6,0x7b,0xad,0x37,0xa1,0x7f,0x8f,0x9a,0xbc,0x27,0x2a,0x24,0x3a,0xdc,0xf8,0x50,0x6c,0x1f,0x11,0x8c,
|
0xf7,0x8e,0xde,0x84,0xfe,0x3d,0x6a,0xf2,0x9e,0xa8,0x90,0xe8,0x70,0xe3,0x43,0xf1,0xf8,0x88,0x60,0x1c,
|
||||||
0x63,0xd7,0x80,0x19,0xfb,0x54,0x9a,0x06,0xf0,0xcd,0xdf,0x78,0x37,0xd2,0x14,0x50,0xd9,0xff,0x19,0x78,
|
0xbb,0x06,0xcc,0x8c,0x4f,0xa5,0x69,0x00,0xdf,0xfc,0x8d,0x77,0x23,0x4d,0x01,0x95,0xed,0x9f,0x81,0x27,
|
||||||
0x62,0x15,0x1b,0xa0,0xb1,0x00,0x23,0xb0,0xd4,0xe3,0xc6,0xa4,0xfb,0x6c,0xb2,0x15,0x29,0x9f,0xae,0x3c,
|
0x56,0xb1,0x01,0x1a,0x0b,0x30,0x02,0x4b,0x3d,0x6e,0x4c,0xba,0xcf,0x26,0x5b,0x91,0xf2,0xe9,0xca,0x63,
|
||||||
0x06,0x72,0xcc,0x52,0x84,0x20,0x7a,0x8e,0xd4,0x87,0xcf,0xb1,0xa1,0xe1,0x73,0x2b,0x02,0x9a,0x36,0x4f,
|
0x20,0xc7,0x2c,0x45,0x08,0xa2,0xe7,0x48,0x7d,0xf8,0x1c,0x0f,0x34,0x7c,0x6e,0x45,0x40,0xd3,0xc3,0x13,
|
||||||
0xe8,0x5c,0x0b,0x99,0xd8,0x72,0x43,0x97,0x53,0x34,0xc4,0x62,0x45,0x39,0x0e,0x27,0x40,0xda,0xe6,0x29,
|
0x3a,0xd7,0x42,0x26,0xb6,0xdc,0xd0,0xe5,0x14,0x0d,0xb1,0x58,0x51,0x8e,0xc3,0x00,0x48,0x8f,0x79,0x0a,
|
||||||
0xc0,0x0e,0x47,0x20,0x84,0x2d,0x40,0x7a,0x90,0x56,0x01,0x0d,0xb6,0x34,0x51,0x4e,0x2f,0x42,0xc2,0xd7,
|
0xb0,0xc3,0x11,0x08,0x61,0x0b,0x90,0x1e,0xa4,0x55,0x40,0x83,0x2d,0x4d,0x94,0xd3,0x8b,0x90,0xf0,0xb5,
|
||||||
0xaa,0x2d,0x1c,0xd3,0xc2,0x20,0xf0,0x28,0x4b,0xa4,0x8a,0x13,0x7b,0x10,0x10,0xe6,0xd7,0xbc,0x98,0xa0,
|
0x6a,0x0b,0xc7,0xb4,0xd0,0x09,0x3c,0xca,0x12,0xa9,0xe2,0xc4,0x1e,0x04,0x84,0xd9,0x35,0x2f,0x26,0x28,
|
||||||
0x6c,0x49,0x13,0x4d,0x6a,0x96,0xb4,0x09,0x20,0x24,0x1e,0x73,0xfd,0x65,0x80,0x81,0x0e,0x33,0x2a,0x13,
|
0x5b,0x52,0xa0,0x49,0xcd,0x92,0x36,0x01,0x84,0xc4,0x73,0xae,0xbf,0x0c,0x30,0xd0,0x61,0x46,0x65,0x42,
|
||||||
0x42,0x82,0x24,0xf1,0x81,0x42,0xfa,0x08,0x44,0x38,0x87,0x81,0xef,0x53,0x7f,0x88,0x9f,0x4d,0x0f,0xd3,
|
0x48,0x90,0x24,0x36,0x50,0x48,0x1f,0x81,0x08,0xe7,0x30,0xf0,0x7d,0x6a,0x0f,0xf1,0xb3,0xe9,0x61,0xba,
|
||||||
0x55,0x0c,0xcf,0xa2,0xda,0x62,0x1b,0x78,0x68,0x9b,0xcb,0xf9,0x4c,0x6e,0x9b,0x0e,0x67,0x61,0xcf,0x75,
|
0x8a,0xe1,0x59,0x54,0x5b,0x6c,0x03,0x0f,0x6d,0x73,0x39,0x9f,0xc9,0x6d,0xd3,0xe9,0x2c,0xec,0xb9,0xee,
|
||||||
0x77,0xea,0x30,0x67,0x87,0x08,0xc0,0x89,0x96,0xed,0x24,0x5a,0xbe,0x69,0x0c,0x41,0x1b,0xfa,0xb0,0xbf,
|
0x4e,0x1d,0x66,0xec,0x10,0x01,0x38,0xd1,0xb2,0x9d,0x44,0xcb,0x37,0xf5,0x21,0x68,0x43,0x1f,0xf6,0x17,
|
||||||
0xd8,0x9c,0x3a,0x67,0x8c,0x55,0xe6,0x02,0x27,0xaa,0x3f,0xc0,0x04,0x99,0x62,0x60,0x7d,0x30,0x24,0x79,
|
0x0f,0xa7,0xce,0x19,0x63,0x95,0x39,0xc7,0x89,0xea,0x0f,0x30,0x41,0xa6,0x98,0x58,0x1f,0x0c,0x49,0x7e,
|
||||||
0xfb,0xe4,0xa2,0x64,0x1d,0xd0,0x68,0x9f,0x40,0x9a,0xe6,0xc4,0x1f,0x03,0x30,0xa4,0xe1,0xa0,0xad,0x0b,
|
0x7c,0x72,0x51,0xb2,0x0e,0xa8,0xb7,0x4f,0x20,0x4d,0x73,0xe2,0x8f,0x01,0x18,0x52,0x77,0xd0,0xd6,0x85,
|
||||||
0x37,0xad,0xb3,0x12,0x24,0xc2,0x29,0x31,0xc4,0xf4,0x18,0x6b,0xe8,0x56,0xda,0xe1,0x40,0xca,0xb9,0xe0,
|
0x99,0xd6,0x59,0x09,0x12,0xe1,0x94,0x18,0x62,0x7a,0x8c,0x35,0x34,0x2b,0xed,0x70,0x20,0xe5,0x5c,0xf0,
|
||||||
0x5d,0x7d,0xfb,0x18,0x99,0x26,0xc4,0x73,0x7a,0x8f,0x39,0xe2,0xfe,0xa3,0x96,0xef,0x83,0x20,0x49,0x03,
|
0xae,0xbe,0x7d,0x8c,0x4c,0x13,0xe2,0x39,0xbd,0xc7,0x1c,0x71,0xff,0x51,0xcb,0xf7,0x41,0x90,0xa4,0x81,
|
||||||
0xc5,0x18,0x24,0x9e,0x18,0x45,0xd2,0xf6,0x7d,0x70,0x88,0xf5,0x66,0xce,0x28,0x08,0x7a,0x32,0x0a,0xfc,
|
0x62,0x0c,0x12,0x4f,0x8c,0x22,0x69,0xfb,0x3e,0x38,0xc4,0x7a,0x33,0x67,0x16,0x04,0x3d,0x99,0x05,0xfe,
|
||||||
0x59,0xd1,0x77,0x36,0x13,0x28,0x07,0x9b,0x2d,0x9d,0x7b,0xd9,0x01,0x95,0x57,0xd0,0x3d,0xae,0xe2,0xe4,
|
0xac,0xe8,0x3b,0x9b,0x09,0x94,0x93,0xcd,0x96,0xce,0xbd,0xec,0x84,0xca,0x2b,0xe8,0x1e,0x57,0x71,0x72,
|
||||||
0x08,0xd3,0x2c,0xe2,0x6a,0x87,0x9c,0x76,0x5c,0x92,0xb8,0x81,0x6d,0xf7,0x7d,0xe8,0x91,0x01,0x0e,0xa8,
|
0x84,0x69,0x16,0x71,0xb5,0x43,0x4e,0x3b,0x2e,0x49,0xdc,0xc0,0xb6,0xfb,0x3e,0xf4,0xc8,0x00,0x07,0x54,
|
||||||
0x10,0xcb,0x1c,0x2c,0x25,0xd3,0x4a,0x3d,0x22,0x50,0xa3,0x59,0x2d,0xe9,0x53,0x3a,0x4b,0x97,0x5c,0x91,
|
0x88,0x65,0x0e,0x96,0x92,0x69,0xa5,0x1e,0x11,0xe8,0xa0,0x59,0x2d,0xe9,0x53,0x3a,0x4b,0x97,0x5c,0x91,
|
||||||
0x84,0x6e,0x09,0xd5,0x4d,0x60,0x93,0xb9,0xba,0x47,0x8c,0x41,0xa5,0x3c,0x72,0x3f,0xb1,0x69,0x9d,0x8c,
|
0x84,0x6e,0x09,0xd5,0x4d,0x60,0x93,0xb9,0xba,0x47,0x8c,0x41,0xa5,0x3c,0x32,0x3f,0xb1,0x69,0x9d,0x8c,
|
||||||
0x33,0x0b,0x34,0xf5,0x9b,0x17,0x65,0xba,0x58,0x61,0xba,0x7e,0x9e,0x00,0x3b,0x10,0x93,0xb3,0x0d,0x7c,
|
0x33,0x0b,0x34,0xb5,0x9b,0x17,0x65,0xba,0x58,0x61,0xba,0x7e,0x9e,0x00,0x3b,0x10,0xc1,0xd9,0x06,0xbe,
|
||||||
0x6b,0x6b,0x64,0xbb,0x2e,0xde,0x88,0x78,0xef,0x18,0x51,0xdb,0xd6,0x76,0x3f,0x7f,0xd6,0xfe,0xa5,0x95,
|
0xb5,0x35,0xb2,0x5d,0x17,0x6f,0x44,0xbc,0x77,0x8c,0xa8,0x6d,0x6b,0xbb,0x9f,0x3f,0x6b,0xff,0xd2,0xca,
|
||||||
0x77,0x76,0x98,0xcb,0xfe,0x19,0xd5,0xd3,0xb9,0xde,0xe5,0x62,0x1a,0x39,0x5e,0xe0,0x6b,0xfe,0xcc,0xa3,
|
0x3b,0x3b,0xcc,0x64,0xff,0x8c,0xea,0xe9,0x5c,0xef,0x72,0x31,0x8d,0x1c,0x2f,0xf0,0x35,0x7f,0xe6,0xd1,
|
||||||
0x06,0x63,0xe0,0xd0,0x0a,0x5d,0x1b,0x23,0xe7,0xb8,0xb4,0x43,0x7f,0xc1,0xdb,0x71,0x89,0xaa,0x2c,0xa5,
|
0x01,0x63,0xe0,0xd0,0x0a,0x5d,0x1b,0x23,0xe7,0xb8,0xb4,0x43,0x7f,0xc1,0xdb,0x71,0x89,0xaa,0x2c,0xa5,
|
||||||
0xa5,0x63,0xe3,0xb7,0x9c,0x60,0x3c,0x84,0x38,0x81,0x7c,0x27,0x30,0x16,0xa5,0x06,0xd9,0xca,0xb5,0xc4,
|
0xa5,0xe3,0xc1,0x6f,0x39,0xc1,0x78,0x08,0x71,0x02,0xf9,0x4e,0x60,0x2c,0x4a,0x0d,0xf2,0x28,0xd7,0x12,
|
||||||
0x6f,0x93,0xcd,0x91,0x4b,0x95,0x6c,0x30,0xf2,0x27,0x8d,0xae,0x75,0xf0,0xed,0x03,0xfd,0xd1,0xc8,0xb2,
|
0xbb,0x4d,0x36,0x47,0x2e,0x55,0xb2,0xc1,0xc8,0x9f,0x34,0xba,0xd6,0xc1,0xb7,0x0f,0xf4,0x47,0x23,0xcb,
|
||||||
0x5e,0x60,0x8c,0x5b,0x93,0x1f,0xeb,0x82,0x04,0x43,0xc6,0x7e,0xf5,0xfa,0x5a,0x90,0x72,0xa8,0x2c,0xf5,
|
0x5a,0x81,0x31,0x6e,0x4d,0x7e,0xac,0x09,0x12,0x0c,0x99,0xf1,0xab,0xd7,0xd7,0x82,0x94,0x43,0x65,0xa9,
|
||||||
0xc5,0x58,0xfb,0x9d,0x04,0xc3,0x31,0xf2,0x93,0xcd,0x15,0xdd,0x16,0xda,0x33,0xb6,0x70,0x0f,0x42,0xd6,
|
0x2d,0xc6,0xda,0xef,0x24,0x18,0x8e,0x91,0x9f,0x6c,0xae,0xe8,0xb6,0xd0,0x9e,0xb1,0x85,0x7b,0x10,0xb2,
|
||||||
0xd4,0x6c,0x49,0xd2,0x0f,0xe3,0xc8,0xcc,0x19,0xdd,0x82,0xfa,0x4b,0x8c,0x77,0xe8,0xba,0x36,0x04,0x0e,
|
0xa6,0xa2,0x25,0x49,0x3f,0x8c,0x23,0x13,0x33,0xba,0x05,0xf5,0x97,0x18,0xef,0xd0,0x75,0x6d,0x08,0x1c,
|
||||||
0x9b,0x04,0x92,0x4c,0x54,0x7a,0x95,0x52,0xb1,0x9f,0x62,0x69,0x38,0x61,0x8d,0xc5,0xec,0xe3,0x3a,0x65,
|
0x16,0x04,0x92,0x4c,0x54,0x7a,0x95,0x52,0xbe,0x9f,0x62,0x69,0x38,0x61,0x8d,0xc5,0xc6,0xc7,0x75,0xca,
|
||||||
0x7b,0xd4,0xda,0xe6,0x2d,0xe8,0x6b,0xf9,0x02,0x2a,0x2e,0x00,0xff,0xfc,0x53,0x53,0x50,0xc5,0x54,0x64,
|
0xe3,0x51,0x6b,0x9b,0xb7,0xa0,0xaf,0xe5,0x0b,0xa8,0xb8,0x00,0xfc,0xf3,0x4f,0x4d,0x41,0x15,0xa1,0xc8,
|
||||||
0x1b,0xd0,0x3d,0x45,0xe2,0xa5,0xfd,0xb6,0xe8,0x3e,0x1e,0x3b,0xd0,0x97,0xeb,0x40,0x1b,0x0c,0xa1,0xad,
|
0x36,0xa0,0x7b,0x8a,0xc4,0x4b,0xfb,0x6d,0xd1,0x7d,0x3c,0x76,0xa0,0x2f,0xd7,0x81,0x36,0x18,0x42,0x5b,
|
||||||
0xf1,0x00,0xe3,0xce,0xa1,0xe3,0x4b,0x10,0x53,0xc7,0x9c,0xa9,0x56,0x93,0xe6,0x09,0x95,0x71,0x3d,0xe9,
|
0xe3,0x0e,0xc6,0x8d,0x43,0xe7,0x97,0x20,0xa6,0x8e,0x19,0x53,0xad,0x26,0xcd,0x13,0x2a,0xe3,0x7a,0xd2,
|
||||||
0x50,0x11,0x43,0x5f,0xe2,0xdb,0x53,0x85,0xee,0x5c,0x88,0xa4,0x7d,0xe4,0x67,0x90,0x1c,0x59,0x95,0x93,
|
0xae,0x22,0xa6,0xbe,0xc4,0xb7,0xa7,0x0a,0xdd,0x39,0x17,0x49,0xdb,0xc8,0xcf,0x20,0x39,0xb2,0x2a,0x27,
|
||||||
0x1e,0x34,0xa1,0x4d,0xe8,0xb0,0x55,0x8a,0x7d,0x1b,0x3f,0xd9,0xd0,0x31,0x7d,0x2b,0x3e,0x2c,0x10,0x73,
|
0x3d,0x68,0x42,0x9b,0xd0,0x69,0xab,0x14,0xdb,0x36,0x7e,0xb2,0xa1,0x63,0xfa,0x56,0x7c,0x58,0x20,0x62,
|
||||||
0x28,0xa4,0xca,0xd3,0x48,0x2d,0x1e,0x07,0x34,0x9d,0x1e,0xd0,0x96,0x57,0x03,0x11,0x9a,0x87,0x91,0x5c,
|
0x28,0xa4,0xca,0x61,0xa4,0x16,0x8f,0x1d,0x9a,0x86,0x07,0xb4,0xe5,0xd5,0x40,0xb8,0xe6,0x61,0x24,0x17,
|
||||||
0x3c,0x28,0xdf,0xd2,0xc3,0xc9,0xe5,0x36,0xe3,0xfd,0xf7,0xfc,0x28,0x5b,0x22,0xbe,0xc2,0xc0,0x56,0x85,
|
0x4f,0xca,0xb7,0xf4,0x74,0x72,0xb9,0xcd,0x78,0xff,0x3d,0xdf,0xcb,0x96,0xf0,0xaf,0xd0,0xb1,0x55,0x6e,
|
||||||
0x99,0x9c,0x00,0x00,0x5f,0xdf,0x44,0x59,0x21,0x0a,0xa3,0x9f,0xf2,0x47,0x11,0xa2,0xa6,0x91,0xa6,0xcb,
|
0x26,0x27,0x00,0xc0,0xd7,0x37,0x51,0x56,0x88,0xc2,0xe8,0xa7,0xfc,0x51,0x84,0xa8,0x69,0xa4,0x70,0xd9,
|
||||||
0x86,0x70,0x87,0x7a,0xbc,0x73,0x85,0x4d,0x2e,0x65,0xe8,0xd4,0x18,0x5c,0x9c,0xd7,0x84,0x2b,0xd8,0x39,
|
0x10,0xe6,0x50,0xcf,0x77,0xae,0xb0,0xc9,0xa5,0x0c,0x9d,0x0e,0x06,0x17,0xe7,0x35,0x61,0x0a,0x76,0x8e,
|
||||||
0x0e,0xcb,0x56,0x54,0x9b,0xee,0x17,0x0d,0x7e,0xe4,0xff,0x01,0x8d,0xa0,0x52,0x52,0xde,0xdb,0x34,0x13,
|
0xc3,0xb2,0x15,0xd5,0xa6,0xfb,0x45,0x93,0x1f,0xd9,0x7f,0x40,0x3d,0xa8,0x94,0x94,0xf7,0x36,0xcd,0x44,
|
||||||
0x51,0x59,0xd7,0xe3,0x75,0x13,0x4f,0x23,0x2c,0xfd,0x28,0xe1,0x36,0xd1,0x1b,0x34,0xa4,0xc8,0x14,0x42,
|
0x54,0xd6,0xf5,0x78,0xdd,0xc4,0xd3,0x08,0x4b,0x3f,0x4a,0xb8,0x4d,0xf4,0x06,0x0d,0xc9,0x33,0x85,0x50,
|
||||||
0x59,0xe1,0xb2,0x5a,0xb8,0x1f,0x38,0x18,0x91,0xf9,0xa2,0xbb,0x85,0xa2,0x24,0x9e,0x5b,0x91,0xe4,0xb6,
|
0x56,0xb8,0xac,0x16,0xee,0x07,0x0e,0x46,0x64,0xbe,0xe8,0x6e,0xa1,0x28,0x89,0x63,0x2b,0x92,0xdc,0x16,
|
||||||
0x30,0x77,0xa1,0xd9,0xa3,0x08,0x74,0xd6,0xe8,0x74,0x8c,0xcb,0xee,0x61,0x99,0x71,0x47,0x72,0xca,0x66,
|
0xc3,0x5d,0x38,0xec,0x51,0x04,0x3a,0x3b,0xe8,0xb4,0x8f,0xcb,0xe6,0x61,0x99,0x71,0x47,0x32,0xca,0x66,
|
||||||
0x3c,0x89,0x59,0x54,0xc7,0x0a,0xd9,0xc2,0x1b,0x02,0xf7,0xa3,0x29,0xcd,0xb6,0x3a,0x88,0x78,0x36,0xe0,
|
0x1c,0xc4,0xcc,0xab,0x63,0x85,0x6c,0xe1,0x0d,0x81,0xfb,0x51,0x48,0xb3,0xad,0x0e,0x22,0x9e,0x0d,0x78,
|
||||||
0x29,0x73,0x83,0xb5,0x7f,0xd2,0xf8,0xca,0xfc,0x3e,0xf4,0x18,0xda,0x80,0xe7,0x6b,0xb5,0x01,0x74,0xce,
|
0xca,0xdc,0x60,0xed,0x9f,0x34,0xbe,0x32,0xbf,0x0f,0x3d,0x86,0x36,0xe0,0xf9,0x5a,0x3d,0x00,0x1a,0xb3,
|
||||||
0xc2,0x22,0x9c,0xb2,0xe8,0xd2,0x50,0x59,0x81,0x52,0x80,0x54,0x4e,0xa8,0x10,0xbe,0x18,0x60,0x46,0x16,
|
0xb0,0x08,0xa7,0x2c,0xba,0x34,0x54,0x56,0xa0,0x14,0x20,0x95,0x13,0x2a,0x84,0x2f,0x06,0x98,0x91,0xc5,
|
||||||
0xcf,0xbe,0xb1,0xeb,0x50,0xc6,0x39,0x93,0xaf,0xcd,0x19,0x52,0x93,0x6e,0x81,0x4a,0x3f,0x80,0x64,0xbe,
|
0xd1,0x37,0x76,0x1d,0xca,0x38,0x27,0xf8,0xda,0x9c,0x21,0x15,0x74,0x0b,0x54,0xfa,0x01,0x24,0xf3,0x75,
|
||||||
0xce,0x81,0xe0,0x58,0x45,0xe9,0x14,0x1a,0xce,0x22,0xb5,0xf7,0x11,0xcf,0x4a,0x68,0xad,0x00,0x2f,0x82,
|
0x0e,0x04,0xc7,0x2a,0x4a,0xa7,0xd0,0x70,0x16,0xa9,0xbd,0x8f,0x78,0x56,0x42,0x6b,0x05,0x78,0x11,0xdc,
|
||||||
0x1b,0xb2,0xac,0xa2,0x76,0x84,0xd1,0x7c,0xa5,0x4d,0xce,0xb0,0x8a,0x4a,0x42,0xd7,0x38,0x3c,0x5f,0x69,
|
0x90,0x65,0x15,0xb5,0x23,0x8c,0xe6,0x2b,0x6d,0x72,0x86,0x55,0x54,0x12,0xba,0xc6,0xe1,0xf9,0x4a,0xfb,
|
||||||
0x3f,0x64,0x59,0x49,0x6d,0xb0,0x20,0x02,0xfa,0x41,0x2e,0x02,0xd4,0xf5,0xdb,0x12,0xf5,0x58,0xd4,0xe9,
|
0x21,0xcb,0x4a,0x6a,0x83,0x05,0x1e,0xd0,0x0f,0x72,0x1e,0xa0,0xae,0xdf,0x96,0xa8,0xc7,0xa2,0x4e,0x87,
|
||||||
0x90,0xfe,0x5a,0x3e,0x1d,0x2d,0xf2,0xe3,0xea,0xb2,0x3c,0x96,0x39,0xf5,0x99,0x5c,0xa5,0xb1,0x49,0x9d,
|
0xf4,0xd7,0xf2,0xe9,0x6c,0x91,0x1f,0x57,0x97,0xe5,0xb1,0xcc,0xa9,0xcf,0xe4,0x2a,0x8d,0x05,0x75,0x72,
|
||||||
0x9c,0xa9,0xb3,0x63,0x17,0x75,0x5a,0xec,0xb8,0x75,0x4a,0x2b,0x38,0x7a,0x12,0x7b,0x2d,0xd6,0x65,0xb8,
|
0xa6,0xce,0x8e,0x5d,0xd4,0x69,0xb1,0xe3,0xd6,0x29,0xad,0xe0,0xe8,0x49,0xec,0xb5,0x58,0x97,0xe1,0xde,
|
||||||
0xb7,0x3f,0x8c,0xce,0xaa,0x28,0x62,0xba,0x51,0x66,0xe5,0x50,0x76,0xf1,0x02,0x86,0x21,0xad,0x5c,0xea,
|
0xfe,0x30,0x3a,0xab,0xa2,0x88,0xe9,0x46,0x99,0x95,0x43,0xd9,0xc5,0x0b,0x18,0x86,0xb4,0x72,0xa9,0x3b,
|
||||||
0x4e,0xab,0x46,0xb4,0xb7,0x17,0x7a,0x0b,0x97,0xa6,0x04,0x80,0xec,0x4c,0x51,0x5d,0x96,0x54,0x68,0xa2,
|
0xad,0x1a,0xd1,0xde,0x5e,0xe8,0x2d,0x5c,0x9a,0x12,0x00,0xb2,0x31,0x45,0x75,0x59,0x52,0xa1,0x89,0x12,
|
||||||
0x04,0x25,0x9e,0xc3,0x33,0x49,0x5e,0x7d,0x9e,0x72,0x55,0x7d,0xde,0x4e,0x3b,0x3f,0xcc,0x52,0xd6,0x3f,
|
0x94,0x78,0x0e,0xcf,0x24,0x79,0xf5,0x79,0xca,0x55,0xf5,0x79,0x3b,0xed,0xfc,0x30,0x4b,0x59,0xff,0x90,
|
||||||
0x24,0x9e,0x65,0x45,0xec,0xdc,0x52,0xb6,0xed,0xf2,0xca,0x67,0x6e,0x31,0x3b,0x16,0x3c,0x2b,0x96,0xb3,
|
0x58,0x96,0x15,0xb1,0x73,0x4b,0xd9,0xb6,0xcb,0x2b,0x9f,0xb9,0xc5,0xec,0x58,0xf0,0xac,0x58,0xce,0x0a,
|
||||||
0x42,0x6a,0x41,0xc1,0x21,0x98,0x96,0x2c,0x69,0x33,0x1a,0x57,0x85,0x50,0x0f,0x30,0xf5,0x98,0x3c,0xa4,
|
0xa9,0x05,0x05,0x87,0x60,0x5a,0xb2,0xa4,0xcd,0x68,0x5c,0x15,0x42,0x3d,0xc0,0xd4,0x62,0xf2,0x94,0x2e,
|
||||||
0x4b,0x60,0xca,0x09,0xa5,0x40,0x4a,0x45,0x6d,0xe8,0xa4,0x05,0x65,0xad,0x8a,0x6b,0xb9,0xc2,0x56,0xa9,
|
0x81,0x29,0x27,0x94,0x02,0x29,0x15,0xb5,0xa1,0x91,0x16,0x94,0xb5,0x2a,0xae,0xe5,0x0a,0x5b,0xa5,0xfe,
|
||||||
0xbf,0xb8,0xb4,0x0d,0x4d,0x7f,0x47,0x71,0x1b,0x4b,0xbe,0xb7,0xbc,0xcd,0x28,0xf8,0x4b,0x15,0xb8,0x63,
|
0xe2,0xd2,0x36,0x1c,0xfa,0x3b,0x8a,0xdb,0x58,0xf2,0xbd,0xe5,0x6d,0x46,0xc1,0x5f,0xaa,0xc0,0x1d,0xcb,
|
||||||
0x39,0xdc,0xbf,0x63,0x89,0x9b,0x9a,0x46,0x85,0x45,0xae,0xe8,0xfd,0xfb,0x96,0xb9,0x22,0x04,0x0f,0xf9,
|
0xee,0xfe,0x1d,0x4b,0xdc,0x54,0x18,0x15,0x16,0xb9,0xa2,0xf7,0xef,0x5b,0xe6,0x0a,0x17,0x3c,0xe4,0xd3,
|
||||||
0xb0,0xac,0x8b,0x0e,0xd8,0x01,0x2a,0x87,0xc0,0x5e,0x5c,0xfc,0xdb,0x43,0x8e,0xe2,0x7c,0x4c,0x70,0x76,
|
0xb2,0x2e,0x3a,0x60,0x07,0xa8,0x1c,0x02,0x7b,0x71,0xf1,0x6f,0x0f,0x39,0x8a,0xf3,0x31,0xc1,0xd9,0xa5,
|
||||||
0x29,0x6d,0x61,0xf4,0xf1,0xe3,0x94,0x62,0xd5,0x85,0x99,0x9e,0x52,0x97,0xc1,0x67,0x20,0x9c,0x3d,0x3f,
|
0xb4,0x85,0xde,0xc7,0x8f,0x53,0x8a,0x55,0x17,0x66,0x7a,0x4a,0x5d,0x06,0x9f,0x81,0x70,0xf6,0xfc,0x2c,
|
||||||
0xcb,0x3a,0x2c,0xe6,0x48,0x61,0x0d,0x6b,0xc5,0x62,0x78,0x92,0xe6,0x42,0x90,0x31,0x4f,0xae,0xea,0x57,
|
0x6b,0xb0,0x98,0x23,0x85,0x35,0xac,0x15,0x8b,0xe1,0x49,0x9a,0x0b,0x41,0xc6,0x3c,0xb9,0xaa,0x5f,0x51,
|
||||||
0x14,0xee,0x19,0x38,0x1d,0xe9,0x6f,0x60,0xaf,0x5a,0xca,0x67,0x94,0x0d,0x5c,0x8f,0x9d,0x16,0xcf,0xd5,
|
0xb8,0x67,0xe0,0x74,0xa4,0xbf,0x81,0xbd,0x6a,0x29,0x9f,0x51,0x36,0x70,0x3d,0x76,0x5a,0x3c,0x57,0x8b,
|
||||||
0xa2,0xd8,0x6e,0x67,0xb4,0x9c,0xba,0x74,0x05,0x18,0xdf,0x7a,0x45,0xbb,0x83,0xff,0x17,0x11,0xc5,0x45,
|
0x62,0xbb,0x9d,0xd1,0x72,0xea,0xd2,0x15,0x60,0x7c,0xeb,0x15,0xed,0x0e,0xfe,0x5f,0x44,0x14,0x17,0x11,
|
||||||
0x84,0x70,0xe5,0xff,0xa2,0x8c,0x48,0x65,0x87,0xa2,0x8e,0xff,0x1e,0xa5,0xc4,0xfc,0xf3,0xb3,0xd4,0x61,
|
0xc2,0x94,0xff,0x8b,0x32,0x22,0x95,0x1d,0x8a,0x3a,0xfe,0x7b,0x94,0x12,0xf3,0xcf,0xcf,0x52,0x87,0xe1,
|
||||||
0xf8,0xbc,0xb2,0xa3,0x26,0xbf,0x60,0x4b,0x4a,0x0e,0xf9,0xe0,0x7c,0xb9,0x72,0x43,0x92,0x90,0xde,0x44,
|
0xf3,0xca,0x8e,0x9a,0xfc,0x82,0x2d,0x29,0x39,0xe4,0x83,0xf3,0xe5,0xca,0x0d,0x49,0x42,0x7a,0x13,0x99,
|
||||||
0xa6,0xb3,0xbf,0x9a,0xa7,0x30,0xed,0x5b,0x4c,0x81,0x02,0x91,0x24,0x7b,0xce,0xe5,0xa5,0x9b,0x12,0x8b,
|
0xce,0xfe,0x6a,0x9e,0xc2,0xb4,0x6f,0x31,0x05,0x0a,0x44,0x92,0xec,0x39,0x97,0x97,0x6e,0x4a,0x2c,0x46,
|
||||||
0xd1,0x85,0x87,0x67,0x85,0xc8,0xa4,0x77,0x97,0x2b,0x23,0x93,0x64,0x73,0xc8,0xa4,0x12,0x85,0x10,0x64,
|
0x17,0x1e,0x9e,0x15,0x22,0x93,0xde,0x5d,0xae,0x8c,0x4c,0x92,0xcd,0x21,0x93,0x4a,0x14,0x42,0x90,0xa1,
|
||||||
0x28,0xc5,0x69,0x7b,0xf1,0x32,0xe0,0xc3,0x37,0x5f,0x94,0x20,0x5c,0x3e,0x39,0x70,0xcf,0x68,0x48,0x85,
|
0x14,0xa7,0xed,0xc5,0xcb,0x80,0x0f,0xdf,0x7c,0x51,0x82,0x70,0xf9,0xe4,0xc0,0x3d,0xa3,0x21,0xe5,0x7a,
|
||||||
0xde,0x9a,0xc2,0xf2,0x14,0x16,0x8f,0x1a,0x34,0x75,0xb1,0x12,0x4f,0x44,0x2b,0xc6,0x14,0x4b,0x73,0x5c,
|
0x6b,0x8a,0x91,0xa7,0xb0,0x78,0x74,0x40,0x53,0x17,0x2b,0xf1,0x44,0xb4,0x62,0x4c,0xb1,0x34,0xc7,0x95,
|
||||||
0xc9,0x93,0x0a,0x5b,0x42,0x5d,0x88,0x6f,0xf1,0x28,0x1a,0x96,0xee,0x2d,0x54,0x54,0x34,0xc4,0x4c,0x98,
|
0x3c,0xa9,0xb0,0x25,0xd4,0x85,0xf8,0x16,0xcf,0xa2,0x61,0xe9,0xde,0x42,0x45,0x45,0x53,0xcc,0x84,0xd9,
|
||||||
0xbd,0xb2,0x08,0x47,0x93,0x4d,0x8f,0x4d,0x96,0x21,0xb1,0x6b,0xaf,0x38,0xe0,0x4c,0x53,0x6e,0xa4,0xe5,
|
0x2b,0x8b,0x70,0x36,0x59,0x78,0x6c,0xb2,0x0c,0x89,0x5d,0x7b,0xc5,0x09,0x67,0x9a,0x72,0x33,0x2d,0x67,
|
||||||
0xec,0x1b,0x0c,0x45,0xea,0x27,0x69,0xaf,0x23,0x4f,0xa5,0x0d,0x79,0x34,0x47,0x61,0x1a,0xdb,0xcb,0x04,
|
0xdf,0x60,0x28,0x52,0x3f,0x49,0x5b,0x1d,0x79,0x2a,0x6d,0xc8,0xa3,0x39,0x0a,0x53,0xdf,0x5e,0xc6,0x09,
|
||||||
0x01,0xf2,0xd4,0x6e,0x46,0x0b,0xfd,0xc2,0x4e,0x93,0xb3,0xae,0x4c,0xc7,0x67,0x30,0x74,0xa0,0x3f,0x06,
|
0x90,0xa7,0x36,0x33,0x5a,0x68,0x17,0x76,0x9a,0x9c,0x35,0x65,0xda,0x3f,0x83,0xa1,0x03,0xfd,0x31,0x20,
|
||||||
0xe4,0x45,0x19,0xa5,0x31,0x75,0xa9,0x58,0x4d,0x74,0xa9,0x23,0x56,0xa2,0xff,0x97,0xb0,0x4d,0xe0,0xc3,
|
0x2f,0x4a,0x2f,0x8d,0xa9,0x4b,0xf9,0x6a,0xa2,0x4b,0xed,0xb1,0x12,0xfd,0xbf,0x84,0x6d,0x02,0x1f,0x4e,
|
||||||
0x29,0xdd,0xd3,0x2b,0x30,0x87,0xa4,0x65,0x00,0x47,0x5a,0x94,0x68,0x63,0xe2,0x7b,0xa0,0xe6,0xce,0xdf,
|
0xe9,0x9e,0x5e,0x81,0x39,0x24,0x2d,0x03,0x38,0xd2,0xa2,0x44,0x1b,0x13,0xdf,0x03,0x35,0x77,0xfe,0x6e,
|
||||||
0x2d,0x97,0xf8,0xec,0xee,0x9d,0x0a,0x71,0x44,0x5b,0x04,0xf9,0xd0,0xb3,0x81,0x0e,0x2d,0xd7,0x36,0xd8,
|
0xb9,0xc4,0x67,0x77,0xef,0x54,0x88,0x23,0xda,0x22,0xc8,0x87,0x9e,0x0d,0x74,0x68,0xb9,0xb6,0xc1,0xd6,
|
||||||
0xba,0x5c,0xa0,0xa4,0x9b,0xf0,0xb0,0xb8,0x67,0x66,0xc6,0x7d,0x2b,0xed,0x4c,0xa8,0x0b,0xe7,0xea,0xdf,
|
0xe5,0x02,0x25,0xdd,0x84,0x87,0xf9,0x3d,0x1b,0x66,0xdc,0xb7,0x72,0x9c,0x09,0x75,0x61,0xac,0xfe,0x3d,
|
||||||
0x63,0x41,0x8c,0xdf,0xcc,0x16,0x2c,0x86,0x81,0xc7,0xae,0x07,0x34,0x11,0x1e,0x4f,0x01,0x86,0xe9,0x37,
|
0x16,0xc4,0xf8,0xcd,0x6c,0xc1,0x62,0x18,0x78,0xec,0x7a,0x40,0x13,0xe1,0xf1,0x14,0x60,0x98,0x7e,0xf3,
|
||||||
0xaf,0xe2,0x25,0xee,0x28,0xa4,0x65,0xb7,0xdf,0xb2,0xa9,0x23,0x64,0x43,0xe1,0xde,0x88,0xbb,0xc9,0x5a,
|
0x2a,0x5e,0xe2,0x8e,0x42,0x5a,0x76,0xfb,0x2d,0x0f,0x75,0x84,0x6c,0x28,0xcc,0x1b,0x71,0x37,0x59,0xcb,
|
||||||
0xfe,0x02,0x4e,0x4a,0xfc,0x22,0x2c,0xed,0x62,0xd7,0x64,0x99,0x86,0x5f,0xb6,0x0a,0x5f,0xd1,0x52,0x7b,
|
0x5f,0xc0,0x48,0x89,0x5d,0xc4,0x48,0xbb,0xd8,0x35,0x59,0xa6,0xe1,0x97,0xad,0xc2,0x57,0xb4,0x74,0xbc,
|
||||||
0x33,0x44,0x5e,0x52,0xca,0x4e,0xce,0x79,0x25,0xba,0xb6,0x92,0x73,0x4b,0x61,0xf6,0xcc,0x0a,0xce,0x4b,
|
0x19,0x22,0x2f,0x29,0x65,0x23,0xe7,0xac,0x12,0x5d,0x5b,0xc9,0x99,0xa5,0x30,0x7b,0x66,0x05,0xe7,0xa5,
|
||||||
0x9f,0x89,0xaf,0x16,0x5d,0x09,0xc9,0x16,0x7b,0x34,0x3e,0xb1,0x5f,0x4b,0xee,0xd4,0x14,0x76,0x1f,0x79,
|
0xcf,0xc4,0x56,0x8b,0xae,0x84,0x64,0x8b,0x3d,0xea,0x9f,0xd8,0xaf,0x25,0x77,0x6a,0x0a,0xbb,0x8f,0x2c,
|
||||||
0x2a,0xfd,0x66,0x7e,0x4e,0xc5,0xd4,0xe7,0x0a,0x54,0x11,0xe2,0xf8,0x5e,0xd6,0x0b,0x3f,0xfc,0x6d,0x9f,
|
0x95,0x7e,0x33,0x3f,0xa7,0x62,0xea,0x73,0x05,0x2a,0x0f,0x71,0x7c,0x2f,0x6b,0x85,0x1f,0xfe,0xb6,0x4f,
|
||||||
0x7c,0x33,0xd4,0xc5,0xe8,0x2b,0xdb,0x07,0xd8,0xe9,0xb4,0x49,0x61,0xf7,0x21,0x9e,0x48,0x05,0x71,0x62,
|
0xbe,0x19,0xea,0x62,0xf4,0x95,0xed,0x03,0xec,0x74,0xda,0xa4,0xb0,0xfb,0x10,0x4f,0xa4,0x82,0x38,0x19,
|
||||||
0x8f,0x20,0x2c,0x93,0x36,0x13,0x2d,0x49,0x42,0xc9,0xea,0x29,0x29,0x8a,0xe8,0x39,0xa8,0xb8,0x3d,0x13,
|
0x8f,0x20,0x2c,0x93,0x36,0x13,0x2d,0x49,0x42,0xc9,0xea,0x29,0x29,0x8a,0xe8,0x39,0xa8,0xf8,0x78,0x26,
|
||||||
0x46,0xc8,0xe1,0x8a,0x48,0xcb,0x1d,0xd9,0xc8,0xba,0x54,0xe8,0x92,0x8e,0x96,0xc7,0x67,0x83,0x5c,0x48,
|
0x8c,0x90,0xc3,0x15,0x91,0x96,0x3b,0xb2,0x91,0x75,0xa9,0xd0,0x25,0x1d,0x2d,0x8f,0xcf,0x06,0x39,0x97,
|
||||||
0x53,0x4d,0x57,0xc0,0x5f,0xc6,0x59,0x4c,0x38,0x07,0x84,0x6b,0xfc,0x3b,0x01,0x90,0x6e,0xbf,0x49,0x00,
|
0xa6,0x9a,0xae,0x80,0xbf,0x8c,0xb1,0x98,0x70,0x0e,0x08,0xd7,0xb8,0x02,0x00,0xe9,0xf2,0x99,0x04,0x20,
|
||||||
0xc2,0x3b,0x70,0x8b,0x00,0x88,0x99,0x90,0x01,0xc0,0x34,0x2a,0x4e,0xd9,0x0b,0x8a,0x28,0xdb,0x8d,0x2e,
|
0xbc,0x82,0xb6,0x08,0x80,0x70,0xc4,0x0c,0x00,0xa6,0x51,0x71,0xc8,0x5d,0x50,0xc3,0xd8,0x6e,0x74,0xa7,
|
||||||
0x75,0x47,0x77,0xf2,0x18,0x6d,0x33,0x7a,0x79,0x98,0x87,0x16,0xf2,0x2f,0x85,0x2f,0xd6,0x1d,0x83,0x8c,
|
0x3a,0xba,0x12,0xc7,0x68,0x9b,0xd1,0xbb,0xbb,0x3c,0xb4,0x90,0x7f,0x29,0x7c,0xb1,0xee,0x18,0x64,0xdc,
|
||||||
0x9b,0x4e,0xb4,0x68,0xd7,0x99,0xcb,0x3a,0x10,0x60,0xdd,0xba,0x8a,0x65,0xe5,0x6c,0xce,0x49,0x34,0x01,
|
0x74,0xa2,0x45,0x9b,0xbe,0x5c,0xd0,0x43,0x80,0x75,0xeb,0x2a,0x96,0x95,0x93,0x29,0x27,0xd1,0xf8,0x8b,
|
||||||
0xc4,0xd4,0x62,0x80,0x7d,0xce,0xab,0xdc,0x84,0xe6,0x92,0x8e,0x87,0x1c,0x32,0x27,0xeb,0x14,0x0d,0x1e,
|
0xa9,0xc5,0x00,0xfb,0x9c,0x57,0xb9,0x07,0xcc,0xc5,0xbc,0x87,0x1c,0x32,0x27,0xe8,0x8b,0x26,0x8f,0x8a,
|
||||||
0x15,0xbb,0x6a,0xd4,0xab,0xdd,0x2c,0x8a,0xa8,0x7d,0xb9,0x89,0x15,0x6b,0xc9,0xdf,0xfe,0x48,0xd0,0x6d,
|
0x5d,0x35,0xea,0xd5,0x6e,0x16,0x45,0xd4,0xbe,0x9c,0x5f,0xc7,0x5a,0xf2,0x97,0x2f,0x12,0x74,0x5b,0x74,
|
||||||
0x51,0xfb,0x59,0x47,0xcb,0x47,0x96,0x50,0xdb,0x1f,0x54,0xd5,0xe8,0x28,0x61,0x15,0x78,0x4c,0xcf,0x22,
|
0xfc,0xac,0xa3,0xe5,0x3d,0x4b,0xa8,0xed,0x0f,0xaa,0x6a,0x74,0x94,0xb0,0x0a,0x3c,0xa6,0x67,0x11,0x3e,
|
||||||
0x7c,0xbc,0xaf,0x95,0x00,0x56,0xbb,0x62,0xe5,0x50,0x40,0x8c,0x48,0x4b,0x83,0x8c,0x75,0xcd,0x85,0x09,
|
0xde,0xd7,0x4a,0x00,0xab,0x5d,0x91,0xb8,0x15,0x10,0x23,0xd2,0xd2,0x20,0x63,0x5d,0x73,0x61,0x02,0x2f,
|
||||||
0xbc,0xa8,0xc7,0x95,0x80,0x76,0xef,0xdb,0x75,0x4c,0x2b,0x21,0xdc,0xaf,0xab,0xfc,0x29,0x93,0x97,0x06,
|
0xea,0x71,0x25,0xa0,0xdd,0xfb,0x76,0x1d,0xd3,0x42,0x04,0xf7,0xeb,0x2a,0x7b,0xca,0xe4,0xa5,0x01,0xa7,
|
||||||
0x9c,0xd2,0x39,0x17,0xb4,0x37,0x1d,0xf3,0x7e,0xdf,0x09,0xb9,0x76,0x35,0x17,0x72,0xed,0xea,0x1d,0x90,
|
0x74,0xce,0x05,0xed,0x4d,0xc7,0xbc,0xdf,0x77,0x42,0xae,0x5d,0xcd,0x85,0x5c,0xbb,0x7a,0x07,0x64,0xaa,
|
||||||
0xa9,0xce,0x85,0x90,0x59,0xbf,0x2b,0x40,0x9e,0x8e,0xab,0x62,0xe3,0x96,0x43,0x1b,0x53,0x96,0x04,0x9a,
|
0x73,0x21,0x64,0xd6,0xef,0x0a,0x90,0xa7,0xe3,0xaa,0xd8,0x37,0xe5,0xd0,0xc6,0x94,0x25,0x81,0x26,0x9a,
|
||||||
0x68,0x2a,0xc4,0x28,0x75,0xb6,0x12,0xc4,0x26,0x86,0xaf,0x01,0x74,0xf4,0x99,0x02,0x64,0x4c,0x5b,0x1a,
|
0x0a,0x31,0x4a,0x9d,0xad,0x04,0xb1,0x89,0xe1,0x6b,0x00,0x1d,0x7d,0xa6,0x00,0x19,0xd3,0x96,0x86,0x99,
|
||||||
0x66,0xa2,0x6d,0x0e,0x50,0xa9,0xcb,0xa2,0xfc,0x35,0x06,0x5e,0x2e,0x7f,0xc9,0x6f,0x73,0x28,0xb9,0xda,
|
0x68,0x9b,0x03,0x54,0xea,0xb2,0x28,0x7f,0x8d,0x81,0x97,0xcb,0x5f,0xf2,0xcb,0x14,0x4a,0xae,0x76,0x5b,
|
||||||
0x6d,0x5d,0xc2,0x1c,0xea,0x84,0xb2,0x4c,0x3e,0x97,0xf4,0x14,0xe1,0x95,0xbb,0xd2,0x16,0xd6,0xaf,0x09,
|
0x97,0x30,0x87,0x3a,0xa1,0x2c,0x93,0xcf,0x25,0x3d,0x45,0x78,0xe5,0xae,0xb4,0x85,0xe5,0x63,0xc2,0x6d,
|
||||||
0xb7,0xb5,0x54,0x01,0xfb,0xc3,0x76,0x44,0xcb,0x5e,0x3a,0x5f,0x53,0x5e,0x3a,0x4f,0x2e,0x2f,0xab,0xee,
|
0x2d,0x55,0x3f,0xfe,0xb0,0x0d,0xc9,0xb2,0x77,0xbe,0xd7,0x94,0x77,0xbe,0x93,0xbb,0xc3,0xaa,0x6b,0xc3,
|
||||||
0x2d,0xe7,0xab,0x6e,0xd7,0x4b,0x15,0xdd,0x3f,0xdb,0xe0,0x35,0x70,0x7f,0xd5,0xa2,0xfd,0x6d,0x42,0xdb,
|
0xf9,0xa2,0xd7,0xf5,0x52,0x35,0xef,0xcf,0x36,0x78,0x0d,0xdc,0x5f,0xb5,0x68,0x7b,0x99,0xd0,0xb6,0x86,
|
||||||
0x1a,0x02,0xfd,0x45,0x5d,0x7c,0x4b,0xc7,0x90,0x12,0xbf,0xe2,0xe6,0xeb,0xa2,0xa0,0x67,0x27,0xeb,0x35,
|
0x40,0x7f,0x51,0xd7,0xbe,0xd2,0x29,0xa0,0xc4,0xaf,0xb8,0x78,0xba,0xc8,0xe9,0xd9,0xc1,0x76,0xcd,0x0d,
|
||||||
0x37,0x90,0x8f,0x6e,0x24,0x85,0x3a,0xa3,0x2c,0x17,0xef,0x89,0xa2,0x5c,0xf0,0xe4,0x34,0x86,0xa7,0xe9,
|
0xe4,0x93,0x13,0x49,0xa1,0xce,0x28,0xcb,0xf9,0x7b,0xa2,0x28,0xe7,0x3c,0x39,0x8d,0xe1,0x61,0x76,0x39,
|
||||||
0xe5,0xf0,0x34,0xbd,0xbc,0x9f,0x1a,0x67,0x99,0x7d,0x8a,0xbe,0x02,0x6c,0xb0,0x3b,0x9f,0xda,0xc9,0xb1,
|
0x3c,0xcc,0x2e,0xef,0xa7,0xe6,0x59,0x66,0x9f,0xa2,0xaf,0x00,0x1b,0xec,0xca,0xa5,0x76,0x72,0xac,0x95,
|
||||||
0x56,0x56,0xec,0xd5,0xe6,0x73,0x5b,0x15,0x95,0x59,0xa9,0xab,0xa7,0x91,0xbf,0x2a,0x3f,0xec,0xce,0x6b,
|
0x15,0x5b,0xa5,0xf9,0xdc,0x56,0x45,0x35,0xac,0xd4,0xcd,0xcf,0xc8,0x5e,0x95,0x1f,0x76,0xe5,0xb4,0xe8,
|
||||||
0xd1,0x51,0x9e,0x84,0x38,0x20,0xb0,0x16,0xd0,0xfd,0x41,0xe6,0xbc,0x4e,0xc1,0xb1,0xf8,0xd0,0x4e,0xed,
|
0x24,0x4d,0x42,0x1c,0x10,0x58,0x0b,0x68,0x79,0x9e,0x39,0x2e,0x53,0x70,0x2c,0x3e,0x33,0x53,0xdb,0x84,
|
||||||
0x13,0x6e,0x12,0x51,0x3b,0x23,0x34,0xb7,0xe8,0xce,0x6d,0x5e,0x4d,0x89,0xdd,0x8a,0xa6,0x7f,0x48,0xe5,
|
0x0f,0x89,0xa8,0x8d,0x11,0x0e,0xb7,0xe8,0xca,0x6b,0x5e,0x4d,0x89,0x5d,0x4a,0xa6,0x7f,0x48,0xe5,0xab,
|
||||||
0xab,0x78,0x83,0xb3,0xcd,0x9b,0x97,0x78,0x5d,0xb0,0xea,0x66,0xd6,0xa1,0x69,0x4c,0x9a,0x56,0x7d,0xde,
|
0x78,0x81,0xb2,0xcd,0x9b,0x97,0x38,0xad,0x5f,0x75,0x2f,0xe9,0xd0,0x34,0x26,0x85,0x55,0x9f,0x77,0x27,
|
||||||
0x9d,0x30,0xd3,0x02,0xa4,0x93,0xa7,0x6e,0x7c,0xe0,0x9f,0x26,0x49,0xd0,0x99,0x8a,0x70,0xb6,0xb1,0xef,
|
0x86,0x69,0x01,0xd2,0xc9,0x53,0x37,0x3e,0xf0,0x2f,0x83,0x24,0xe8,0x4c,0x45,0x18,0x6d,0xec,0x33,0xa1,
|
||||||
0x94,0x52,0x01,0x23,0xe7,0x90,0x05,0xdf,0x32,0xf0,0x17,0xa2,0x23,0xf4,0x56,0xfc,0x4e,0x94,0xae,0xb0,
|
0x94,0xc3,0xc8,0x39,0x64,0xc1,0xa7,0x04,0xfc,0x7d,0xe4,0x08,0xbd,0x15,0xbf,0x92,0xa4,0x2b,0x2c,0x91,
|
||||||
0x44,0xae,0x6e,0x75,0xd7,0x9b,0xf1,0x97,0x44,0x42,0xf7,0x10,0x4b,0x5f,0x7c,0x85,0xbc,0xd9,0x0f,0xbe,
|
0xab,0x5b,0xdd,0xf5,0x66,0xfc,0x1d,0x8d,0xd0,0x3d,0xc4,0xd2,0x07,0x57,0x21,0x6f,0xf6,0x7b,0xab,0xe8,
|
||||||
0xa2,0xb3,0x93,0x3b,0x41,0xe6,0xdf,0x7d,0x65,0x24,0xe2,0xef,0xbd,0x72,0xaf,0x99,0xc2,0x8f,0x4c,0x6d,
|
0xe8,0xe2,0x4e,0x90,0xf9,0x67,0x57,0x19,0x89,0xf8,0x73,0xab,0xdc,0x5b,0x9e,0xf0,0x1b,0x4f,0x9b,0x4e,
|
||||||
0x3a,0x14,0x01,0x30,0x69,0x2c,0x3d,0x83,0x09,0x10,0x8d,0xa5,0x13,0x7e,0x2a,0x50,0xf5,0xa8,0x7f,0xa4,
|
0x45,0x00,0x4c,0xea,0x4b,0xcf,0x60,0x02,0x44,0x63,0xe9,0x84,0x6f,0xca,0xab,0x1e,0xb5,0x8f,0xf4,0xcd,
|
||||||
0x8f,0x4e,0xc5,0xe7,0xa6,0xdb,0xfc,0x2b,0xdb,0xff,0x00,0xdf,0xd5,0x86,0xbe,0x7b,0x3b,0x00,0x00};
|
0xa7,0xf8,0xda,0x73,0x9b,0x7f,0xe4,0xfa,0x1f,0x6e,0xdd,0xfc,0xe9,0xfa,0x3a,0x00,0x00};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -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 = 40;
|
const uint8_t VersionMetadata = 41;
|
||||||
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+40";
|
const char VersionFullSemVer[] = "2.0.0-beta.1+41";
|
||||||
const char VersionCommitDate[] = "2018-02-12";
|
const char VersionCommitDate[] = "2018-02-13";
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -239,7 +239,17 @@ void updateTimeTrigger()
|
|||||||
#ifdef SerialDebug
|
#ifdef SerialDebug
|
||||||
_d("Triggers:: active time trigger: ");
|
_d("Triggers:: active time trigger: ");
|
||||||
if (activeTimeTrigger != nullptr)
|
if (activeTimeTrigger != nullptr)
|
||||||
|
{
|
||||||
|
_d(activeTimeTrigger->brightness);
|
||||||
|
_d(" @ ");
|
||||||
|
|
||||||
|
switch (activeTimeTrigger->triggerType)
|
||||||
|
{
|
||||||
|
case RelativeToSunrise: _d("sunrise "); break;
|
||||||
|
case RelativeToSunset: _d("sunset "); break;
|
||||||
|
}
|
||||||
_dln(activeTimeTrigger->time);
|
_dln(activeTimeTrigger->time);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
_dln("null");
|
_dln("null");
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,350 +0,0 @@
|
|||||||
/*
|
|
||||||
* Stairs lighting
|
|
||||||
* Copyright 2017 (c) Mark van Renswoude
|
|
||||||
*
|
|
||||||
* https://git.x2software.net/pub/Stairs
|
|
||||||
*
|
|
||||||
* This code was ported over from Domoticz' SunRiseSet.cpp
|
|
||||||
* https://github.com/domoticz/domoticz/
|
|
||||||
*/
|
|
||||||
#include "./praisethesun.h"
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef PI
|
|
||||||
#define PI 3.1415926535897932384
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* A macro to compute the number of days elapsed since 2000 Jan 0.0 */
|
|
||||||
/* (which is equal to 1999 Dec 31, 0h UT) */
|
|
||||||
|
|
||||||
#define days_since_2000_Jan_0(y,m,d) \
|
|
||||||
(367L*(y)-((7*((y)+(((m)+9)/12)))/4)+((275*(m))/9)+(d)-730530L)
|
|
||||||
|
|
||||||
/* Some conversion factors between radians and degrees */
|
|
||||||
|
|
||||||
#ifndef PI
|
|
||||||
#define PI 3.1415926535897932384
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define RADEG ( 180.0 / PI )
|
|
||||||
#define DEGRAD ( PI / 180.0 )
|
|
||||||
|
|
||||||
/* The trigonometric functions in degrees */
|
|
||||||
|
|
||||||
#define sind(x) sin((x)*DEGRAD)
|
|
||||||
#define cosd(x) cos((x)*DEGRAD)
|
|
||||||
#define tand(x) tan((x)*DEGRAD)
|
|
||||||
|
|
||||||
#define atand(x) (RADEG*atan(x))
|
|
||||||
#define asind(x) (RADEG*asin(x))
|
|
||||||
#define acosd(x) (RADEG*acos(x))
|
|
||||||
#define atan2d(y,x) (RADEG*atan2(y,x))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
double GMST0(double d);
|
|
||||||
double revolution( double x );
|
|
||||||
void sun_RA_dec( double d, double *RA, double *dec, double *r );
|
|
||||||
double rev180( double x );
|
|
||||||
void sunpos( double d, double *lon, double *r );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int sunriset( int year, int month, int day, double lon, double lat,
|
|
||||||
double altit, int upper_limb, double *trise, double *tset )
|
|
||||||
/***************************************************************************/
|
|
||||||
/* Note: year,month,date = calendar date, 1801-2099 only. */
|
|
||||||
/* Eastern longitude positive, Western longitude negative */
|
|
||||||
/* Northern latitude positive, Southern latitude negative */
|
|
||||||
/* The longitude value IS critical in this function! */
|
|
||||||
/* altit = the altitude which the Sun should cross */
|
|
||||||
/* Set to -35/60 degrees for rise/set, -6 degrees */
|
|
||||||
/* for civil, -12 degrees for nautical and -18 */
|
|
||||||
/* degrees for astronomical twilight. */
|
|
||||||
/* upper_limb: non-zero -> upper limb, zero -> center */
|
|
||||||
/* Set to non-zero (e.g. 1) when computing rise/set */
|
|
||||||
/* times, and to zero when computing start/end of */
|
|
||||||
/* twilight. */
|
|
||||||
/* *rise = where to store the rise time */
|
|
||||||
/* *set = where to store the set time */
|
|
||||||
/* Both times are relative to the specified altitude, */
|
|
||||||
/* and thus this function can be used to compute */
|
|
||||||
/* various twilight times, as well as rise/set times */
|
|
||||||
/* Return value: 0 = sun rises/sets this day, times stored at */
|
|
||||||
/* *trise and *tset. */
|
|
||||||
/* +1 = sun above the specified "horizon" 24 hours. */
|
|
||||||
/* *trise set to time when the sun is at south, */
|
|
||||||
/* minus 12 hours while *tset is set to the south */
|
|
||||||
/* time plus 12 hours. "Day" length = 24 hours */
|
|
||||||
/* -1 = sun is below the specified "horizon" 24 hours */
|
|
||||||
/* "Day" length = 0 hours, *trise and *tset are */
|
|
||||||
/* both set to the time when the sun is at south. */
|
|
||||||
/* */
|
|
||||||
/**********************************************************************/
|
|
||||||
{
|
|
||||||
double d, /* Days since 2000 Jan 0.0 (negative before) */
|
|
||||||
sr, /* Solar distance, astronomical units */
|
|
||||||
sRA, /* Sun's Right Ascension */
|
|
||||||
sdec, /* Sun's declination */
|
|
||||||
sradius, /* Sun's apparent radius */
|
|
||||||
t, /* Diurnal arc */
|
|
||||||
tsouth, /* Time when Sun is at south */
|
|
||||||
sidtime; /* Local sidereal time */
|
|
||||||
|
|
||||||
int rc = 0; /* Return cde from function - usually 0 */
|
|
||||||
|
|
||||||
/* Compute d of 12h local mean solar time */
|
|
||||||
d = days_since_2000_Jan_0(year,month,day) + 0.5 - lon/360.0;
|
|
||||||
|
|
||||||
/* Compute the local sidereal time of this moment */
|
|
||||||
sidtime = revolution(GMST0(d) + 180.0 + lon);
|
|
||||||
|
|
||||||
/* Compute Sun's RA, Decl and distance at this moment */
|
|
||||||
sun_RA_dec( d, &sRA, &sdec, &sr );
|
|
||||||
|
|
||||||
/* Compute time when Sun is at south - in hours UT */
|
|
||||||
tsouth = 12.0 - rev180(sidtime - sRA)/15.0;
|
|
||||||
|
|
||||||
/* Compute the Sun's apparent radius in degrees */
|
|
||||||
sradius = 0.2666 / sr;
|
|
||||||
|
|
||||||
/* Do correction to upper limb, if necessary */
|
|
||||||
if ( upper_limb )
|
|
||||||
altit -= sradius;
|
|
||||||
|
|
||||||
/* Compute the diurnal arc that the Sun traverses to reach */
|
|
||||||
/* the specified altitude altit: */
|
|
||||||
{
|
|
||||||
double cost;
|
|
||||||
cost = ( sind(altit) - sind(lat) * sind(sdec) ) /
|
|
||||||
( cosd(lat) * cosd(sdec) );
|
|
||||||
if ( cost >= 1.0 )
|
|
||||||
rc = -1, t = 0.0; /* Sun always below altit */
|
|
||||||
else if ( cost <= -1.0 )
|
|
||||||
rc = +1, t = 12.0; /* Sun always above altit */
|
|
||||||
else
|
|
||||||
t = acosd(cost)/15.0; /* The diurnal arc, hours */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Store rise and set times - in hours UT */
|
|
||||||
*trise = tsouth - t;
|
|
||||||
*tset = tsouth + t;
|
|
||||||
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
double daylen( int year, int month, int day, double lon, double lat, double altit, int upper_limb )
|
|
||||||
/**********************************************************************/
|
|
||||||
/* Note: year,month,date = calendar date, 1801-2099 only. */
|
|
||||||
/* Eastern longitude positive, Western longitude negative */
|
|
||||||
/* Northern latitude positive, Southern latitude negative */
|
|
||||||
/* The longitude value is not critical. Set it to the correct */
|
|
||||||
/* longitude if you're picky, otherwise set to to, say, 0.0 */
|
|
||||||
/* The latitude however IS critical - be sure to get it correct */
|
|
||||||
/* altit = the altitude which the Sun should cross */
|
|
||||||
/* Set to -35/60 degrees for rise/set, -6 degrees */
|
|
||||||
/* for civil, -12 degrees for nautical and -18 */
|
|
||||||
/* degrees for astronomical twilight. */
|
|
||||||
/* upper_limb: non-zero -> upper limb, zero -> center */
|
|
||||||
/* Set to non-zero (e.g. 1) when computing day length */
|
|
||||||
/* and to zero when computing day+twilight length. */
|
|
||||||
/**********************************************************************/
|
|
||||||
{
|
|
||||||
double d, /* Days since 2000 Jan 0.0 (negative before) */
|
|
||||||
obl_ecl, /* Obliquity (inclination) of Earth's axis */
|
|
||||||
sr, /* Solar distance, astronomical units */
|
|
||||||
slon, /* True solar longitude */
|
|
||||||
sin_sdecl, /* Sine of Sun's declination */
|
|
||||||
cos_sdecl, /* Cosine of Sun's declination */
|
|
||||||
sradius, /* Sun's apparent radius */
|
|
||||||
t; /* Diurnal arc */
|
|
||||||
|
|
||||||
/* Compute d of 12h local mean solar time */
|
|
||||||
d = days_since_2000_Jan_0(year,month,day) + 0.5 - lon/360.0;
|
|
||||||
|
|
||||||
/* Compute obliquity of ecliptic (inclination of Earth's axis) */
|
|
||||||
obl_ecl = 23.4393 - 3.563E-7 * d;
|
|
||||||
|
|
||||||
/* Compute Sun's ecliptic longitude and distance */
|
|
||||||
sunpos( d, &slon, &sr );
|
|
||||||
|
|
||||||
/* Compute sine and cosine of Sun's declination */
|
|
||||||
sin_sdecl = sind(obl_ecl) * sind(slon);
|
|
||||||
cos_sdecl = sqrt( 1.0 - sin_sdecl * sin_sdecl );
|
|
||||||
|
|
||||||
/* Compute the Sun's apparent radius, degrees */
|
|
||||||
sradius = 0.2666 / sr;
|
|
||||||
|
|
||||||
/* Do correction to upper limb, if necessary */
|
|
||||||
if ( upper_limb )
|
|
||||||
altit -= sradius;
|
|
||||||
|
|
||||||
/* Compute the diurnal arc that the Sun traverses to reach */
|
|
||||||
/* the specified altitude altit: */
|
|
||||||
{
|
|
||||||
double cost;
|
|
||||||
cost = ( sind(altit) - sind(lat) * sin_sdecl ) /
|
|
||||||
( cosd(lat) * cos_sdecl );
|
|
||||||
if ( cost >= 1.0 )
|
|
||||||
t = 0.0; /* Sun always below altit */
|
|
||||||
else if ( cost <= -1.0 )
|
|
||||||
t = 24.0; /* Sun always above altit */
|
|
||||||
else t = (2.0/15.0) * acosd(cost); /* The diurnal arc, hours */
|
|
||||||
}
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* This function computes the Sun's position at any instant */
|
|
||||||
|
|
||||||
void sunpos( double d, double *lon, double *r )
|
|
||||||
/******************************************************/
|
|
||||||
/* Computes the Sun's ecliptic longitude and distance */
|
|
||||||
/* at an instant given in d, number of days since */
|
|
||||||
/* 2000 Jan 0.0. The Sun's ecliptic latitude is not */
|
|
||||||
/* computed, since it's always very near 0. */
|
|
||||||
/******************************************************/
|
|
||||||
{
|
|
||||||
double M, /* Mean anomaly of the Sun */
|
|
||||||
w, /* Mean longitude of perihelion */
|
|
||||||
/* Note: Sun's mean longitude = M + w */
|
|
||||||
e, /* Eccentricity of Earth's orbit */
|
|
||||||
E, /* Eccentric anomaly */
|
|
||||||
x, y, /* x, y coordinates in orbit */
|
|
||||||
v; /* True anomaly */
|
|
||||||
|
|
||||||
/* Compute mean elements */
|
|
||||||
M = revolution(356.0470 + 0.9856002585 * d);
|
|
||||||
w = 282.9404 + 4.70935E-5 * d;
|
|
||||||
e = 0.016709 - 1.151E-9 * d;
|
|
||||||
|
|
||||||
/* Compute true longitude and radius vector */
|
|
||||||
E = M + e * RADEG * sind(M) * ( 1.0 + e * cosd(M) );
|
|
||||||
x = cosd(E) - e;
|
|
||||||
y = sqrt( 1.0 - e*e ) * sind(E);
|
|
||||||
*r = sqrt( x*x + y*y ); /* Solar distance */
|
|
||||||
v = atan2d( y, x ); /* True anomaly */
|
|
||||||
*lon = v + w; /* True solar longitude */
|
|
||||||
if ( *lon >= 360.0 )
|
|
||||||
*lon -= 360.0; /* Make it 0..360 degrees */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void sun_RA_dec( double d, double *RA, double *dec, double *r )
|
|
||||||
/******************************************************/
|
|
||||||
/* Computes the Sun's equatorial coordinates RA, Decl */
|
|
||||||
/* and also its distance, at an instant given in d, */
|
|
||||||
/* the number of days since 2000 Jan 0.0. */
|
|
||||||
/******************************************************/
|
|
||||||
{
|
|
||||||
double lon, obl_ecl, x, y, z;
|
|
||||||
|
|
||||||
/* Compute Sun's ecliptical coordinates */
|
|
||||||
sunpos( d, &lon, r );
|
|
||||||
|
|
||||||
/* Compute ecliptic rectangular coordinates (z=0) */
|
|
||||||
x = *r * cosd(lon);
|
|
||||||
y = *r * sind(lon);
|
|
||||||
|
|
||||||
/* Compute obliquity of ecliptic (inclination of Earth's axis) */
|
|
||||||
obl_ecl = 23.4393 - 3.563E-7 * d;
|
|
||||||
|
|
||||||
/* Convert to equatorial rectangular coordinates - x is unchanged */
|
|
||||||
z = y * sind(obl_ecl);
|
|
||||||
y = y * cosd(obl_ecl);
|
|
||||||
|
|
||||||
/* Convert to spherical coordinates */
|
|
||||||
*RA = atan2d( y, x );
|
|
||||||
*dec = atan2d( z, sqrt(x*x + y*y) );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************/
|
|
||||||
/* This function reduces any angle to within the first revolution */
|
|
||||||
/* by subtracting or adding even multiples of 360.0 until the */
|
|
||||||
/* result is >= 0.0 and < 360.0 */
|
|
||||||
/******************************************************************/
|
|
||||||
|
|
||||||
#define INV360 ( 1.0 / 360.0 )
|
|
||||||
|
|
||||||
double revolution( double x )
|
|
||||||
/*****************************************/
|
|
||||||
/* Reduce angle to within 0..360 degrees */
|
|
||||||
/*****************************************/
|
|
||||||
{
|
|
||||||
return( x - 360.0 * floor( x * INV360 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
double UtcToLocal(double time, double tz)
|
|
||||||
/*********************************************/
|
|
||||||
/* Add Time Zone difference to time */
|
|
||||||
/*********************************************/
|
|
||||||
{
|
|
||||||
time += tz;
|
|
||||||
return((time > 24.0) ? time-24.0 : (time < 0.0) ? time+24.0 : time);
|
|
||||||
}
|
|
||||||
|
|
||||||
double rev180( double x )
|
|
||||||
/*********************************************/
|
|
||||||
/* Reduce angle to within +180..+180 degrees */
|
|
||||||
/*********************************************/
|
|
||||||
{
|
|
||||||
return( x - 360.0 * floor( x * INV360 + 0.5 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*******************************************************************/
|
|
||||||
/* This function computes GMST0, the Greenwich Mean Sidereal Time */
|
|
||||||
/* at 0h UT (i.e. the sidereal time at the Greenwhich meridian at */
|
|
||||||
/* 0h UT). GMST is then the sidereal time at Greenwich at any */
|
|
||||||
/* time of the day. I've generalized GMST0 as well, and define it */
|
|
||||||
/* as: GMST0 = GMST - UT -- this allows GMST0 to be computed at */
|
|
||||||
/* other times than 0h UT as well. While this sounds somewhat */
|
|
||||||
/* contradictory, it is very practical: instead of computing */
|
|
||||||
/* GMST like: */
|
|
||||||
/* */
|
|
||||||
/* GMST = (GMST0) + UT * (366.2422/365.2422) */
|
|
||||||
/* */
|
|
||||||
/* where (GMST0) is the GMST last time UT was 0 hours, one simply */
|
|
||||||
/* computes: */
|
|
||||||
/* */
|
|
||||||
/* GMST = GMST0 + UT */
|
|
||||||
/* */
|
|
||||||
/* where GMST0 is the GMST "at 0h UT" but at the current moment! */
|
|
||||||
/* Defined in this way, GMST0 will increase with about 4 min a */
|
|
||||||
/* day. It also happens that GMST0 (in degrees, 1 hr = 15 degr) */
|
|
||||||
/* is equal to the Sun's mean longitude plus/minus 180 degrees! */
|
|
||||||
/* (if we neglect aberration, which amounts to 20 seconds of arc */
|
|
||||||
/* or 1.33 seconds of time) */
|
|
||||||
/* */
|
|
||||||
/*******************************************************************/
|
|
||||||
|
|
||||||
double GMST0(double d)
|
|
||||||
{
|
|
||||||
double sidtim0;
|
|
||||||
/* Sidtime at 0h UT = L (Sun's mean longitude) + 180.0 degr */
|
|
||||||
/* L = M + w, as defined in sunpos(). Since I'm too lazy to */
|
|
||||||
/* add these numbers, I'll let the C compiler do it for me. */
|
|
||||||
/* Any decent C compiler will add the constants at compile */
|
|
||||||
/* time, imposing no runtime or code overhead. */
|
|
||||||
sidtim0 = revolution( ( 180.0 + 356.0470 + 282.9404 ) +
|
|
||||||
( 0.9856002585 + 4.70935E-5 ) * d );
|
|
||||||
return sidtim0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Part of this code was provided by Paul Schlyter
|
|
||||||
* Here is the original copyright information
|
|
||||||
* Written as DAYLEN.C, 1989-08-16
|
|
||||||
* Modified to SUNRISET.C, 1992-12-01
|
|
||||||
* (c) Paul Schlyter, 1989, 1992
|
|
||||||
* Released to the public domain by Paul Schlyter, December 1992
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
||||||
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* Stairs lighting
|
|
||||||
* Copyright 2017 (c) Mark van Renswoude
|
|
||||||
*
|
|
||||||
* https://git.x2software.net/pub/Stairs
|
|
||||||
*
|
|
||||||
* This code was ported over from Domoticz' SunRiseSet.cpp
|
|
||||||
* https://github.com/domoticz/domoticz/
|
|
||||||
*/
|
|
||||||
#ifndef __praisethesun
|
|
||||||
#define __praisethesun
|
|
||||||
|
|
||||||
double daylen( int year, int month, int day, double lon, double lat, double altit, int upper_limb );
|
|
||||||
|
|
||||||
int sunriset( int year, int month, int day, double lon, double lat,
|
|
||||||
double altit, int upper_limb, double *trise, double *tset );
|
|
||||||
|
|
||||||
|
|
||||||
/* This macro computes the length of the day, from sunrise to sunset. */
|
|
||||||
/* Sunrise/set is considered to occur when the Sun's upper limb is */
|
|
||||||
/* 35 arc minutes below the horizon (this accounts for the refraction */
|
|
||||||
/* of the Earth's atmosphere). */
|
|
||||||
#define day_length(year,month,day,lon,lat) \
|
|
||||||
daylen(year, month, day, lon, lat, -35.0/60.0, 1)
|
|
||||||
|
|
||||||
/* This macro computes the length of the day, including civil twilight. */
|
|
||||||
/* Civil twilight starts/ends when the Sun's center is 6 degrees below */
|
|
||||||
/* the horizon. */
|
|
||||||
#define day_civil_twilight_length(year,month,day,lon,lat) \
|
|
||||||
daylen(year, month, day, lon, lat, -6.0, 0)
|
|
||||||
|
|
||||||
/* This macro computes the length of the day, incl. nautical twilight. */
|
|
||||||
/* Nautical twilight starts/ends when the Sun's center is 12 degrees */
|
|
||||||
/* below the horizon. */
|
|
||||||
#define day_nautical_twilight_length(year,month,day,lon,lat) \
|
|
||||||
daylen(year, month, day, lon, lat, -12.0, 0)
|
|
||||||
|
|
||||||
/* This macro computes the length of the day, incl. astronomical twilight. */
|
|
||||||
/* Astronomical twilight starts/ends when the Sun's center is 18 degrees */
|
|
||||||
/* below the horizon. */
|
|
||||||
#define day_astronomical_twilight_length(year,month,day,lon,lat) \
|
|
||||||
daylen(year, month, day, lon, lat, -18.0, 0)
|
|
||||||
|
|
||||||
/* This macro computes times for sunrise/sunset. */
|
|
||||||
/* Sunrise/set is considered to occur when the Sun's upper limb is */
|
|
||||||
/* 35 arc minutes below the horizon (this accounts for the refraction */
|
|
||||||
/* of the Earth's atmosphere). */
|
|
||||||
#define sun_rise_set(year,month,day,lon,lat,rise,set) \
|
|
||||||
sunriset( year, month, day, lon, lat, -35.0/60.0, 1, rise, set )
|
|
||||||
|
|
||||||
/* This macro computes the start and end times of civil twilight. */
|
|
||||||
/* Civil twilight starts/ends when the Sun's center is 6 degrees below */
|
|
||||||
/* the horizon. */
|
|
||||||
#define civil_twilight(year,month,day,lon,lat,start,end) \
|
|
||||||
sunriset( year, month, day, lon, lat, -6.0, 0, start, end )
|
|
||||||
|
|
||||||
/* This macro computes the start and end times of nautical twilight. */
|
|
||||||
/* Nautical twilight starts/ends when the Sun's center is 12 degrees */
|
|
||||||
/* below the horizon. */
|
|
||||||
#define nautical_twilight(year,month,day,lon,lat,start,end) \
|
|
||||||
sunriset( year, month, day, lon, lat, -12.0, 0, start, end )
|
|
||||||
|
|
||||||
/* This macro computes the start and end times of astronomical twilight. */
|
|
||||||
/* Astronomical twilight starts/ends when the Sun's center is 18 degrees */
|
|
||||||
/* below the horizon. */
|
|
||||||
#define astronomical_twilight(year,month,day,lon,lat,start,end) \
|
|
||||||
sunriset( year, month, day, lon, lat, -18.0, 0, start, end )
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -9,7 +9,6 @@
|
|||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include "../../debug.h"
|
#include "../../debug.h"
|
||||||
#include "../../global.h"
|
#include "../../global.h"
|
||||||
#include "../../praisethesun.h"
|
|
||||||
|
|
||||||
|
|
||||||
timeDayOfWeek_t toTimeDayOfWeek(DayOfWeek day)
|
timeDayOfWeek_t toTimeDayOfWeek(DayOfWeek day)
|
||||||
@ -131,16 +130,15 @@ TimeTrigger* TimeTriggerSettings::getActiveTrigger(tmElements_t &time)
|
|||||||
TimeTrigger* activeTrigger = nullptr;
|
TimeTrigger* activeTrigger = nullptr;
|
||||||
int16_t activeTriggerTime = 0;
|
int16_t activeTriggerTime = 0;
|
||||||
|
|
||||||
double sunrise = 0;
|
|
||||||
double sunset = 0;
|
|
||||||
|
|
||||||
sun_rise_set(tmYearToCalendar(time.Year), time.Month, time.Day,
|
Dusk2Dawn location(systemSettings->latitude(), systemSettings->longitude(), timezoneOffset / 3600.0f);
|
||||||
systemSettings->latitude(), systemSettings->longitude(),
|
|
||||||
&sunrise, &sunset);
|
|
||||||
|
|
||||||
uint16_t sunriseMinutes = floor(sunrise * 60);
|
// Praise the sun \o/
|
||||||
uint16_t sunsetMinutes = floor(sunset * 60);
|
// DST is always hardcoded as false, since it is already included in timezoneOffset
|
||||||
uint16_t dayTime = (time.Hour * 60) + time.Minute;
|
int16_t sunriseMinutes = location.sunrise(time.Year, time.Month, time.Day, false);
|
||||||
|
int16_t sunsetMinutes = location.sunset(time.Year, time.Month, time.Day, false);
|
||||||
|
|
||||||
|
int16_t dayTime = (time.Hour * 60) + time.Minute;
|
||||||
|
|
||||||
_d("TimeTrigger :: sunrise: "); _dln(sunriseMinutes);
|
_d("TimeTrigger :: sunrise: "); _dln(sunriseMinutes);
|
||||||
_d("TimeTrigger :: sunset: "); _dln(sunsetMinutes);
|
_d("TimeTrigger :: sunset: "); _dln(sunsetMinutes);
|
||||||
@ -158,16 +156,15 @@ TimeTrigger* TimeTriggerSettings::getActiveTrigger(tmElements_t &time)
|
|||||||
|
|
||||||
switch (trigger->triggerType)
|
switch (trigger->triggerType)
|
||||||
{
|
{
|
||||||
RelativeToSunrise:
|
case RelativeToSunrise:
|
||||||
triggerTime += sunriseMinutes;
|
triggerTime += sunriseMinutes;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
RelativeToSunset:
|
case RelativeToSunset:
|
||||||
triggerTime += sunsetMinutes;
|
triggerTime += sunsetMinutes;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Check if the current time is after the time set in the trigger, and
|
// Check if the current time is after the time set in the trigger, and
|
||||||
// if this trigger is later than any previously found trigger, so that
|
// if this trigger is later than any previously found trigger, so that
|
||||||
// we'll always get the most recent match
|
// we'll always get the most recent match
|
||||||
@ -182,6 +179,7 @@ TimeTrigger* TimeTriggerSettings::getActiveTrigger(tmElements_t &time)
|
|||||||
if (activeTrigger != nullptr)
|
if (activeTrigger != nullptr)
|
||||||
return activeTrigger;
|
return activeTrigger;
|
||||||
|
|
||||||
|
|
||||||
// If there are no active triggers on this day, go back
|
// If there are no active triggers on this day, go back
|
||||||
// one weekday and try again until we've come around completely
|
// one weekday and try again until we've come around completely
|
||||||
if (dayOfWeek == Monday)
|
if (dayOfWeek == Monday)
|
||||||
|
|||||||
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <TimeLib.h>
|
#include <TimeLib.h>
|
||||||
|
#include <Dusk2Dawn.h>
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
#include "../abstractjson.h"
|
#include "../abstractjson.h"
|
||||||
|
|
||||||
|
|||||||
@ -326,11 +326,6 @@
|
|||||||
<input type="text" id="lat" v-model="system.lat">
|
<input type="text" id="lat" v-model="system.lat">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="horizontal">
|
|
||||||
<label for="lat">{{ $t('system.ntpLat') }}</label>
|
|
||||||
<input type="text" id="lat" v-model="system.lat">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="horizontal">
|
<div class="horizontal">
|
||||||
<label for="lng">{{ $t('system.ntpLng') }}</label>
|
<label for="lng">{{ $t('system.ntpLng') }}</label>
|
||||||
<input type="text" id="lng" v-model="system.lng">
|
<input type="text" id="lng" v-model="system.lng">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user