diff --git a/dist/index.html.gz.h b/dist/index.html.gz.h index 74c75e5c..e9ce8c9b 100644 --- a/dist/index.html.gz.h +++ b/dist/index.html.gz.h @@ -1,2 +1,2 @@ -#define index_html_gz_len 9507 -static const char index_html_gz[] PROGMEM = {31,139,8,0,0,0,0,0,0,3,221,125,107,91,219,72,147,232,247,243,43,26,101,222,32,13,146,108,32,16,98,35,103,51,129,76,114,54,23,54,144,153,221,135,229,240,180,237,54,86,34,75,90,73,230,178,140,255,251,169,170,238,214,221,216,185,204,236,236,59,23,144,212,173,170,234,234,234,186,117,169,57,220,24,71,163,236,46,22,108,154,205,130,193,33,254,100,1,15,175,60,67,132,6,220,11,62,30,28,206,68,198,217,104,202,147,84,100,158,49,207,38,206,1,180,101,126,22,136,193,59,255,173,127,53,205,216,235,249,240,176,35,31,29,6,126,248,133,37,34,240,140,52,187,11,68,58,21,34,51,216,52,17,19,207,152,102,89,156,246,58,157,25,191,29,141,67,119,24,69,89,154,37,60,198,155,81,52,235,228,15,58,187,238,174,251,180,51,74,211,226,153,59,243,161,87,154,26,10,71,21,228,149,159,33,20,248,53,157,15,93,63,42,222,115,178,232,234,42,16,157,29,23,254,173,130,84,77,57,228,6,221,173,168,0,207,231,212,29,5,209,124,60,9,120,34,136,116,254,153,223,118,2,127,88,134,158,6,254,88,36,157,103,238,83,183,91,67,44,155,126,44,226,84,4,98,148,249,255,45,220,207,105,167,235,110,239,184,79,8,107,241,60,199,191,251,167,13,153,112,117,182,11,236,245,182,135,48,147,172,133,124,38,60,227,218,23,55,113,148,128,232,140,162,48,19,33,200,222,141,63,206,166,222,88,92,251,35,225,208,141,237,135,126,230,243,192,73,71,60,16,222,54,128,216,112,156,115,127,194,130,140,189,57,102,207,46,6,255,135,193,63,135,233,40,241,227,140,165,201,104,237,49,225,106,216,75,167,254,53,200,226,83,119,183,184,7,238,2,158,142,4,137,240,15,55,206,69,56,246,39,23,142,51,56,164,241,12,92,92,59,34,113,146,232,230,126,24,37,120,57,140,178,44,154,245,182,227,91,150,70,48,251,236,209,104,52,90,4,124,40,130,251,177,159,198,1,191,235,13,131,104,244,101,225,38,124,236,71,78,20,103,126,20,222,199,124,60,246,195,171,94,151,237,197,183,253,209,60,73,163,164,23,71,62,48,37,89,32,205,51,30,142,157,225,28,160,135,233,125,224,167,153,67,52,244,194,40,20,253,25,79,174,252,176,215,237,231,96,26,239,176,192,207,9,240,67,152,124,225,16,29,234,93,39,193,37,222,219,22,179,126,116,45,146,73,16,221,244,248,60,139,22,238,36,74,102,14,204,76,114,119,175,209,176,46,219,233,194,8,187,229,86,38,175,113,30,147,40,184,167,153,235,237,116,197,172,210,169,202,137,50,33,146,73,48,158,204,116,69,146,68,137,197,228,111,199,15,39,81,254,10,142,119,81,110,24,69,1,176,42,17,227,254,4,80,59,41,172,128,158,251,20,209,22,157,122,67,1,52,136,123,37,100,189,77,115,179,210,204,39,192,230,162,213,130,86,53,181,195,44,212,195,198,33,47,220,43,158,137,27,126,231,0,163,169,17,56,197,179,30,113,111,241,72,65,96,238,56,137,226,113,116,3,243,26,165,62,78,112,79,201,112,141,187,205,55,156,153,8,231,229,201,146,204,121,4,107,107,50,241,71,78,26,250,147,73,149,27,143,232,153,24,59,170,15,16,124,235,76,5,77,232,94,183,52,163,206,157,154,211,144,95,15,121,114,63,228,163,47,87,73,52,7,41,81,92,188,26,114,243,201,182,141,255,237,217,238,51,107,195,159,225,242,228,97,214,87,2,142,82,59,79,81,192,36,16,103,152,128,148,217,149,187,222,20,49,170,153,121,52,153,76,22,46,176,10,52,3,140,118,204,65,144,26,136,177,147,194,80,95,59,174,20,146,118,153,113,111,166,126,38,156,76,204,98,39,246,71,95,0,171,26,248,14,140,187,64,211,195,119,128,188,43,36,31,248,109,102,17,163,57,179,31,241,253,241,246,100,194,186,54,210,192,246,186,255,192,11,222,237,118,217,118,183,251,15,171,223,186,104,244,58,219,149,171,96,58,23,45,232,229,18,64,40,253,218,210,47,250,131,252,133,109,111,129,166,27,153,248,42,115,216,174,152,45,33,163,170,39,214,26,47,44,20,57,86,24,223,190,187,191,191,255,20,6,220,133,187,93,48,198,240,15,221,41,62,116,187,19,182,159,119,154,192,221,129,238,132,96,136,63,114,48,215,60,128,159,138,198,251,230,68,2,59,181,162,9,196,36,235,185,123,249,72,113,204,165,225,183,79,115,28,204,83,7,76,10,252,196,1,198,247,149,101,84,230,244,40,128,113,247,64,13,79,235,76,175,195,96,82,51,246,38,126,2,218,52,154,56,232,36,85,245,184,212,138,185,204,235,53,144,69,113,189,69,170,1,28,219,186,104,3,190,20,43,130,105,69,90,109,88,133,200,37,95,77,195,86,60,66,129,213,32,213,218,131,85,166,159,72,155,66,147,150,203,56,24,36,166,255,127,10,198,41,55,54,106,214,118,159,192,67,154,44,245,96,219,125,242,236,1,134,76,124,17,140,161,111,16,183,27,164,66,141,111,187,59,40,39,117,193,1,37,28,220,197,83,31,180,137,155,198,176,128,128,202,123,30,250,51,78,154,22,31,177,237,148,129,102,71,165,43,152,92,11,125,231,70,12,191,248,153,83,237,185,211,210,117,129,94,64,161,186,193,131,129,254,215,96,102,129,10,61,70,144,181,197,48,26,107,163,168,13,255,78,23,173,196,4,188,161,210,170,166,103,255,50,19,99,159,179,40,12,238,24,120,21,66,132,12,84,37,51,17,40,205,13,235,237,162,137,177,238,219,192,238,33,136,117,96,60,57,88,10,163,187,46,140,167,251,7,75,96,108,239,29,172,9,227,217,179,157,101,48,182,247,17,134,59,139,198,224,211,97,7,230,166,232,186,70,161,83,145,216,166,47,37,132,208,98,169,91,93,80,26,202,2,178,66,46,28,210,67,74,190,247,39,251,45,61,82,88,80,185,137,218,223,95,204,3,151,75,34,150,121,89,37,231,170,218,115,153,111,213,210,143,252,27,165,114,70,83,63,24,91,247,13,241,254,151,47,226,110,146,128,127,156,50,148,208,251,73,18,205,238,193,182,135,41,58,82,61,242,130,205,109,139,37,81,6,206,136,217,181,22,89,244,64,251,238,126,119,44,174,44,152,53,189,2,170,240,119,36,2,221,88,0,170,192,95,218,156,131,7,103,153,188,226,195,142,12,41,113,102,7,173,62,57,186,223,238,85,20,65,80,198,99,63,173,185,228,159,255,107,46,146,59,240,199,33,188,80,55,20,77,84,28,242,86,184,235,6,156,159,235,241,230,106,208,235,6,158,159,151,196,157,171,49,172,8,84,192,168,139,36,29,129,23,139,113,223,182,123,0,193,74,241,204,249,33,56,150,196,180,173,241,236,119,35,107,139,99,225,42,5,103,19,244,2,172,183,82,143,31,61,186,74,248,250,121,73,244,218,138,80,38,78,50,113,155,117,62,243,107,46,159,26,131,201,60,164,149,206,192,131,62,139,94,167,129,201,109,97,39,214,61,239,120,59,123,123,182,144,191,18,250,213,191,230,9,75,237,204,30,121,239,120,54,117,65,108,85,119,123,170,158,248,161,126,18,122,230,104,107,106,117,118,250,254,196,28,121,222,212,74,189,204,235,246,69,144,138,123,4,52,244,70,206,180,159,222,128,128,78,205,204,11,7,238,222,243,97,199,220,113,224,177,213,131,43,124,221,30,89,247,35,158,10,198,123,169,103,10,39,177,58,195,45,83,28,38,207,247,123,93,171,63,76,4,7,111,18,59,8,236,144,56,28,59,236,148,27,18,108,224,142,192,134,39,139,180,227,237,47,18,145,205,147,240,126,218,75,237,180,151,217,16,188,45,22,57,39,62,254,250,75,22,189,62,253,77,115,98,219,243,60,208,116,115,136,111,178,212,13,68,120,149,77,31,63,54,133,199,221,43,59,129,159,67,155,195,207,196,210,236,105,48,103,212,96,206,212,3,45,10,44,234,2,236,236,121,183,55,237,100,246,208,203,58,200,100,205,17,53,240,17,144,223,45,143,7,57,1,140,216,154,254,156,243,193,198,81,253,60,173,179,3,184,177,181,243,243,180,165,21,121,2,44,217,122,146,183,86,121,18,218,215,189,33,105,198,181,164,8,7,254,233,253,155,179,203,147,23,31,95,188,59,245,238,97,168,239,124,112,181,83,48,188,187,54,176,66,221,237,62,237,226,221,47,228,132,134,34,77,193,65,216,91,216,159,222,92,158,189,248,229,212,59,191,207,248,85,207,200,248,16,172,241,196,55,236,73,2,65,192,56,184,235,25,191,227,253,194,46,58,164,64,111,92,238,113,74,15,202,93,2,49,46,119,120,123,124,84,105,166,60,70,185,195,71,122,80,238,50,251,175,44,43,247,120,247,111,103,103,198,226,2,9,126,245,230,248,237,81,78,50,31,195,144,47,231,169,72,48,63,84,126,229,5,182,176,162,5,253,199,158,241,73,221,51,176,72,44,0,117,11,246,25,188,57,136,118,178,169,159,50,176,89,49,191,130,222,232,100,247,12,88,226,208,14,119,124,88,226,142,38,84,226,142,121,154,222,128,255,81,198,125,146,63,147,88,245,253,143,192,58,18,151,96,131,203,216,94,30,179,14,59,249,215,51,70,207,21,70,24,59,172,169,227,211,147,131,157,253,125,100,131,68,190,249,242,120,147,153,120,245,254,227,171,157,39,111,187,219,140,66,193,9,31,9,139,97,7,0,164,122,108,158,188,5,215,235,105,231,237,217,193,179,110,119,179,212,113,41,165,105,69,22,70,105,216,160,245,244,253,122,100,158,190,223,92,19,75,34,224,190,142,231,227,241,233,241,122,12,161,158,235,226,2,201,174,99,2,233,174,227,129,121,5,248,4,30,91,193,66,101,243,148,41,135,143,153,93,15,46,249,16,96,89,125,22,138,43,138,21,128,187,16,161,166,232,98,249,87,33,15,152,153,8,204,200,1,22,230,236,16,44,244,11,35,14,82,4,64,215,157,130,24,34,124,224,78,34,98,193,179,180,42,163,216,194,242,22,73,254,217,84,176,112,62,27,10,64,55,97,153,143,62,31,166,2,168,23,251,248,138,73,128,64,37,38,161,160,101,56,15,134,233,82,98,146,202,202,70,187,171,72,185,4,57,202,162,164,76,208,235,179,179,19,141,72,183,74,162,222,205,131,204,143,3,127,36,57,37,27,113,54,171,163,35,38,37,2,28,192,52,195,16,13,243,103,25,76,243,240,14,150,153,96,4,255,197,201,27,151,125,58,162,11,6,68,3,204,0,98,18,224,181,0,208,48,73,115,137,71,232,129,218,16,74,176,25,120,76,154,83,44,157,70,243,0,160,138,66,136,16,244,154,58,99,158,69,64,47,136,68,2,50,43,18,63,170,40,142,23,208,236,168,102,166,155,37,19,176,9,195,80,77,176,236,131,3,147,169,111,38,64,126,238,74,147,135,145,125,70,46,187,24,1,9,98,12,3,7,169,236,18,197,90,2,215,20,35,232,62,194,12,202,221,37,37,223,75,20,31,233,22,38,91,148,154,5,14,227,61,74,8,70,69,16,239,41,172,186,179,18,35,136,200,217,145,152,112,152,97,18,52,28,79,138,250,153,222,38,6,195,244,233,13,37,57,82,152,147,39,7,7,207,158,233,241,192,107,106,56,235,205,1,26,151,75,176,3,64,72,221,198,48,253,88,14,227,8,56,142,122,35,97,111,78,24,4,115,192,245,20,89,75,93,135,73,244,5,124,91,246,129,18,242,52,43,146,213,119,140,75,242,193,161,152,50,83,220,242,89,28,128,118,157,221,225,123,234,181,17,6,170,7,7,79,150,146,76,38,176,66,50,196,159,254,8,236,77,6,106,56,108,80,78,173,44,111,213,134,135,110,137,249,69,175,180,52,45,56,1,199,146,194,30,60,3,46,167,157,158,228,243,165,63,206,47,145,200,78,143,210,68,240,216,101,167,66,176,143,199,47,142,222,29,19,236,201,60,129,153,131,9,22,25,247,131,229,250,160,57,168,121,60,134,213,182,98,108,178,211,195,67,132,33,197,243,33,140,106,202,74,239,164,46,59,81,162,150,77,65,177,112,90,200,180,216,97,233,66,24,203,34,69,184,146,44,76,75,196,245,55,72,217,81,111,178,215,106,193,221,248,65,128,11,17,100,151,161,171,33,17,130,98,64,235,142,175,124,5,27,208,70,172,226,2,245,249,154,121,46,243,68,191,236,178,223,167,152,125,97,50,229,55,154,130,103,137,74,2,155,109,90,126,147,57,12,235,75,24,221,132,234,37,52,4,240,92,190,64,131,6,221,167,224,2,23,181,23,83,35,108,125,9,104,113,222,228,12,66,3,171,59,111,244,128,228,55,66,23,10,175,42,11,119,109,180,109,126,27,65,138,151,57,111,57,210,111,193,73,150,240,50,119,161,104,65,53,124,224,194,197,98,178,93,82,0,65,39,251,245,245,127,51,130,1,198,104,44,2,80,59,152,75,147,211,39,249,239,79,216,93,52,167,153,195,139,77,144,219,48,66,29,138,226,200,195,220,225,219,208,4,183,147,180,196,118,75,117,209,230,72,188,149,138,164,230,72,188,9,71,16,246,16,110,73,157,188,71,119,2,100,137,207,162,57,44,41,229,98,160,222,132,59,137,2,223,64,49,86,139,16,85,13,153,145,178,158,47,186,230,214,131,1,142,93,119,61,3,32,23,219,36,152,167,83,57,252,107,30,84,34,26,18,123,106,103,69,187,242,69,192,175,152,205,103,21,59,27,0,57,180,85,133,139,63,187,193,236,38,189,76,122,64,173,59,120,194,211,105,251,104,96,62,193,47,68,205,227,207,40,81,154,9,152,91,48,255,41,12,179,6,97,77,131,93,82,42,9,254,8,252,153,223,136,168,20,104,236,192,84,135,175,26,100,89,207,98,39,244,5,21,76,115,92,50,234,123,221,238,114,127,181,178,74,42,14,221,101,54,77,162,44,11,4,94,8,112,187,130,241,82,7,150,233,190,172,212,87,14,230,165,220,96,78,217,20,22,70,92,241,122,73,185,235,55,193,170,229,182,130,20,62,153,239,0,77,62,9,169,30,53,200,47,218,1,30,74,193,166,157,44,102,130,42,42,243,200,146,138,114,196,49,16,168,33,69,175,185,132,150,225,46,46,224,126,23,17,49,85,184,4,5,150,138,30,221,60,134,158,101,135,105,167,219,157,173,235,127,47,225,46,12,22,55,46,174,253,236,110,13,254,86,122,127,53,135,95,131,135,1,18,69,131,75,43,236,105,242,5,172,13,174,9,100,15,248,252,176,224,147,170,88,117,109,54,227,183,36,168,146,89,219,221,46,60,235,234,117,149,46,23,186,135,248,50,147,194,191,156,21,121,135,150,209,79,120,162,71,128,171,127,4,179,57,22,82,243,145,226,43,86,148,4,38,10,111,163,50,182,221,117,105,151,46,153,210,104,184,81,86,209,205,191,146,205,150,75,82,183,74,170,79,41,111,153,178,155,169,63,154,170,182,82,104,3,234,58,152,143,129,58,95,45,115,9,67,47,118,156,23,8,156,207,208,253,137,163,16,213,58,234,236,66,1,104,234,219,200,107,95,250,34,196,57,187,228,58,204,185,68,59,119,41,147,114,196,128,98,84,199,212,149,229,93,201,36,178,82,87,57,196,87,64,209,199,95,127,249,253,119,25,164,50,83,154,66,120,180,245,242,229,25,122,245,175,62,157,117,15,158,89,54,147,200,211,18,200,28,90,190,238,17,9,218,49,70,155,77,56,73,124,50,1,30,230,62,20,58,66,98,6,106,27,194,125,144,122,228,81,138,151,180,119,8,140,70,111,27,157,205,27,80,18,204,7,253,66,204,70,27,13,238,197,23,205,177,149,124,88,102,160,197,88,118,69,83,119,9,74,104,226,95,213,243,20,196,167,241,28,5,138,97,55,166,187,73,134,229,93,136,214,82,104,73,246,155,189,24,141,80,25,158,96,241,128,234,199,65,19,160,133,143,20,36,28,55,101,12,213,96,52,81,37,170,49,232,108,167,121,2,161,67,35,115,88,34,136,40,150,157,20,198,16,216,191,146,248,41,79,155,111,233,88,147,96,134,48,195,165,25,88,151,232,136,166,186,38,155,85,50,74,93,214,98,113,58,39,30,163,11,14,49,254,156,118,170,191,150,44,169,79,90,105,202,83,38,233,58,244,164,88,190,6,179,75,89,21,12,153,240,38,127,255,91,136,2,177,156,135,21,210,94,161,79,195,70,210,27,108,80,247,190,158,137,2,250,144,98,178,138,228,14,73,186,181,10,69,99,67,171,177,196,182,134,254,36,250,46,236,95,63,126,248,116,114,121,122,246,226,236,248,242,95,143,255,227,212,59,55,148,230,50,100,194,14,46,134,121,190,28,110,2,113,45,192,13,52,166,115,234,147,175,108,184,161,93,97,248,45,57,97,124,17,193,181,159,63,191,68,165,128,192,64,9,41,94,65,195,44,158,131,242,191,212,111,10,82,37,112,145,135,222,112,173,195,237,226,49,185,232,23,54,240,224,242,221,135,163,99,36,250,195,100,2,237,167,1,24,31,185,125,8,119,175,192,90,22,119,212,6,209,90,172,91,244,117,64,21,69,112,245,33,4,160,159,142,78,46,79,62,126,56,251,240,242,195,219,203,223,142,63,158,190,249,240,30,16,236,217,251,23,246,209,241,171,23,159,222,158,93,22,125,242,46,222,158,157,239,187,217,180,105,14,236,246,54,182,113,251,201,48,54,188,32,26,17,155,220,105,148,102,24,188,89,180,11,117,35,134,167,17,206,154,23,138,27,246,187,190,51,141,27,220,153,51,182,26,175,109,25,189,131,109,195,234,231,47,186,81,8,50,145,242,43,225,233,61,36,19,128,3,90,77,133,196,148,121,194,5,171,197,251,63,153,70,189,242,205,176,220,24,13,113,56,54,141,67,184,26,24,91,217,150,113,216,161,75,107,177,88,16,128,232,181,184,173,224,144,123,54,70,247,214,216,18,110,22,157,146,136,153,219,251,22,220,124,138,97,205,191,4,123,111,90,11,27,183,243,175,197,167,36,40,94,151,68,9,15,169,145,179,250,102,204,100,81,103,79,50,18,228,211,114,193,163,49,45,59,163,110,36,7,208,203,149,224,64,81,128,240,64,31,28,149,105,144,239,99,88,54,247,174,68,246,114,158,36,224,187,190,3,49,51,45,57,5,158,39,44,116,73,110,140,119,115,152,124,129,1,141,94,229,111,142,12,236,148,35,81,213,165,57,108,48,234,112,157,198,129,15,51,99,195,165,242,11,82,147,91,127,252,97,102,94,215,178,13,220,85,6,118,3,217,158,135,2,138,203,181,137,81,166,15,16,161,226,94,71,85,70,166,48,219,48,187,240,147,211,207,108,97,87,7,82,230,157,124,151,253,100,110,18,19,206,101,85,48,173,170,139,222,104,42,64,48,198,155,53,206,44,108,233,182,144,51,228,93,186,218,195,52,203,83,138,229,170,63,185,184,249,107,222,207,147,160,151,207,28,204,194,76,100,211,104,12,110,224,167,51,195,70,208,189,255,123,250,225,189,43,53,139,63,185,131,247,109,85,151,121,70,58,135,199,42,91,29,133,157,207,41,170,8,165,216,123,101,148,160,168,198,129,160,96,243,19,17,8,15,23,11,107,1,47,202,125,72,30,136,36,131,139,197,194,222,22,187,150,141,10,249,165,172,210,93,54,12,53,4,163,147,222,129,195,12,62,234,125,78,252,135,211,111,165,30,104,146,4,168,25,59,165,188,199,199,232,166,180,40,236,204,230,82,180,125,207,56,204,146,1,8,214,22,94,141,7,134,13,87,155,135,52,97,170,140,91,11,126,122,126,97,176,17,40,242,212,51,202,213,192,134,244,232,61,99,19,68,99,211,232,12,54,109,130,214,209,224,150,1,198,188,235,26,64,179,149,64,199,254,181,134,129,165,168,36,189,6,67,246,169,42,13,120,46,139,116,140,193,102,31,208,152,56,246,208,235,246,195,195,86,77,170,118,176,251,225,214,150,228,83,228,181,246,59,15,47,236,212,227,158,23,253,241,71,228,121,15,104,222,199,143,55,218,49,149,22,105,159,6,67,149,210,165,225,176,74,117,237,230,150,153,62,55,152,148,120,163,103,24,22,112,71,50,71,51,23,151,181,39,19,70,134,174,196,199,244,4,12,31,153,141,206,42,154,180,64,100,208,18,129,69,146,156,202,249,29,1,68,38,241,168,69,42,241,24,3,102,108,69,106,26,136,202,129,161,118,196,153,124,8,243,48,104,159,33,201,254,250,168,198,232,139,163,195,50,139,174,133,163,139,175,85,166,46,31,148,126,43,175,238,98,69,157,151,124,21,75,57,252,92,66,36,46,77,67,137,156,14,74,250,194,14,34,62,62,21,25,122,122,105,89,93,129,98,85,5,34,242,151,131,187,82,168,81,233,78,86,244,130,130,105,181,147,143,31,255,228,130,34,196,197,138,235,89,65,7,231,169,106,236,62,12,63,35,252,47,226,46,133,39,88,58,127,204,65,125,228,189,50,41,109,28,44,201,230,35,13,133,149,181,167,92,14,23,155,86,159,43,33,29,116,31,63,54,213,116,99,21,134,203,179,44,49,13,242,62,172,231,220,157,248,1,168,116,115,243,188,88,165,231,217,133,4,226,142,208,173,48,173,30,39,27,134,13,150,181,176,108,48,194,218,181,73,1,122,81,171,67,5,184,114,19,37,53,171,253,154,163,129,49,23,111,242,241,88,190,103,222,99,105,68,143,12,53,170,51,34,171,39,22,136,183,232,158,136,9,166,134,114,84,136,171,25,159,106,167,1,216,37,95,85,92,106,137,100,145,101,89,117,46,13,74,21,182,194,93,192,100,9,183,45,76,91,134,178,53,164,123,0,105,43,236,54,180,50,28,90,15,173,138,202,214,70,171,96,215,208,230,129,208,74,164,69,200,180,14,202,2,110,13,161,12,9,86,98,83,193,210,58,168,20,196,133,94,77,224,50,85,180,139,35,25,158,194,242,198,114,96,240,188,172,190,208,159,127,168,217,0,201,111,60,106,21,114,88,114,49,185,165,117,147,107,42,33,63,239,94,128,252,158,111,95,192,143,29,90,97,104,165,83,126,45,126,149,111,188,148,208,219,29,79,140,131,230,227,88,235,71,160,25,92,77,240,217,161,77,58,151,54,168,18,169,8,95,162,166,52,13,250,248,197,144,181,86,164,75,202,26,164,108,206,47,54,241,221,25,143,75,227,41,92,131,159,192,38,73,223,182,175,213,124,250,158,191,55,125,235,57,120,147,27,93,155,58,192,194,174,162,181,67,136,136,173,158,15,235,217,175,35,215,38,255,207,70,28,34,226,138,11,126,222,176,132,173,52,100,37,183,53,171,251,166,228,164,111,64,23,237,66,68,222,57,58,0,221,126,122,168,213,113,63,5,159,33,58,79,47,188,115,14,63,109,31,127,132,240,227,162,95,248,123,185,125,200,61,62,154,199,21,126,105,155,63,120,95,19,208,94,68,194,181,176,245,52,31,35,111,42,1,145,120,110,22,241,140,227,143,29,178,229,70,27,67,91,250,149,191,219,210,171,71,88,86,175,29,100,155,88,106,23,31,195,5,165,223,155,130,223,8,143,0,62,22,149,139,34,234,169,204,28,154,111,76,197,175,14,134,132,245,92,119,77,167,176,70,145,116,121,91,33,86,121,88,48,66,31,241,227,130,141,241,3,218,223,164,0,85,56,170,35,215,25,5,3,29,243,63,199,91,214,127,186,229,95,166,99,186,63,91,214,243,142,150,232,251,25,255,28,37,189,12,149,194,204,15,233,114,231,2,80,0,4,184,220,189,176,19,96,38,98,130,187,61,108,128,133,211,59,167,254,212,147,250,96,211,5,76,54,44,15,113,35,146,38,109,118,238,81,148,137,71,179,235,87,159,100,249,82,227,46,225,26,248,242,247,194,150,161,207,75,116,5,95,69,137,140,126,90,102,12,23,31,40,38,250,197,203,205,176,102,240,225,134,135,94,18,72,201,72,206,171,163,150,98,46,68,174,122,176,101,48,19,99,117,0,235,243,16,66,124,75,45,237,13,47,147,16,2,164,32,7,192,92,148,69,172,123,7,80,162,162,156,53,109,217,121,85,58,168,239,133,141,186,177,252,56,78,162,24,212,38,207,5,4,31,96,57,106,33,35,74,222,23,154,34,24,147,34,141,28,200,6,105,42,61,85,152,25,187,217,75,175,37,41,142,82,107,247,185,87,157,84,51,115,51,126,117,137,90,204,206,89,101,61,55,160,15,211,216,248,53,216,115,204,72,111,128,199,254,31,114,91,57,146,153,194,25,56,170,148,25,12,51,221,221,53,136,22,77,68,58,135,96,53,185,211,164,114,73,136,239,101,46,172,7,220,220,85,142,100,217,89,85,34,147,185,72,22,76,195,88,220,126,64,203,174,166,206,218,240,156,109,212,154,37,87,21,81,78,252,100,118,195,19,225,224,103,202,134,98,179,129,159,43,131,167,14,198,210,29,38,209,13,24,234,75,220,78,66,119,253,18,162,124,84,106,126,77,180,65,233,165,81,0,118,63,186,82,145,113,126,11,198,191,223,34,109,246,138,25,42,197,27,250,235,35,214,30,120,144,127,170,34,15,235,33,78,62,60,233,82,189,216,185,109,224,195,8,77,193,125,35,9,1,195,5,65,182,57,166,170,208,111,155,39,130,76,157,126,51,255,254,34,246,245,151,12,88,34,159,136,56,74,59,169,63,142,166,29,145,198,88,80,121,57,243,169,120,232,18,250,64,123,64,91,253,29,73,94,27,102,204,184,120,162,129,89,107,134,82,82,164,158,220,19,196,93,90,247,21,55,64,241,28,35,16,57,247,58,208,180,141,15,239,49,9,38,223,179,138,175,61,206,40,142,55,193,123,129,219,8,121,91,111,194,8,129,50,180,90,31,231,213,250,234,185,155,232,30,238,85,126,53,196,92,92,94,205,254,112,207,126,125,20,69,90,25,71,34,191,159,192,32,50,251,141,28,6,123,187,219,253,153,187,169,165,12,222,9,170,116,113,243,18,193,225,151,53,63,103,238,148,250,128,55,171,126,7,202,53,46,146,209,218,39,194,246,74,131,83,42,38,119,243,90,114,171,99,86,158,235,170,242,37,189,235,67,42,237,137,45,25,147,175,40,44,210,237,146,194,208,43,63,251,25,63,111,237,212,40,41,42,218,27,120,101,190,190,29,99,136,43,191,201,193,70,62,43,163,36,39,224,133,41,133,75,238,237,117,105,225,53,191,97,5,233,25,129,141,47,125,169,76,16,123,198,20,164,133,18,156,54,229,150,255,97,83,158,243,31,22,101,213,240,155,178,83,157,51,111,245,212,41,97,13,6,164,148,89,71,2,252,166,135,94,253,82,173,226,123,85,63,115,147,186,35,141,121,72,64,164,66,57,165,114,82,77,139,65,180,193,147,175,37,174,187,146,56,197,172,54,226,36,221,173,196,69,113,137,54,82,125,149,239,219,115,75,135,10,186,154,127,169,28,155,96,232,244,68,139,147,23,131,32,152,13,229,177,209,69,31,93,14,25,88,159,181,58,105,88,189,255,239,142,6,20,77,38,32,105,0,10,191,208,3,85,144,117,204,237,159,117,35,125,237,136,185,7,95,126,156,66,162,66,43,23,172,99,203,154,246,173,114,246,218,188,7,193,35,69,217,215,82,88,254,44,28,61,216,8,139,102,193,198,21,67,228,168,229,97,102,50,23,107,135,137,14,144,237,133,234,59,143,205,170,61,216,216,214,77,96,53,150,182,225,220,86,81,60,126,92,71,64,43,69,46,62,35,95,133,242,105,194,111,28,57,46,156,18,218,64,111,186,88,247,11,224,183,156,138,97,116,11,58,92,51,177,146,142,210,15,125,144,37,189,5,96,20,222,149,140,249,196,121,245,93,42,43,180,46,192,248,149,185,43,52,209,249,89,24,89,171,200,84,102,68,245,237,85,253,62,245,212,160,192,92,50,130,50,242,203,64,150,114,251,107,131,212,235,175,14,13,3,50,18,103,112,82,84,173,16,176,93,47,210,231,101,165,3,161,74,101,157,155,26,116,101,121,57,163,32,74,69,43,217,21,88,173,11,83,7,59,216,136,159,120,194,35,120,213,32,80,160,20,31,225,193,24,42,131,130,188,177,87,12,163,236,144,25,83,95,105,131,165,169,152,101,105,20,3,80,27,150,30,45,109,32,229,130,216,136,37,151,209,238,182,167,153,237,22,237,66,28,76,33,112,204,146,60,134,69,174,228,91,7,28,66,126,126,248,172,207,33,214,207,3,83,125,200,71,49,144,205,195,192,31,28,114,117,16,207,35,149,104,167,206,121,50,150,83,254,30,205,204,97,135,131,55,9,111,24,20,237,182,13,161,130,135,5,62,227,213,41,80,254,120,69,228,241,157,154,112,22,20,24,50,219,219,152,56,212,29,118,235,198,157,93,126,36,21,53,56,114,118,190,61,186,217,84,17,249,142,157,206,144,151,247,235,86,110,178,233,61,54,104,95,148,83,196,149,77,217,60,77,15,13,176,36,19,172,214,234,129,26,77,163,36,123,133,41,221,30,125,144,103,216,81,40,197,228,197,120,220,171,198,18,153,43,231,132,194,226,55,120,170,134,124,0,214,85,194,123,69,241,79,175,133,223,121,228,255,255,204,238,237,57,119,38,47,156,87,93,231,217,197,253,182,253,100,241,199,185,186,220,91,88,63,117,172,231,102,142,0,34,150,238,33,70,144,226,208,219,223,219,219,221,123,110,86,178,54,230,198,182,133,54,173,87,123,44,119,106,135,88,181,68,37,175,184,135,162,11,159,186,183,93,60,221,4,235,153,186,183,175,224,31,3,39,211,250,17,48,170,220,207,175,48,94,203,111,84,204,184,121,56,207,183,176,66,126,205,224,127,39,227,195,212,96,254,216,51,168,250,245,12,111,7,155,118,232,233,84,75,95,125,225,216,154,99,149,91,99,121,108,182,185,21,226,186,41,214,214,38,110,238,243,43,220,186,170,236,251,1,86,92,94,194,213,101,44,229,117,134,200,13,76,83,74,224,37,112,141,156,107,11,212,79,71,39,57,40,189,247,52,15,90,246,36,17,152,74,237,85,70,204,176,238,100,229,160,107,128,192,217,194,175,170,198,130,73,30,16,71,139,209,75,248,70,241,241,101,235,38,19,120,240,152,78,24,98,164,5,239,233,28,81,5,89,113,174,19,110,154,114,28,30,238,239,25,54,47,118,41,161,15,109,73,229,200,225,178,204,104,181,75,8,222,12,214,8,61,126,108,242,218,136,138,227,66,20,135,241,210,193,165,42,225,226,45,77,52,237,45,66,156,205,243,141,70,208,135,173,69,241,248,181,176,139,87,207,235,200,74,123,195,200,180,214,183,151,236,26,175,216,149,213,251,177,131,182,45,88,196,21,38,147,157,39,122,55,182,29,113,203,190,172,50,18,33,126,12,96,176,206,128,209,149,102,235,10,154,150,19,19,100,248,141,232,183,82,35,191,48,37,114,42,223,156,230,100,201,169,106,45,39,205,167,70,10,130,84,27,121,190,165,180,163,195,202,91,176,108,233,166,30,155,201,175,13,5,136,125,189,70,172,125,171,6,197,71,90,173,1,5,122,135,29,125,183,208,194,37,81,131,21,46,85,204,125,23,225,229,5,82,148,131,253,0,250,240,126,85,9,106,78,249,67,75,97,21,144,63,105,85,40,180,117,100,146,107,43,105,90,46,162,89,2,158,13,10,168,44,62,254,238,5,163,106,212,127,60,161,19,30,164,146,210,35,137,162,190,136,170,53,29,228,194,180,87,203,212,37,13,11,102,202,186,18,76,9,95,72,83,167,159,105,195,183,142,129,105,216,67,105,241,154,222,124,234,208,201,63,172,116,0,80,201,133,150,41,130,10,21,149,107,138,147,244,230,88,81,238,231,91,245,150,116,62,156,249,153,217,72,55,54,28,217,246,13,84,119,202,211,218,62,143,213,220,142,197,80,84,31,196,33,139,251,202,20,136,196,231,1,184,60,47,146,132,223,153,56,198,241,124,36,106,123,137,210,174,138,115,153,33,191,200,247,88,158,211,91,16,6,203,183,57,22,106,196,243,116,154,59,157,189,252,29,239,156,219,234,233,69,233,169,122,100,139,133,125,191,192,13,241,162,18,195,187,164,189,49,138,99,181,99,166,37,133,185,58,185,210,22,56,252,132,85,41,181,61,79,172,107,116,65,240,112,34,238,155,58,184,119,126,1,145,127,41,129,253,3,55,55,51,244,254,115,210,10,246,75,25,163,4,10,252,198,200,18,35,66,29,180,52,2,76,92,41,237,50,163,96,183,77,125,91,84,180,84,220,151,146,82,58,15,109,233,230,20,116,59,244,105,31,161,61,213,86,218,117,160,207,229,105,139,193,191,194,56,51,139,34,180,127,230,125,28,128,233,198,195,87,32,206,137,98,112,184,240,168,173,90,212,151,187,86,134,172,33,228,126,8,225,140,140,51,23,24,114,170,156,139,140,93,117,122,229,145,250,140,164,146,11,105,221,18,180,42,149,85,166,213,220,230,197,24,186,56,46,5,3,131,34,70,24,98,14,89,30,51,169,78,87,0,125,92,82,77,57,197,213,199,234,21,121,160,39,52,169,66,51,169,47,229,141,81,235,171,106,173,171,54,109,20,5,1,143,211,252,49,79,174,240,172,100,125,242,101,222,60,56,196,116,103,110,249,19,7,143,73,51,6,114,15,2,7,224,95,145,84,195,48,161,223,128,85,186,211,28,2,56,58,122,232,251,155,243,82,55,6,129,75,117,140,116,82,167,62,178,185,99,84,79,121,230,202,188,84,217,43,7,200,154,3,110,132,114,216,14,191,232,152,225,82,204,148,47,252,42,103,229,2,169,178,181,190,146,7,90,106,242,128,170,6,154,210,83,50,120,164,203,193,195,101,129,148,183,166,37,37,89,56,168,102,204,115,254,21,200,52,180,60,137,83,194,78,103,199,24,245,30,237,114,148,191,207,64,217,150,68,16,55,68,29,176,58,113,20,207,99,237,161,208,67,113,11,180,140,197,88,123,3,3,121,24,78,101,234,71,60,161,195,149,75,116,23,179,82,57,92,182,62,41,68,187,35,79,170,91,107,102,42,47,232,233,121,33,111,43,12,147,227,75,69,204,19,142,231,127,228,228,248,215,190,92,139,205,121,164,140,175,202,37,171,100,64,89,189,172,65,158,238,174,8,35,21,68,159,179,41,37,180,68,128,114,148,235,98,112,242,61,106,133,73,194,103,175,212,227,37,120,112,71,169,81,123,220,138,70,246,116,234,11,225,23,122,92,64,199,140,66,249,74,150,216,202,159,176,6,151,168,72,226,108,158,114,40,247,193,66,255,250,194,119,210,153,179,155,123,243,20,211,231,121,53,233,255,214,234,122,6,71,234,139,132,113,85,76,75,149,65,133,172,42,135,86,133,76,5,56,4,78,102,11,191,255,21,128,243,152,62,61,152,206,135,248,225,193,32,143,115,90,117,21,146,252,164,58,144,114,113,16,161,169,124,36,33,185,79,99,27,141,50,59,185,26,222,224,143,75,188,153,204,179,238,193,179,42,3,212,103,28,198,128,178,168,249,40,150,135,80,250,133,63,33,84,170,230,90,87,21,112,111,195,74,148,27,43,94,190,51,54,96,219,223,21,4,125,29,5,59,128,111,231,47,196,7,178,203,118,255,66,124,32,120,108,221,44,12,171,136,101,33,132,185,204,125,55,53,123,64,205,222,223,134,154,125,160,102,255,111,67,205,83,160,230,233,223,134,154,3,160,230,224,47,148,211,46,224,123,17,4,213,156,66,229,103,187,82,45,169,65,74,126,13,208,133,95,67,5,82,231,63,77,255,73,232,43,134,140,122,189,85,255,225,183,229,63,128,245,107,17,1,54,5,48,190,124,121,246,87,33,84,134,76,14,115,235,175,69,44,145,254,85,8,245,98,84,167,1,172,39,218,203,124,158,237,157,7,60,136,66,1,84,124,5,248,93,248,11,235,226,152,238,13,94,207,97,5,193,239,175,165,113,191,22,113,22,85,36,75,27,84,121,73,123,16,217,172,133,42,60,53,245,171,193,202,37,36,47,103,87,213,171,250,10,46,157,230,21,117,223,204,44,41,95,58,62,167,50,22,86,42,96,97,141,210,61,73,186,236,137,39,45,163,222,172,62,227,183,224,85,117,107,79,181,183,5,207,191,141,79,74,154,190,153,87,84,114,196,206,138,130,189,111,102,89,233,105,227,47,110,172,205,209,114,229,224,159,195,210,175,91,215,192,139,162,222,240,155,88,67,96,214,27,188,44,95,252,209,195,254,42,97,160,114,163,239,24,104,145,79,168,253,109,33,149,81,40,235,237,188,202,75,175,38,89,206,155,227,41,241,167,186,109,174,50,38,77,251,44,67,220,246,69,195,228,169,251,75,85,114,17,190,249,15,231,255,154,94,71,185,116,76,130,87,79,168,72,225,146,86,131,49,248,29,127,229,201,54,21,141,19,115,215,197,136,33,241,67,200,66,42,199,150,206,214,123,188,174,97,91,123,100,178,116,251,33,84,49,247,147,213,233,179,121,170,210,103,39,208,253,27,137,81,95,247,62,64,203,60,92,135,154,242,55,190,236,19,189,82,159,12,76,141,196,240,59,126,88,142,191,70,190,148,60,149,94,169,255,9,150,21,217,230,156,13,234,204,59,188,86,39,74,61,52,61,88,79,26,205,83,37,12,21,219,221,198,28,162,167,45,35,92,126,145,118,3,180,27,175,156,130,239,39,157,209,199,192,19,255,182,33,205,226,54,91,151,126,45,106,85,242,43,74,74,99,169,89,131,98,21,254,0,181,81,2,81,202,0,47,249,106,93,113,165,145,8,174,242,178,61,45,76,147,240,112,114,87,243,96,73,134,151,85,139,13,171,137,193,111,99,202,178,116,216,255,128,252,203,189,243,88,136,241,165,26,222,143,92,1,167,8,248,7,46,129,7,168,39,254,252,21,210,223,200,11,227,219,148,145,108,221,169,44,9,5,15,104,159,95,111,85,140,125,30,68,87,13,53,201,3,103,121,75,107,142,89,54,173,181,37,39,107,149,37,23,33,32,153,249,249,251,198,224,49,157,35,213,47,216,50,221,169,98,80,147,170,118,110,153,172,23,70,23,104,167,125,17,232,122,132,149,78,17,43,59,70,184,123,220,194,79,185,171,60,56,204,232,120,187,162,126,2,41,58,204,228,31,201,201,18,188,204,179,229,71,135,29,184,195,39,120,228,246,73,148,100,249,131,147,36,194,184,55,96,234,107,191,188,161,216,217,171,219,248,218,223,42,148,41,152,90,125,246,218,118,94,110,56,32,62,60,36,3,175,228,0,232,15,56,181,12,94,215,108,99,87,249,167,128,58,52,118,248,141,124,89,21,69,230,179,51,120,28,14,211,184,95,147,220,218,166,200,63,159,200,22,219,157,107,201,106,147,75,235,120,244,36,184,114,35,143,138,207,203,156,173,37,98,100,105,196,50,119,50,47,87,58,149,221,190,118,146,53,88,58,34,137,209,79,231,134,39,244,109,165,188,163,63,168,165,42,141,42,95,36,172,53,21,141,215,212,39,16,45,211,241,100,112,38,59,50,117,184,24,51,233,248,88,172,117,214,71,141,91,48,43,79,74,194,88,59,133,108,217,32,139,205,204,250,222,225,63,159,252,54,54,67,191,74,229,182,200,129,129,254,251,145,250,218,151,105,254,177,161,31,242,196,199,3,75,229,121,238,130,229,91,173,165,191,221,165,63,117,93,253,145,43,24,11,63,123,61,31,50,253,128,225,215,96,168,252,92,86,108,37,115,22,150,62,170,30,66,152,136,69,47,116,186,162,252,152,218,104,108,59,27,234,15,63,186,20,131,192,127,195,193,59,254,69,176,116,158,200,179,100,105,36,119,250,172,239,121,140,227,164,147,61,57,69,107,49,29,121,137,0,161,71,194,232,79,135,108,192,52,12,114,30,203,19,142,253,16,59,243,204,31,210,233,190,234,128,160,17,29,78,170,202,149,24,125,24,235,178,55,19,121,54,241,148,10,122,82,27,198,44,79,97,36,114,232,111,147,16,200,79,167,191,72,170,229,252,85,180,70,71,207,132,193,100,45,23,158,224,145,130,162,16,225,72,10,151,44,192,229,73,70,42,193,65,169,170,233,150,137,31,228,121,18,186,70,254,104,133,22,183,235,33,149,86,120,88,43,213,212,80,67,240,228,223,105,252,58,47,117,201,186,120,137,107,166,20,116,62,160,235,202,53,13,255,220,203,127,221,85,143,28,169,127,26,175,223,155,38,164,148,213,81,31,133,247,83,86,192,245,243,34,234,220,174,126,87,111,16,192,183,244,172,9,79,39,242,100,194,234,97,72,186,144,65,110,49,228,160,154,219,96,249,241,19,146,171,112,133,158,160,60,171,33,199,33,95,251,40,245,14,59,34,254,173,7,42,255,235,13,151,60,91,2,238,125,68,165,47,10,94,156,136,135,224,169,169,161,115,51,201,187,40,124,204,90,119,252,188,214,147,231,50,148,222,199,26,94,60,144,193,24,252,230,131,158,4,65,147,74,181,90,88,214,10,21,153,92,61,252,161,80,250,213,202,154,213,222,196,255,244,34,111,47,224,249,95,188,216,87,187,161,135,211,221,124,5,149,255,166,171,46,91,98,37,191,118,183,168,138,234,148,42,3,213,108,23,158,168,75,229,191,245,153,138,19,95,234,137,6,224,170,140,45,37,232,35,44,100,60,163,191,74,81,213,184,21,100,125,149,113,139,87,218,55,229,3,124,143,101,139,91,157,236,191,145,248,183,213,9,254,47,22,254,37,150,78,214,98,230,229,143,171,13,94,145,180,171,254,117,224,234,246,68,123,166,156,68,96,198,74,223,158,215,210,75,234,15,137,73,233,230,201,3,187,4,223,136,128,178,77,149,19,12,65,44,224,17,157,19,207,100,109,124,91,238,253,111,35,157,29,149,140,64,27,53,248,255,216,161,8,12,29,135,0,0}; \ No newline at end of file +#define index_html_gz_len 9651 +static const char index_html_gz[] PROGMEM = {31,139,8,0,0,0,0,0,0,3,221,125,107,123,219,56,143,232,247,243,43,24,117,222,70,154,200,178,157,52,105,106,199,238,118,154,116,218,179,189,228,52,233,204,217,39,155,147,135,182,233,88,173,44,105,37,57,151,205,248,191,31,0,36,37,234,226,196,189,204,188,179,239,92,18,137,164,0,16,4,64,0,188,228,96,99,18,141,179,219,88,176,89,54,15,134,7,248,147,5,60,188,28,88,34,180,224,93,240,201,240,96,46,50,206,198,51,158,164,34,27,88,139,108,218,218,135,186,204,207,2,49,124,231,191,245,47,103,25,123,189,24,29,180,101,209,65,224,135,95,88,34,130,129,149,102,183,129,72,103,66,100,22,155,37,98,58,176,102,89,22,167,189,118,123,206,111,198,147,208,27,69,81,150,102,9,143,241,101,28,205,219,121,65,123,199,219,241,158,182,199,105,90,148,121,115,31,90,165,169,165,112,148,65,94,250,25,66,129,95,179,197,200,243,163,226,187,86,22,93,94,6,162,189,237,193,191,101,144,170,42,135,92,163,187,17,21,224,249,156,122,227,32,90,76,166,1,79,4,145,206,63,243,155,118,224,143,76,232,105,224,79,68,210,126,230,61,245,58,21,196,178,234,199,34,78,69,32,198,153,255,223,194,251,156,182,59,94,119,219,123,66,88,139,242,28,255,206,159,214,101,194,213,238,22,216,171,117,247,97,38,89,11,249,92,12,172,43,95,92,199,81,2,162,51,142,194,76,132,32,123,215,254,36,155,13,38,226,202,31,139,22,189,184,126,232,103,62,15,90,233,152,7,98,208,5,16,27,173,214,153,63,101,65,198,222,28,177,103,231,195,255,197,224,159,131,116,156,248,113,198,210,100,188,118,159,80,27,118,211,153,127,5,178,248,212,219,41,222,129,187,128,167,45,65,34,252,131,141,51,17,78,252,233,121,171,53,60,160,254,12,61,212,29,145,180,146,232,250,110,20,37,248,56,138,178,44,154,247,186,241,13,75,35,24,125,246,104,60,30,47,3,62,18,193,221,196,79,227,128,223,246,70,65,52,254,178,244,18,62,241,163,86,20,103,126,20,222,197,124,50,241,195,203,94,135,237,198,55,253,241,34,73,163,164,23,71,62,48,37,89,34,205,115,30,78,90,163,5,64,15,211,187,192,79,179,22,209,208,11,163,80,244,231,60,185,244,195,94,167,159,131,169,125,195,2,63,39,192,15,97,240,69,139,232,80,223,182,18,84,241,94,87,204,251,209,149,72,166,65,116,221,227,139,44,90,122,211,40,153,183,96,100,146,219,59,141,134,117,216,118,7,122,216,49,107,153,124,198,113,76,162,224,142,70,174,183,221,17,243,82,163,50,39,76,66,36,147,160,63,153,237,137,36,137,18,135,201,223,45,63,156,70,249,39,216,223,165,89,49,142,2,96,85,34,38,253,41,160,110,165,160,1,61,239,41,162,45,26,245,70,2,104,16,119,74,200,122,155,246,102,169,154,79,129,205,69,173,3,181,106,104,71,89,168,187,141,93,94,122,151,60,19,215,252,182,5,140,166,74,224,20,207,122,196,189,229,35,5,129,121,147,36,138,39,209,53,140,107,148,250,56,192,61,37,195,21,238,214,191,104,205,69,184,48,7,75,50,231,17,232,214,116,234,143,91,105,232,79,167,101,110,60,162,50,49,105,169,54,64,240,77,107,38,104,64,119,59,198,136,182,110,213,152,134,252,106,196,147,187,17,31,127,185,76,162,5,72,137,226,226,229,136,219,79,186,46,254,183,235,122,207,156,13,127,142,234,201,195,172,175,4,28,165,118,145,162,128,73,32,173,81,2,82,230,150,222,122,51,196,168,70,230,209,116,58,93,122,192,42,176,12,208,219,9,7,65,170,33,198,70,10,67,85,119,60,41,36,205,50,227,93,207,252,76,180,50,49,143,91,177,63,254,2,88,85,199,183,161,223,5,154,30,126,3,228,93,34,249,192,111,59,139,24,141,153,251,136,239,77,186,211,41,235,184,72,3,219,237,252,3,31,120,167,211,97,221,78,231,31,78,191,81,105,180,158,237,72,45,152,45,68,3,122,169,2,8,165,95,81,253,162,61,200,95,216,244,21,88,186,177,141,159,178,22,219,17,243,21,100,148,237,196,90,253,5,69,145,125,133,254,237,121,123,123,123,79,161,195,29,120,219,129,201,24,254,161,55,197,135,78,103,202,246,242,70,83,120,219,215,141,16,12,241,71,118,230,138,7,240,83,209,120,87,31,72,96,167,54,52,129,152,102,61,111,55,239,41,246,217,232,126,243,48,199,193,34,109,193,148,2,63,177,131,241,93,73,141,76,78,143,3,232,119,15,204,240,172,202,244,42,12,38,45,99,111,234,39,96,77,163,105,11,157,164,178,29,151,86,49,151,121,173,3,89,20,87,107,164,25,192,190,173,139,54,224,43,177,34,152,70,164,229,138,135,16,121,228,171,105,216,138,71,40,176,26,164,210,61,208,50,93,34,231,20,26,180,92,198,97,66,98,250,255,167,48,57,229,147,141,26,181,157,39,80,72,131,165,10,186,222,147,103,247,48,100,234,139,96,2,109,131,184,121,66,42,204,120,215,219,70,57,169,10,14,24,225,224,54,158,249,96,77,188,52,6,5,2,42,239,120,232,207,57,89,90,44,98,221,148,129,101,71,163,43,152,212,133,126,235,90,140,190,248,89,171,220,114,187,161,233,18,189,128,194,116,131,7,3,237,175,96,154,5,42,116,31,65,214,150,163,104,162,39,69,61,241,111,119,112,150,152,130,55,100,104,53,149,253,219,92,76,124,206,162,48,184,101,224,85,8,17,50,48,149,204,70,160,52,54,172,183,131,83,140,115,215,4,118,23,65,172,3,227,201,254,74,24,157,117,97,60,221,219,95,1,163,187,187,191,38,140,103,207,182,87,193,232,238,33,12,111,30,77,192,167,195,6,204,75,209,117,141,194,86,73,98,235,190,148,16,66,139,165,174,245,192,104,168,25,144,21,114,209,34,59,164,228,123,111,186,215,208,34,5,133,202,167,168,189,189,229,34,240,184,36,98,149,151,101,56,87,229,150,171,124,171,134,118,228,223,40,147,51,158,249,193,196,185,171,137,247,191,125,17,183,211,4,252,227,148,161,132,222,77,147,104,126,7,115,123,152,162,35,213,35,47,216,238,58,44,137,50,112,70,236,142,179,204,162,123,234,119,246,58,19,113,233,192,168,105,13,40,195,223,150,8,116,101,1,168,4,127,101,117,14,30,156,101,242,138,15,218,50,164,196,145,29,54,250,228,232,126,123,151,81,4,65,25,143,253,180,226,146,127,254,175,133,72,110,193,31,135,240,66,189,80,52,81,114,200,27,225,174,27,112,126,174,198,155,15,131,94,55,240,252,188,34,238,124,24,195,3,129,10,76,234,34,73,199,224,197,98,220,215,245,246,33,88,41,202,90,63,4,199,138,152,182,49,158,253,110,100,77,113,44,60,165,224,108,130,93,0,125,51,90,252,232,222,149,194,215,207,43,162,215,70,132,50,113,146,137,155,172,253,153,95,113,89,106,13,167,139,144,52,157,129,7,125,26,189,78,3,155,187,194,77,156,59,222,30,108,239,238,186,66,254,74,232,87,255,138,39,44,117,51,119,60,120,199,179,153,7,98,171,154,187,51,85,226,135,186,36,28,216,227,173,153,211,222,238,251,83,123,60,24,204,156,116,144,13,58,125,17,164,226,14,1,141,6,227,214,172,159,94,131,128,206,236,108,16,14,189,221,231,163,182,189,221,130,98,167,7,79,248,185,59,118,238,198,60,21,140,247,210,129,45,90,137,211,30,109,217,226,32,121,190,215,235,56,253,81,34,56,120,147,216,64,96,131,164,197,177,193,182,89,145,96,5,111,9,172,120,178,76,219,131,189,101,34,178,69,18,222,205,122,169,155,246,50,23,130,183,229,50,231,196,199,95,127,201,162,215,39,191,105,78,116,7,131,1,88,186,5,196,55,89,234,5,34,188,204,102,143,31,219,98,192,189,75,55,129,159,35,151,195,207,196,209,236,169,49,103,92,99,206,108,0,86,20,88,212,1,216,217,243,78,111,214,206,220,209,32,107,35,147,53,71,84,199,199,64,126,199,236,15,114,2,24,177,53,251,57,231,131,139,189,250,121,86,101,7,112,99,107,251,231,89,67,45,242,4,88,178,245,36,175,45,243,36,116,175,122,35,178,140,107,73,17,118,252,211,251,55,167,23,199,47,62,190,120,119,50,184,131,174,190,243,193,213,78,97,226,221,113,129,21,234,109,231,105,7,223,126,33,39,52,20,105,10,14,194,238,210,253,244,230,226,244,197,47,39,131,179,187,140,95,246,172,140,143,96,54,158,250,150,59,77,32,8,152,4,183,61,235,119,124,95,186,69,131,20,232,141,205,22,39,84,96,54,9,196,196,108,240,246,232,176,84,77,121,12,179,193,71,42,48,155,204,255,43,203,204,22,239,254,207,233,169,181,60,71,130,95,189,57,122,123,152,147,204,39,208,229,139,69,42,18,204,15,153,159,188,192,26,86,212,160,255,216,179,62,169,119,6,51,18,11,192,220,194,252,12,222,28,68,59,217,204,79,25,204,89,49,191,132,214,232,100,247,44,80,113,168,135,55,62,50,184,163,9,149,184,99,158,166,215,224,127,152,184,143,243,50,137,85,191,255,8,172,99,113,1,115,176,137,237,229,17,107,179,227,127,63,101,84,174,48,66,223,65,167,142,78,142,247,183,247,246,144,13,18,249,230,203,163,77,102,227,211,251,143,175,182,159,188,237,116,25,133,130,83,62,22,14,195,6,0,72,181,216,60,126,11,174,215,211,246,219,211,253,103,157,206,166,209,112,37,165,105,73,22,198,105,88,163,245,228,253,122,100,158,188,223,92,19,75,34,224,189,138,231,227,209,201,209,122,12,161,150,235,226,2,201,174,98,2,233,174,226,129,113,5,248,4,30,107,97,134,202,22,41,83,14,31,179,59,3,120,228,35,128,229,244,89,40,46,41,86,0,238,66,132,154,162,139,229,95,134,60,96,118,34,48,35,7,88,88,107,155,96,161,95,24,113,144,34,0,186,238,16,196,16,225,3,119,18,17,11,158,165,101,25,197,26,150,215,72,242,79,103,130,133,139,249,72,0,186,41,203,124,244,249,48,21,64,173,216,199,87,76,2,4,42,49,9,5,53,163,69,48,74,87,18,147,148,52,27,231,93,69,202,5,200,81,22,37,38,65,175,79,79,143,53,34,93,43,137,122,183,8,50,63,14,252,177,228,148,172,196,209,44,247,142,152,148,8,112,0,211,12,67,52,204,159,101,48,204,163,91,80,51,193,8,254,139,227,55,30,251,116,72,15,12,136,6,152,1,196,36,192,107,1,160,97,144,22,18,143,208,29,117,33,148,96,115,240,152,52,167,88,58,139,22,1,64,21,133,16,33,232,53,109,198,34,139,128,94,16,137,4,100,86,36,126,84,50,28,47,160,186,165,170,153,174,150,76,192,42,12,67,53,193,178,13,118,76,166,190,153,0,249,185,53,6,15,35,251,140,92,118,49,6,18,196,4,58,14,82,217,33,138,181,4,174,41,70,208,124,140,25,148,219,11,74,190,27,20,31,234,26,38,107,148,153,5,14,227,59,74,8,70,69,16,239,41,172,186,177,18,35,136,200,217,161,152,114,24,97,18,52,236,79,138,246,153,190,38,6,195,240,233,5,37,217,83,24,147,39,251,251,207,158,233,254,192,103,170,59,235,141,1,78,46,23,48,15,0,33,213,57,134,233,98,217,141,67,224,56,218,141,132,189,57,102,16,204,1,215,83,100,45,53,29,37,209,23,240,109,217,7,74,200,211,168,72,86,223,50,46,201,7,135,98,198,108,113,195,231,113,0,214,117,126,139,223,169,207,198,24,168,238,239,63,89,73,50,77,129,37,146,33,254,244,199,48,223,100,96,134,195,26,229,84,203,242,90,61,241,208,43,49,191,104,149,26,195,130,3,112,36,41,236,65,25,112,57,109,247,36,159,47,252,73,254,136,68,182,123,148,38,130,98,143,157,8,193,62,30,189,56,124,119,68,176,167,139,4,70,14,6,88,100,220,15,86,219,131,122,167,22,241,4,180,237,129,190,201,70,247,119,17,186,20,47,70,208,171,25,51,190,73,61,118,172,68,45,155,129,97,225,164,200,164,236,160,186,16,198,178,72,17,174,36,11,211,18,113,245,11,50,118,212,154,230,107,165,112,215,126,16,160,34,130,236,50,116,53,36,66,48,12,56,187,227,39,95,193,6,156,35,30,226,2,181,249,154,113,54,121,162,63,246,216,239,51,204,190,48,153,242,27,207,192,179,68,35,129,213,46,169,223,116,1,221,250,18,70,215,161,250,8,39,2,40,151,31,80,167,193,246,41,184,192,69,237,197,84,8,91,95,2,26,156,55,57,130,80,193,170,206,27,21,144,252,70,232,66,225,83,73,113,215,70,219,228,183,17,164,120,149,243,150,35,253,102,156,169,24,47,146,122,71,117,177,196,7,227,67,34,9,67,25,70,153,118,38,78,78,222,122,26,83,9,214,189,232,144,190,139,41,144,37,146,24,168,171,249,212,170,11,172,212,68,205,55,147,73,10,218,192,248,120,44,226,12,173,107,67,99,102,159,188,126,209,117,114,19,194,182,167,147,39,162,59,222,123,202,183,39,219,251,211,177,152,236,63,121,38,68,119,52,122,186,39,158,238,60,235,142,158,237,136,81,119,123,61,166,145,251,112,145,251,157,100,133,106,129,67,225,151,50,89,47,233,135,72,157,253,250,250,191,25,193,128,25,124,34,2,176,213,152,128,148,50,47,133,214,159,178,219,104,65,226,142,15,155,160,236,200,244,69,138,58,12,189,215,94,242,134,38,184,153,164,21,14,143,180,177,77,222,215,91,105,125,43,222,215,155,112,12,177,34,225,150,212,201,119,244,193,64,1,249,60,90,0,203,149,95,134,147,13,188,73,20,248,5,234,190,178,92,104,159,73,114,204,201,177,104,154,79,185,12,112,236,120,235,205,154,210,66,77,131,69,58,147,221,191,226,65,41,12,36,91,65,245,172,168,87,14,28,56,99,243,197,188,228,156,4,64,14,173,239,161,197,204,174,49,37,76,31,147,241,84,198,10,74,120,58,107,238,13,140,39,56,211,104,174,253,57,101,151,51,1,99,11,62,83,10,221,172,64,88,211,203,49,44,113,130,63,2,127,238,55,168,12,129,198,6,76,53,248,170,78,154,147,19,54,66,7,90,193,180,39,134,39,180,219,233,172,118,242,75,90,82,242,130,47,178,89,18,101,89,32,240,65,128,175,26,76,86,122,253,76,183,101,70,91,217,153,151,114,85,62,101,51,80,140,184,20,42,208,140,168,191,4,87,32,159,96,105,150,36,159,39,64,63,137,132,84,247,26,228,23,39,79,30,74,193,166,229,63,102,131,253,54,121,228,200,217,101,204,209,224,85,144,98,168,97,160,101,184,244,13,184,223,69,68,76,25,46,65,1,85,209,189,91,196,208,210,244,50,183,59,157,249,186,65,203,10,238,66,103,113,181,231,202,207,110,215,224,111,169,245,87,115,248,53,184,101,32,81,212,185,180,196,158,58,95,96,138,70,157,64,246,64,160,4,10,159,148,197,170,227,178,57,191,33,65,149,204,234,118,58,80,214,209,122,149,174,22,186,251,248,50,151,194,191,154,21,121,131,134,222,79,121,162,123,128,218,63,134,209,156,8,105,249,200,240,21,26,37,129,137,194,69,43,245,109,103,93,218,165,31,171,44,26,174,46,150,108,243,175,228,232,72,149,212,181,146,234,19,74,246,166,236,122,230,143,103,170,206,136,7,193,92,7,139,9,80,231,43,53,151,48,180,178,227,184,124,60,58,57,69,159,49,142,66,52,235,104,179,11,3,160,169,111,34,175,89,245,69,136,99,118,193,117,108,120,129,243,220,133,204,100,18,3,138,94,29,81,83,150,55,165,41,145,25,77,101,23,95,1,69,31,127,253,229,247,223,101,100,207,108,57,21,66,209,214,203,151,167,232,148,188,250,116,218,217,127,230,184,76,34,79,13,144,57,180,92,239,17,9,206,99,140,86,232,112,144,248,116,10,60,204,29,79,244,30,197,28,204,54,207,192,157,33,30,165,248,72,11,174,192,104,12,81,208,29,186,6,35,193,124,176,47,196,108,156,163,193,39,251,162,57,246,32,31,86,77,208,98,34,155,226,84,119,1,70,104,234,95,86,147,59,196,167,201,2,5,138,97,51,166,155,73,134,229,77,136,86,35,30,167,249,155,189,0,247,9,140,225,49,238,184,80,237,56,88,2,156,225,35,5,9,251,77,105,86,213,25,77,148,65,53,70,234,205,52,79,33,222,170,165,91,13,130,136,98,217,72,97,12,129,253,15,18,63,227,105,253,43,29,160,19,204,16,70,216,24,129,117,137,142,104,168,43,178,89,38,195,104,178,22,139,211,5,241,24,227,150,91,150,44,104,121,255,107,201,146,246,164,145,166,60,207,148,174,67,79,138,123,254,96,116,41,21,133,113,38,190,228,223,127,11,81,32,150,139,178,231,254,10,125,26,54,150,222,96,141,186,247,213,244,29,208,135,20,211,172,72,238,144,164,91,155,80,156,108,72,27,13,182,213,236,39,209,119,238,254,250,241,195,167,227,139,147,211,23,167,71,23,255,126,244,31,39,131,51,75,89,46,75,102,57,225,97,148,47,50,192,75,32,174,4,184,129,214,108,65,109,114,205,134,23,90,74,135,223,146,19,214,23,17,92,249,121,249,5,26,5,4,6,70,72,241,10,42,230,241,2,140,255,133,254,82,144,41,129,135,60,95,1,207,58,71,81,20,147,139,126,238,2,15,46,222,125,56,60,66,162,63,76,167,80,127,18,192,228,35,215,92,225,237,21,204,150,197,27,213,65,136,27,235,26,253,28,208,54,44,120,250,16,2,208,79,135,199,23,199,31,63,156,126,120,249,225,237,197,111,71,31,79,222,124,120,15,8,118,221,189,115,247,240,232,213,139,79,111,79,47,138,54,121,147,193,174,155,47,86,186,180,211,0,216,61,216,232,226,154,157,101,109,12,130,104,76,108,242,102,81,154,97,196,235,208,210,221,181,24,157,68,56,106,131,80,92,179,223,245,155,109,93,227,114,166,181,85,251,108,203,234,237,119,45,167,159,127,232,69,33,200,68,202,47,197,64,47,188,217,0,28,208,106,42,36,166,108,32,60,152,181,120,255,39,219,170,110,23,180,28,47,198,137,56,156,216,214,1,60,13,173,173,108,203,58,104,211,163,179,92,46,9,64,244,90,220,148,112,200,133,46,171,115,99,109,9,47,139,78,72,196,236,238,158,3,47,159,98,208,249,151,48,223,219,206,210,197,61,16,87,226,83,18,20,159,75,162,196,0,169,145,163,250,102,194,228,78,216,158,100,36,200,167,227,129,71,99,59,110,70,205,72,14,160,149,39,193,129,161,0,225,129,54,216,43,219,34,223,199,114,92,62,184,20,217,203,69,146,128,239,250,14,196,204,118,228,16,12,6,194,65,151,228,218,122,183,128,193,23,24,208,104,45,127,115,104,97,163,28,137,218,146,155,195,134,73,29,158,211,56,240,97,100,92,120,84,126,65,106,115,231,143,63,236,108,208,113,92,11,151,226,129,221,64,246,96,128,2,138,234,90,199,40,115,46,136,80,113,175,173,182,147,166,48,218,48,186,240,147,211,207,108,233,150,59,98,242,78,126,203,126,178,55,137,9,103,114,43,53,105,213,121,111,60,19,32,24,147,205,10,103,150,174,116,91,200,25,26,92,120,218,195,180,205,33,197,61,190,63,121,184,98,110,223,45,146,160,151,143,28,140,194,92,100,179,104,2,110,224,167,83,203,69,208,189,255,125,242,225,189,39,45,139,63,189,133,239,93,181,153,245,148,108,14,143,85,138,63,10,219,159,83,52,17,202,176,247,76,148,96,168,38,129,160,96,243,19,17,8,133,203,165,179,132,15,229,226,45,15,68,146,193,195,114,233,118,197,142,227,162,65,126,41,183,54,175,234,134,234,130,213,78,111,193,97,6,31,245,46,39,254,195,201,183,82,15,52,73,2,212,136,157,80,242,228,99,116,109,40,133,155,185,92,138,182,63,176,14,178,100,8,130,181,133,79,147,161,229,194,211,230,1,13,152,218,251,174,5,63,61,59,183,216,24,12,121,58,176,204,45,212,150,244,232,7,214,38,136,198,166,213,30,110,186,4,173,173,193,173,2,140,201,234,53,128,102,15,2,157,248,87,26,6,238,223,37,233,181,24,178,79,109,109,129,114,185,179,201,26,110,246,1,141,141,125,15,7,157,126,120,208,104,73,213,178,127,63,220,218,146,124,138,6,141,237,206,194,115,220,18,48,24,68,127,252,17,13,6,247,88,222,199,143,55,154,49,25,74,218,167,206,208,246,114,163,59,172,180,37,121,115,203,78,158,91,76,74,188,213,179,44,7,184,35,153,163,153,139,106,61,144,9,35,75,31,95,192,244,4,116,31,153,141,206,42,78,105,129,200,160,38,130,25,73,114,42,231,119,4,16,153,196,163,148,84,226,177,134,204,218,138,212,48,16,149,67,75,109,35,96,178,16,198,97,216,60,66,146,253,213,94,77,208,23,71,135,101,30,93,137,150,222,177,174,210,155,121,167,244,87,249,150,56,86,108,142,147,159,226,254,23,63,151,16,137,75,211,96,144,211,70,73,95,186,65,196,39,39,34,67,79,47,53,205,21,24,86,181,171,70,254,106,225,82,30,90,84,122,147,219,160,193,192,52,206,147,143,31,255,228,129,33,68,101,69,125,86,208,193,121,42,79,118,31,70,159,17,254,23,113,155,66,9,158,55,56,226,96,62,242,86,153,148,54,14,51,201,230,35,13,133,153,214,83,170,195,249,166,211,231,74,72,135,157,199,143,109,53,220,184,117,197,227,89,150,216,22,121,31,206,115,238,77,253,0,76,186,189,121,86,104,233,89,118,46,129,120,99,116,43,108,167,199,105,14,195,10,199,89,58,46,76,194,218,181,73,1,122,177,193,137,118,45,203,149,167,212,46,183,171,247,6,250,92,124,201,39,19,249,157,125,135,251,73,122,52,81,163,57,35,178,122,98,137,120,139,230,137,152,98,106,40,71,133,184,234,241,169,118,26,128,93,242,83,197,165,134,72,22,89,150,149,199,210,162,84,97,35,220,37,12,150,240,154,194,180,85,40,27,67,186,123,144,54,194,110,66,43,195,161,245,208,170,168,108,109,180,10,118,5,109,30,8,61,136,180,8,153,214,65,89,192,173,32,148,33,193,131,216,84,176,180,14,42,5,113,169,181,9,92,166,146,117,105,73,134,167,160,222,184,135,26,60,47,167,47,244,153,25,53,26,32,249,181,162,70,33,7,149,139,201,45,173,78,185,182,18,242,179,206,57,200,239,89,247,28,126,108,147,134,225,44,157,242,43,241,171,252,226,165,132,222,236,120,98,28,180,152,196,218,62,2,205,224,106,130,207,14,117,210,185,116,193,148,72,67,248,18,45,165,109,209,137,33,75,110,80,35,91,98,90,16,115,58,63,223,196,111,231,60,54,250,83,184,6,63,193,156,36,125,219,190,54,243,233,123,254,222,246,157,231,224,77,110,116,92,106,0,138,93,70,235,134,16,17,59,61,31,244,217,175,34,215,83,254,159,141,56,68,196,37,23,252,172,54,19,54,210,144,25,110,107,86,245,77,201,73,223,128,38,218,133,136,6,103,232,0,116,250,201,129,54,199,253,4,124,134,232,44,57,31,156,113,248,233,250,248,35,132,31,231,253,194,223,203,231,135,220,227,163,113,124,192,47,109,242,7,239,42,2,218,139,72,184,150,174,30,230,35,228,77,41,32,18,207,237,34,158,105,249,147,22,205,229,86,19,67,27,218,153,135,221,180,246,8,199,233,53,131,108,18,75,237,226,99,184,160,236,123,93,240,107,225,17,192,199,157,248,162,136,122,74,35,135,211,55,166,226,31,14,134,132,243,92,55,77,103,160,163,72,186,124,45,17,171,60,44,232,161,143,248,81,97,99,60,117,252,155,20,160,18,71,117,228,58,167,96,160,109,255,231,100,203,249,79,207,252,101,183,108,239,103,199,121,222,214,18,125,55,231,159,163,164,151,161,81,152,251,33,61,110,159,3,10,128,0,143,59,32,86,192,76,196,4,111,187,88,1,138,211,59,163,246,212,146,218,96,213,57,12,54,168,135,184,22,73,157,54,55,247,40,76,226,113,218,245,203,37,89,174,106,220,35,92,67,95,254,94,186,50,244,121,137,174,224,171,40,145,209,79,195,136,161,242,129,97,162,95,220,172,6,157,193,194,141,1,122,73,32,37,99,57,174,45,165,138,185,16,121,170,96,203,98,54,198,234,0,214,231,33,132,248,142,82,237,141,65,38,33,4,72,65,14,128,121,40,139,120,88,0,64,137,146,113,214,180,101,103,101,233,160,182,231,46,218,70,179,56,78,162,24,204,38,207,5,4,11,112,15,111,33,35,74,222,151,154,34,232,147,34,141,28,200,26,105,42,61,85,76,51,110,189,149,214,37,41,142,210,106,247,249,160,60,168,118,230,101,252,242,2,173,152,155,179,202,121,110,65,27,166,177,241,43,152,207,49,35,189,1,30,251,127,200,101,229,72,102,10,231,224,168,82,102,48,204,116,115,207,34,90,52,17,233,2,130,213,228,86,147,202,37,33,254,32,243,64,31,112,113,87,57,146,166,179,170,68,38,243,144,44,24,134,137,184,249,128,51,187,26,58,103,99,208,234,162,213,52,92,85,68,57,245,147,249,53,79,68,11,207,118,91,138,205,22,158,241,6,79,29,38,75,111,148,68,215,48,81,95,224,114,18,186,235,23,16,229,163,81,243,43,162,13,70,47,141,2,152,247,163,75,21,25,231,175,48,249,247,27,164,205,125,96,132,140,120,67,31,217,98,205,129,7,249,167,42,242,112,238,227,228,253,131,46,205,139,155,207,13,124,20,225,84,112,87,75,66,64,119,65,144,93,142,169,42,244,219,22,137,160,169,78,127,153,31,90,137,125,125,252,3,207,21,36,34,142,210,118,234,79,162,89,91,164,49,238,66,189,152,251,180,227,234,2,218,64,125,64,75,253,109,73,94,19,102,204,184,12,68,13,179,182,12,70,82,164,154,220,19,196,93,210,251,146,27,160,120,142,17,136,28,123,29,104,186,214,135,247,152,4,147,223,57,197,17,153,83,138,227,109,240,94,224,53,66,222,86,171,48,66,160,12,173,182,199,249,17,7,85,238,37,186,133,119,153,63,141,48,23,151,31,1,184,191,101,191,218,139,34,173,140,61,145,135,78,48,136,204,126,35,135,193,237,118,58,63,115,47,117,212,132,119,140,38,93,92,191,68,112,120,28,233,231,204,155,81,27,240,102,213,239,64,185,198,69,50,90,251,68,88,95,170,104,25,59,240,189,124,3,190,211,182,75,229,122,43,254,138,214,213,46,25,107,98,43,250,228,43,10,139,116,187,164,48,28,152,101,63,227,153,224,118,133,146,226,24,64,13,175,204,215,55,99,12,81,243,235,28,172,229,179,50,74,114,2,94,24,82,120,228,131,221,14,41,94,253,224,47,72,207,24,230,120,227,120,55,65,236,89,51,144,22,74,112,186,148,91,254,135,75,121,206,127,56,148,85,195,131,120,39,58,103,222,232,169,83,194,26,38,16,35,179,142,4,248,117,15,189,124,188,175,228,123,149,207,6,74,219,145,198,60,36,32,210,160,156,208,30,92,77,139,69,180,65,201,215,18,215,121,144,56,197,172,38,226,36,221,141,196,69,177,65,27,153,190,210,165,0,249,76,135,6,186,156,127,41,221,53,97,233,244,68,131,147,23,131,32,216,53,227,177,209,65,31,93,118,25,88,159,53,58,105,120,228,225,255,182,52,160,104,58,5,73,3,80,120,172,17,76,65,214,182,187,63,235,74,58,34,138,185,7,95,158,232,33,81,33,205,133,217,177,65,167,125,199,204,94,219,119,32,120,100,40,251,90,10,205,179,244,232,193,70,184,211,24,230,184,162,139,28,173,60,140,76,230,225,134,107,162,3,100,123,169,218,46,98,187,60,31,108,116,117,21,204,26,43,235,112,108,203,40,30,63,174,34,32,77,145,202,103,229,90,40,75,19,126,221,146,253,194,33,161,5,244,186,139,117,183,4,126,203,161,24,69,55,96,195,53,19,75,233,40,93,232,131,44,233,37,0,171,240,174,100,204,39,206,202,223,210,94,76,231,28,38,63,147,187,66,19,157,95,32,146,53,138,76,105,68,84,219,94,217,239,83,165,22,5,230,146,17,148,145,95,5,210,200,237,175,13,82,235,95,21,26,6,100,36,206,224,164,168,189,66,192,118,173,164,207,77,163,3,161,74,73,207,109,13,186,164,94,173,113,16,165,162,145,236,18,172,70,197,212,193,14,86,226,185,88,40,130,79,45,2,5,70,241,17,222,38,162,50,40,200,27,247,129,110,152,14,153,53,243,149,53,88,153,138,89,149,70,177,0,181,229,232,222,210,2,82,46,136,181,88,114,21,237,94,115,154,217,109,176,46,196,193,20,2,199,44,201,99,88,228,74,190,116,192,33,228,231,7,207,250,28,98,253,60,48,213,55,163,20,29,217,60,8,252,225,1,87,183,23,61,82,137,118,106,156,39,99,57,229,239,113,154,57,104,115,240,38,225,11,139,162,221,166,46,148,240,176,192,103,188,60,4,202,31,47,137,60,126,83,17,206,130,2,75,102,123,107,3,135,182,195,109,92,184,115,205,34,105,168,193,145,115,243,229,209,205,186,137,200,87,236,116,134,220,92,175,123,112,145,77,175,177,65,253,210,76,17,151,22,101,243,52,61,84,128,74,38,184,91,171,7,102,52,141,146,236,21,166,116,123,116,138,209,114,163,80,138,201,139,201,164,87,142,37,50,79,142,9,133,197,111,240,42,18,89,0,179,171,132,247,138,226,159,94,3,191,243,200,255,255,217,157,155,51,222,154,190,104,189,234,180,158,157,223,117,221,39,203,63,206,212,227,238,210,249,169,237,60,183,115,4,16,177,116,14,48,130,20,7,131,189,221,221,157,221,231,118,41,107,99,111,116,29,156,211,122,149,98,185,82,59,194,93,75,180,229,21,215,80,244,198,167,206,77,7,175,132,193,253,76,157,155,87,240,143,133,131,233,252,8,24,101,238,231,79,24,175,229,47,42,102,220,60,88,228,75,88,33,191,98,240,127,43,227,163,212,98,254,100,96,209,238,215,83,124,29,110,186,225,64,167,90,250,234,88,104,99,142,85,46,141,229,177,217,230,86,136,122,83,232,214,38,46,238,243,75,92,186,42,173,251,1,86,84,47,225,233,109,44,166,158,33,114,11,211,148,18,184,1,174,150,115,109,128,250,233,240,56,7,165,215,158,22,65,195,154,36,2,83,169,189,82,143,25,238,59,121,176,211,21,64,224,108,225,81,180,137,96,146,7,196,209,162,247,18,190,85,156,88,109,92,100,2,15,30,211,9,35,140,180,224,59,157,35,42,33,43,46,195,194,69,83,142,221,195,245,61,203,229,197,42,37,180,161,37,169,28,57,60,154,140,86,171,132,224,205,224,30,161,199,143,109,94,233,81,113,199,138,226,48,62,182,80,85,37,92,124,165,129,166,181,69,136,179,121,190,208,8,246,176,113,83,60,30,177,246,240,233,121,21,153,177,54,140,76,107,252,122,197,170,241,3,171,178,122,61,118,216,180,4,139,184,194,100,186,253,68,175,198,54,35,110,88,151,85,147,68,136,135,1,44,214,30,50,122,210,108,125,128,166,213,196,4,25,30,172,253,86,106,228,177,92,34,167,116,80,55,39,75,14,85,227,118,210,124,104,164,32,72,179,145,231,91,140,21,29,102,46,193,178,149,139,122,108,46,143,104,10,16,251,234,30,177,230,165,26,20,31,57,107,13,41,208,59,104,235,183,165,22,46,137,26,102,97,99,199,220,119,17,110,42,72,177,29,236,7,208,135,239,15,109,65,205,41,191,79,21,30,2,242,39,105,133,66,91,69,38,185,246,32,77,171,69,52,75,192,179,65,1,149,155,143,191,91,97,212,30,245,31,79,232,148,7,169,164,244,80,162,168,41,145,121,230,106,173,161,52,63,248,147,135,205,196,164,92,68,179,232,159,48,62,223,76,209,131,3,81,222,92,67,190,100,243,182,165,170,202,227,206,37,115,210,130,57,157,47,165,207,161,203,180,7,178,206,76,95,115,76,164,235,81,15,171,210,22,221,91,197,140,235,171,140,88,70,230,106,74,84,148,158,41,96,213,171,148,197,190,75,223,169,214,164,139,209,220,207,236,90,222,183,22,81,52,175,100,123,51,158,86,22,220,156,250,186,56,230,4,244,53,50,114,151,165,73,129,72,124,30,128,239,249,34,73,248,173,141,125,156,44,198,162,178,168,43,29,28,113,38,151,42,206,243,197,174,231,244,149,231,167,242,107,142,59,102,226,69,58,203,189,255,94,254,205,224,140,187,170,244,220,40,85,69,174,88,186,119,75,220,153,80,108,137,25,92,208,34,37,37,20,180,135,172,37,133,121,58,203,213,20,193,253,132,219,131,42,139,207,184,193,212,3,193,195,129,184,171,79,134,189,179,243,37,244,212,253,51,86,153,51,12,195,114,210,10,246,75,25,163,76,22,252,198,16,31,67,115,29,61,214,34,125,212,148,102,153,81,176,155,134,190,41,60,93,41,238,43,73,49,110,243,91,185,74,8,205,14,124,90,208,105,206,121,26,203,63,116,217,3,173,245,248,151,24,240,103,81,132,142,136,125,23,7,224,67,225,213,65,16,112,70,49,120,190,120,81,92,37,252,206,125,92,75,110,230,228,126,8,113,165,12,248,151,24,251,171,228,151,76,34,232,60,215,35,117,158,167,148,148,106,92,155,117,74,91,220,108,167,190,222,142,201,140,226,178,31,140,208,138,96,109,132,201,124,121,73,170,186,27,4,12,175,97,154,114,138,203,197,234,19,121,29,45,84,169,29,127,210,94,202,23,171,210,86,109,122,47,207,82,227,40,8,120,156,230,197,60,185,196,155,190,245,189,173,121,245,240,0,243,206,185,11,150,180,240,146,63,107,40,23,131,176,3,254,37,73,53,116,19,218,13,89,169,57,141,33,128,163,139,179,190,191,58,223,115,200,32,130,44,247,145,238,153,213,23,142,183,173,242,29,229,92,77,47,101,246,202,14,178,122,135,107,49,53,214,195,47,186,36,219,8,94,115,197,47,115,86,42,72,153,173,85,77,30,106,169,201,35,219,10,104,202,19,202,40,158,30,135,247,239,207,164,5,4,82,41,201,194,97,121,233,34,231,95,129,76,67,203,179,105,6,118,186,249,200,170,182,104,150,163,252,123,6,198,214,16,65,92,153,110,193,172,19,71,241,34,214,174,8,21,138,27,160,101,34,38,218,27,24,202,171,156,74,67,63,230,9,93,13,110,208,93,140,74,233,106,228,234,160,16,237,45,121,207,226,90,35,83,250,64,15,207,11,249,90,98,152,236,95,42,98,158,112,188,189,38,39,199,191,242,165,46,214,199,145,82,239,42,169,175,178,50,166,121,89,131,60,221,92,17,70,38,136,206,21,42,35,180,66,128,114,148,235,98,104,229,155,5,20,38,9,159,189,82,197,43,240,224,210,94,109,19,120,35,26,217,178,85,85,132,95,168,184,128,142,169,29,243,73,238,117,150,63,65,7,87,152,72,226,108,158,251,49,219,224,137,139,170,226,183,210,121,107,39,247,207,41,185,146,39,56,165,163,91,217,96,53,60,84,71,67,38,101,49,53,182,104,21,178,170,28,90,21,187,22,224,16,56,77,91,120,16,91,0,206,35,58,3,50,91,140,240,4,200,48,15,56,27,109,21,146,252,164,220,17,115,151,22,161,41,157,86,145,220,167,190,141,199,153,155,92,142,174,241,199,5,190,76,23,89,103,255,89,153,1,234,60,141,53,164,116,118,222,139,213,1,144,254,224,79,8,126,202,73,239,135,118,210,119,65,19,229,10,215,32,95,162,28,178,238,119,69,59,95,71,193,54,224,219,254,11,241,129,236,178,157,191,16,31,8,30,91,55,29,198,74,98,89,8,97,46,115,223,77,205,46,80,179,251,183,161,102,15,168,217,251,219,80,243,20,168,121,250,183,161,102,31,168,217,255,11,229,180,3,248,94,4,65,57,167,80,250,217,108,84,13,51,72,89,200,33,186,240,107,152,64,106,252,167,217,63,9,253,129,46,163,93,111,180,127,120,200,255,7,176,126,45,34,96,78,1,140,47,95,158,254,85,8,213,68,38,187,185,245,215,34,150,72,255,42,132,90,25,213,181,12,235,137,246,42,159,167,187,125,143,7,81,24,128,146,175,0,191,11,127,97,93,28,179,221,225,235,5,104,16,252,254,90,26,247,42,17,103,177,157,103,101,133,218,231,211,28,68,214,55,165,21,158,154,250,85,99,229,10,146,87,179,171,236,85,125,5,151,78,242,173,141,223,204,44,41,95,58,62,167,253,68,204,216,73,196,106,123,40,37,233,178,37,222,19,142,118,179,92,198,111,192,171,234,84,74,181,183,5,229,223,198,39,37,77,223,204,43,218,251,197,78,139,157,147,223,204,50,163,180,246,247,98,214,230,168,185,133,243,207,97,233,215,233,53,240,162,216,248,249,77,172,33,48,235,117,94,238,35,253,209,221,254,42,97,160,125,95,223,209,209,34,159,80,249,203,88,42,163,96,218,237,124,187,157,214,38,185,175,58,199,99,240,167,188,127,65,101,76,234,243,179,12,113,155,149,134,201,191,25,177,210,36,23,225,155,127,127,254,175,238,117,152,123,248,36,120,85,66,187,69,46,72,27,172,225,239,248,43,79,182,169,104,156,152,187,46,70,12,137,239,67,22,210,190,120,233,108,189,199,231,10,182,181,123,38,247,208,223,135,42,230,126,242,112,250,108,145,170,244,217,49,52,255,70,98,212,49,235,123,104,89,132,235,80,99,30,182,102,159,232,147,234,96,96,106,36,134,223,241,253,114,252,53,242,165,228,201,248,164,250,7,132,30,200,54,231,108,80,151,15,226,179,186,218,235,190,225,193,141,189,209,34,85,194,80,154,187,155,152,67,244,52,101,132,205,15,105,53,64,187,241,202,41,248,126,210,25,157,202,158,250,55,53,105,22,55,217,186,244,107,81,43,147,95,50,82,26,75,101,54,40,180,240,7,152,13,3,132,145,1,94,113,125,128,226,74,45,17,92,230,101,115,90,152,6,225,254,228,174,230,193,138,12,47,43,239,250,44,39,6,191,141,41,171,210,97,255,4,249,151,155,24,98,33,38,23,170,123,63,82,3,78,16,240,15,84,129,123,168,39,254,252,21,210,95,203,11,227,215,148,145,108,92,169,52,132,130,7,180,206,175,151,42,38,62,15,162,203,154,153,228,65,107,117,77,99,142,89,86,173,181,36,39,55,141,75,46,66,64,50,247,243,239,173,225,99,186,208,171,95,176,101,182,93,198,160,6,85,173,220,50,185,113,27,93,160,237,102,37,208,251,17,30,116,138,152,233,24,225,234,113,3,63,229,170,242,240,64,222,21,92,236,159,64,138,14,50,249,39,158,178,4,31,243,108,249,225,65,27,222,176,4,47,140,63,142,146,44,47,56,78,34,140,123,3,166,142,93,230,21,197,202,94,117,142,175,252,165,77,153,130,169,108,148,95,123,158,151,11,14,136,15,111,43,193,39,217,1,250,243,99,13,157,215,155,231,177,169,252,67,86,109,234,59,252,70,190,60,20,69,230,163,51,124,28,142,210,184,95,145,220,202,162,200,191,158,200,22,203,157,107,201,106,157,75,235,120,244,36,184,114,33,143,78,1,152,156,173,36,98,228,214,136,85,238,100,190,93,233,68,54,251,218,65,214,96,233,174,42,70,63,91,215,60,161,67,174,242,141,254,28,156,218,105,84,58,26,178,214,80,212,62,83,103,81,26,134,227,201,240,84,54,100,234,150,55,102,211,61,190,184,233,92,95,148,239,192,168,60,49,132,177,114,29,220,170,78,22,139,153,213,181,195,127,61,249,173,45,134,126,149,201,109,144,3,11,253,247,67,117,236,154,105,254,177,145,31,242,196,199,155,99,229,95,35,16,44,95,106,53,254,242,156,62,115,252,240,105,99,152,44,252,236,245,98,196,116,1,195,99,121,104,252,60,86,44,37,115,22,26,167,219,71,16,38,226,166,23,186,230,82,158,106,183,106,203,206,150,250,179,165,30,197,32,240,223,104,248,142,127,17,44,93,36,242,82,95,234,201,173,190,116,125,17,99,63,233,138,85,78,209,90,76,119,143,34,64,104,145,48,250,195,55,27,48,12,195,156,199,242,170,105,63,196,198,60,243,229,5,245,234,166,166,49,221,18,171,182,43,49,58,161,236,177,55,83,121,73,244,140,54,244,164,46,244,89,94,135,73,228,208,95,214,33,144,159,78,126,145,84,203,241,43,89,141,182,30,9,139,201,189,92,120,149,74,10,134,66,132,99,41,92,114,39,52,79,50,50,9,45,148,170,138,109,153,250,65,158,39,161,103,228,143,54,104,113,179,29,82,105,133,251,173,82,197,12,213,4,79,254,149,209,175,243,82,87,232,197,75,212,25,35,232,188,199,214,153,123,26,254,181,213,127,93,173,71,142,84,239,40,208,223,205,18,50,202,234,206,149,194,251,49,13,112,245,226,142,42,183,203,23,28,88,4,240,45,149,213,225,233,68,158,76,88,221,15,73,111,100,144,75,12,57,168,250,50,88,126,15,136,228,42,60,161,39,40,47,205,200,113,200,207,62,74,187,195,14,137,127,235,129,202,255,246,200,5,207,86,128,123,31,209,214,23,5,47,78,196,125,240,212,208,208,5,166,228,93,20,62,102,165,57,158,115,30,200,11,50,140,239,113,15,47,222,140,97,13,127,243,193,78,130,160,73,163,90,222,88,214,8,21,153,92,190,133,163,48,250,229,157,53,15,123,19,255,108,37,111,222,192,243,63,88,217,31,118,67,15,102,59,185,6,153,127,145,88,111,91,98,134,95,187,83,236,138,106,27,59,3,213,104,23,158,168,71,219,127,171,35,21,39,190,180,19,53,192,101,25,91,73,208,71,80,100,252,99,9,101,138,202,147,91,65,214,87,77,110,241,131,243,155,242,1,190,103,102,139,27,157,236,191,145,248,55,237,19,252,31,44,252,43,102,58,185,23,51,223,254,248,240,132,87,36,237,202,127,219,186,188,60,209,156,41,39,17,152,51,227,18,128,74,122,73,253,25,60,41,221,60,185,103,149,224,27,17,80,182,169,116,149,36,136,5,20,209,133,253,76,238,141,111,202,189,255,109,164,179,173,146,17,56,71,13,255,63,255,10,252,59,219,137,0,0}; \ No newline at end of file diff --git a/lib/MQTT/MqttClient.cpp b/lib/MQTT/MqttClient.cpp index b2020628..0aa01930 100644 --- a/lib/MQTT/MqttClient.cpp +++ b/lib/MQTT/MqttClient.cpp @@ -7,6 +7,8 @@ #include #include +using namespace std::placeholders; + MqttClient::MqttClient(Settings& settings, MiLightClient*& milightClient) : milightClient(milightClient), settings(settings), @@ -16,15 +18,18 @@ MqttClient::MqttClient(Settings& settings, MiLightClient*& milightClient) this->domain = new char[strDomain.length() + 1]; strcpy(this->domain, strDomain.c_str()); - this->mqttClient = new PubSubClient(tcpClient); } MqttClient::~MqttClient() { - mqttClient->disconnect(); + mqttClient.disconnect(); delete this->domain; } void MqttClient::begin() { +#if ASYNC_TCP_SSL_ENABLED + char hexVal[2]; + uint8_t fingerprint[SHA1_SIZE]; +#endif #ifdef MQTT_DEBUG printf_P( PSTR("MqttClient - Connecting to: %s\nparsed:%s:%u\n"), @@ -33,17 +38,32 @@ void MqttClient::begin() { settings.mqttPort() ); #endif - - mqttClient->setServer(this->domain, settings.mqttPort()); - mqttClient->setCallback( - [this](char* topic, byte* payload, int length) { - this->publishCallback(topic, payload, length); + mqttmsg = false; + mqttClient.setServer(this->domain, settings.mqttPort()); + mqttClient.onMessage(std::bind(&MqttClient::publishCallback, this, _1, _2, _3, _4, _5, _6)); + mqttClient.onConnect(std::bind(&MqttClient::connectCallback, this, _1)); +#if ASYNC_TCP_SSL_ENABLED + mqttClient.setSecure(settings.mqttSecure); + if(settings.mqttSecure && settings.mqttServerFingerprint.length() == (SHA1_SIZE * 2)) + { + // Convert string to uint8_t[] + for(size_t i=0;i 0) { + mqttClient.setCredentials(settings.mqttUsername.c_str(), settings.mqttPassword.c_str()); + } + reconnect(); } -bool MqttClient::connect() { +void MqttClient::connect() { char nameBuffer[30]; sprintf_P(nameBuffer, PSTR("milight-hub-%u"), ESP.getChipId()); @@ -51,15 +71,8 @@ bool MqttClient::connect() { Serial.println(F("MqttClient - connecting")); #endif - if (settings.mqttUsername.length() > 0) { - return mqttClient->connect( - nameBuffer, - settings.mqttUsername.c_str(), - settings.mqttPassword.c_str() - ); - } else { - return mqttClient->connect(nameBuffer); - } + mqttClient.connect(); + } void MqttClient::reconnect() { @@ -67,24 +80,23 @@ void MqttClient::reconnect() { return; } - if (! mqttClient->connected()) { - if (connect()) { - subscribe(); - -#ifdef MQTT_DEBUG - Serial.println(F("MqttClient - Successfully connected to MQTT server")); -#endif - } else { - Serial.println(F("ERROR: Failed to connect to MQTT server")); - } + if (! mqttClient.connected()) { + connect(); } lastConnectAttempt = millis(); } +void MqttClient::connectCallback(bool sessionPresent) +{ + subscribe(); +#ifdef MQTT_DEBUG + Serial.println(F("MqttClient - Successfully connected to MQTT server")); +#endif +} void MqttClient::handleClient() { reconnect(); - mqttClient->loop(); + if(mqttmsg) publishLoop(); } void MqttClient::sendUpdate(const MiLightRemoteConfig& remoteConfig, uint16_t deviceId, uint16_t groupId, const char* update) { @@ -106,7 +118,7 @@ void MqttClient::subscribe() { printf_P(PSTR("MqttClient - subscribing to topic: %s\n"), topic.c_str()); #endif - mqttClient->subscribe(topic.c_str()); + mqttClient.subscribe(topic.c_str(), 0); } void MqttClient::publish( @@ -128,26 +140,40 @@ void MqttClient::publish( printf("MqttClient - publishing update to %s\n", topic.c_str()); #endif - mqttClient->publish(topic.c_str(), message, retain); + mqttClient.publish(topic.c_str(), 0, retain, message); } -void MqttClient::publishCallback(char* topic, byte* payload, int length) { +void MqttClient::publishCallback(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t length, size_t index, size_t total) { + if(!mqttmsg) // For now irgnore new message while process last message. + { + strncpy(mqtttopic,topic,strlen(topic)); + mqtttopic[strlen(topic)] = '\0'; + strncpy(mqttpayload,payload,length); + mqttpayload[length] = '\0'; + + mqttmsg = true; + } +} + +void MqttClient::publishLoop(){ uint16_t deviceId = 0; uint8_t groupId = 0; const MiLightRemoteConfig* config = &FUT092Config; + size_t length = strlen(mqttpayload); char cstrPayload[length + 1]; - cstrPayload[length] = 0; - memcpy(cstrPayload, payload, sizeof(byte)*length); + + strncpy(cstrPayload, mqttpayload, sizeof cstrPayload - 1); + cstrPayload[length] = '\0'; #ifdef MQTT_DEBUG - printf("MqttClient - Got message on topic: %s\n%s\n", topic, cstrPayload); + printf("MqttClient - Got message on topic: %s, %s\n", mqtttopic, mqttpayload); #endif char topicPattern[settings.mqttTopicPattern.length()]; strcpy(topicPattern, settings.mqttTopicPattern.c_str()); TokenIterator patternIterator(topicPattern, settings.mqttTopicPattern.length(), '/'); - TokenIterator topicIterator(topic, strlen(topic), '/'); + TokenIterator topicIterator(mqtttopic, strlen(mqtttopic), '/'); UrlTokenBindings tokenBindings(patternIterator, topicIterator); if (tokenBindings.hasBinding("device_id")) { @@ -169,7 +195,7 @@ void MqttClient::publishCallback(char* topic, byte* payload, int length) { Serial.println(F("MqttClient - WARNING: could not find device_type token. Defaulting to FUT092.\n")); } - StaticJsonBuffer<400> buffer; + StaticJsonBuffer buffer; JsonObject& obj = buffer.parseObject(cstrPayload); #ifdef MQTT_DEBUG @@ -178,6 +204,8 @@ void MqttClient::publishCallback(char* topic, byte* payload, int length) { milightClient->prepare(config, deviceId, groupId); milightClient->update(obj); + + mqttmsg = false; } inline void MqttClient::bindTopicString( diff --git a/lib/MQTT/MqttClient.h b/lib/MQTT/MqttClient.h index cac9e393..40853f0a 100644 --- a/lib/MQTT/MqttClient.h +++ b/lib/MQTT/MqttClient.h @@ -1,8 +1,9 @@ #include #include -#include +#include #include #include +#include #ifndef MQTT_CONNECTION_ATTEMPT_FREQUENCY #define MQTT_CONNECTION_ATTEMPT_FREQUENCY 5000 @@ -11,6 +12,10 @@ #ifndef _MQTT_CLIENT_H #define _MQTT_CLIENT_H +#ifndef MQTTBUFFER +#define MQTTBUFFER 400 +#endif + class MqttClient { public: MqttClient(Settings& settings, MiLightClient*& milightClient); @@ -24,15 +29,20 @@ class MqttClient { private: WiFiClient tcpClient; - PubSubClient* mqttClient; + AsyncMqttClient mqttClient; MiLightClient*& milightClient; Settings& settings; char* domain; unsigned long lastConnectAttempt; + std::atomic mqttmsg; + char mqtttopic[MQTTBUFFER]; + char mqttpayload[MQTTBUFFER]; - bool connect(); + void connect(); void subscribe(); - void publishCallback(char* topic, byte* payload, int length); + void publishCallback(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t length, size_t index, size_t total); + void publishLoop(void); + void connectCallback(bool sessionPresent); void publish( const String& topic, const MiLightRemoteConfig& remoteConfig, diff --git a/lib/Settings/Settings.cpp b/lib/Settings/Settings.cpp index 8582b0c1..19c660e5 100644 --- a/lib/Settings/Settings.cpp +++ b/lib/Settings/Settings.cpp @@ -97,6 +97,8 @@ void Settings::patch(JsonObject& parsedSettings) { this->setIfPresent(parsedSettings, "mqtt_topic_pattern", mqttTopicPattern); this->setIfPresent(parsedSettings, "mqtt_update_topic_pattern", mqttUpdateTopicPattern); this->setIfPresent(parsedSettings, "mqtt_state_topic_pattern", mqttStateTopicPattern); + this->setIfPresent(parsedSettings, "mqtt_secure", mqttSecure); + this->setIfPresent(parsedSettings, "mqtt_server_fingerprint", mqttServerFingerprint); this->setIfPresent(parsedSettings, "discovery_port", discoveryPort); this->setIfPresent(parsedSettings, "listen_repeats", listenRepeats); this->setIfPresent(parsedSettings, "state_flush_interval", stateFlushInterval); @@ -192,6 +194,8 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) { root["mqtt_topic_pattern"] = this->mqttTopicPattern; root["mqtt_update_topic_pattern"] = this->mqttUpdateTopicPattern; root["mqtt_state_topic_pattern"] = this->mqttStateTopicPattern; + root["mqtt_secure"] = this->mqttSecure; + root["mqtt_server_fingerprint"] = this->mqttServerFingerprint; root["discovery_port"] = this->discoveryPort; root["listen_repeats"] = this->listenRepeats; root["state_flush_interval"] = this->stateFlushInterval; diff --git a/lib/Settings/Settings.h b/lib/Settings/Settings.h index 9aad3a0b..18848ba0 100644 --- a/lib/Settings/Settings.h +++ b/lib/Settings/Settings.h @@ -152,6 +152,8 @@ class Settings { String mqttTopicPattern; String mqttUpdateTopicPattern; String mqttStateTopicPattern; + bool mqttSecure; + String mqttServerFingerprint; GroupStateField *groupStateFields; size_t numGroupStateFields; uint16_t discoveryPort; diff --git a/platformio.ini b/platformio.ini index e5f2116f..0068481b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,7 +19,7 @@ lib_deps_external = ; WiFiManager https://github.com/cmidgley/WiFiManager ArduinoJson - PubSubClient + AsyncMqttClient https://github.com/ratkins/RGBConverter Hash WebSockets @@ -27,7 +27,7 @@ lib_deps_external = ESP8266WebServer extra_scripts = pre:.build_web.py -build_flags = !python .get_version.py -DMQTT_MAX_PACKET_SIZE=200 -DHTTP_UPLOAD_BUFLEN=128 -Idist -Ilib/DataStructures +build_flags = !python .get_version.py -DMQTT_MAX_PACKET_SIZE=200 -DHTTP_UPLOAD_BUFLEN=128 -Idist -Ilib/DataStructures -DASYNC_TCP_SSL_ENABLED # -D DEBUG_PRINTF # -D MQTT_DEBUG # -D MILIGHT_UDP_DEBUG diff --git a/web/src/js/script.js b/web/src/js/script.js index ce1bcf03..6df14908 100644 --- a/web/src/js/script.js +++ b/web/src/js/script.js @@ -120,6 +120,18 @@ var UI_FIELDS = [ { help: "Password to log into MQTT server", type: "string", tab: "tab-mqtt" + }, { + tag: "mqtt_secure", + friendly: "MQTT secure", + help: "Whether or not to use SSL.", + type: "mqtt_secure", + tab: "tab-mqtt" + }, { + tag: "mqtt_server_fingerprint", + friendly: "MQTT server fingerprint", + help: "Adds an acceptable server fingerprint (SHA1). Example 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12", + type: "string", + tab: "tab-mqtt" }, { tag: "radio_interface_type", friendly: "Radio interface type", @@ -833,6 +845,15 @@ $(function() { ' Disable' + '' + ''; + } else if (k.type == 'mqtt_secure') { + elmt += '
' + + ''+ + '' + + '
'; } else { elmt += ''; }