Browse Source

Fixed frontend errors

Added obligatory rainbow animation
develop
Mark van Renswoude 1 year ago
parent
commit
16743c505d
  1. 3
      gulpfile.js
  2. 245
      src/assets/html.h
  3. 6406
      src/assets/js.h
  4. 6
      src/assets/version.h
  5. 5
      src/config.h
  6. 2
      src/main.cpp
  7. 27
      src/server/api.cpp
  8. 53
      src/strip.cpp
  9. 13
      src/strip.h
  10. 2
      web/src/BaseVM.js
  11. 1
      web/src/store/index.js
  12. 4
      web/src/views/System.vue

3
gulpfile.js

@ -24,7 +24,6 @@ const webpackConfig = require('./webpack.build.js')
const config = {
assetsPath: 'web/',
distPath: 'web/dist/',
outputPath: 'src/assets/',
@ -87,7 +86,7 @@ const SCSSSrc = [
function embedHTML()
{
return gulp.src(config.assetsPath + '*.html')
return gulp.src(config.distPath + 'index.html')
.pipe(print(filepath => { return 'HTML: ' + filepath; }))
.pipe(htmlmin({
collapseWhitespace: true,

245
src/assets/html.h

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

6406
src/assets/js.h
File diff suppressed because it is too large
View File

6
src/assets/version.h

@ -6,8 +6,8 @@ const uint8_t VersionMinor = 1;
const uint8_t VersionPatch = 0;
const uint8_t VersionMetadata = 0;
const char VersionBranch[] = "develop";
const char VersionSemVer[] = "0.1.0-develop.4";
const char VersionFullSemVer[] = "0.1.0-develop.4";
const char VersionCommitDate[] = "2020-09-20";
const char VersionSemVer[] = "0.1.0-develop.8";
const char VersionFullSemVer[] = "0.1.0-develop.8";
const char VersionCommitDate[] = "2020-09-23";
#endif

5
src/config.h

@ -19,6 +19,11 @@
//#define EnableCrashAPI
#define NeoPixelBusFeature NeoGrbwFeature
#define NeoPixelBusMethod Neo800KbpsMethod
#ifdef SerialDebug
extern const uint32_t SerialDebugBaudrate;
extern const uint32_t SerialDebugStartupDelay;

2
src/main.cpp

@ -128,6 +128,8 @@ void loop()
updateWiFi();
updateLED();
strip->tick();
}

27
src/server/api.cpp

@ -13,15 +13,10 @@ void handleSetStatic(AsyncWebServerRequest *request)
{
_dln("API :: set/static");
AsyncWebParameter* rParam;
AsyncWebParameter* gParam;
AsyncWebParameter* bParam;
AsyncWebParameter* wParam;
rParam = request->getParam("r");
gParam = request->getParam("g");
bParam = request->getParam("b");
wParam = request->getParam("w");
AsyncWebParameter* rParam = request->getParam("r");
AsyncWebParameter* gParam = request->getParam("g");
AsyncWebParameter* bParam = request->getParam("b");
AsyncWebParameter* wParam = request->getParam("w");
if (rParam == nullptr || gParam == nullptr || bParam == nullptr || wParam == nullptr)
{
@ -37,7 +32,21 @@ void handleSetStatic(AsyncWebServerRequest *request)
}
void handleSetRainbow(AsyncWebServerRequest *request)
{
_dln("API :: set/rainbow");
AsyncWebParameter* speedParam = request->getParam("speed");
uint16_t speed = speedParam == nullptr ? 0 : speedParam->value().toInt();
strip->setRainbow(speed);
request->send(200);
}
void registerAPIRoutes(AsyncWebServer* server)
{
server->on("/api/set/static", HTTP_GET, handleSetStatic);
server->on("/api/set/rainbow", HTTP_GET, handleSetRainbow);
}

53
src/strip.cpp

@ -18,19 +18,70 @@ RgbwColor clearColor(0);
void Strip::init(uint16_t ledCount)
{
mBus = new NeoPixelBus<NeoGrbwFeature, Neo400KbpsMethod>(ledCount);
mBus = new NeoPixelBus<NeoPixelBusFeature, NeoPixelBusMethod>(ledCount);
mBus->Begin();
setStatic(clearColor);
}
void Strip::tick()
{
if (tickMethod != nullptr)
(*this.*tickMethod)();
}
void Strip::setStatic(const RgbwColor color)
{
tickMethod = nullptr;
_d("Strip :: setStatic, color = "); _d(color.R); _d(","); _d(color.G); _d(","); _d(color.B); _d(","); _dln(color.W);
RgbwColor corrected = colorGamma.Correct(color);
_d("Strip :: setStatic, gamma corrected = "); _d(corrected.R); _d(","); _d(corrected.G); _d(","); _d(corrected.B); _d(","); _dln(corrected.W);
mBus->ClearTo(corrected);
this->update();
}
void Strip::setRainbow(uint16_t speed)
{
lastTick = currentTime;
delay = (uint32_t)(1000.0F / (float)speed);
tickMethod = speed > 0 ? &Strip::tickRainbow : nullptr;
uint16_t ledCount = systemSettings->ledCount();
HslColor* color = new HslColor(0, 1, 0.5);
for (uint16_t ledIndex = 0; ledIndex < ledCount; ledIndex++)
{
color->H = (float)ledIndex / (float)ledCount;
mBus->SetPixelColor(ledIndex, *color);
}
delete color;
this->update();
}
void Strip::update()
{
while (!mBus->CanShow())
yield();
mBus->Show();
}
void Strip::tickRainbow()
{
uint32_t shiftAmount = (currentTime - lastTick) / delay;
if (shiftAmount == 0)
return;
lastTick = currentTime;
mBus->RotateLeft(shiftAmount);
this->update();
}

13
src/strip.h

@ -10,14 +10,25 @@
#include <NeoPixelBus.h>
#include "./config.h"
class Strip
{
private:
NeoPixelBus<NeoGrbwFeature, Neo400KbpsMethod>* mBus;
NeoPixelBus<NeoPixelBusFeature, NeoPixelBusMethod>* mBus;
void(Strip::*tickMethod)() = nullptr;
uint32_t lastTick;
uint32_t delay;
void update();
void tickRainbow();
public:
void init(uint16_t ledCount);
void tick();
void setStatic(const RgbwColor color);
void setRainbow(uint16_t speed);
};
#endif

2
web/src/BaseVM.js

@ -7,7 +7,7 @@ export default {
methods: {
setSaving(value)
{
self.$store.commit('saving', value);
this.$store.commit('saving', value);
},

1
web/src/store/index.js

@ -58,7 +58,6 @@ export default new Vuex.Store({
notifyAPIError(context, payload)
{
console.log(payload.error);
let errorMessage = '';
if (payload.error.response)

4
web/src/views/System.vue

@ -19,7 +19,7 @@
</div>
</form>
<form @submit.prevent="applySystem">
<form @submit.prevent="save">
<h3>{{ $t('system.pinsTitle') }}</h3>
<div class="horizontal">
@ -105,7 +105,7 @@ export default {
axios.post('/api/system', self.system, { retry: 10, retryDelay: 1000, headers: { 'Content-Type': 'application/json' } })
.then(response =>
{
self.showNotification(i18n.t('rebootPending'));
self.showNotification(self.$i18n.t('rebootPending'));
})
.catch(e => self.handleAPIError('error.applySystem', e))
.then(() =>

Loading…
Cancel
Save