From 536181b142617d17c8b547793b103e3f7790e9d2 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:10:25 +0800 Subject: [PATCH] Sync with esp3d 2b1 --- embedded/package-lock.json | 2178 +++++++++-------- embedded/src/index.js | 25 +- embedded/src/menu.js | 2 +- src/core/commands/ESP0.cpp | 45 +- src/core/commands/ESP102.cpp | 7 +- src/core/commands/ESP103.cpp | 7 +- src/core/commands/ESP104.cpp | 12 +- src/core/commands/ESP116.cpp | 94 + src/core/commands/ESP117.cpp | 118 + src/core/commands/ESP118.cpp | 101 + src/core/commands/ESP300.cpp | 75 + src/core/commands/ESP301.cpp | 150 ++ src/core/commands/ESP400.cpp | 86 +- src/core/commands/ESP420.cpp | 110 +- src/core/commands/ESP610.cpp | 6 +- src/core/commands/ESP710.cpp | 2 +- src/core/commands/ESP715.cpp | 2 +- src/core/commands/ESP720.cpp | 12 +- src/core/commands/ESP740.cpp | 8 +- src/core/commands/ESP780.cpp | 8 +- src/core/commands/ESP800.cpp | 2 +- src/core/commands/ESP902.cpp | 86 + src/core/commands/ESP950.cpp | 79 + src/core/esp3d.cpp | 35 +- src/core/esp3d_client_types.h | 1 + src/core/esp3d_commands.cpp | 213 +- src/core/esp3d_commands.h | 20 +- src/core/esp3d_hal.cpp | 104 +- src/core/esp3d_hal.h | 2 + src/core/esp3d_message.cpp | 188 +- src/core/esp3d_message.h | 77 +- src/core/esp3d_messageFifo.h | 168 ++ src/core/esp3d_settings.cpp | 103 +- src/core/esp3d_string.cpp | 72 +- src/core/esp3d_string.h | 3 + src/include/esp3d_defines.h | 27 +- src/include/esp3d_pins.h | 21 + src/include/esp3d_sanity.h | 29 +- src/include/esp3d_version.h | 2 +- src/modules/bluetooth/BT_service.cpp | 67 +- src/modules/bluetooth/BT_service.h | 4 +- src/modules/camera/camera.cpp | 2 + src/modules/display/display.cpp | 2 +- src/modules/ethernet/ethconfig.cpp | 173 +- src/modules/ethernet/ethconfig.h | 3 +- src/modules/filesystem/sd/sd_sdfat2_esp32.cpp | 18 +- .../filesystem/sd/sd_sdfat2_esp8266.cpp | 11 +- src/modules/ftp/FtpServer.h | 4 +- src/modules/gcode_host/gcode_host.cpp | 43 +- src/modules/gcode_host/gcode_host.h | 26 +- src/modules/gcode_host/gcode_script_fifo.h | 134 + src/modules/http/embedded.h | 1705 ++++++------- src/modules/http/favicon.h | 56 +- src/modules/http/http_server.cpp | 11 +- .../lua_interpreter_service.cpp | 513 +++- .../lua_interpreter/lua_interpreter_service.h | 65 +- src/modules/mDNS/mDNS.cpp | 5 + src/modules/mks/mks_service.cpp | 2 +- src/modules/network/netconfig.cpp | 44 +- src/modules/network/netconfig.h | 1 + .../notifications/notifications_service.cpp | 57 + .../notifications/notifications_service.h | 1 + src/modules/serial/serial_service.cpp | 433 +--- src/modules/serial/serial_service.h | 29 +- src/modules/serial/serial_service_esp32.cpp | 259 ++ src/modules/serial/serial_service_esp8266.cpp | 278 +++ src/modules/serial2socket/serial2socket.cpp | 6 +- src/modules/telnet/telnet_server.cpp | 78 +- src/modules/telnet/telnet_server.h | 9 +- src/modules/time/time_service.cpp | 23 +- src/modules/time/time_service.h | 2 + src/modules/update/update_service.cpp | 84 +- src/modules/usb-serial/usb_serial_service.cpp | 511 ++++ src/modules/usb-serial/usb_serial_service.h | 87 + src/modules/webdav/webdav_server.h | 4 +- src/modules/websocket/websocket_server.cpp | 63 +- src/modules/websocket/websocket_server.h | 2 + src/modules/wifi/wificonfig.cpp | 40 +- src/modules/wifi/wificonfig.h | 1 + 79 files changed, 6146 insertions(+), 2990 deletions(-) create mode 100644 src/core/commands/ESP116.cpp create mode 100644 src/core/commands/ESP117.cpp create mode 100644 src/core/commands/ESP118.cpp create mode 100644 src/core/commands/ESP300.cpp create mode 100644 src/core/commands/ESP301.cpp create mode 100644 src/core/commands/ESP902.cpp create mode 100644 src/core/commands/ESP950.cpp create mode 100644 src/core/esp3d_messageFifo.h create mode 100644 src/modules/gcode_host/gcode_script_fifo.h create mode 100644 src/modules/serial/serial_service_esp32.cpp create mode 100644 src/modules/serial/serial_service_esp8266.cpp create mode 100644 src/modules/usb-serial/usb_serial_service.cpp create mode 100644 src/modules/usb-serial/usb_serial_service.h diff --git a/embedded/package-lock.json b/embedded/package-lock.json index 4c0c77c..6549dcd 100644 --- a/embedded/package-lock.json +++ b/embedded/package-lock.json @@ -48,80 +48,20 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/code-frame/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/code-frame/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/compat-data": { "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", @@ -162,15 +102,17 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", + "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.23.0", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" + "@babel/parser": "^7.26.5", + "@babel/types": "^7.26.5", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" @@ -441,19 +383,21 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -495,87 +439,15 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "node_modules/@babel/parser": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", + "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", "dev": true, + "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "@babel/types": "^7.26.5" }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", - "dev": true, "bin": { "parser": "bin/babel-parser.js" }, @@ -1767,34 +1639,33 @@ "dev": true }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", - "debug": "^4.1.0", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", + "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.5", + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.5", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -1802,14 +1673,14 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", + "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -1854,14 +1725,15 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -1877,10 +1749,11 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1902,10 +1775,11 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -1962,30 +1836,33 @@ } }, "node_modules/@types/eslint": { - "version": "8.44.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", - "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, "node_modules/@types/eslint-scope": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz", - "integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "dev": true, + "license": "MIT", "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, "node_modules/@types/estree": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz", - "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==", - "dev": true + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/express": { "version": "4.17.13", @@ -2154,148 +2031,163 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, + "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, + "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -2339,13 +2231,15 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/abbrev": { "version": "1.1.1", @@ -2367,10 +2261,11 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -2378,15 +2273,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -2634,21 +2520,22 @@ } }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -2662,6 +2549,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2671,6 +2559,7 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -2679,7 +2568,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bonjour-service": { "version": "1.1.1", @@ -2716,21 +2606,22 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "dev": true, "funding": [ { @@ -2746,11 +2637,12 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -2782,18 +2674,37 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "node_modules/call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", "dev": true, + "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2810,9 +2721,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001543", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", - "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==", + "version": "1.0.30001695", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", + "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", "dev": true, "funding": [ { @@ -2827,7 +2738,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", @@ -3132,6 +3044,7 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3143,10 +3056,11 @@ "dev": true }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3188,10 +3102,11 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3386,6 +3301,7 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -3489,17 +3405,34 @@ "tslib": "^2.0.3" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.540", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.540.tgz", - "integrity": "sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==", - "dev": true + "version": "1.5.84", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz", + "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { "version": "8.0.0", @@ -3517,19 +3450,21 @@ } }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz", + "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -3559,17 +3494,51 @@ "node": ">=4" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3580,15 +3549,6 @@ "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "dev": true }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -3646,6 +3606,7 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3701,37 +3662,38 @@ } }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -3740,6 +3702,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express-fileupload": { @@ -3833,10 +3799,11 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3845,13 +3812,14 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -3867,6 +3835,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -3875,13 +3844,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/finalhandler/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3917,9 +3888,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "dev": true, "funding": [ { @@ -3927,6 +3898,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -3950,15 +3922,17 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", - "dev": true + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz", + "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==", + "dev": true, + "license": "Unlicense" }, "node_modules/fs.realpath": { "version": "1.0.0", @@ -3981,10 +3955,14 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gensync": { "version": "1.0.0-beta.2", @@ -4005,20 +3983,44 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "dev": true, + "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "function-bind": "^1.1.2", + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -4055,7 +4057,8 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/globals": { "version": "11.12.0", @@ -4091,11 +4094,25 @@ "node": ">=0.10.0" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" }, "node_modules/handle-thing": { "version": "2.0.1", @@ -4124,11 +4141,12 @@ "node": ">=8" } }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4136,16 +4154,17 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/he": { @@ -4379,6 +4398,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -4395,6 +4415,7 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4404,6 +4425,7 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4429,10 +4451,11 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz", - "integrity": "sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -4466,6 +4489,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -4618,6 +4642,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -4775,18 +4800,20 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-parse-even-better-errors": { @@ -4912,32 +4939,48 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/memfs": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz", - "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, + "license": "Unlicense", "dependencies": { - "fs-monkey": "1.0.3" + "fs-monkey": "^1.0.4" }, "engines": { "node": ">= 4.0.0" } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -4955,13 +4998,14 @@ } }, "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -4972,6 +5016,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5066,9 +5111,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -5076,6 +5121,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -5118,10 +5164,11 @@ } }, "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "dev": true, + "license": "MIT" }, "node_modules/nodemon": { "version": "3.0.1", @@ -5272,10 +5319,14 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5291,6 +5342,7 @@ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -5475,16 +5527,18 @@ "dev": true }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", @@ -5691,12 +5745,13 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -5724,10 +5779,11 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -5981,13 +6037,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/schema-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", - "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", + "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", @@ -5995,7 +6053,7 @@ "ajv-keywords": "^5.1.0" }, "engines": { - "node": ">= 12.13.0" + "node": ">= 10.13.0" }, "funding": { "type": "opencollective", @@ -6064,10 +6122,11 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -6092,6 +6151,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -6100,13 +6160,25 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/send/node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6115,22 +6187,25 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/send/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -6196,15 +6271,16 @@ "dev": true }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -6214,7 +6290,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/shallow-clone": { "version": "3.0.1", @@ -6258,15 +6335,77 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6504,10 +6643,11 @@ } }, "node_modules/terser": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz", - "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==", + "version": "5.37.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz", + "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -6522,16 +6662,17 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz", + "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" + "schema-utils": "^4.3.0", + "serialize-javascript": "^6.0.2", + "terser": "^5.31.1" }, "engines": { "node": ">= 10.13.0" @@ -6560,6 +6701,7 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -6569,29 +6711,12 @@ "node": ">= 10.13.0" } }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/terser-webpack-plugin/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -6614,20 +6739,12 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -6640,6 +6757,7 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } @@ -6676,6 +6794,7 @@ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -6735,14 +6854,15 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "dev": true, "funding": [ { @@ -6758,9 +6878,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -6818,10 +6939,11 @@ } }, "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -6840,34 +6962,34 @@ } }, "node_modules/webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", - "dev": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -6949,13 +7071,14 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz", - "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, + "license": "MIT", "dependencies": { "colorette": "^2.0.10", - "memfs": "^3.4.1", + "memfs": "^3.4.3", "mime-types": "^2.1.31", "range-parser": "^1.2.1", "schema-utils": "^4.0.0" @@ -7094,10 +7217,11 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -7222,10 +7346,11 @@ "dev": true }, "node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.3.0" }, @@ -7297,65 +7422,14 @@ } }, "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "requires": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" } }, "@babel/compat-data": { @@ -7388,15 +7462,16 @@ } }, "@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", + "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", "dev": true, "requires": { - "@babel/types": "^7.23.0", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" + "@babel/parser": "^7.26.5", + "@babel/types": "^7.26.5", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" } }, "@babel/helper-annotate-as-pure": { @@ -7592,15 +7667,15 @@ } }, "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true }, "@babel/helper-validator-option": { @@ -7631,75 +7706,15 @@ "@babel/types": "^7.23.0" } }, - "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "@babel/parser": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", + "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@babel/types": "^7.26.5" } }, - "@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", - "dev": true - }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.22.15", "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", @@ -8497,43 +8512,39 @@ } }, "@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" } }, "@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", + "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", - "debug": "^4.1.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.5", + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.5", + "debug": "^4.3.1", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", + "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" } }, "@discoveryjs/json-ext": { @@ -8566,14 +8577,14 @@ } }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, "requires": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" } }, "@jridgewell/resolve-uri": { @@ -8583,9 +8594,9 @@ "dev": true }, "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true }, "@jridgewell/source-map": { @@ -8605,9 +8616,9 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.1.0", @@ -8665,9 +8676,9 @@ } }, "@types/eslint": { - "version": "8.44.3", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", - "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "requires": { "@types/estree": "*", @@ -8675,9 +8686,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz", - "integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "dev": true, "requires": { "@types/eslint": "*", @@ -8685,9 +8696,9 @@ } }, "@types/estree": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz", - "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "@types/express": { @@ -8857,148 +8868,148 @@ "dev": true }, "@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, @@ -9054,18 +9065,11 @@ } }, "acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true }, - "acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "requires": {} - }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -9246,21 +9250,21 @@ "dev": true }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, "requires": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -9325,24 +9329,24 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" } }, "buffer-from": { @@ -9366,14 +9370,24 @@ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dev": true, + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + } + }, + "call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" } }, "camel-case": { @@ -9387,9 +9401,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001543", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", - "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==", + "version": "1.0.30001695", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", + "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", "dev": true }, "chalk": { @@ -9622,9 +9636,9 @@ "dev": true }, "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true }, "cookie-signature": { @@ -9655,9 +9669,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -9869,6 +9883,17 @@ "tslib": "^2.0.3" } }, + "dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -9876,9 +9901,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.540", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.540.tgz", - "integrity": "sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==", + "version": "1.5.84", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz", + "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==", "dev": true }, "emoji-regex": { @@ -9894,15 +9919,15 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true }, "enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz", + "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -9921,16 +9946,37 @@ "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true }, + "es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true + }, "es-module-lexer": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, + "es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "requires": { + "es-errors": "^1.3.0" + } + }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true }, "escape-html": { @@ -9939,12 +9985,6 @@ "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "dev": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -10028,37 +10068,37 @@ } }, "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -10141,22 +10181,22 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -10209,9 +10249,9 @@ } }, "follow-redirects": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "dev": true }, "forwarded": { @@ -10227,9 +10267,9 @@ "dev": true }, "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz", + "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==", "dev": true }, "fs.realpath": { @@ -10246,9 +10286,9 @@ "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true }, "gensync": { @@ -10264,15 +10304,31 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "dev": true, + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "function-bind": "^1.1.2", + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + } + }, + "get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" } }, "glob": { @@ -10331,10 +10387,16 @@ } } }, + "gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true + }, "graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "handle-thing": { @@ -10358,18 +10420,21 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true - }, "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "dev": true }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "requires": { + "function-bind": "^1.1.2" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -10585,9 +10650,9 @@ } }, "http-proxy-middleware": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz", - "integrity": "sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, "requires": { "@types/http-proxy": "^1.17.8", @@ -10830,9 +10895,9 @@ "dev": true }, "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true }, "json-parse-even-better-errors": { @@ -10934,6 +10999,12 @@ "semver": "^6.0.0" } }, + "math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -10941,18 +11012,18 @@ "dev": true }, "memfs": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz", - "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "requires": { - "fs-monkey": "1.0.3" + "fs-monkey": "^1.0.4" } }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true }, "merge-stream": { @@ -10968,13 +11039,13 @@ "dev": true }, "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" } }, "mime": { @@ -11045,9 +11116,9 @@ } }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true }, "negotiator": { @@ -11079,9 +11150,9 @@ "dev": true }, "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true }, "nodemon": { @@ -11192,9 +11263,9 @@ "dev": true }, "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "dev": true }, "obuf": { @@ -11346,15 +11417,15 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "dev": true }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true }, "picomatch": { @@ -11495,12 +11566,12 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "randombytes": { @@ -11519,9 +11590,9 @@ "dev": true }, "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, "requires": { "bytes": "3.1.2", @@ -11719,9 +11790,9 @@ "dev": true }, "schema-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", - "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", + "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", @@ -11781,9 +11852,9 @@ "dev": true }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, "requires": { "debug": "2.6.9", @@ -11824,6 +11895,12 @@ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -11839,9 +11916,9 @@ } }, "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -11904,15 +11981,15 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "setprototypeof": { @@ -11952,14 +12029,51 @@ "dev": true }, "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + } + }, + "side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + } + }, + "side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + } + }, + "side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" } }, "signal-exit": { @@ -12147,9 +12261,9 @@ "dev": true }, "terser": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz", - "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==", + "version": "5.37.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz", + "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.3", @@ -12167,16 +12281,16 @@ } }, "terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz", + "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==", "dev": true, "requires": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" + "schema-utils": "^4.3.0", + "serialize-javascript": "^6.0.2", + "terser": "^5.31.1" }, "dependencies": { "jest-worker": { @@ -12190,17 +12304,6 @@ "supports-color": "^8.0.0" } }, - "schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -12218,12 +12321,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -12311,13 +12408,13 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "dev": true, "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" } }, "uri-js": { @@ -12360,9 +12457,9 @@ "dev": true }, "watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, "requires": { "glob-to-regexp": "^0.4.1", @@ -12379,34 +12476,33 @@ } }, "webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", - "dev": true, - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", + "dev": true, + "requires": { + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "dependencies": { @@ -12458,13 +12554,13 @@ } }, "webpack-dev-middleware": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz", - "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, "requires": { "colorette": "^2.0.10", - "memfs": "^3.4.1", + "memfs": "^3.4.3", "mime-types": "^2.1.31", "range-parser": "^1.2.1", "schema-utils": "^4.0.0" @@ -12554,9 +12650,9 @@ } }, "ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "dev": true, "requires": {} } @@ -12628,9 +12724,9 @@ "dev": true }, "ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "dev": true, "requires": {} }, diff --git a/embedded/src/index.js b/embedded/src/index.js index 5ee9ce5..2c8c010 100644 --- a/embedded/src/index.js +++ b/embedded/src/index.js @@ -350,7 +350,8 @@ function processFWJson(text) { } if (json.WebUpdate == "Enabled") firmware.classList.remove("hide"); - hostpath = json.HostPath; + if (typeof json.HostPath != "undefined") hostpath = json.HostPath; + console.log("HostPath: " + hostpath); if (json.WiFiMode && json.WebSocketIP) { if (isLimitedEnvironment(json.WiFiMode)) { let address = @@ -404,7 +405,9 @@ function startSocket(ip, port, sync) { msg += String.fromCharCode(bytes[i]); if (bytes[i] == 10 || bytes[i] == 13) { wsMsg += msg; - consoleContentUpdate(wsMsg); + if (!wsMsg.startsWith("ESP3D says: command forwarded")) { + consoleContentUpdate(wsMsg); + } wsMsg = ""; msg = ""; } @@ -534,6 +537,13 @@ function dirIcon(plus = false) { } function dispatchFileStatus(jsonresponse) { let json; + let currentpath = currentPath; + if (!currentpath.endsWith("/")) currentpath += "/"; + currentpath += hostpath; + if (!currentpath.endsWith("/")) currentpath += "/"; + let currentpath2 = currentpath.replaceAll("//", "/"); + currentpath = currentpath2; + console.log("currentpath: " + currentpath); let eventslisteners = []; let showESP3Dbutton = false; try { @@ -606,7 +616,7 @@ function dispatchFileStatus(jsonresponse) { for (let i1 = 0; i1 < json.files.length; i1++) { if (String(json.files[i1].size) != "-1") { if ( - currentPath == hostpath && + currentPath == "/" && (json.files[i1].name == "index.html.gz" || json.files[i1].name == "index.html") ) { @@ -660,12 +670,12 @@ function dispatchFileStatus(jsonresponse) { let url = new URL( "http://" + window.location.host + - currentPath + - "/" + + currentpath + eventslisteners[i].target ); window.open(url, "_blank"); }); + break; case "filedel": document @@ -768,6 +778,11 @@ function uploadFiles() { formData.append("path", currentPath); let currentpath = currentPath; if (!currentpath.endsWith("/")) currentpath += "/"; + currentpath += hostpath; + if (!currentpath.endsWith("/")) currentpath += "/"; + let currentpath2 = currentpath.replaceAll("//", "/"); + currentpath = currentpath2; + console.log(currentpath); for (let i3 = 0; i3 < files.length; i3++) { let file = files[i3]; let arg = currentpath + file.name + "S"; diff --git a/embedded/src/menu.js b/embedded/src/menu.js index 1437535..73be241 100644 --- a/embedded/src/menu.js +++ b/embedded/src/menu.js @@ -11,7 +11,7 @@ function initMenus() { }); document.getElementById("hlpLink").addEventListener("click", function () { - window.open("https://github.com/luc-github/ESP3DLib/wiki", "_blank"); + window.open("https://esp3d.io/ESP3DLib/Version_3.X/documentation/", "_blank"); }); } diff --git a/src/core/commands/ESP0.cpp b/src/core/commands/ESP0.cpp index 8751549..47ba361 100644 --- a/src/core/commands/ESP0.cpp +++ b/src/core/commands/ESP0.cpp @@ -26,15 +26,11 @@ const char* help[] = { "[ESP100](SSID) - display/set STA SSID", "[ESP101](Password) - set STA password", #endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) "[ESP102](Mode) - display/set STA IP mode (DHCP/STATIC)", "[ESP103](IP=xxxx MSK=xxxx GW=xxxx) - display/set STA IP/Mask/GW", -#endif // WIFI_FEATURE || ETH_FEATURE -#if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) "[ESP104](State) - display/set sta fallback mode which can be BT, SETUP, " "OFF", -#endif // WIFI_FEATURE || BLUETOOTH_FEATURE || ETH_FEATURE -#if defined(WIFI_FEATURE) "[ESP105](SSID) - display/set AP SSID", "[ESP106](Password) - set AP password", "[ESP107](IP) - display/set AP IP", @@ -53,6 +49,11 @@ const char* help[] = { "[ESP115](State) - display/set immediate Network state which can be ON, " "OFF", #endif // WIFI_FEATURE || ETH_FEATURE || BT_FEATURE +#if defined(ETH_FEATURE) + "[ESP116](Mode) - display/set ETH STA IP mode (DHCP/STATIC)", + "[ESP117](IP=xxxx MSK=xxxx GW=xxxx) - display/set ETH STA IP/Mask/GW", + "[ESP118](State) - display/set eth sta fallback mode which can be BT, Off", +#endif // ETH_FEATURE #if defined(HTTP_FEATURE) "[ESP120](State) - display/set HTTP state which can be ON, OFF", "[ESP121](Port) - display/set HTTP port ", @@ -116,6 +117,10 @@ const char* help[] = { "[ESP250]F=(frequency) D=(duration) - play sound on buzzer", #endif // BUZZER_DEVICE "[ESP290](delay in ms) - do a pause", +#if defined(ESP_LUA_INTERPRETER_FEATURE) + "[ESP300] - execute Lua script", + "[ESP301]action= - query and control ESP300 execution", +#endif // ESP_LUA_INTERPRETER_FEATURE "[ESP400] - display ESP3D settings in JSON", "[ESP401]P=(position) T=(type) V=(value) - Set specific setting", #ifdef SD_UPDATE_FEATURE @@ -138,7 +143,7 @@ const char* help[] = { #endif // AUTHENTICATION_FEATURE #if defined(NOTIFICATION_FEATURE) "[ESP600](message) - send notification", - "[ESP610]type=(NONE/PUSHOVER/EMAIL/LINE/TELEGRAM/IFTTT/HOMEASSISTANT) " + "[ESP610]type=(NONE/PUSHOVER/EMAIL/LINE/TELEGRAM/IFTTT/HOMEASSISTANT/WHATSAPP) " "(T1=xxx) (T2=xxx) " "(TS=xxx) - display/set Notification settings", "[ESP620]URL=http://XXXXXX - send GET notification", @@ -174,6 +179,9 @@ const char* help[] = { "[ESP900](ENABLE/DISABLE) - display/set serial state", "[ESP901] - display/set serial baud rate", #endif // COMMUNICATION_PROTOCOL != SOCKET_SERIAL +#if defined(USB_SERIAL_FEATURE) + "[ESP902] - display/set USB Serial baud rate", +#endif // defined(USB_SERIAL_FEATURE) #ifdef BUZZER_DEVICE "[ESP910](ENABLE/DISABLE) - display/set buzzer state", #endif // BUZZER_DEVICE @@ -181,6 +189,9 @@ const char* help[] = { "[ESP930](ENABLE/DISABLE/CLOSE) - display/set serial bridge state", "[ESP931] - display/set serial bridge baud rate", #endif // defined(ESP_SERIAL_BRIDGE_OUTPUT) +#if defined(USB_SERIAL_FEATURE) + "[ESP950] - display/set client output", +#endif // defined(USB_SERIAL_FEATURE) #if defined(ARDUINO_ARCH_ESP32) && \ (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || \ CONFIG_IDF_TARGET_ESP32C3) @@ -192,13 +203,9 @@ const uint cmdlist[] = { #if defined(WIFI_FEATURE) 100, 101, #endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) 102, 103, -#endif // WIFI_FEATURE || ETH_FEATURE -#if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) 104, -#endif // WIFI_FEATURE || BLUETOOTH_FEATURE || ETH_FEATURE -#if defined(WIFI_FEATURE) 105, 106, 107, 108, #endif // WIFI_FEATURE #if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) @@ -210,6 +217,9 @@ const uint cmdlist[] = { #if defined(WIFI_FEATURE) || defined(ETH_FEATURE) || defined(BT_FEATURE) 112, 114, 115, #endif // WIFI_FEATURE || ETH_FEATURE || BT_FEATURE +#if defined(ETH_FEATURE) + 116, 117, 118, +#endif // ETH_FEATURE #if defined(HTTP_FEATURE) 120, 121, #endif // HTTP_FEATURE @@ -257,7 +267,11 @@ const uint cmdlist[] = { #ifdef BUZZER_DEVICE 250, #endif // BUZZER_DEVICE - 290, 400, 401, + 290, +#if defined(ESP_LUA_INTERPRETER_FEATURE) + 300, 301, +#endif // ESP_LUA_INTERPRETER_FEATURE + 400, 401, #ifdef SD_UPDATE_FEATURE 402, #endif // SD_UPDATE_FEATURE @@ -296,13 +310,18 @@ const uint cmdlist[] = { #if COMMUNICATION_PROTOCOL != SOCKET_SERIAL 900, 901, #endif // COMMUNICATION_PROTOCOL != SOCKET_SERIAL +#if defined(USB_SERIAL_FEATURE) + 902, +#endif // defined(USB_SERIAL_FEATURE) #ifdef BUZZER_DEVICE 910, - #endif // BUZZER_DEVICE #if defined(ESP_SERIAL_BRIDGE_OUTPUT) 930, 931, #endif // defined(ESP_SERIAL_BRIDGE_OUTPUT) +#if defined(USB_SERIAL_FEATURE) + 950, +#endif // defined(USB_SERIAL_FEATURE) #if defined(ARDUINO_ARCH_ESP32) && \ (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || \ CONFIG_IDF_TARGET_ESP32C3) diff --git a/src/core/commands/ESP102.cpp b/src/core/commands/ESP102.cpp index 731d20b..a51b947 100644 --- a/src/core/commands/ESP102.cpp +++ b/src/core/commands/ESP102.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "../../include/esp3d_config.h" -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) #include "../../modules/network/netconfig.h" #include "../esp3d_commands.h" #include "../esp3d_settings.h" @@ -26,9 +26,6 @@ #if defined(WIFI_FEATURE) #include "../../modules/wifi/wificonfig.h" #endif // WIFI_FEATURE -#if defined(ETH_FEATURE) -#include "../../modules/ethernet/ethconfig.h" -#endif // ETH_FEATURE #include "../../modules/authentication/authentication_service.h" #define COMMAND_ID 102 // Change STA IP mode (DHCP/STATIC) @@ -97,4 +94,4 @@ void ESP3DCommands::ESP102(int cmd_params_pos, ESP3DMessage* msg) { } } -#endif // WIFI_FEATURE || ETH_FEATURE +#endif // WIFI_FEATURE diff --git a/src/core/commands/ESP103.cpp b/src/core/commands/ESP103.cpp index 4820c14..cb2acc2 100644 --- a/src/core/commands/ESP103.cpp +++ b/src/core/commands/ESP103.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "../../include/esp3d_config.h" -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) #include "../../modules/network/netconfig.h" #include "../esp3d_commands.h" #include "../esp3d_settings.h" @@ -26,9 +26,6 @@ #if defined(WIFI_FEATURE) #include "../../modules/wifi/wificonfig.h" #endif // WIFI_FEATURE -#if defined(ETH_FEATURE) -#include "../../modules/ethernet/ethconfig.h" -#endif // ETH_FEATURE #include "../../modules/authentication/authentication_service.h" #define COMMAND_ID 103 // Change STA IP/Mask/GW @@ -121,4 +118,4 @@ void ESP3DCommands::ESP103(int cmd_params_pos, ESP3DMessage* msg) { } } -#endif // WIFI_FEATURE || ETH_FEATURE +#endif // WIFI_FEATURE diff --git a/src/core/commands/ESP104.cpp b/src/core/commands/ESP104.cpp index 651aa05..0630483 100644 --- a/src/core/commands/ESP104.cpp +++ b/src/core/commands/ESP104.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "../../include/esp3d_config.h" -#if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) #include "../../modules/authentication/authentication_service.h" #include "../../modules/network/netconfig.h" #include "../esp3d_commands.h" @@ -54,11 +54,6 @@ void ESP3DCommands::ESP104(int cmd_params_pos, ESP3DMessage* msg) { ok_msg = "BT"; } else #endif // BLUETOOTH_FEATURE -#if defined(WIFI_FEATURE) - if (byteValue == (uint8_t)ESP_AP_SETUP) { - ok_msg = "CONFIG"; - } else -#endif // WIFI_FEATURE if (byteValue == (uint8_t)ESP_NO_NETWORK) { ok_msg = "OFF"; } else { @@ -76,11 +71,6 @@ void ESP3DCommands::ESP104(int cmd_params_pos, ESP3DMessage* msg) { byteValue = (uint8_t)ESP_BT; } else #endif // BLUETOOTH_FEATURE -#if defined(WIFI_FEATURE) - if (tmpstr == "CONFIG") { - byteValue = (uint8_t)ESP_AP_SETUP; - } else -#endif // WIFI_FEATURE if (tmpstr == "OFF") { byteValue = (uint8_t)ESP_NO_NETWORK; } else { diff --git a/src/core/commands/ESP116.cpp b/src/core/commands/ESP116.cpp new file mode 100644 index 0000000..221eaa4 --- /dev/null +++ b/src/core/commands/ESP116.cpp @@ -0,0 +1,94 @@ +/* + ESP116.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(ETH_FEATURE) +#include "../../modules/network/netconfig.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" +#include "../../modules/ethernet/ethconfig.h" +#include "../../modules/authentication/authentication_service.h" +#define COMMAND_ID 116 +// Change ETH STA IP mode (DHCP/STATIC) +//[ESP116][json=no] [pwd=] +void ESP3DCommands::ESP116(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; + uint8_t byteValue = (uint8_t)-1; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + byteValue = ESP3DSettings::readByte(ESP_ETH_STA_IP_MODE); + if (byteValue == static_cast(DHCP_MODE)) { + ok_msg = "DHCP"; + } else if (byteValue == static_cast(STATIC_IP_MODE)) { + ok_msg = "STATIC"; + } else { + ok_msg = "Unknown:" + String(byteValue); + } + } else { +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level != ESP3DAuthenticationLevel::admin) { + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + if (tmpstr == "DHCP") { + byteValue = static_cast(DHCP_MODE); + } else if (tmpstr == "STATIC") { + byteValue = static_cast(STATIC_IP_MODE); + } else { + byteValue = (uint8_t)-1; // unknow flag so put outof range value + } + esp3d_log("got %s param for a value of %d, is valid %d", tmpstr.c_str(), + byteValue, + ESP3DSettings::isValidByteSetting(byteValue, ESP_ETH_STA_IP_MODE)); + if (ESP3DSettings::isValidByteSetting(byteValue, ESP_ETH_STA_IP_MODE)) { + esp3d_log("Value %d is valid", byteValue); + if (!ESP3DSettings::writeByte(ESP_ETH_STA_IP_MODE, byteValue)) { + hasError = true; + error_msg = "Set value failed"; + } + } else { + hasError = true; + error_msg = "Invalid parameter"; + } + } + + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // ETH_FEATURE diff --git a/src/core/commands/ESP117.cpp b/src/core/commands/ESP117.cpp new file mode 100644 index 0000000..f3282f8 --- /dev/null +++ b/src/core/commands/ESP117.cpp @@ -0,0 +1,118 @@ +/* + ESP117.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(ETH_FEATURE) +#include "../../modules/network/netconfig.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" +#include "../../modules/ethernet/ethconfig.h" +#include "../../modules/authentication/authentication_service.h" +#define COMMAND_ID 117 +// Change ETH STA IP/Mask/GW +//[ESP117]IP= MSK= GW= DNS= [json=no] [pwd= +void ESP3DCommands::ESP117(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; + const char* cmdList[] = {"IP=", "MSK=", "GW=", "DNS="}; + uint8_t cmdListSize = sizeof(cmdList) / sizeof(char*); + const ESP3DSettingIndex settingIndex[] = { + ESP_ETH_STA_IP_VALUE, ESP_ETH_STA_MASK_VALUE, ESP_ETH_STA_GATEWAY_VALUE, + ESP_ETH_STA_DNS_VALUE}; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + if (json) { + ok_msg = "{\"ip\":\""; + } else { + ok_msg = "IP: "; + } + ok_msg += ESP3DSettings::readIPString(ESP_ETH_STA_IP_VALUE); + if (json) { + ok_msg += "\",\"gw\":\""; + } else { + ok_msg += ", GW: "; + } + ok_msg += ESP3DSettings::readIPString(ESP_ETH_STA_GATEWAY_VALUE); + if (json) { + ok_msg += "\",\"msk\":\""; + } else { + ok_msg += ", MSK: "; + } + ok_msg += ESP3DSettings::readIPString(ESP_ETH_STA_MASK_VALUE); + if (json) { + ok_msg += "\",\"dns\":\""; + } else { + ok_msg += ", DNS: "; + } + ok_msg += ESP3DSettings::readIPString(ESP_ETH_STA_DNS_VALUE); + if (json) { + ok_msg += "\"}"; + } + } else { +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level != ESP3DAuthenticationLevel::admin) { + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + bool hasParam = false; + for (uint8_t i = 0; i < cmdListSize; i++) { + tmpstr = get_param(msg, cmd_params_pos, cmdList[i]); + if (tmpstr.length() != 0) { + hasParam = true; + if (ESP3DSettings::isValidIPStringSetting(tmpstr.c_str(), + settingIndex[i])) { + esp3d_log("Value %s is valid", tmpstr.c_str()); + if (!ESP3DSettings::writeIPString(settingIndex[i], tmpstr.c_str())) { + hasError = true; + error_msg = "Set value failed"; + } + } else { + hasError = true; + error_msg = "Invalid parameter"; + } + } + } + if (!hasParam && !hasError) { + hasError = true; + error_msg = "Invalid parameter"; + } + } + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // ETH_FEATURE diff --git a/src/core/commands/ESP118.cpp b/src/core/commands/ESP118.cpp new file mode 100644 index 0000000..23fd06a --- /dev/null +++ b/src/core/commands/ESP118.cpp @@ -0,0 +1,101 @@ +/* + ESP118.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(ETH_FEATURE) +#include "../../modules/authentication/authentication_service.h" +#include "../../modules/network/netconfig.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" + +#define COMMAND_ID 118 +// Set ETH STA fallback mode state at boot which can be BT, WIFI-SETUP, OFF +//[ESP118] json= pwd= +void ESP3DCommands::ESP118(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; + uint8_t byteValue = (uint8_t)-1; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + byteValue = ESP3DSettings::readByte(ESP_ETH_STA_FALLBACK_MODE); +#if defined(BLUETOOTH_FEATURE) + if (byteValue == (uint8_t)ESP_BT) { + ok_msg = "BT"; + } else +#endif // BLUETOOTH_FEATURE + if (byteValue == (uint8_t)ESP_NO_NETWORK) { + ok_msg = "OFF"; + } else { + ok_msg = "Unknown"; + } + } else { +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level != ESP3DAuthenticationLevel::admin) { + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE +#if defined(BLUETOOTH_FEATURE) + if (tmpstr == "BT") { + byteValue = (uint8_t)ESP_BT; + } else +#endif // BLUETOOTH_FEATURE + if (tmpstr == "OFF") { + byteValue = (uint8_t)ESP_NO_NETWORK; + } else { + byteValue = (uint8_t)-1; // unknow flag so put outof range value + } + esp3d_log( + "got %s param for a value of %d, is valid %d", tmpstr.c_str(), + byteValue, + ESP3DSettings::isValidByteSetting(byteValue, ESP_ETH_STA_FALLBACK_MODE)); + if (ESP3DSettings::isValidByteSetting(byteValue, ESP_ETH_STA_FALLBACK_MODE)) { + esp3d_log("Value %d is valid", byteValue); + if (!ESP3DSettings::writeByte(ESP_ETH_STA_FALLBACK_MODE, byteValue)) { + hasError = true; + error_msg = "Set value failed"; + } + } else { + hasError = true; + error_msg = "Invalid parameter"; + } + } + + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // ETH_FEATURE diff --git a/src/core/commands/ESP300.cpp b/src/core/commands/ESP300.cpp new file mode 100644 index 0000000..88f8256 --- /dev/null +++ b/src/core/commands/ESP300.cpp @@ -0,0 +1,75 @@ +/* + ESP300.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(ESP_LUA_INTERPRETER_FEATURE) +#include "../../modules/authentication/authentication_service.h" +#include "../../modules/lua_interpreter/lua_interpreter_service.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" + +#define COMMAND_ID 300 + +// process local file +//[ESP300] +void ESP3DCommands::ESP300(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + hasError = true; + error_msg = "Missing parameter"; + esp3d_log_e("%s", error_msg.c_str()); + } else { + if (!esp3d_lua_interpreter.isScriptRunning()) { + if (esp3d_lua_interpreter.executeScriptAsync(tmpstr.c_str())) { + esp3d_log("Processing %s", tmpstr.c_str()); + } else { + hasError = true; + error_msg = "Error processing script"; + esp3d_log_e("%s", error_msg.c_str()); + } + } else { + hasError = true; + error_msg = "Script already running"; + } + } + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // ESP_LUA_INTERPRETER_FEATURE diff --git a/src/core/commands/ESP301.cpp b/src/core/commands/ESP301.cpp new file mode 100644 index 0000000..d1b9902 --- /dev/null +++ b/src/core/commands/ESP301.cpp @@ -0,0 +1,150 @@ +/* + ESP301.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +// #define ESP_LOG_FEATURE LOG_OUTPUT_SERIAL0 +#include "../../include/esp3d_config.h" +#if defined(ESP_LUA_INTERPRETER_FEATURE) +#include "../../modules/authentication/authentication_service.h" +#include "../../modules/lua_interpreter/lua_interpreter_service.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" +#include "../esp3d_string.h" + + +#define COMMAND_ID 301 + +// Query and Control ESP300 execution +//[ESP301]action= +void ESP3DCommands::ESP301(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + String error = esp3d_lua_interpreter.getLastError(); + if (!esp3d_lua_interpreter.isScriptRunning()) { + if (json) { + ok_msg = "{\"status\":\"idle\""; + if (error.length() > 0) { + ok_msg += ",\"error\":\"" + error + "\""; + } + ok_msg+="}"; + } else { + ok_msg = "idle"; + if (error.length() > 0) { + ok_msg += ", error: " + error; + } + } + } else { + String status = + esp3d_lua_interpreter.isScriptPaused() ? "paused" : "running"; + + if (error.length() > 0) { + status = "error"; + } + String scriptName = esp3d_lua_interpreter.getCurrentScriptName(); + String duration = esp3d_string::formatDuration( + esp3d_lua_interpreter.getExecutionTime()); + if (json) { + String errorMsg = error.length() > 0 ? ",\"error\":\"" + error + "\"" : ""; + ok_msg = "{\"status\":\"" + status + "\",\"script\":\"" + scriptName + + "\",\"duration\":\"" + duration + "\"" + errorMsg + "}"; + } else { + ok_msg = status; + if (error.length() > 0) { + ok_msg += ": " + error; + } + ok_msg += ", " + scriptName + ", duration " + duration; + } + } + } else { + tmpstr = get_param(msg, cmd_params_pos, "action="); + if (tmpstr.length() == 0) { + hasError = true; + error_msg = "Missing parameter"; + esp3d_log_e("%s", error_msg.c_str()); + } else { + tmpstr.toUpperCase(); + if (tmpstr != "PAUSE" && tmpstr != "ABORT" && tmpstr != "RESUME") { + hasError = true; + error_msg = "Unknown action"; + esp3d_log_e("%s", error_msg.c_str()); + } else { + if (esp3d_lua_interpreter.isScriptRunning()) { + if (tmpstr == "PAUSE") { + if (esp3d_lua_interpreter.isScriptPaused()) { + hasError = true; + error_msg = "Script already paused"; + esp3d_log_e("%s", error_msg.c_str()); + } else { + if (esp3d_lua_interpreter.pauseScript()) { + ok_msg = "Script paused"; + } else { + hasError = true; + error_msg = "Pause failed"; + esp3d_log_e("%s", error_msg.c_str()); + } + } + } else if (tmpstr == "RESUME") { + if (!esp3d_lua_interpreter.isScriptPaused()) { + hasError = true; + error_msg = "Script not paused"; + esp3d_log_e("%s", error_msg.c_str()); + } else { + if (esp3d_lua_interpreter.resumeScript()) { + ok_msg = "Script resumed"; + } else { + hasError = true; + error_msg = "Resume failed"; + esp3d_log_e("%s", error_msg.c_str()); + } + } + } else if (tmpstr == "ABORT") { + esp3d_lua_interpreter.abortScript(); + ok_msg = "Script aborted"; + } + } else { + hasError = true; + error_msg = "No script running"; + esp3d_log_e("%s", error_msg.c_str()); + } + } + } + } + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // ESP_LUA_INTERPRETER_FEATURE diff --git a/src/core/commands/ESP400.cpp b/src/core/commands/ESP400.cpp index dfe1bf3..2ab1741 100644 --- a/src/core/commands/ESP400.cpp +++ b/src/core/commands/ESP400.cpp @@ -32,6 +32,20 @@ #endif // TIMESTAMP_FEATURE #define COMMAND_ID 400 +#ifndef STRINGIFY +#define STRINGIFY(x) #x +#endif // STRINGIFY +#define STRING(x) STRINGIFY(x) + +#if defined(USB_SERIAL_FEATURE) +const char* OutputClientsLabels[] = { + "serial port", + "usb port", +}; +const char* OutputClientsValues[] = {"1", + "2"}; +#endif // USB_SERIAL_FEATURE + const char* YesNoLabels[] = {"no", "yes"}; const char* YesNoValues[] = {"0", "1"}; const char* RadioModeLabels[] = {"none" @@ -91,15 +105,28 @@ const char* FallbackValues[] = {"0" #endif // BLUETOOTH_FEATURE }; +const char* EthFallbackValues[] = {"0" +#ifdef BLUETOOTH_FEATURE + , + "3" +#endif // BLUETOOTH_FEATURE +}; +const char* EthFallbackLabels[] = {"none" +#ifdef BLUETOOTH_FEATURE + , + "bt" +#endif // BLUETOOTH_FEATURE +}; + const char* FirmwareLabels[] = {"Unknown", "Grbl", "Marlin", "Smoothieware", "Repetier"}; const char* FirmwareValues[] = {"0", "10", "20", "40", "50"}; #ifdef NOTIFICATION_FEATURE const char* NotificationsLabels[] = { - "none", "pushover", "email", "line", "telegram", "ifttt", "home-assistant"}; + "none", "pushover", "email", "line", "telegram", "ifttt", "home-assistant","WhatsApp"}; -const char* NotificationsValues[] = {"0", "1", "2", "3", "4", "5", "6"}; +const char* NotificationsValues[] = {"0", "1", "2", "3", "4", "5", "6", "7"}; #endif // NOTIFICATION_FEATURE const char* IpModeLabels[] = {"static", "dhcp"}; @@ -108,10 +135,14 @@ const char* IpModeValues[] = {"0", "1"}; const char* SupportedApChannelsStr[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14"}; + +/// Note Currently the Serial and USB Serial baud rate list is the same +// if this change this part need to be updated const char* SupportedBaudListSizeStr[] = { "9600", "19200", "38400", "57600", "74880", "115200", "230400", "250000", "500000", "921600", "1000000", "1958400", "2000000"}; + #ifdef SENSOR_DEVICE const char* SensorLabels[] = {"none" @@ -204,6 +235,34 @@ void ESP3DCommands::ESP400(int cmd_params_pos, ESP3DMessage* msg) { dispatchSetting(json, "network/network", ESP_BOOT_RADIO_STATE, "radio_boot", YesNoValues, YesNoLabels, sizeof(YesNoValues) / sizeof(char*), -1, -1, -1, NULL, true, target, requestId); +#if defined(ETH_FEATURE) + // Ethernet STA IP mode + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_IP_MODE, "ip mode", + IpModeValues, IpModeLabels, + sizeof(IpModeLabels) / sizeof(char*), -1, -1, -1, nullptr, + true, target, requestId); + // Ethernet STA static IP + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_IP_VALUE, "ip", nullptr, + nullptr, -1, -1, -1, -1, nullptr, true, target, requestId); + + // Ethernet STA static Gateway + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_GATEWAY_VALUE, "gw", + nullptr, nullptr, -1, -1, -1, -1, nullptr, true, target, + requestId); + // Ethernet STA static Mask + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_MASK_VALUE, "msk", + nullptr, nullptr, -1, -1, -1, -1, nullptr, true, target, + requestId); + // Ethernet STA static DNS + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_DNS_VALUE, "DNS", + nullptr, nullptr, -1, -1, -1, -1, nullptr, true, target, + requestId); + // Ethernet Sta fallback mode + dispatchSetting(json, "network/eth-sta", ESP_ETH_STA_FALLBACK_MODE, + "sta fallback mode", EthFallbackValues, EthFallbackLabels, + sizeof(EthFallbackValues) / sizeof(char*), -1, -1, -1, + nullptr, true, target, requestId); +#endif // ETH_FEATURE #ifdef WIFI_FEATURE // STA SSID network/sta dispatchSetting(json, "network/sta", ESP_STA_SSID, "SSID", nullptr, nullptr, @@ -214,7 +273,7 @@ void ESP3DCommands::ESP400(int cmd_params_pos, ESP3DMessage* msg) { nullptr, 64, 8, 0, -1, nullptr, true, target, requestId); #endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) // STA IP mode dispatchSetting(json, "network/sta", ESP_STA_IP_MODE, "ip mode", IpModeValues, IpModeLabels, sizeof(IpModeLabels) / sizeof(char*), -1, -1, @@ -233,15 +292,15 @@ void ESP3DCommands::ESP400(int cmd_params_pos, ESP3DMessage* msg) { dispatchSetting(json, "network/sta", ESP_STA_DNS_VALUE, "DNS", nullptr, nullptr, -1, -1, -1, -1, nullptr, true, target, requestId); -#endif // WIFI_FEATURE || ETH_FEATURE +#endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) || defined(BT_FEATURE) +#if defined(WIFI_FEATURE) // Sta fallback mode dispatchSetting(json, "network/sta", ESP_STA_FALLBACK_MODE, "sta fallback mode", FallbackValues, FallbackLabels, sizeof(FallbackValues) / sizeof(char*), -1, -1, -1, nullptr, true, target, requestId); -#endif // WIFI_FEATURE || ETH_FEATURE || BT_FEATURE +#endif // WIFI_FEATURE #if defined(WIFI_FEATURE) // AP SSID network/ap dispatchSetting(json, "network/ap", ESP_AP_SSID, "SSID", nullptr, nullptr, 32, @@ -460,7 +519,20 @@ void ESP3DCommands::ESP400(int cmd_params_pos, ESP3DMessage* msg) { true, target, requestId); #endif // FIXED_FW_TARGET #if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL - // Baud Rate +#if defined(USB_SERIAL_FEATURE) + dispatchSetting(json, "system/system", ESP_OUTPUT_CLIENT, "output", + OutputClientsValues, OutputClientsLabels, + sizeof(OutputClientsValues) / sizeof(char*), -1, -1, -1, + nullptr, true, target, requestId); + // Usb-Serial Baud Rate + dispatchSetting(json, "system/system", ESP_USB_SERIAL_BAUD_RATE, + "usb-serial baud", SupportedBaudListSizeStr, + SupportedBaudListSizeStr, + sizeof(SupportedBaudListSizeStr) / sizeof(char*), -1, -1, -1, + nullptr, true, target, requestId); + +#endif // defined(USB_SERIAL_FEATURE) + // Serial Baud Rate dispatchSetting(json, "system/system", ESP_BAUD_RATE, "baud", SupportedBaudListSizeStr, SupportedBaudListSizeStr, sizeof(SupportedBaudListSizeStr) / sizeof(char*), -1, -1, -1, diff --git a/src/core/commands/ESP420.cpp b/src/core/commands/ESP420.cpp index e4cf899..1428cf6 100644 --- a/src/core/commands/ESP420.cpp +++ b/src/core/commands/ESP420.cpp @@ -81,6 +81,16 @@ #if defined(AUTHENTICATION_FEATURE) #include "../../modules/authentication/authentication_service.h" #endif // AUTHENTICATION_FEATURE +#if defined(SSDP_FEATURE) && defined(ARDUINO_ARCH_ESP32) +#include +#endif // SSDP_FEATURE +#if defined(MDNS_FEATURE) +#include "../../modules/mDNS/mDNS.h" +#endif // MDNS_FEATURE + +#if defined(USB_SERIAL_FEATURE) +#include "../../modules/usb-serial/usb_serial_service.h" +#endif // defined(USB_SERIAL_FEATURE) // Get ESP current status // output is JSON or plain text according parameter @@ -155,12 +165,35 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { return; } + // FW architecture + tmpstr = ESP3DSettings::TargetBoard(); +#ifdef ARDUINO_ARCH_ESP32 + tmpstr = ESP.getChipModel(); + tmpstr += "-"; + tmpstr += ESP.getChipRevision(); + tmpstr += "-"; + tmpstr += ESP.getChipCores(); + tmpstr += "@"; +#endif // ARDUINO_ARCH_ESP32 + if (!dispatchIdValue(json, "FW arch", tmpstr.c_str(), target, requestId, + false)) { + return; + } + // SDK Version tmpstr = ESP.getSdkVersion(); + if (!dispatchIdValue(json, "SDK", tmpstr.c_str(), target, requestId, false)) { return; } + // Arduino Version + tmpstr = ESP3DHal::arduinoVersion(); + if (!dispatchIdValue(json, "Arduino", tmpstr.c_str(), target, requestId, + false)) { + return; + } + // Flash size tmpstr = esp3d_string::formatBytes(ESP.getFlashChipSize()); if (!dispatchIdValue(json, "flash size", tmpstr.c_str(), target, requestId, @@ -194,15 +227,48 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { return; } #endif // FILESYSTEM_FEATURE -#if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL - // baud rate - tmpstr = String(esp3d_serial_service.baudRate()); - if (!dispatchIdValue(json, "baud", tmpstr.c_str(), target, requestId, - false)) { + +#if defined(USB_SERIAL_FEATURE) + tmpstr = "???"; + if (esp3d_commands.getOutputClient() == ESP3DClientType::usb_serial) { + tmpstr = "usb port"; + } + if (esp3d_commands.getOutputClient() == ESP3DClientType::serial) { + tmpstr = "serial port"; + } + if (!dispatchIdValue(json, "output", tmpstr.c_str(), target, requestId)) { return; } + if (esp3d_commands.getOutputClient() == ESP3DClientType::usb_serial) { + tmpstr = String(esp3d_usb_serial_service.baudRate()); + if (!dispatchIdValue(json, "baud", tmpstr.c_str(), target, requestId, + false)) { + return; + } + } + if (esp3d_usb_serial_service.isConnected()) { + tmpstr = esp3d_usb_serial_service.getVIDString(); + tmpstr += ":"; + tmpstr += esp3d_usb_serial_service.getPIDString(); + if (!dispatchIdValue(json, "Vid/Pid", tmpstr.c_str(), target, requestId, + false)) { + return; + } + } +#endif // defined(USB_SERIAL_FEATURE) + +#if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL + if (esp3d_commands.getOutputClient() == ESP3DClientType::serial) { + // baud rate + tmpstr = String(esp3d_serial_service.baudRate()); + if (!dispatchIdValue(json, "baud", tmpstr.c_str(), target, requestId, + false)) { + return; + } + } #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == // MKS_SERIAL + #if defined(WIFI_FEATURE) if (WiFi.getMode() != WIFI_OFF) { // sleep mode @@ -244,6 +310,26 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { false)) { return; } + #if defined (SSDP_FEATURE) + // SSDP enabled + #if defined(ARDUINO_ARCH_ESP32) + tmpstr = SSDP.started() ? "ON (" + String(SSDP.localIP().toString()) + ")" : "OFF"; + #endif // ARDUINO_ARCH_ESP32 + #if defined(ARDUINO_ARCH_ESP8266) + tmpstr = "ON" ; + #endif // ARDUINO_ARCH_ESP8266 + if (!dispatchIdValue(json, "SSDP", tmpstr.c_str(), target, requestId, false)) { + return; + } + #endif // SSDP_FEATURE + + #if defined (MDNS_FEATURE) + // MDNS enabled + tmpstr = esp3d_mDNS.started() ? "ON" : "OFF"; + if (!dispatchIdValue(json, "MDNS", tmpstr.c_str(), target, requestId, false)) { + return; + } + #endif // MDNS_FEATURE #if defined(HTTP_FEATURE) if (HTTP_Server::started()) { @@ -374,6 +460,7 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { return; } // IP mode + esp3d_log("IP mode %d", NetConfig::isIPModeDHCP(ESP_ETH_STA)); tmpstr = (NetConfig::isIPModeDHCP(ESP_ETH_STA)) ? "dhcp" : "static"; if (!dispatchIdValue(json, "ip mode", tmpstr.c_str(), target, requestId, false)) { @@ -403,6 +490,10 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { false)) { return; } + } else { + if (!dispatchIdValue(json, "ethernet", "OFF", target, requestId, false)) { + return; + } } #endif // ETH_FEATURE #if defined(WIFI_FEATURE) @@ -642,7 +733,7 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { #endif // NOTIFICATION_FEATURE #if defined(SD_DEVICE) // SD enabled - tmpstr = (ESP3DSettings::GetSDDevice() == ESP_DIRECT_SD) ? "direct " + tmpstr = (ESP3DSettings::GetSDDevice() == ESP_NOT_SHARED_SD) ? "direct " : (ESP3DSettings::GetSDDevice() == ESP_SHARED_SD) ? "shared " : "none "; tmpstr += "("; @@ -728,13 +819,6 @@ void ESP3DCommands::ESP420(int cmd_params_pos, ESP3DMessage* msg) { return; } - // FW architecture - tmpstr = ESP3DSettings::TargetBoard(); - if (!dispatchIdValue(json, "FW arch", tmpstr.c_str(), target, requestId, - false)) { - return; - } - // end of list if (json) { if (!dispatch("]}", target, requestId, ESP3DMessageType::tail)) { diff --git a/src/core/commands/ESP610.cpp b/src/core/commands/ESP610.cpp index 8471939..09ab276 100644 --- a/src/core/commands/ESP610.cpp +++ b/src/core/commands/ESP610.cpp @@ -42,9 +42,9 @@ void ESP3DCommands::ESP610(int cmd_params_pos, ESP3DMessage* msg) { String tmpstr; const char* cmdList[] = {"type=", "T1=", "T2=", "TS="}; uint8_t cmdListSize = sizeof(cmdList) / sizeof(char*); - const char* notificationStr[] = {"NONE", "PUSHOVER", "EMAIL", - "LINE", "TELEGRAM", "IFTTT", - "HOMEASSISTANT"}; + const char* notificationStr[] = {"NONE", "PUSHOVER", "EMAIL", + "LINE", "TELEGRAM", "IFTTT", + "HOMEASSISTANT", "WHATSAPP"}; uint8_t notificationStrSize = sizeof(notificationStr) / sizeof(char*); const ESP3DSettingIndex settingIndex[] = { ESP_NOTIFICATION_TYPE, ESP_NOTIFICATION_TOKEN1, ESP_NOTIFICATION_TOKEN2, diff --git a/src/core/commands/ESP710.cpp b/src/core/commands/ESP710.cpp index 010e6a1..0bf6878 100644 --- a/src/core/commands/ESP710.cpp +++ b/src/core/commands/ESP710.cpp @@ -56,7 +56,7 @@ void ESP3DCommands::ESP710(int cmd_params_pos, ESP3DMessage* msg) { } else { if (formatfs) { ok_msg = "Starting formating..."; - endMsg = ESP3DMessageManager::copyMsgInfos(*msg); + endMsg = esp3d_message_manager.copyMsgInfos(*msg); } else { hasError = true; error_msg = "Invalid parameter"; diff --git a/src/core/commands/ESP715.cpp b/src/core/commands/ESP715.cpp index 84f34aa..2f7570a 100644 --- a/src/core/commands/ESP715.cpp +++ b/src/core/commands/ESP715.cpp @@ -57,7 +57,7 @@ void ESP3DCommands::ESP715(int cmd_params_pos, ESP3DMessage* msg) { if (formatsd) { if (ESP_SD::getState() != ESP_SDCARD_BUSY) { ok_msg = "Starting formating..."; - endMsg = ESP3DMessageManager::copyMsgInfos(*msg); + endMsg = esp3d_message_manager.copyMsgInfos(*msg); } else { hasError = true; error_msg = "SD card busy"; diff --git a/src/core/commands/ESP720.cpp b/src/core/commands/ESP720.cpp index 1406ac2..1690760 100644 --- a/src/core/commands/ESP720.cpp +++ b/src/core/commands/ESP720.cpp @@ -49,7 +49,11 @@ void ESP3DCommands::ESP720(int cmd_params_pos, ESP3DMessage* msg) { #endif // AUTHENTICATION_FEATURE ESP3DMessage msgInfo; - ESP3DMessageManager::copyMsgInfos(&msgInfo, *msg); + esp3d_log("Copy msg infos"); + if (!esp3d_message_manager.copyMsgInfos(&msgInfo, *msg)) { + esp3d_log_e("Error copying msg infos"); + return; + } tmpstr = get_clean_param(msg, cmd_params_pos); if (tmpstr.length() == 0) { @@ -104,7 +108,7 @@ void ESP3DCommands::ESP720(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -156,7 +160,7 @@ void ESP3DCommands::ESP720(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -202,7 +206,7 @@ void ESP3DCommands::ESP720(int cmd_params_pos, ESP3DMessage* msg) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); newMsg->type = ESP3DMessageType::tail; if (!dispatch(newMsg, ok_msg.c_str())) { esp3d_log_e("Error sending response to clients"); diff --git a/src/core/commands/ESP740.cpp b/src/core/commands/ESP740.cpp index e6f8e6e..2f3e6bf 100644 --- a/src/core/commands/ESP740.cpp +++ b/src/core/commands/ESP740.cpp @@ -49,7 +49,7 @@ void ESP3DCommands::ESP740(int cmd_params_pos, ESP3DMessage* msg) { #endif // AUTHENTICATION_FEATURE ESP3DMessage msgInfo; - ESP3DMessageManager::copyMsgInfos(&msgInfo, *msg); + esp3d_message_manager.copyMsgInfos(&msgInfo, *msg); tmpstr = get_clean_param(msg, cmd_params_pos); if (tmpstr.length() == 0) { @@ -118,7 +118,7 @@ void ESP3DCommands::ESP740(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -170,7 +170,7 @@ void ESP3DCommands::ESP740(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -216,7 +216,7 @@ void ESP3DCommands::ESP740(int cmd_params_pos, ESP3DMessage* msg) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); newMsg->type = ESP3DMessageType::tail; if (!dispatch(newMsg, ok_msg.c_str())) { esp3d_log_e("Error sending response to clients"); diff --git a/src/core/commands/ESP780.cpp b/src/core/commands/ESP780.cpp index f0307a0..f4f98ca 100644 --- a/src/core/commands/ESP780.cpp +++ b/src/core/commands/ESP780.cpp @@ -49,7 +49,7 @@ void ESP3DCommands::ESP780(int cmd_params_pos, ESP3DMessage* msg) { #endif // AUTHENTICATION_FEATURE ESP3DMessage msgInfo; - ESP3DMessageManager::copyMsgInfos(&msgInfo, *msg); + esp3d_message_manager.copyMsgInfos(&msgInfo, *msg); tmpstr = get_clean_param(msg, cmd_params_pos); if (tmpstr.length() == 0) { @@ -105,7 +105,7 @@ void ESP3DCommands::ESP780(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -157,7 +157,7 @@ void ESP3DCommands::ESP780(int cmd_params_pos, ESP3DMessage* msg) { if (!json) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); if (newMsg) { newMsg->type = ESP3DMessageType::core; if (!dispatch(newMsg, ok_msg.c_str())) { @@ -203,7 +203,7 @@ void ESP3DCommands::ESP780(int cmd_params_pos, ESP3DMessage* msg) { ok_msg += "\n"; } - ESP3DMessage* newMsg = ESP3DMessageManager::copyMsgInfos(msgInfo); + ESP3DMessage* newMsg = esp3d_message_manager.copyMsgInfos(msgInfo); newMsg->type = ESP3DMessageType::tail; if (!dispatch(newMsg, ok_msg.c_str())) { esp3d_log_e("Error sending response to clients"); diff --git a/src/core/commands/ESP800.cpp b/src/core/commands/ESP800.cpp index 74c35f3..9cd24fc 100644 --- a/src/core/commands/ESP800.cpp +++ b/src/core/commands/ESP800.cpp @@ -147,7 +147,7 @@ void ESP3DCommands::ESP800(int cmd_params_pos, ESP3DMessage* msg) { } // SD connection - if (ESP3DSettings::GetSDDevice() == ESP_DIRECT_SD) { + if (ESP3DSettings::GetSDDevice() == ESP_NOT_SHARED_SD) { tmpstr = "direct"; } else if (ESP3DSettings::GetSDDevice() == ESP_SHARED_SD) { tmpstr = "shared"; diff --git a/src/core/commands/ESP902.cpp b/src/core/commands/ESP902.cpp new file mode 100644 index 0000000..b731d4c --- /dev/null +++ b/src/core/commands/ESP902.cpp @@ -0,0 +1,86 @@ +/* + ESP902.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(USB_SERIAL_FEATURE) +#include "../../modules/authentication/authentication_service.h" +#include "../../modules/usb-serial/usb_serial_service.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" + +#define COMMAND_ID 902 +// Set USB Serial baudrate +//[ESP902] json= pwd= +void ESP3DCommands::ESP902(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + if (tmpstr.length() == 0) { + const ESP3DSettingDescription* settingPtr = + ESP3DSettings::getSettingPtr(ESP_USB_SERIAL_BAUD_RATE); + if (settingPtr) { + ok_msg = String(ESP3DSettings::readUint32(ESP_USB_SERIAL_BAUD_RATE)); + } else { + hasError = true; + error_msg = "This setting is unknown"; + } + } else { +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level != ESP3DAuthenticationLevel::admin) { + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + esp3d_log( + "got %s param for a value of %s, is valid %d", tmpstr.c_str(), + tmpstr.c_str(), + ESP3DSettings::isValidIntegerSetting(tmpstr.toInt(), ESP_USB_SERIAL_BAUD_RATE)); + if (ESP3DSettings::isValidIntegerSetting(tmpstr.toInt(), ESP_USB_SERIAL_BAUD_RATE)) { + esp3d_log("Value %s is valid", tmpstr.c_str()); + if (!ESP3DSettings::writeUint32(ESP_USB_SERIAL_BAUD_RATE, tmpstr.toInt())) { + hasError = true; + error_msg = "Set value failed"; + } + } else { + hasError = true; + error_msg = "Invalid parameter"; + } + } + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // defined(USB_SERIAL_FEATURE) diff --git a/src/core/commands/ESP950.cpp b/src/core/commands/ESP950.cpp new file mode 100644 index 0000000..ce9e871 --- /dev/null +++ b/src/core/commands/ESP950.cpp @@ -0,0 +1,79 @@ +/* + ESP950.cpp - ESP3D command class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "../../include/esp3d_config.h" +#if defined(USB_SERIAL_FEATURE) +#include "../../modules/authentication/authentication_service.h" +#include "../esp3d_commands.h" +#include "../esp3d_settings.h" + +#define COMMAND_ID 950 +// Get / Set Serial Output +//[ESP950] json= pwd= +void ESP3DCommands::ESP950(int cmd_params_pos, ESP3DMessage* msg) { + ESP3DClientType target = msg->origin; + ESP3DRequest requestId = msg->request_id; + (void)requestId; + msg->target = target; + msg->origin = ESP3DClientType::command; + bool hasError = false; + String error_msg = "Invalid parameters"; + String ok_msg = "ok"; + bool json = hasTag(msg, cmd_params_pos, "json"); + String tmpstr; +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level == ESP3DAuthenticationLevel::guest) { + msg->authentication_level = ESP3DAuthenticationLevel::not_authenticated; + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + tmpstr = get_clean_param(msg, cmd_params_pos); + + if (tmpstr.length() == 0) { + uint8_t setting_mode = ESP3DSettings::readByte(ESP_OUTPUT_CLIENT); + if (setting_mode == (uint8_t)ESP3DClientType::usb_serial) { + ok_msg = "USB"; + } else { + ok_msg = "SERIAL"; + } + } else { +#if defined(AUTHENTICATION_FEATURE) + if (msg->authentication_level != ESP3DAuthenticationLevel::admin) { + dispatchAuthenticationError(msg, COMMAND_ID, json); + return; + } +#endif // AUTHENTICATION_FEATURE + if (tmpstr == "USB" || tmpstr == "SERIAL") { + if (!ESP3DSettings::writeByte(ESP_OUTPUT_CLIENT, tmpstr == "USB" ? (uint8_t)ESP3DClientType::usb_serial: (uint8_t)ESP3DClientType::serial)) { + hasError = true; + error_msg = "Set value failed"; + } + } else { + hasError = true; + error_msg = "Invalid parameter"; + } + } + if (!dispatchAnswer(msg, COMMAND_ID, json, hasError, + hasError ? error_msg.c_str() : ok_msg.c_str())) { + esp3d_log_e("Error sending response to clients"); + } +} + +#endif // USB_SERIAL_FEATURE diff --git a/src/core/esp3d.cpp b/src/core/esp3d.cpp index e936bba..6826513 100644 --- a/src/core/esp3d.cpp +++ b/src/core/esp3d.cpp @@ -28,6 +28,7 @@ #include "../include/esp3d_config.h" #include "esp3d_settings.h" +#include "esp3d_commands.h" #if COMMUNICATION_PROTOCOL != SOCKET_SERIAL || ESP_SERIAL_BRIDGE_OUTPUT #include "../modules/serial/serial_service.h" @@ -50,14 +51,17 @@ #ifdef GCODE_HOST_FEATURE #include "../modules/gcode_host/gcode_host.h" #endif // GCODE_HOST_FEATURE -#ifdef ESP_LUA_INTERPRETER_FEATURE -#include "../modules/lua_interpreter/lua_interpreter_service.h" -#endif // #ifdef #ifdef SD_UPDATE_FEATURE #include "../modules/update/update_service.h" #endif // SD_UPDATE_FEATURE #include "../modules/boot_delay/boot_delay.h" #include "esp3d_message.h" +#ifdef ESP_LUA_INTERPRETER_FEATURE +#include "../modules/lua_interpreter/lua_interpreter_service.h" +#endif // ESP_LUA_INTERPRETER_FEATURE +#if defined(USB_SERIAL_FEATURE) +#include "../modules/usb-serial/usb_serial_service.h" +#endif // USB_SERIAL_FEATURE bool Esp3D::restart = false; @@ -102,8 +106,21 @@ bool Esp3D::begin() { // Restart ESP3D restart_now(); } + + esp3d_commands.getOutputClient(true); + + #if defined(USB_SERIAL_FEATURE) + if (esp3d_commands.getOutputClient() == ESP3DClientType::usb_serial) { + if (!esp3d_usb_serial_service.begin()) { + esp3d_log_e("Error with usb serial service"); + res = false; + } + } + #endif // USB_SERIAL_FEATURE + // BT do not start automaticaly so should be OK #if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL + // Serial service if (!esp3d_serial_service.begin(ESP_SERIAL_OUTPUT)) { esp3d_log_e("Error with serial service"); @@ -163,6 +180,9 @@ void Esp3D::handle() { if (restart) { restart_now(); } +#if defined(USB_SERIAL_FEATURE) + esp3d_usb_serial_service.handle(); +#endif // USB_SERIAL_FEATURE #if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL esp3d_serial_service.handle(); #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == @@ -182,6 +202,10 @@ void Esp3D::handle() { #if defined(GCODE_HOST_FEATURE) esp3d_gcode_host.handle(); #endif // GCODE_HOST_FEATURE + +#ifdef ESP_LUA_INTERPRETER_FEATURE + esp3d_lua_interpreter.handle(); +#endif // ESP_LUA_INTERPRETER_FEATURE } bool Esp3D::started() { return _started; } @@ -201,6 +225,9 @@ bool Esp3D::end() { #if defined(FILESYSTEM_FEATURE) ESP_FileSystem::end(); #endif // FILESYSTEM_FEATURE +#if defined(USB_SERIAL_FEATURE) + esp3d_usb_serial_service.end(); +#endif // USB_SERIAL_FEATURE #if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL esp3d_serial_service.end(); #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == @@ -251,7 +278,7 @@ void Esp3D::restart_now() { #if defined(FILESYSTEM_FEATURE) ESP_FileSystem::end(); #endif // FILESYSTEM_FEATURE -#if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL +#if (COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL) & defined(ARDUINO_ARCH_ESP8266) esp3d_serial_service.swap(); #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == // MKS_SERIAL diff --git a/src/core/esp3d_client_types.h b/src/core/esp3d_client_types.h index 38b74e4..dd3c111 100644 --- a/src/core/esp3d_client_types.h +++ b/src/core/esp3d_client_types.h @@ -42,6 +42,7 @@ enum class ESP3DClientType : uint8_t { serial_bridge = 12, remote_screen = 13, // target only = M117 mks_serial = 14, + lua_script = 15, command, // origin only system, // origin only all_clients diff --git a/src/core/esp3d_commands.cpp b/src/core/esp3d_commands.cpp index 1a84e9a..e50068a 100644 --- a/src/core/esp3d_commands.cpp +++ b/src/core/esp3d_commands.cpp @@ -66,6 +66,10 @@ const char *esp3dmsgstr[] = {"head", "core", "tail", "unique"}; #include "../modules/http/http_server.h" #endif // HTTP_FEATURE +#if defined(ESP_LUA_INTERPRETER_FEATURE) +#include "../modules/lua_interpreter/lua_interpreter_service.h" +#endif // ESP_LUA_INTERPRETER_FEATURE + #ifdef BLUETOOTH_FEATURE #include "../modules/bluetooth/BT_service.h" #endif // BLUETOOTH_FEATURE @@ -78,9 +82,18 @@ const char *esp3dmsgstr[] = {"head", "core", "tail", "unique"}; #include "../modules/display/display.h" #endif // DISPLAY_DEVICE +#if defined(GCODE_HOST_FEATURE) +#include "../modules/gcode_host/gcode_host.h" +#endif // GCODE_HOST_FEATURE + +#if defined(USB_SERIAL_FEATURE) +#include "../modules/usb-serial/usb_serial_service.h" +#endif // USB_SERIAL_FEATURE + ESP3DCommands esp3d_commands; ESP3DCommands::ESP3DCommands() { + //Need to sync with setting part #if COMMUNICATION_PROTOCOL == RAW_SERIAL _output_client = ESP3DClientType::serial; #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL @@ -94,8 +107,6 @@ ESP3DCommands::ESP3DCommands() { ESP3DCommands::~ESP3DCommands() {} -bool ESP3DCommands::isRealTimeCommand(char *cmd, size_t len) { return false; } - // check if current line is an [ESPXXX] command bool ESP3DCommands::is_esp_command(uint8_t *sbuf, size_t len) { // TODO @@ -331,6 +342,7 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, msg->origin == ESP3DClientType::serial_bridge || msg->origin == ESP3DClientType::telnet || msg->origin == ESP3DClientType::websocket || + msg->origin == ESP3DClientType::usb_serial || msg->origin == ESP3DClientType::bluetooth)) { msg->authentication_level = AuthenticationService::getAuthenticatedLevel(pwd.c_str(), msg); @@ -344,6 +356,11 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, serial_bridge_service.setAuthentication(msg->authentication_level); break; #endif // ESP_SERIAL_BRIDGE_OUTPUT +#if defined(USB_SERIAL_FEATURE) + case ESP3DClientType::usb_serial: + esp3d_usb_serial_service.setAuthentication(msg->authentication_level); + break; +#endif // USB_SERIAL_FEATURE #if defined(TELNET_FEATURE) case ESP3DClientType::telnet: telnet_server.setAuthentication(msg->authentication_level); @@ -384,7 +401,7 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, ESP101(cmd_params_pos, msg); break; #endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) // Change STA IP mode (DHCP/STATIC) //[ESP102]pwd= case 102: @@ -395,15 +412,11 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, case 103: ESP103(cmd_params_pos, msg); break; -#endif // WIFI_FEATURE ||ETH_FEATURE -#if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) // Set fallback mode which can be BT, WIFI-AP, OFF //[ESP104]pwd= case 104: ESP104(cmd_params_pos, msg); break; -#endif // WIFI_FEATURE || BLUETOOTH_FEATURE || ETH_FEATURE) -#if defined(WIFI_FEATURE) // AP SSID //[ESP105][pwd=] case 105: @@ -461,6 +474,24 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, break; #endif // WIFI_FEATURE|| ETH_FEATURE || BT_FEATURE +#if defined(ETH_FEATURE) + // Change ETH STA IP mode (DHCP/STATIC) + //[ESP116]pwd= + case 116: + ESP102(cmd_params_pos, msg); + break; + // Change ETH STA IP/Mask/GW + //[ESP117]IP= MSK= GW= pwd= + case 117: + ESP117(cmd_params_pos, msg); + break; + // Set fallback mode which can be BT, OFF + //[ESP118]pwd= + case 118: + ESP118(cmd_params_pos, msg); + break; +#endif // ETH_FEATURE + #ifdef HTTP_FEATURE // Set HTTP state which can be ON, OFF //[ESP120]pwd= @@ -627,6 +658,19 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, case 290: ESP290(cmd_params_pos, msg); break; +#if defined(ESP_LUA_INTERPRETER_FEATURE) + // Execute Lua script + //[ESP300] + case 300: + ESP300(cmd_params_pos, msg); + break; + // Query and Control ESP300 execution + //[ESP301]action= + case 301: + ESP301(cmd_params_pos, msg); + break; +#endif // ESP_LUA_INTERPRETER_FEATURE + // Get full ESP3D settings //[ESP400] case 400: @@ -789,6 +833,17 @@ void ESP3DCommands::execute_internal_command(int cmd, int cmd_params_pos, ESP901(cmd_params_pos, msg); break; #endif // COMMUNICATION_PROTOCOL != SOCKET_SERIAL +#if defined(USB_SERIAL_FEATURE) + // Get / Set USB Serial Baud Rate + //[ESP902] json= pwd= + case 902: + ESP902(cmd_params_pos, msg); + break; + // Get / Set Client Output + case 950: + ESP950(cmd_params_pos, msg); + break; +#endif // defined(USB_SERIAL_FEATURE) #ifdef BUZZER_DEVICE // Get state / Set Enable / Disable buzzer //[ESP910] @@ -1099,10 +1154,6 @@ bool ESP3DCommands::dispatchIdValue(bool json, const char *Id, } bool ESP3DCommands::formatCommand(char *cmd, size_t len) { - if (isRealTimeCommand(cmd, len)) { - // TODO: what if is realtime command ? - return true; - } uint sizestr = strlen(cmd); if (len > sizestr + 2) { cmd[sizestr] = '\n'; @@ -1148,10 +1199,6 @@ void ESP3DCommands::process(ESP3DMessage *msg) { esp3d_log("Execute internal command %d", cmdId); execute_internal_command(cmdId, espcmdpos, msg); } else { - esp3d_log("Dispatch command, len %d, from %d(%s) to %d(%s)", msg->size, - static_cast(msg->origin), GETCLIENTSTR(msg->origin), - static_cast(msg->target), GETCLIENTSTR(msg->target)); - // Work around to avoid to dispatch single \n or \r to everyone as it is // part of previous ESP3D command if (msg->size == 1 && @@ -1160,10 +1207,11 @@ void ESP3DCommands::process(ESP3DMessage *msg) { lastIsESP3D = false; // delete message esp3d_log("Delete message"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); return; } lastIsESP3D = false; + esp3d_log("Dispatch message: %s", msg->data); dispatch(msg); } } @@ -1189,25 +1237,28 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg, uint8_t *sbuf, size_t len) { } tmpstr += '\n'; esp3d_log("update command success: *%s*", tmpstr.c_str()); - if (!ESP3DMessageManager::setDataContent(msg, (uint8_t *)tmpstr.c_str(), + if (!esp3d_message_manager.setDataContent(msg, (uint8_t *)tmpstr.c_str(), tmpstr.length())) { esp3d_log_e("set data content failed"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); return false; } } else { esp3d_log("format command success, no need to update"); - if (!ESP3DMessageManager::setDataContent(msg, sbuf, len)) { + if (!esp3d_message_manager.setDataContent(msg, sbuf, len)) { esp3d_log_e("set data content failed"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); return false; } } } else { esp3d_log("not unique or tail message"); - if (!ESP3DMessageManager::setDataContent(msg, sbuf, len)) { + if (msg->type == ESP3DMessageType::realtimecmd){ + esp3d_log("realtime command"); + } + if (!esp3d_message_manager.setDataContent(msg, sbuf, len)) { esp3d_log_e("set data content failed"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); return false; } } @@ -1218,7 +1269,7 @@ bool ESP3DCommands::dispatch(uint8_t *sbuf, size_t size, ESP3DClientType target, ESP3DRequest requestId, ESP3DMessageType type, ESP3DClientType origin, ESP3DAuthenticationLevel authentication_level) { - ESP3DMessage *newMsgPtr = ESP3DMessageManager::newMsg(origin, target); + ESP3DMessage *newMsgPtr = esp3d_message_manager.newMsg(origin, target); if (newMsgPtr) { newMsgPtr->request_id = requestId; newMsgPtr->type = type; @@ -1232,7 +1283,7 @@ bool ESP3DCommands::dispatch(const char *sbuf, ESP3DClientType target, ESP3DRequest requestId, ESP3DMessageType type, ESP3DClientType origin, ESP3DAuthenticationLevel authentication_level) { - ESP3DMessage *newMsgPtr = ESP3DMessageManager::newMsg(origin, target); + ESP3DMessage *newMsgPtr = esp3d_message_manager.newMsg(origin, target); if (newMsgPtr) { newMsgPtr->request_id = requestId; newMsgPtr->type = type; @@ -1244,23 +1295,25 @@ bool ESP3DCommands::dispatch(const char *sbuf, ESP3DClientType target, } ESP3DClientType ESP3DCommands::getOutputClient(bool fromSettings) { - // TODO: add setting for it when necessary +//It is a setting only if there is a choice between USB/Serial +#if defined(USB_SERIAL_FEATURE) + if (fromSettings) { + _output_client = (ESP3DClientType)ESP3DSettings::readByte(ESP_OUTPUT_CLIENT); + } + return _output_client; +#else (void)fromSettings; + //if not setting, then it is the default one, which is hardcoded +#endif esp3d_log("OutputClient: %d %s", static_cast(_output_client), GETCLIENTSTR(_output_client)); return _output_client; + } bool ESP3DCommands::dispatch(ESP3DMessage *msg) { bool sendOk = true; String tmp; - esp3d_log( - "Dispatch message origin %d(%s) to client %d(%s) , size: %d, type: " - "%d(%s)", - static_cast(msg->origin), - esp3dclientstr[static_cast(msg->origin)], - static_cast(msg->target), GETCLIENTSTR(msg->target), msg->size, - static_cast(msg->type), GETMSGTYPESTR(msg->type)); esp3d_log("Dispatch message data: %s", (const char *)msg->data); if (!msg) { esp3d_log_e("no msg"); @@ -1271,7 +1324,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { switch (msg->target) { case ESP3DClientType::no_client: esp3d_log("No client message"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); break; #if COMMUNICATION_PROTOCOL == RAW_SERIAL case ESP3DClientType::serial: @@ -1281,6 +1334,15 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { esp3d_log_e("Serial dispatch failed"); } break; +#if defined(USB_SERIAL_FEATURE) + case ESP3DClientType::usb_serial: + esp3d_log("USB Serial message"); + if (!esp3d_usb_serial_service.dispatch(msg)) { + sendOk = false; + esp3d_log_e("USB Serial dispatch failed"); + } + break; +#endif // USB_SERIAL_FEATURE #endif // COMMUNICATION_PROTOCOL == RAW_SERIAL #if COMMUNICATION_PROTOCOL == SOCKET_SERIAL @@ -1293,7 +1355,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { MYSERIAL1.write('\n'); } } - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); break; case ESP3DClientType::socket_serial: @@ -1305,6 +1367,16 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { break; #endif // COMMUNICATION_PROTOCOL == SOCKET_SERIAL +#if defined(ESP_LUA_INTERPRETER_FEATURE) + case ESP3DClientType::lua_script: + esp3d_log("Lua script message"); + if (!esp3d_lua_interpreter.dispatch(msg)) { + sendOk = false; + esp3d_log_e("Lua script dispatch failed"); + } + break; +#endif // ESP_LUA_INTERPRETER_FEATURE + #if defined(ESP_SERIAL_BRIDGE_OUTPUT) case ESP3DClientType::serial_bridge: esp3d_log("Serial bridge message"); @@ -1381,8 +1453,24 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { break; #endif // COMMUNICATION_PROTOCOL == MKS_SERIAL +#if defined(GCODE_HOST_FEATURE) + case ESP3DClientType::stream: + esp3d_log("Gcode host message"); + if (!esp3d_gcode_host.dispatch(msg)) { + sendOk = false; + esp3d_log_e("Gcode host dispatch failed"); + } + break; +#endif // GCODE_HOST_FEATURE + #ifdef PRINTER_HAS_DISPLAY case ESP3DClientType::remote_screen: + if (ESP3DSettings::GetFirmwareTarget() == GRBL || + ESP3DSettings::GetFirmwareTarget() == GRBLHAL) { + esp3d_log_e("Remote screen message is not supported for GRBL"); + sendOk = false; + break; + } esp3d_log("Remote screen message"); // change target to output client msg->target = getOutputClient(); @@ -1393,7 +1481,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { tmp.replace("\n", " "); tmp.replace("\r", ""); tmp += "\n"; - if (ESP3DMessageManager::setDataContent(msg, (uint8_t *)tmp.c_str(), + if (esp3d_message_manager.setDataContent(msg, (uint8_t *)tmp.c_str(), tmp.length())) { return dispatch(msg); } @@ -1412,7 +1500,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::remote_screen; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::remote_screen; dispatch(copy_msg); @@ -1423,6 +1511,43 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { } #endif // PRINTER_HAS_DISPLAY +#if defined(ESP_LUA_INTERPRETER_FEATURE) + if (msg->origin != ESP3DClientType::lua_script && + msg->origin == getOutputClient() && esp3d_lua_interpreter.isScriptRunning()) { + if (msg->target == ESP3DClientType::all_clients) { + // become the reference message + msg->target = ESP3DClientType::lua_script; + } else { + // duplicate message because current is already pending + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); + if (copy_msg) { + copy_msg->target = ESP3DClientType::lua_script; + dispatch(copy_msg); + } else { + esp3d_log_e("Cannot duplicate message for lua script"); + } + } + } +#endif // ESP_LUA_INTERPRETER_FEATURE + +#if defined(GCODE_HOST_FEATURE) + if (msg->origin != ESP3DClientType::stream && esp3d_gcode_host.getStatus() != HOST_NO_STREAM) { + if (msg->target == ESP3DClientType::all_clients) { + // become the reference message + msg->target = ESP3DClientType::stream; + } else { + // duplicate message because current is already pending + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); + if (copy_msg) { + copy_msg->target = ESP3DClientType::stream; + dispatch(copy_msg); + } else { + esp3d_log_e("Cannot duplicate message for gcode host"); + } + } + } +#endif + #if defined(DISPLAY_DEVICE) if (msg->origin != ESP3DClientType::rendering && msg->origin != getOutputClient()) { @@ -1432,7 +1557,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->request_id.id = ESP_OUTPUT_STATUS; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::rendering; copy_msg->request_id.id = ESP_OUTPUT_STATUS; @@ -1452,7 +1577,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::echo_serial; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::echo_serial; dispatch(copy_msg); @@ -1470,7 +1595,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::serial_bridge; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::serial_bridge; dispatch(copy_msg); @@ -1489,7 +1614,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::bluetooth; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::bluetooth; dispatch(copy_msg); @@ -1508,7 +1633,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::telnet; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::telnet; dispatch(copy_msg); @@ -1531,7 +1656,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::webui_websocket; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::webui_websocket; dispatch(copy_msg); @@ -1553,7 +1678,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { msg->target = ESP3DClientType::websocket; } else { // duplicate message because current is already pending - ESP3DMessage *copy_msg = ESP3DMessageManager::copyMsg(*msg); + ESP3DMessage *copy_msg = esp3d_message_manager.copyMsg(*msg); if (copy_msg) { copy_msg->target = ESP3DClientType::websocket; dispatch(copy_msg); @@ -1585,7 +1710,7 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) { // clear message if (!sendOk) { esp3d_log_e("Send msg failed"); - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); } return sendOk; } diff --git a/src/core/esp3d_commands.h b/src/core/esp3d_commands.h index f63f1b5..3925b95 100644 --- a/src/core/esp3d_commands.h +++ b/src/core/esp3d_commands.h @@ -53,14 +53,10 @@ class ESP3DCommands { void ESP100(int cmd_params_pos, ESP3DMessage* msg); void ESP101(int cmd_params_pos, ESP3DMessage* msg); #endif // WIFI_FEATURE -#if defined(WIFI_FEATURE) || defined(ETH_FEATURE) +#if defined(WIFI_FEATURE) void ESP102(int cmd_params_pos, ESP3DMessage* msg); void ESP103(int cmd_params_pos, ESP3DMessage* msg); -#endif // WIFI_FEATURE ||ETH_FEATURE -#if defined(WIFI_FEATURE) || defined(BLUETOOTH_FEATURE) || defined(ETH_FEATURE) void ESP104(int cmd_params_pos, ESP3DMessage* msg); -#endif // WIFI_FEATURE || BLUETOOTH_FEATURE || ETH_FEATURE -#if defined(WIFI_FEATURE) void ESP105(int cmd_params_pos, ESP3DMessage* msg); void ESP106(int cmd_params_pos, ESP3DMessage* msg); void ESP107(int cmd_params_pos, ESP3DMessage* msg); @@ -77,6 +73,11 @@ class ESP3DCommands { void ESP114(int cmd_params_pos, ESP3DMessage* msg); void ESP115(int cmd_params_pos, ESP3DMessage* msg); #endif // WIFI_FEATURE || BLUETOOTH_FEATURE || ETH_FEATURE +#if defined(ETH_FEATURE) + void ESP116(int cmd_params_pos, ESP3DMessage* msg); + void ESP117(int cmd_params_pos, ESP3DMessage* msg); + void ESP118(int cmd_params_pos, ESP3DMessage* msg); +#endif // ETH_FEATURE #if defined(HTTP_FEATURE) void ESP120(int cmd_params_pos, ESP3DMessage* msg); void ESP121(int cmd_params_pos, ESP3DMessage* msg); @@ -131,6 +132,10 @@ class ESP3DCommands { #endif // SENSOR_DEVICE void ESP220(int cmd_params_pos, ESP3DMessage* msg); void ESP290(int cmd_params_pos, ESP3DMessage* msg); +#if defined(ESP_LUA_INTERPRETER_FEATURE) + void ESP300(int cmd_params_pos, ESP3DMessage* msg); + void ESP301(int cmd_params_pos, ESP3DMessage* msg); +#endif // ESP_LUA_INTERPRETER_FEATURE void ESP400(int cmd_params_pos, ESP3DMessage* msg); void ESP401(int cmd_params_pos, ESP3DMessage* msg); #if defined(WIFI_FEATURE) @@ -175,6 +180,10 @@ class ESP3DCommands { void ESP900(int cmd_params_pos, ESP3DMessage* msg); void ESP901(int cmd_params_pos, ESP3DMessage* msg); #endif // COMMUNICATION_PROTOCOL != SOCKET_SERIAL +#if defined(USB_SERIAL_FEATURE) + void ESP902(int cmd_params_pos, ESP3DMessage* msg); + void ESP950(int cmd_params_pos, ESP3DMessage* msg); +#endif // defined(USB_SERIAL_FEATURE) #if defined(ESP_SERIAL_BRIDGE_OUTPUT) void ESP930(int cmd_params_pos, ESP3DMessage* msg); void ESP931(int cmd_params_pos, ESP3DMessage* msg); @@ -218,7 +227,6 @@ class ESP3DCommands { bool isFirst = false); bool dispatchAuthenticationError(ESP3DMessage* msg, uint cmdid, bool json); bool formatCommand(char* cmd, size_t len); - bool isRealTimeCommand(char* cmd, size_t len); ESP3DClientType getOutputClient(bool fromSettings = false); void setOutputClient(ESP3DClientType output_client) { _output_client = output_client; diff --git a/src/core/esp3d_hal.cpp b/src/core/esp3d_hal.cpp index 56a527d..286342f 100644 --- a/src/core/esp3d_hal.cpp +++ b/src/core/esp3d_hal.cpp @@ -34,9 +34,18 @@ #endif // __has_include ("rtc_wdt.h") #endif // CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 #include +#if ESP_ARDUINO_VERSION_MAJOR == 3 +#include +#include +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 +#if ESP_ARDUINO_VERSION_MAJOR == 2 #include +#endif // ESP_ARDUINO_VERSION_MAJOR == 2 #include + +#if !CONFIG_IDF_TARGET_ESP32C6 #include +#endif // !CONFIG_IDF_TARGET_ESP32C6 TaskHandle_t ESP3DHal::xHandle = nullptr; #endif // ARDUINO_ARCH_ESP32 @@ -65,6 +74,26 @@ int ESP3DHal::analogRead(uint8_t pin) { #endif } +const char* ESP3DHal::arduinoVersion() { + static String version = ""; +#ifdef ARDUINO_ARCH_ESP32 + version = ESP_ARDUINO_VERSION_MAJOR; + version += "."; + version += ESP_ARDUINO_VERSION_MINOR; + version += "."; + version += ESP_ARDUINO_VERSION_PATCH; +#endif // ARDUINO_ARCH_ESP32 + +#ifdef ARDUINO_ARCH_ESP8266 +#ifdef ARDUINO_ESP8266_RELEASE + version = ARDUINO_ESP8266_RELEASE; +#else + version = ESP.getCoreVersion(); +#endif // ARDUINO_ESP8266_RELEASE +#endif // ARDUINO_ARCH_ESP8266 + return version.c_str(); +} + bool ESP3DHal::analogWrite(uint8_t pin, uint value) { if (value > (_analogRange - 1)) { return false; @@ -115,10 +144,7 @@ void ESP3DHal::analogRange(uint32_t range) { // Setup bool ESP3DHal::begin() { -#if defined(ARDUINO_ARCH_ESP32) && defined(CAMERA_DEVICE) - esp3d_log("Disable brown out"); - WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); // disable brownout detector -#endif // ARDUINO_ARCH_ESP32 && CAMERA_DEVICE + checkTWDT(); // Clear all wifi state WiFi.persistent(false); WiFi.disconnect(true); @@ -140,47 +166,61 @@ bool ESP3DHal::begin() { // End ESP3D void ESP3DHal::end() {} +void ESP3DHal::checkTWDT() { + // ESP32-C6 Seems not working with esp_task_wdt_reset() + // I itinitally though it was wrong initialization of TWDT + // doing esp_task_wdt_init() is not working + // but esp_task_wdt_reconfigure() is working + // unfortunately it is still not working with esp_task_wdt_reset() + // so because doing esp_task_wdt_reconfigure and not do not change the + // behavior so I comment it for now as note Instead I use vTaskDelay(1) to + // feed the WDT and seems ok delay(1) seems also ok + /* + #if CONFIG_IDF_TARGET_ESP32C6 + //ESP32-C6 + esp_err_t err = esp_task_wdt_status(NULL); + if (err == ESP_ERR_NOT_FOUND) { + esp3d_log_e("WDT was never initialized"); + esp_task_wdt_config_t twdt_config = { + .timeout_ms = 2 * 1000, + .idle_core_mask = (1 << 0), + .trigger_panic = true, + }; + err = esp_task_wdt_reconfigure(&twdt_config); + if (err == ESP_ERR_INVALID_STATE) { + esp3d_log_e("WDT already initialized"); + } else if (err != ESP_OK) { + esp3d_log_e("WDT cannot be setup"); + } else { + esp3d_log("WDT setup ok"); + } + } + #endif // CONFIG_IDF_TARGET_ESP32C6 + */ +} + // Watchdog feeder void ESP3DHal::wdtFeed() { +#ifdef ARDUINO_ARCH_ESP32 + vTaskDelay(1); + return; +#endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 ESP.wdtFeed(); #endif // ARDUINO_ARCH_ESP8266 -#ifdef ARDUINO_ARCH_ESP32 - static uint64_t lastYield = 0; - uint64_t now = millis(); - if ((now - lastYield) > 2000) { - lastYield = now; - vTaskDelay(5); // delay 1 RTOS tick - } -#if !defined(DISABLE_WDT_ESP3DLIB_TASK) && !defined(DISABLE_WDT_CORE_0) -#if CONFIG_IDF_TARGET_ESP32 - // FIXME: not implemented - rtc_wdt_feed(); -#endif // CONFIG_IDF_TARGET_ESP32S2 -#endif //! defined(DISABLE_WDT_ESP3DLIB_TASK) && !defined(DISABLE_WDT_CORE_0) -#ifndef DISABLE_WDT_ESP3DLIB_TASK - if (xHandle && esp_task_wdt_status(xHandle) == ESP_OK) { - if (esp_task_wdt_reset() != ESP_OK) { - esp3d_log_e("WDT Reset failed"); - } - } -#endif // DISABLE_WDT_ESP3DLIB_TASK -#endif // ARDUINO_ARCH_ESP32 } // wait function void ESP3DHal::wait(uint32_t milliseconds) { -#if defined(ASYNCWEBSERVER) + #ifdef ARDUINO_ARCH_ESP32 uint32_t timeout = millis(); while ((millis() - timeout) < milliseconds) { wdtFeed(); } -#else // !(ASYNCWEBSERVER - wdtFeed(); - // before 0 was acceptable, now it seems need to put 5 to have some effect if - // on esp32 core 0 - delay(milliseconds < 5 ? 5 : milliseconds); -#endif // !ASYNCWEBSERVER +#endif // CONFIG_IDF_TARGET_ESP32 +#ifdef ARDUINO_ARCH_ESP8266 +delay(milliseconds); +#endif // ARDUINO_ARCH_ESP8266 } uint16_t ESP3DHal::getChipID() { diff --git a/src/core/esp3d_hal.h b/src/core/esp3d_hal.h index a1f017e..da59ea0 100644 --- a/src/core/esp3d_hal.h +++ b/src/core/esp3d_hal.h @@ -48,6 +48,8 @@ class ESP3DHal { static bool analogWrite(uint8_t pin, uint value); static void analogWriteFreq(uint32_t freq); static void analogRange(uint32_t range); + static const char * arduinoVersion(); + static void checkTWDT(); #if defined(ARDUINO_ARCH_ESP32) static TaskHandle_t xHandle; #endif // ARDUINO_ARCH_ESP32 diff --git a/src/core/esp3d_message.cpp b/src/core/esp3d_message.cpp index f3b48da..bd7e7e4 100644 --- a/src/core/esp3d_message.cpp +++ b/src/core/esp3d_message.cpp @@ -24,28 +24,67 @@ ESP3DRequest no_id{.id = 0}; +ESP3DMessageManager esp3d_message_manager; + +ESP3DMessageManager::ESP3DMessageManager() { + _mutex = xSemaphoreCreateMutex(); #if defined(ESP_LOG_FEATURE) -int msg_counting = 0; + _msg_counting = 0; #endif // ESP_LOG_FEATURE +} + +ESP3DMessageManager::~ESP3DMessageManager() { vSemaphoreDelete(_mutex); } bool ESP3DMessageManager::deleteMsg(ESP3DMessage* message) { - if (!message) return false; + esp3d_log("Delete msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + bool result = _deleteMsg(message); + xSemaphoreGive(_mutex); + esp3d_log("Delete msg done"); + return result; + } else { + esp3d_log_e("Mutex not taken"); + } + return false; +} + +bool ESP3DMessageManager::_deleteMsg(ESP3DMessage* message) { + esp3d_log("_Delete msg"); + if (!message) { + esp3d_log_e("Message is null"); + return false; + } if (message->data) { + esp3d_log("Free data"); free(message->data); } free(message); message = NULL; #if defined(ESP_LOG_FEATURE) - esp3d_log("Deletion : Now we have %ld msg", --msg_counting); + esp3d_log("Deletion : Now we have %ld msg", --_msg_counting); #endif // ESP_LOG_FEATURE return true; } ESP3DMessage* ESP3DMessageManager::newMsg() { + esp3d_log("New msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = nullptr; + newMsgPtr = _newMsg(); + xSemaphoreGive(_mutex); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_newMsg() { + esp3d_log("_New msg"); ESP3DMessage* newMsgPtr = (ESP3DMessage*)malloc(sizeof(ESP3DMessage)); if (newMsgPtr) { #if defined(ESP_LOG_FEATURE) - esp3d_log("Creation : Now we have %ld msg", ++msg_counting); + esp3d_log("Creation : Now we have %ld msg", ++_msg_counting); #endif // ESP_LOG_FEATURE newMsgPtr->data = nullptr; newMsgPtr->size = 0; @@ -57,45 +96,113 @@ ESP3DMessage* ESP3DMessageManager::newMsg() { } else { esp3d_log_e("Out of memory"); } + esp3d_log("Message created"); return newMsgPtr; } ESP3DMessage* ESP3DMessageManager::newMsg(ESP3DRequest requestId) { - ESP3DMessage* newMsgPtr = newMsg(); + esp3d_log("New msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = nullptr; + newMsgPtr = _newMsg(requestId); + xSemaphoreGive(_mutex); + esp3d_log("New msg done"); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_newMsg(ESP3DRequest requestId) { + esp3d_log("_New msg"); + ESP3DMessage* newMsgPtr = _newMsg(); if (newMsgPtr) { + esp3d_log("New msg done"); newMsgPtr->origin = ESP3DClientType::command; newMsgPtr->request_id = requestId; + } else { + esp3d_log_e("newMsgPtr is null"); } return newMsgPtr; } bool ESP3DMessageManager::copyMsgInfos(ESP3DMessage* newMsgPtr, ESP3DMessage msg) { + esp3d_log("Copy msg infos"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + bool result = _copyMsgInfos(newMsgPtr, msg); + xSemaphoreGive(_mutex); + esp3d_log("Copy msg infos done"); + return result; + } else { + esp3d_log_e("Mutex not taken"); + } + return NULL; +} + +bool ESP3DMessageManager::_copyMsgInfos(ESP3DMessage* newMsgPtr, + ESP3DMessage msg) { + esp3d_log("_Copy msg infos"); if (!newMsgPtr) { + esp3d_log_e("newMsgPtr is null"); return false; } + esp3d_log("Copying msg infos"); newMsgPtr->origin = msg.origin; newMsgPtr->target = msg.target; newMsgPtr->authentication_level = msg.authentication_level; newMsgPtr->request_id = msg.request_id; newMsgPtr->type = msg.type; + return true; } ESP3DMessage* ESP3DMessageManager::copyMsgInfos(ESP3DMessage msg) { - ESP3DMessage* newMsgPtr = newMsg(); + esp3d_log("Copy msg infos"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = _copyMsgInfos(msg); + xSemaphoreGive(_mutex); + esp3d_log("Copy msg infos done"); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_copyMsgInfos(ESP3DMessage msg) { + esp3d_log("_Copy msg infos"); + ESP3DMessage* newMsgPtr = _newMsg(); if (newMsgPtr) { - copyMsgInfos(newMsgPtr, msg); + _copyMsgInfos(newMsgPtr, msg); + } else { + esp3d_log_e("newMsg is null"); } return newMsgPtr; } ESP3DMessage* ESP3DMessageManager::copyMsg(ESP3DMessage msg) { - ESP3DMessage* newMsgPtr = newMsg(msg.origin, msg.target, msg.data, msg.size, - msg.authentication_level); + esp3d_log("Copy msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = _copyMsg(msg); + xSemaphoreGive(_mutex); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_copyMsg(ESP3DMessage msg) { + esp3d_log("_Copy msg"); + ESP3DMessage* newMsgPtr = _newMsg(msg.origin, msg.target, msg.data, msg.size, + msg.authentication_level); if (newMsgPtr) { newMsgPtr->request_id = msg.request_id; newMsgPtr->type = msg.type; + } else { + esp3d_log_e("newMsgPtr is null"); } return newMsgPtr; } @@ -103,15 +210,36 @@ ESP3DMessage* ESP3DMessageManager::copyMsg(ESP3DMessage msg) { ESP3DMessage* ESP3DMessageManager::newMsg( ESP3DClientType origin, ESP3DClientType target, const uint8_t* data, size_t length, ESP3DAuthenticationLevel authentication_level) { - ESP3DMessage* newMsgPtr = newMsg(origin, target, authentication_level); + esp3d_log("New msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = + _newMsg(origin, target, data, length, authentication_level); + xSemaphoreGive(_mutex); + esp3d_log("New msg done"); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_newMsg( + ESP3DClientType origin, ESP3DClientType target, const uint8_t* data, + size_t length, ESP3DAuthenticationLevel authentication_level) { + ESP3DMessage* newMsgPtr = _newMsg(origin, target, authentication_level); + esp3d_log("_New msg"); if (newMsgPtr) { - if (!setDataContent(newMsgPtr, data, length)) { - deleteMsg(newMsgPtr); + if (!_setDataContent(newMsgPtr, data, length)) { + _deleteMsg(newMsgPtr); newMsgPtr = nullptr; esp3d_log_e("newMsg failed for origin %d, target %d, data %s", (uint8_t)origin, (uint8_t)target, data ? (char*)data : "null"); + } else { + esp3d_log("Message created"); } + } else { + esp3d_log_e("newMsgPtr is null"); } return newMsgPtr; } @@ -119,17 +247,51 @@ ESP3DMessage* ESP3DMessageManager::newMsg( ESP3DMessage* ESP3DMessageManager::newMsg( ESP3DClientType origin, ESP3DClientType target, ESP3DAuthenticationLevel authentication_level) { - ESP3DMessage* newMsgPtr = newMsg(); + esp3d_log("New msg"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + ESP3DMessage* newMsgPtr = _newMsg(origin, target, authentication_level); + xSemaphoreGive(_mutex); + esp3d_log("New msg done"); + return newMsgPtr; + } else { + esp3d_log_e("Mutex not taken"); + } + return nullptr; +} + +ESP3DMessage* ESP3DMessageManager::_newMsg( + ESP3DClientType origin, ESP3DClientType target, + ESP3DAuthenticationLevel authentication_level) { + esp3d_log("_New msg"); + ESP3DMessage* newMsgPtr = _newMsg(); if (newMsgPtr) { newMsgPtr->origin = origin; newMsgPtr->target = target; newMsgPtr->authentication_level = authentication_level; + } else { + esp3d_log_e("newMsgPtr is null"); } + esp3d_log("_New msg done"); return newMsgPtr; } bool ESP3DMessageManager::setDataContent(ESP3DMessage* msg, const uint8_t* data, size_t length) { + esp3d_log("Set data content"); + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + bool result = _setDataContent(msg, data, length); + xSemaphoreGive(_mutex); + esp3d_log("Set data content done"); + return result; + } else { + esp3d_log_e("Mutex not taken"); + } + return false; +} + +bool ESP3DMessageManager::_setDataContent(ESP3DMessage* msg, + const uint8_t* data, size_t length) { + esp3d_log("_Set data content"); if (!msg) { esp3d_log_e("no valid msg container"); return false; diff --git a/src/core/esp3d_message.h b/src/core/esp3d_message.h index 253c30c..a921ae8 100644 --- a/src/core/esp3d_message.h +++ b/src/core/esp3d_message.h @@ -25,8 +25,7 @@ #define ESP_STATE_DISCONNECTED 0 -#ifndef _ESP3DOUTPUT_H -#define _ESP3DOUTPUT_H +#pragma once #include "../include/esp3d_config.h" @@ -43,8 +42,25 @@ class WebServer; #include "../modules/authentication/authentication_level_types.h" #include "esp3d_client_types.h" +#if defined(ARDUINO_ARCH_ESP32) +#include "freertos/FreeRTOS.h" +#include "freertos/semphr.h" +#endif // ARDUINO_ARCH_ESP32 -enum class ESP3DMessageType : uint8_t { head, core, tail, unique }; +#if defined(ARDUINO_ARCH_ESP8266) +//To avoid compilation error on ESP8266 +// and to use many ifdefs +#ifndef pdTRUE +#define pdTRUE true +#define xSemaphoreTake(A, B) true +#define xSemaphoreGive(A) +#define xSemaphoreCreateMutex(A) 0 +#define vSemaphoreDelete(A) +#define SemaphoreHandle_t void* +#endif //pdTRUE +#endif //ESP8266 + +enum class ESP3DMessageType : uint8_t { head, core, tail, unique, realtimecmd }; union ESP3DRequest { uint id; @@ -68,21 +84,44 @@ struct ESP3DMessage { class ESP3DMessageManager final { public: - static ESP3DMessage *newMsg(); - static ESP3DMessage *newMsg(ESP3DRequest requestId); - static bool deleteMsg(ESP3DMessage *message); - static bool copyMsgInfos(ESP3DMessage *newMsgPtr, ESP3DMessage msg); - static ESP3DMessage *copyMsgInfos(ESP3DMessage msg); - static ESP3DMessage *copyMsg(ESP3DMessage msg); - static ESP3DMessage *newMsg(ESP3DClientType origin, ESP3DClientType target, - const uint8_t *data, size_t length, - ESP3DAuthenticationLevel authentication_level = - ESP3DAuthenticationLevel::guest); - static ESP3DMessage *newMsg(ESP3DClientType origin, ESP3DClientType target, - ESP3DAuthenticationLevel authentication_level = - ESP3DAuthenticationLevel::guest); - static bool setDataContent(ESP3DMessage *msg, const uint8_t *data, - size_t length); + ESP3DMessageManager(); + ~ESP3DMessageManager(); + ESP3DMessage *newMsg(); + ESP3DMessage *newMsg(ESP3DRequest requestId); + bool deleteMsg(ESP3DMessage *message); + bool copyMsgInfos(ESP3DMessage *newMsgPtr, ESP3DMessage msg); + ESP3DMessage *copyMsgInfos(ESP3DMessage msg); + + ESP3DMessage *copyMsg(ESP3DMessage msg); + + ESP3DMessage *newMsg(ESP3DClientType origin, ESP3DClientType target, + const uint8_t *data, size_t length, + ESP3DAuthenticationLevel authentication_level = + ESP3DAuthenticationLevel::guest); + ESP3DMessage *newMsg(ESP3DClientType origin, ESP3DClientType target, + ESP3DAuthenticationLevel authentication_level = + ESP3DAuthenticationLevel::guest); + bool setDataContent(ESP3DMessage *msg, const uint8_t *data, size_t length); + + private: + bool _deleteMsg(ESP3DMessage *message); + ESP3DMessage *_newMsg(); + ESP3DMessage *_newMsg(ESP3DRequest requestId); + bool _copyMsgInfos(ESP3DMessage *newMsgPtr, ESP3DMessage msg); + ESP3DMessage *_copyMsgInfos(ESP3DMessage msg); + ESP3DMessage *_copyMsg(ESP3DMessage msg); + ESP3DMessage *_newMsg(ESP3DClientType origin, ESP3DClientType target, + const uint8_t *data, size_t length, + ESP3DAuthenticationLevel authentication_level = + ESP3DAuthenticationLevel::guest); + ESP3DMessage *_newMsg(ESP3DClientType origin, ESP3DClientType target, + ESP3DAuthenticationLevel authentication_level = + ESP3DAuthenticationLevel::guest); + bool _setDataContent(ESP3DMessage *msg, const uint8_t *data, size_t length); + SemaphoreHandle_t _mutex; +#if defined(ESP_LOG_FEATURE) + int _msg_counting; +#endif // ESP_LOG_FEATURE }; -#endif //_ESP3DOUTPUT_H +extern ESP3DMessageManager esp3d_message_manager; \ No newline at end of file diff --git a/src/core/esp3d_messageFifo.h b/src/core/esp3d_messageFifo.h new file mode 100644 index 0000000..f52b944 --- /dev/null +++ b/src/core/esp3d_messageFifo.h @@ -0,0 +1,168 @@ +/* + esp3d_messageFifo.h - class for managing messages list, thread safe + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#pragma once +#if !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP8285) + +#include + +#include + +#include "../include/esp3d_config.h" +#include "esp3d_message.h" +#if defined(ARDUINO_ARCH_ESP32) +#include "freertos/FreeRTOS.h" +#include "freertos/semphr.h" +#endif // ARDUINO_ARCH_ESP32 + +#if defined(ARDUINO_ARCH_ESP8266) +// To avoid compilation error on ESP8266 +// and to use many ifdefs +#ifndef pdTRUE +#define pdTRUE true +#define xSemaphoreTake(A, B) true +#define xSemaphoreGive(A) +#define xSemaphoreCreateMutex(A) 0 +#define vSemaphoreDelete(A) +#define SemaphoreHandle_t void* +#endif // pdTRUE +#endif // ESP8266 + +class ESP3DMessageFIFO { + public: + ESP3DMessageFIFO(size_t maxSize = 5) { + _mutex = xSemaphoreCreateMutex(); + _maxSize = maxSize; + } + + ~ESP3DMessageFIFO() { + clear(); + vSemaphoreDelete(_mutex); + } + void setId(String id) { _id = id; } + String getId() { return _id; } + + void setMaxSize(size_t maxSize) { _maxSize = maxSize; } + size_t getMaxSize() { return _maxSize; } + + void push(ESP3DMessage* message) { + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + esp3d_log("push to list [%s] size: %d", _id.c_str(), fifo.size()); + if (fifo.size() >= _maxSize && _maxSize != 0) { + esp3d_log("remove oldest message to make room for new one"); + ESP3DMessage* oldestMessage = fifo.front(); + fifo.pop(); + esp3d_message_manager.deleteMsg(oldestMessage); + esp3d_log("oldest message removed, list [%s] size: %d", _id.c_str(), + fifo.size()); + } + fifo.push(message); + esp3d_log("push to list [%s] size: %d", _id.c_str(), fifo.size()); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("push to list [%s] failed, list size: %d", _id.c_str(), + fifo.size()); + esp3d_log_e("Delete message"); + esp3d_message_manager.deleteMsg(message); + } + } + + ESP3DMessage* pop() { + ESP3DMessage* message = nullptr; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + if (!fifo.empty()) { + esp3d_log("pop from list [%s] size: %d", _id.c_str(), fifo.size()); + message = fifo.front(); + fifo.pop(); + esp3d_log("Now list [%s] size: %d", _id.c_str(), fifo.size()); + esp3d_log("Message: %s", (const char*)message->data); + } + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("pop from list [%s] failed, list size: %d", _id.c_str(), + fifo.size()); + } + return message; + } + + bool isEmpty() { + bool empty = true; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + empty = fifo.empty(); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + return empty; + } + + size_t size() { + size_t s = 0; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + s = fifo.size(); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + return s; + } + + void clear() { + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + while (!fifo.empty()) { + ESP3DMessage* message = fifo.front(); + fifo.pop(); + esp3d_message_manager.deleteMsg(message); + } + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + } + + bool applyToEach(std::function fn, + bool stopOnFalse = true) { + bool result = false; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + result = true; + size_t size = fifo.size(); + for (size_t i = 0; i < size; ++i) { + ESP3DMessage* message = fifo.front(); + bool result = fn(message); + fifo.pop(); + if (!result && stopOnFalse) { + result = false; + break; + } + } + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + return result; + } + + private: + std::queue fifo; + SemaphoreHandle_t _mutex; + size_t _maxSize; + String _id; +}; + +#endif // !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP8285) \ No newline at end of file diff --git a/src/core/esp3d_settings.cpp b/src/core/esp3d_settings.cpp index f205e67..da30a72 100644 --- a/src/core/esp3d_settings.cpp +++ b/src/core/esp3d_settings.cpp @@ -54,6 +54,9 @@ #endif // TIMESTAMP_FEATURE #include "../modules/serial/serial_service.h" +#if defined(USB_SERIAL_FEATURE) +#include "../modules/usb-serial/usb_serial_service.h" +#endif // USB_SERIAL_FEATURE // Current Settings Version #define CURRENT_SETTINGS_VERSION "ESP3D05" @@ -75,6 +78,12 @@ #define MIN_SERVER_ADDRESS_LENGTH 0 // default byte values +#ifdef ETH_FEATURE +#define DEFAULT_ETH_STA_FALLBACK_MODE STRING(ESP_NO_NETWORK) +#else +#define DEFAULT_ETH_STA_FALLBACK_MODE STRING(ESP_NO_NETWORK) +#endif // ETH_FEATURE + #ifdef WIFI_FEATURE #define DEFAULT_STA_FALLBACK_MODE STRING(ESP_AP_SETUP) #if defined(STATION_WIFI_SSID) && defined(STATION_WIFI_PASSWORD) @@ -95,6 +104,17 @@ #endif // BLUETOOTH_FEATURE #endif // WIFI_FEATURE + +#if COMMUNICATION_PROTOCOL == RAW_SERIAL +#define DEFAULT_OUTPUT_CLIENT STRING(ESP3DClientType::serial); +#endif // COMMUNICATION_PROTOCOL == RAW_SERIAL +#if COMMUNICATION_PROTOCOL == MKS_SERIAL +#define DEFAULT_OUTPUT_CLIENT STRING(ESP3DClientType::mks_serial); +#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL +#if COMMUNICATION_PROTOCOL == SOCKET_SERIAL +#define DEFAULT_OUTPUT_CLIENT STRING(ESP3DClientType::socket_serial); +#endif + #define DEFAULT_BUZZER_STATE "1" #define DEFAULT_INTERNET_TIME "0" #define DEFAULT_SETUP "0" @@ -192,6 +212,12 @@ uint16_t ESP3DSettingsData[] = {ESP_RADIO_MODE, ESP_STA_DNS_VALUE, ESP_AP_IP_VALUE, ESP_STA_IP_MODE, + ESP_ETH_STA_FALLBACK_MODE, + ESP_ETH_STA_IP_VALUE, + ESP_ETH_STA_GATEWAY_VALUE, + ESP_ETH_STA_MASK_VALUE, + ESP_ETH_STA_DNS_VALUE, + ESP_ETH_STA_IP_MODE, ESP_SETTINGS_VERSION, ESP_NOTIFICATION_TYPE, ESP_CALIBRATION, @@ -239,9 +265,9 @@ uint16_t ESP3DSettingsData[] = {ESP_RADIO_MODE, ESP_FTP_DATA_ACTIVE_PORT, ESP_FTP_DATA_PASSIVE_PORT, ESP_WEBDAV_PORT, - ESP_SERIAL_BRIDGE_BAUD - -}; + ESP_SERIAL_BRIDGE_BAUD, + ESP_OUTPUT_CLIENT, + ESP_USB_SERIAL_BAUD_RATE}; #if defined(SD_DEVICE) const uint8_t SupportedSPIDivider[] = {1, 2, 4, 6, 8, 16, 32}; const uint8_t SupportedSPIDividerSize = @@ -714,6 +740,8 @@ const char *ESP3DSettings::TargetBoard() { #define TYPE_BOARD "ESP32-S3" #elif CONFIG_IDF_TARGET_ESP32C3 #define TYPE_BOARD "ESP32-C3" +#elif CONFIG_IDF_TARGET_ESP32C6 +#define TYPE_BOARD "ESP32-C6" #endif #ifdef BOARD_HAS_PSRAM #define IS_PSRAM " (PSRAM)" @@ -857,6 +885,15 @@ bool ESP3DSettings::isValidIntegerSetting(uint32_t value, } switch (settingElement) { #if COMMUNICATION_PROTOCOL == RAW_SERIAL || COMMUNICATION_PROTOCOL == MKS_SERIAL +#if defined(USB_SERIAL_FEATURE) + case ESP_USB_SERIAL_BAUD_RATE: + for (uint8_t i = 0; i < SupportedUsbSerialBaudListSize; i++) { + if (value == SupportedUsbSerialBaudList[i]) { + return true; + } + } + break; +#endif // USB_SERIAL_FEATURE case ESP_SERIAL_BRIDGE_BAUD: case ESP_BAUD_RATE: for (uint8_t i = 0; i < SupportedBaudListSize; i++) { @@ -932,6 +969,12 @@ bool ESP3DSettings::isValidByteSetting(uint8_t value, return true; } break; + case ESP_OUTPUT_CLIENT: + if (value == (uint8_t)ESP3DClientType::serial) return true; +#if ESP_SERIAL_OUTPUT == USE_USB_SERIAL + if (value == (uint8_t)ESP3DClientType::usb_serial) return true; +#endif // ESP_SERIAL_OUTPUT == USE_USB_SERIAL + break; #if defined(NOTIFICATION_FEATURE) case ESP_NOTIFICATION_TYPE: if (value == ESP_NO_NOTIFICATION || value == ESP_PUSHOVER_NOTIFICATION || @@ -960,12 +1003,19 @@ bool ESP3DSettings::isValidByteSetting(uint8_t value, return true; } break; - case ESP_STA_IP_MODE: +#ifdef ETH_FEATURE + case ESP_ETH_STA_IP_MODE: if (value == DHCP_MODE || value == STATIC_IP_MODE) { return true; } break; +#endif // ETH_FEATURE #if defined(WIFI_FEATURE) + case ESP_STA_IP_MODE: + if (value == DHCP_MODE || value == STATIC_IP_MODE) { + return true; + } + break; case ESP_AP_CHANNEL: for (uint8_t i = 0; i < SupportedApChannelsSize; i++) { if (value == SupportedApChannels[i]) { @@ -1012,11 +1062,22 @@ bool ESP3DSettings::isValidByteSetting(uint8_t value, // 0 means no timeout so it is ok to have 0 return true; break; - case ESP_STA_FALLBACK_MODE: +#ifdef ETH_FEATURE + case ESP_ETH_STA_FALLBACK_MODE: if (value == ESP_NO_NETWORK +#if defined(BT_FEATURE) + || value == ESP_BT +#endif // BT_FEATURE + ) { + return true; + } + break; +#endif // ETH_FEATURE #if defined(WIFI_FEATURE) + case ESP_STA_FALLBACK_MODE: + if (value == ESP_NO_NETWORK + || value == ESP_AP_SETUP -#endif // WIFI_FEATURE #if defined(BT_FEATURE) || value == ESP_BT #endif // BT_FEATURE @@ -1024,7 +1085,7 @@ bool ESP3DSettings::isValidByteSetting(uint8_t value, return true; } break; - +#endif // WIFI_FEATURE default: return false; } @@ -1117,8 +1178,11 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_SECURE_SERIAL: case ESP_BOOT_RADIO_STATE: case ESP_STA_FALLBACK_MODE: + case ESP_ETH_STA_FALLBACK_MODE: case ESP_SERIAL_BRIDGE_ON: case ESP_STA_IP_MODE: + case ESP_ETH_STA_IP_MODE: + case ESP_OUTPUT_CLIENT: setting.type = ESP3DSettingType::byte_t; // byte break; @@ -1144,6 +1208,10 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_STA_GATEWAY_VALUE: case ESP_STA_MASK_VALUE: case ESP_STA_DNS_VALUE: + case ESP_ETH_STA_IP_VALUE: + case ESP_ETH_STA_GATEWAY_VALUE: + case ESP_ETH_STA_MASK_VALUE: + case ESP_ETH_STA_DNS_VALUE: case ESP_AP_IP_VALUE: setting.type = ESP3DSettingType::ip_t; // ip = 4 bytes @@ -1165,7 +1233,7 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_FTP_DATA_PASSIVE_PORT: case ESP_WEBDAV_PORT: case ESP_SERIAL_BRIDGE_BAUD: - + case ESP_USB_SERIAL_BAUD_RATE: setting.type = ESP3DSettingType::integer_t; // integer = 4 bytes break; default: @@ -1197,11 +1265,18 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_WEBDAV_ON: case ESP_SECURE_SERIAL: case ESP_BOOT_RADIO_STATE: + case ESP_ETH_STA_FALLBACK_MODE: case ESP_STA_FALLBACK_MODE: case ESP_SERIAL_BRIDGE_ON: + case ESP_ETH_STA_IP_MODE: case ESP_STA_IP_MODE: + case ESP_OUTPUT_CLIENT: setting.size = 1; // 1 byte break; + case ESP_ETH_STA_IP_VALUE: + case ESP_ETH_STA_GATEWAY_VALUE: + case ESP_ETH_STA_MASK_VALUE: + case ESP_ETH_STA_DNS_VALUE: case ESP_STA_IP_VALUE: case ESP_STA_GATEWAY_VALUE: case ESP_STA_MASK_VALUE: @@ -1223,6 +1298,7 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_FTP_DATA_PASSIVE_PORT: case ESP_WEBDAV_PORT: case ESP_SERIAL_BRIDGE_BAUD: + case ESP_USB_SERIAL_BAUD_RATE: setting.size = 4; // 4 bytes break; // Note for string size is the max size of the string, in EEPROM it use @@ -1278,6 +1354,7 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( // default value of setting in string switch (index) { + case ESP_ETH_STA_IP_MODE: case ESP_STA_IP_MODE: setting.default_val = DEFAULT_STA_IP_MODE; break; @@ -1287,6 +1364,8 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_STA_SSID: setting.default_val = DEFAULT_STA_SSID; break; + case ESP_OUTPUT_CLIENT: + setting.default_val = DEFAULT_OUTPUT_CLIENT; case ESP_NOTIFICATION_TYPE: setting.default_val = DEFAULT_NOTIFICATION_TYPE; break; @@ -1350,6 +1429,9 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_BOOT_RADIO_STATE: setting.default_val = DEFAULT_BOOT_RADIO_STATE; break; + case ESP_ETH_STA_FALLBACK_MODE: + setting.default_val = DEFAULT_ETH_STA_FALLBACK_MODE; + break; case ESP_STA_FALLBACK_MODE: setting.default_val = DEFAULT_STA_FALLBACK_MODE; break; @@ -1401,21 +1483,26 @@ const ESP3DSettingDescription *ESP3DSettings::getSettingPtr( case ESP_TIME_ZONE: setting.default_val = DEFAULT_TIME_ZONE; break; + case ESP_ETH_STA_IP_VALUE: case ESP_STA_IP_VALUE: setting.default_val = DEFAULT_STA_IP_VALUE; break; + case ESP_ETH_STA_GATEWAY_VALUE: case ESP_STA_GATEWAY_VALUE: setting.default_val = DEFAULT_STA_GATEWAY_VALUE; break; + case ESP_ETH_STA_MASK_VALUE: case ESP_STA_MASK_VALUE: setting.default_val = DEFAULT_STA_MASK_VALUE; break; + case ESP_ETH_STA_DNS_VALUE: case ESP_STA_DNS_VALUE: setting.default_val = DEFAULT_STA_DNS_VALUE; break; case ESP_AP_IP_VALUE: setting.default_val = DEFAULT_AP_IP_VALUE; break; + case ESP_USB_SERIAL_BAUD_RATE: case ESP_BAUD_RATE: setting.default_val = DEFAULT_BAUD_RATE; break; diff --git a/src/core/esp3d_string.cpp b/src/core/esp3d_string.cpp index 6c1c56f..2d64aaf 100644 --- a/src/core/esp3d_string.cpp +++ b/src/core/esp3d_string.cpp @@ -22,6 +22,7 @@ #include #include "../include/esp3d_config.h" +#include "esp3d_settings.h" #if defined(WIFI_FEATURE) || defined(ETH_FEATURE) #include "../modules/network/netconfig.h" @@ -169,6 +170,28 @@ const char* esp3d_string::encodeString(const char* s) { return tmp.c_str(); } +// Encode a string to be used in a URL +const char* esp3d_string::urlEncode(const char* s) { + static String encoded; + encoded = ""; + char temp[4]; + for (size_t i = 0; i < strlen(s); i++) { + temp[0] = s[i]; + if (temp[0] == 32) { // space + encoded.concat('+'); + } else if ((temp[0] >= 48 && temp[0] <= 57) /*0-9*/ + || (temp[0] >= 65 && temp[0] <= 90) /*A-Z*/ + || (temp[0] >= 97 && temp[0] <= 122) /*a-z*/ + ) { + encoded.concat(temp[0]); + } else { // character needs encoding + snprintf(temp, 4, "%%%02X", temp[0]); + encoded.concat(temp); + } + } + return encoded.c_str(); +} + // helper to format size to readable string const char* esp3d_string::formatBytes(uint64_t bytes) { static String res; @@ -186,7 +209,7 @@ const char* esp3d_string::formatBytes(uint64_t bytes) { bool esp3d_string::isPrintableChar(char ch) { int c = static_cast(ch); - if (c == 9 || (c >= 32 && c <= 126) || c >= 128) { + if (c == '\t' || c == '\r' || (c >= ' ' && c <= '~') || c >= 128) { return true; } return false; @@ -213,3 +236,50 @@ const char* esp3d_string::expandString(const char* s, bool formatspace) { } return tmp.c_str(); } + +const char* esp3d_string::formatDuration(uint64_t duration) { + unsigned long seconds = duration / 1000; + unsigned long minutes = seconds / 60; + unsigned long hours = minutes / 60; + unsigned long days = hours / 24; + + seconds %= 60; + minutes %= 60; + hours %= 24; + + static String result; + bool display = false; + result = ""; + if (days > 0) { + result += String(days) + "d "; + display = true; + } + if (hours > 0 || display) { + result += String(hours) + "h "; + display = true; + } + if (minutes > 0 || display) { + result += String(minutes) + "m "; + display = true; + } + result += String(seconds) + "s"; + + return result.c_str(); +} + +bool esp3d_string::isRealTimeCommand(char c) { + if (ESP3DSettings::GetFirmwareTarget() == GRBL || + ESP3DSettings::GetFirmwareTarget() == GRBLHAL) { + // Standard characters + if (c == '?' || c == '!' || c == '~' || c == 0x18) { // 0x18 is ^X + return true; + } + + // Range >= 0x80 et <= 0xA4 + const unsigned char uc = static_cast(c); + if (uc >= 0x80 && uc <= 0xA4) { + return true; + } + } + return false; +} \ No newline at end of file diff --git a/src/core/esp3d_string.h b/src/core/esp3d_string.h index 09b51fa..c96f03e 100644 --- a/src/core/esp3d_string.h +++ b/src/core/esp3d_string.h @@ -22,6 +22,7 @@ #define _ESP3D_STRING_H #include namespace esp3d_string { +const char* formatDuration(uint64_t duration); const char* getTimeString(time_t time, bool isGMT); const char* generateUUID(const char* seed); const char* getContentType(const char* filename); @@ -29,6 +30,8 @@ const char* encodeString(const char* s); const char* formatBytes(uint64_t bytes); bool isPrintableChar(char c); const char* expandString(const char* s, bool formatspace = false); +const char * urlEncode(const char* s); +bool isRealTimeCommand(char c); } // namespace esp3d_string #endif //_ESP3D_STRING_H diff --git a/src/include/esp3d_defines.h b/src/include/esp3d_defines.h index 0a00b15..612e757 100644 --- a/src/include/esp3d_defines.h +++ b/src/include/esp3d_defines.h @@ -59,7 +59,7 @@ typedef uint ESP3DSettingIndex; #define ESP_INTERNET_TIME 120 // 1 byte = flag #define ESP_HTTP_PORT 121 // 4 bytes = int #define ESP_TELNET_PORT 125 // 4 bytes = int -// #define FREE 129 // 1 bytes = flag +#define ESP_OUTPUT_CLIENT 129 // 1 bytes = flag #define ESP_HOSTNAME \ 130 // 33 bytes 32+1 = string ; warning does not support multibyte char like // chinese @@ -119,7 +119,7 @@ typedef uint ESP3DSettingIndex; #define ESP_SETUP 1192 // 1 byte = flag // #define FREE 1193 // 1 byte = flag // #define FREE 1194 // 1 byte = flag -// #define FREE 1195 // 1 byte = flag +#define ESP_ETH_STA_FALLBACK_MODE 1195 // 1 byte = flag #define ESP_FTP_CTRL_PORT 1196 // 4 bytes = int #define ESP_FTP_DATA_ACTIVE_PORT 1200 // 4 bytes = int #define ESP_FTP_DATA_PASSIVE_PORT 1204 // 4 bytes = int @@ -133,9 +133,14 @@ typedef uint ESP3DSettingIndex; #define ESP_BOOT_RADIO_STATE 1221 // 1 byte = flag #define ESP_STA_FALLBACK_MODE 1222 // 1 byte = flag #define ESP_SERIAL_BRIDGE_ON 1223 // 1 byte = flag -// #define FREE 1224 // 1 byte = flag +#define ESP_ETH_STA_IP_MODE 1224 // 1 byte = flag #define ESP_SERIAL_BRIDGE_BAUD 1225 // 4 bytes= int #define ESP_TIME_ZONE 1229 // 7 bytes 6+1 = string +#define ESP_ETH_STA_IP_VALUE 1237 // 4 bytes xxx.xxx.xxx.xxx +#define ESP_ETH_STA_MASK_VALUE 1240 // 4 bytes xxx.xxx.xxx.xxx +#define ESP_ETH_STA_GATEWAY_VALUE 1244 // 4 bytes xxx.xxx.xxx.xxx +#define ESP_ETH_STA_DNS_VALUE 1248 // 4 bytes xxx.xxx.xxx.xxx +#define ESP_USB_SERIAL_BAUD_RATE 1252 // 4 bytes= int // Hidden password #define HIDDEN_PASSWORD "********" @@ -156,6 +161,7 @@ typedef uint ESP3DSettingIndex; #define USE_SERIAL_0 1 #define USE_SERIAL_1 2 #define USE_SERIAL_2 3 +#define USE_USB_SERIAL -1 // Serial service ID #define MAIN_SERIAL 1 @@ -182,7 +188,7 @@ typedef uint ESP3DSettingIndex; // SD connection #define ESP_NO_SD 0 -#define ESP_DIRECT_SD 1 +#define ESP_NOT_SHARED_SD 1 #define ESP_SHARED_SD 2 // SD Device type @@ -248,6 +254,7 @@ typedef uint ESP3DSettingIndex; #define ESP_TELEGRAM_NOTIFICATION 4 #define ESP_IFTTT_NOTIFICATION 5 #define ESP_HOMEASSISTANT_NOTIFICATION 6 +#define ESP_WHATS_APP_NOTIFICATION 7 // SENSOR #define NO_SENSOR_DEVICE 0 @@ -313,14 +320,18 @@ typedef uint ESP3DSettingIndex; #define MODE_ETH_CLOCK_GPIO16_OUT 2 #define MODE_ETH_CLOCK_GPIO17_OUT 3 -// Ethernet type (Check ETH.h eth_phy_type_t) +// Ethernet type (Check ETH.h eth_phy_type_t because it enum with #ifdef CONFIG_....) #define TYPE_ETH_PHY_LAN8720 0 #define TYPE_ETH_PHY_TLK110 1 #define TYPE_ETH_PHY_RTL8201 2 #define TYPE_ETH_PHY_DP83848 3 -#define TYPE_ETH_PHY_DM9051 4 -#define TYPE_ETH_PHY_KSZ8041 5 -#define TYPE_ETH_PHY_KSZ8081 6 +#define TYPE_ETH_PHY_KSZ8041 4 +#define TYPE_ETH_PHY_KSZ8081 5 +#define TYPE_ETH_PHY_DM9051 6 +#define TYPE_ETH_PHY_W5500 7 +#define TYPE_ETH_PHY_KSZ8851 8 + + // Host path #define ESP3D_HOST_PATH "/" diff --git a/src/include/esp3d_pins.h b/src/include/esp3d_pins.h index 8cc5d39..21ab923 100644 --- a/src/include/esp3d_pins.h +++ b/src/include/esp3d_pins.h @@ -478,6 +478,27 @@ #define ESP_SD_DETECT_PIN -1 #endif // ESP_SD_DETECT_PIN +//SPI pis for ethernet +#ifndef ETH_PHY_CS +#define ETH_PHY_CS 15 +#endif // ETH_PHY_CS +#ifndef ETH_PHY_IRQ +#define ETH_PHY_IRQ 4 +#endif // ETH_PHY_IRQ +#ifndef ETH_PHY_RST +#define ETH_PHY_RST 5 +#endif // ETH_PHY_RST +#ifndef ETH_SPI_SCK +#define ETH_SPI_SCK 14 +#endif // ETH_SPI_SCK +#ifndef ETH_SPI_MISO +#define ETH_SPI_MISO 12 +#endif // ETH_SPI_MISO +#ifndef ETH_SPI_MOSI +#define ETH_SPI_MOSI 13 +#endif // ETH_SPI_MOSI + + #if defined(PIN_RESET_FEATURE) && !defined(ESP3D_RESET_PIN) #define ESP3D_RESET_PIN -1 #endif // PIN_RESET_FEATURE diff --git a/src/include/esp3d_sanity.h b/src/include/esp3d_sanity.h index b6db467..11af8b5 100644 --- a/src/include/esp3d_sanity.h +++ b/src/include/esp3d_sanity.h @@ -18,8 +18,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SANITY_ESP3D_H -#define _SANITY_ESP3D_H +#pragma once + +/************************** + * Arduino core version + * ***********************/ +#if ESP_ARDUINO_VERSION_MAJOR == 1 +#error "ESP3D does not support Arduino Core 1.x.x" +#endif /************************** * Settings @@ -68,18 +74,26 @@ #if COMMUNICATION_PROTOCOL == MKS_SERIAL #if defined(PRINTER_HAS_DISPLAY) -#error MKS serial protocol is not compatible with display output +#error MKS serial protocol is not compatible with `PRINTER_HAS_DISPLAY`, comment `PRINTER_HAS_DISPLAY` in configuration.h #endif // defined(PRINTER_HAS_DISPLAY) #if defined(ESP_SERIAL_BRIDGE_OUTPUT) #error MKS serial protocol is not compatible with serial bridge output #endif // defined(ESP_SERIAL_BRIDGE_OUTPUT) #endif // COMMUNICATION_PROTOCOL == MKS_SERIAL +/************************** + * USB-Serial + * ***********************/ +#if defined(USB_SERIAL_FEATURE) && (!defined(ARDUINO_ARCH_ESP32) || (!defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3))) +#error USB-Serial is only available for ESP32 S2 and S3 +#endif + + /************************** * Bluetooth * ***********************/ -#if defined(BLUETOOTH_FEATURE) && defined(ARDUINO_ARCH_ESP8266) -#error Bluetooth is not available in ESP8266 +#if (defined(BLUETOOTH_FEATURE) && !defined(ARDUINO_ARCH_ESP32)) || (defined(BLUETOOTH_FEATURE) && (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3))) +#error Bluetooth is only available for ESP32 #endif /************************** @@ -197,4 +211,9 @@ #error SD_UPDATE_FEATURE is not available because SD_DEVICE is not enabled #endif +/************************** + * Lua + * ***********************/ +#if defined(ESP_LUA_INTERPRETER_FEATURE) && (defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP8285)) +#error ESP_LUA_INTERPRETER_FEATURE is not available for ESP8266 and ESP8285 #endif // SANITY_CHECK diff --git a/src/include/esp3d_version.h b/src/include/esp3d_version.h index e244fc8..478698a 100644 --- a/src/include/esp3d_version.h +++ b/src/include/esp3d_version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H // version and sources location -#define FW_VERSION "3.0.0.a233" +#define FW_VERSION "3.0.0.2b1" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H diff --git a/src/modules/bluetooth/BT_service.cpp b/src/modules/bluetooth/BT_service.cpp index a7b0796..f0b0af2 100644 --- a/src/modules/bluetooth/BT_service.cpp +++ b/src/modules/bluetooth/BT_service.cpp @@ -25,7 +25,7 @@ #ifdef BLUETOOTH_FEATURE #include "../../core/esp3d_commands.h" #include "../../core/esp3d_settings.h" -#include "../../esp3d_string.h" +#include "../../core/esp3d_string.h" #include "../network/netconfig.h" #include "BT_service.h" #include "BluetoothSerial.h" @@ -176,7 +176,7 @@ void BTService::handle() { // we cannot left data in buffer too long // in case some commands "forget" to add \n if (((millis() - _lastflush) > TIMEOUT_BT_FLUSH) && (_buffer_size > 0)) { - flushbuffer(); + flushBuffer(); } } @@ -189,51 +189,48 @@ void BTService::initAuthentication() { } ESP3DAuthenticationLevel BTService::getAuthentication() { return _auth; } -void BTService::flushbuffer() { - _buffer[_buffer_size] = 0x0; - // dispatch command - ESP3DMessage *msg = ESP3DMessageManager::newMsg( - ESP3DClientType::bluetooth, esp3d_commands.getOutputClient(), _buffer, - _buffer_size, _auth); - if (msg) { - // process command - esp3d_commands.process(msg); +void BTService::flushData(const uint8_t *data, size_t size, + ESP3DMessageType type) { + ESP3DMessage *message = esp3d_message_manager.newMsg( + ESP3DClientType::bluetooth, esp3d_commands.getOutputClient(), data, + size, _auth); + + if (message) { + message->type = type; + esp3d_log("Process Message"); + esp3d_commands.process(message); } else { esp3d_log_e("Cannot create message"); } _lastflush = millis(); +} + +void BTService::flushChar(char c) { + flushData((uint8_t *)&c, 1, ESP3DMessageType::realtimecmd); +} + +void BTService::flushBuffer() { + _buffer[_buffer_size] = 0x0; + flushData((uint8_t *)_buffer, _buffer_size, ESP3DMessageType::unique); _buffer_size = 0; } // push collected data to buffer and proceed accordingly void BTService::push2buffer(uint8_t *sbuf, size_t len) { + if (!_buffer || !_started) { + return; + } for (size_t i = 0; i < len; i++) { _lastflush = millis(); - // command is defined - if ((char(sbuf[i]) == '\n') || (char(sbuf[i]) == '\r')) { - if (_buffer_size < ESP3D_BT_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - flushbuffer(); - } else if (esp3d_string::isPrintableChar(char(sbuf[i]))) { - if (_buffer_size < ESP3D_BT_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } else { - flushbuffer(); - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - } else { // it is not printable char - // clean buffer first - if (_buffer_size > 0) { - flushbuffer(); - } - // process char + if (esp3d_string::isRealTimeCommand(sbuf[i])) { + flushChar(sbuf[i]); + } else { _buffer[_buffer_size] = sbuf[i]; _buffer_size++; - flushbuffer(); + if (_buffer_size > ESP3D_BT_BUFFER_SIZE || + _buffer[_buffer_size - 1] == '\n') { + flushBuffer(); + } } } } @@ -288,7 +285,7 @@ bool BTService::dispatch(ESP3DMessage *message) { if (sentcnt != message->size) { return false; } - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } diff --git a/src/modules/bluetooth/BT_service.h b/src/modules/bluetooth/BT_service.h index 2421ca7..4d849ef 100644 --- a/src/modules/bluetooth/BT_service.h +++ b/src/modules/bluetooth/BT_service.h @@ -57,7 +57,9 @@ class BTService { uint8_t _buffer[ESP3D_BT_BUFFER_SIZE + 1]; // keep space of 0x0 terminal size_t _buffer_size; void push2buffer(uint8_t* sbuf, size_t len); - void flushbuffer(); + void flushBuffer(); + void flushChar(char c); + void flushData(const uint8_t* data, size_t size, ESP3DMessageType type); bool _started; }; diff --git a/src/modules/camera/camera.cpp b/src/modules/camera/camera.cpp index 4ccbe9d..1891463 100644 --- a/src/modules/camera/camera.cpp +++ b/src/modules/camera/camera.cpp @@ -242,8 +242,10 @@ int Camera::command(const char *param, const char *value) { bool Camera::initHardware() { _initialised = false; + #if !(CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6) esp3d_log("Disable brown out"); WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); // disable brownout detector + #endif // !(CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6) stopHardware(); camera_config_t config; config.ledc_channel = LEDC_CHANNEL_0; diff --git a/src/modules/display/display.cpp b/src/modules/display/display.cpp index e630015..1dbcb09 100644 --- a/src/modules/display/display.cpp +++ b/src/modules/display/display.cpp @@ -52,7 +52,7 @@ bool Display::dispatch(ESP3DMessage* message) { break; } - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } return false; diff --git a/src/modules/ethernet/ethconfig.cpp b/src/modules/ethernet/ethconfig.cpp index 413a6e5..03def79 100644 --- a/src/modules/ethernet/ethconfig.cpp +++ b/src/modules/ethernet/ethconfig.cpp @@ -25,66 +25,51 @@ #include "esp_eth.h" #endif // ARDUINO_ARCH_ESP32 -#ifdef ARDUINO_ARCH_ESP8266 -#endif // ARDUINO_ARCH_ESP8266 #include "../../core/esp3d_commands.h" #include "../../core/esp3d_settings.h" +#include "../../core/esp3d_string.h" #include "../network/netconfig.h" #include "ethconfig.h" +#ifdef ETHERNET_SPI_USE_SPI +#define ETH_SPI SPI +#endif // ETHERNET_SPI_USE_SPI +#if ETHERNET_SPI_USE_SPI2 +#define ETH_SPI SPI2 +#endif // ETHERNET_SPI_USE_SPI2 +#ifndef ETH_SPI +#define ETH_SPI SPI +#endif // ETH_SPI +# + +#if defined(GCODE_HOST_FEATURE) +#include "../gcode_host/gcode_host.h" +#endif // GCODE_HOST_FEATURE + bool EthConfig::_started = false; bool EthConfig::_connected = false; +uint8_t EthConfig::_ipMode = DHCP_MODE; const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0}; bool EthConfig::StartSTA() { bool res = true; - if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE)) { - int32_t IP = ESP3DSettings::read_IP(ESP_STA_IP_VALUE); - int32_t GW = ESP3DSettings::read_IP(ESP_STA_GATEWAY_VALUE); - int32_t MK = ESP3DSettings::read_IP(ESP_STA_MASK_VALUE); - int32_t DNS = ESP3DSettings::read_IP(ESP_STA_DNS_VALUE); + if (_ipMode == STATIC_IP_MODE) { + int32_t IP = ESP3DSettings::read_IP(ESP_ETH_STA_IP_VALUE); + int32_t GW = ESP3DSettings::read_IP(ESP_ETH_STA_GATEWAY_VALUE); + int32_t MK = ESP3DSettings::read_IP(ESP_ETH_STA_MASK_VALUE); + int32_t DNS = ESP3DSettings::read_IP(ESP_ETH_STA_DNS_VALUE); IPAddress ip(IP), mask(MK), gateway(GW), dns(DNS); res = ETH.config(ip, gateway, mask, dns); } return res; } -/*bool EthConfig::StartSRV() -{ - bool res = true; - //static IP - int32_t IP = ESP3DSettings::read_IP(ESP_AP_IP_VALUE); - IPAddress ip(IP), mask(DEFAULT_AP_MASK_VALUE), gateway(IP); - if (!ETH.config(ip, gateway,mask)) { - res = false; - esp3d_log_e("Set static IP error"); - } - //start DHCP server - if(res) { - dhcps_lease_t lease; - lease.enable = true; - lease.start_ip.addr = static_cast(IP) + (1 << 24); - lease.end_ip.addr = static_cast(IP) + (11 << 24); - tcpip_adapter_dhcps_stop(TCPIP_ADAPTER_IF_ETH); - tcpip_adapter_dhcps_option( - (tcpip_adapter_option_mode_t)TCPIP_ADAPTER_OP_SET, - (tcpip_adapter_option_id_t)REQUESTED_IP_ADDRESS, - (void*)&lease, sizeof(dhcps_lease_t) - ); - - if (tcpip_adapter_dhcps_start(TCPIP_ADAPTER_IF_ETH) != ESP_OK){ - res = false; - esp3d_log_e("Start DHCP server failed"); - } - } - return res; -}*/ - -bool EthConfig::linkUp() { -#if defined(ESP_IDF_VERSION_MAJOR) - // patch for https://github.com/espressif/arduino-esp32/issues/6105 - return _connected; -#else - return ETH.linkUp(); -#endif + +bool EthConfig::linkUp() { return _connected; } + +uint8_t EthConfig::ipMode(bool fromsettings) { + if (fromsettings) { + _ipMode = (ESP3DSettings::readByte(ESP_ETH_STA_IP_MODE) != DHCP_MODE); + } + return _ipMode; } /** @@ -92,10 +77,47 @@ bool EthConfig::linkUp() { */ bool EthConfig::begin(int8_t& espMode) { bool res = false; - + ipMode(true); end(); +#if ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_LAN8720 + esp3d_log("ETH PHY Type %d", ESP3D_ETH_PHY_TYPE); _started = ETH.begin(); +#endif // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_LAN8720 +#if ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_TLK110 || \ + ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_RTL8201 || \ + ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_DP83848 || \ + ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_KSZ8041 || \ + ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_KSZ8081 + eth_phy_type_t phytype = ETH_PHY_TLK110; + if (ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_RTL8201) { + phytype = ETH_PHY_RTL8201; + } + if (ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_DP83848) { + phytype = ETH_PHY_DP83848; + } + if (ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_KSZ8041) { + phytype = ETH_PHY_KSZ8041; + } + if (ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_KSZ8081) { + phytype = ETH_PHY_KSZ8081; + } + esp3d_log("ETH PHY Type %d", phytype); + _started = ETH.begin(phytype, ESP3D_ETH_PHY_ADDR, ESP3D_ETH_PHY_POWER_PIN, + ESP3D_ETH_PHY_MDC_PIN, ESP3D_ETH_PHY_MDIO_PIN, + ESP3D_ETH_CLK_MODE_PIN); +#endif // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_TLK110 || ESP3D_ETH_PHY_TYPE == + // TYPE_ETH_PHY_RTL8201 || ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_DP83848 || + // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_KSZ8041 || ESP3D_ETH_PHY_TYPE == + // TYPE_ETH_PHY_KSZ8081 +#if ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_W5500 + esp3d_log("ETH spi PHY Type %d", ESP3D_ETH_PHY_TYPE); + ETH_SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI); + _started = ETH.begin(ETH_PHY_W5500, ESP3D_ETH_PHY_ADDR, ETH_PHY_CS, + ETH_PHY_IRQ, ETH_PHY_RST, ETH_SPI); +#endif // ESP3D_ETH_PHY_TYPE == TYPE_ETH_PHY_W5500 + if (_started) { + esp3d_log("Starting ethernet success"); if (ESP3DSettings::isVerboseBoot()) { esp3d_commands.dispatch("Starting ethernet", ESP3DClientType::all_clients, no_id, ESP3DMessageType::unique, @@ -104,50 +126,63 @@ bool EthConfig::begin(int8_t& espMode) { } res = true; } else { - esp3d_commands.dispatch("Failed starting ethernet write failed", + esp3d_commands.dispatch("Failed starting ethernet failed", ESP3DClientType::all_clients, no_id, ESP3DMessageType::unique, ESP3DClientType::system, ESP3DAuthenticationLevel::admin); + esp3d_log("Failed starting ethernet failed"); + return false; } ETH.setHostname(NetConfig::hostname(true)); - // DHCP is only for Client if (espMode == ESP_ETH_STA) { if (!StartSTA()) { if (ESP3DSettings::isVerboseBoot()) { + esp3d_log("Starting fallback mode"); esp3d_commands.dispatch( "Starting fallback mode", ESP3DClientType::all_clients, no_id, ESP3DMessageType::unique, ESP3DClientType::system, ESP3DAuthenticationLevel::admin); } - espMode = ESP3DSettings::readByte(ESP_STA_FALLBACK_MODE); - res = true; + espMode = ESP3DSettings::readByte(ESP_ETH_STA_FALLBACK_MODE); + res = false; + return res; } else { + esp3d_log("Client started"); if (ESP3DSettings::isVerboseBoot()) { esp3d_commands.dispatch("Client started", ESP3DClientType::all_clients, no_id, ESP3DMessageType::unique, ESP3DClientType::system, ESP3DAuthenticationLevel::admin); } - } - } else { - // if(!StartSRV()){ - // res = false; - // - // } else { - // - // } + res = true; + } } - - // if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE) || (espMode - // == ESP_ETH_SRV)){ - if ((ESP3DSettings::readByte(ESP_STA_IP_MODE) != DHCP_MODE)) { - // as no event to display static IP - esp3d_commands.dispatch(ETH.localIP().toString().c_str(), - ESP3DClientType::all_clients, no_id, - ESP3DMessageType::unique, ESP3DClientType::system, - ESP3DAuthenticationLevel::admin); + if (res) { + // Static IP or DHCP client ? + if ((ESP3DSettings::readByte(ESP_ETH_STA_IP_MODE) == DHCP_MODE)) { + uint64_t start = millis(); + String ip = ETH.localIP().toString(); + esp3d_log("IP"); + esp3d_log("Waiting for IP"); + while (millis() - start < 10000 && ip == "0.0.0.0") { + ip = ETH.localIP().toString(); + ESP3DHal::wait(100); + } + if (ip != "0.0.0.0") { + esp3d_log("Show IP"); + esp3d_commands.dispatch( + ETH.localIP().toString().c_str(), ESP3DClientType::all_clients, + no_id, ESP3DMessageType::unique, ESP3DClientType::system, + ESP3DAuthenticationLevel::admin); + } else { + esp3d_log_e("Failed to get IP"); + res = false; + } + } + } else { + esp3d_log_e("Failed starting ethernet"); } return res; @@ -158,8 +193,10 @@ bool EthConfig::begin(int8_t& espMode) { */ void EthConfig::end() { - // esp_eth_disable(); + // ETH.end(); _started = false; + _ipMode = DHCP_MODE; + _connected = false; } bool EthConfig::started() { return _started; } diff --git a/src/modules/ethernet/ethconfig.h b/src/modules/ethernet/ethconfig.h index 69040d0..de5aae8 100644 --- a/src/modules/ethernet/ethconfig.h +++ b/src/modules/ethernet/ethconfig.h @@ -55,12 +55,13 @@ class EthConfig { static void handle(); static bool started(); static void setConnected(bool connected) { _connected = connected; } - + static uint8_t ipMode(bool fromsettings = false); static bool linkUp(); private: static bool _started; static bool _connected; + static uint8_t _ipMode; }; #endif //_ETH_CONFIG_H diff --git a/src/modules/filesystem/sd/sd_sdfat2_esp32.cpp b/src/modules/filesystem/sd/sd_sdfat2_esp32.cpp index 4a1c7af..fae399c 100644 --- a/src/modules/filesystem/sd/sd_sdfat2_esp32.cpp +++ b/src/modules/filesystem/sd/sd_sdfat2_esp32.cpp @@ -127,27 +127,11 @@ uint8_t ESP_SD::getState(bool refresh) { ESP_SD_MOSI_PIN != -1 ? ESP_SD_MOSI_PIN : MOSI, ESP_SD_SCK_PIN != -1 ? ESP_SD_SCK_PIN : SCK); // refresh content if card was removed -#if !(defined(ESP_SD_DETECT_PIN) && ESP_SD_DETECT_PIN != -1) - if (xPortGetCoreID() == 0) { - disableCore0WDT(); - } else { - disableCore1WDT(); - } -#endif // !(defined(ESP_SD_DETECT_PIN) if (SD.begin((ESP_SD_CS_PIN == -1) ? SS : ESP_SD_CS_PIN, SD_SCK_MHZ(FREQMZ / _spi_speed_divider))) { - csd_t m_csd; - if (SD.card()->readCSD(&m_csd) && sdCardCapacity(&m_csd) > 0) { _state = ESP_SDCARD_IDLE; - } } -#if !(defined(ESP_SD_DETECT_PIN) && ESP_SD_DETECT_PIN != -1) - if (xPortGetCoreID() == 0) { - enableCore0WDT(); - } else { - enableCore1WDT(); - } -#endif // !(defined(ESP_SD_DETECT_PIN) + return _state; } diff --git a/src/modules/filesystem/sd/sd_sdfat2_esp8266.cpp b/src/modules/filesystem/sd/sd_sdfat2_esp8266.cpp index 506e4e1..15927a8 100644 --- a/src/modules/filesystem/sd/sd_sdfat2_esp8266.cpp +++ b/src/modules/filesystem/sd/sd_sdfat2_esp8266.cpp @@ -123,12 +123,7 @@ uint8_t ESP_SD::getState(bool refresh) { if (SD.begin((ESP_SD_CS_PIN == -1) ? SS : ESP_SD_CS_PIN, SD_SCK_HZ(F_CPU / _spi_speed_divider))) { esp3d_log("Init SD State ok"); - csd_t m_csd; - if (SD.card()->readCSD(&m_csd) && sdCardCapacity(&m_csd) > 0) { - _state = ESP_SDCARD_IDLE; - } else { - esp3d_log_e("Cannot get card size"); - } + _state = ESP_SDCARD_IDLE; } else { esp3d_log_e("Init SD State failed"); } @@ -463,6 +458,9 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, } // todo need also to add short filename const char* ESP_SDFile::shortname() const { + #if SDFAT_FILE_TYPE != 1 + return _name.c_str(); +#else static char sname[13]; File ftmp = SD.open(_filename.c_str()); if (ftmp) { @@ -475,6 +473,7 @@ const char* ESP_SDFile::shortname() const { } else { return _name.c_str(); } +#endif } void ESP_SDFile::close() { diff --git a/src/modules/ftp/FtpServer.h b/src/modules/ftp/FtpServer.h index 5f8b058..723308b 100644 --- a/src/modules/ftp/FtpServer.h +++ b/src/modules/ftp/FtpServer.h @@ -31,8 +31,8 @@ #ifndef FTP_SERVER_H #define FTP_SERVER_H -class WiFiServer; -class WiFiClient; +#include +#include #ifndef FF_MAX_LFN #define FF_MAX_LFN 255 #endif diff --git a/src/modules/gcode_host/gcode_host.cpp b/src/modules/gcode_host/gcode_host.cpp index b83f62b..d239e4f 100644 --- a/src/modules/gcode_host/gcode_host.cpp +++ b/src/modules/gcode_host/gcode_host.cpp @@ -47,6 +47,18 @@ bool GcodeHost::begin() { return true; } +bool GcodeHost::dispatch(ESP3DMessage* message) { + if (!message || _step == HOST_NO_STREAM) { + return false; + } + if (message->size > 0 && message->data) { + push(message->data, message->size); + esp3d_message_manager.deleteMsg(message); + return true; + } + return false; + } + void GcodeHost::end() { _commandNumber = 0; _error = ERROR_NO_ERROR; @@ -69,7 +81,7 @@ bool GcodeHost::push(const uint8_t *sbuf, size_t len) { esp3d_log("Push got %d bytes", len); for (size_t i = 0; i < len; i++) { // it is a line process it - if (sbuf[i] == '\n' || sbuf[i] == '\r') { + if (sbuf[i] == '\n') { flush(); } else { // fill buffer until it is full @@ -213,6 +225,11 @@ void GcodeHost::endStream() { } #endif // SD_DEVICE _step = HOST_NO_STREAM; + if (!_scriptList.isEmpty()){ + ScriptEntry scr = _scriptList.pop(); + processScript(scr.script.c_str(),scr.auth_type); + } + //TODO: do same for files } void GcodeHost::readNextCommand() { @@ -246,7 +263,7 @@ void GcodeHost::readNextCommand() { } else { _processedSize++; _currentPosition++; - if (!(((char)c == '\n') || ((char)c == '\r'))) { + if (!((char)c == '\n')) { _currentCommand += (char)c; } else { processing = false; @@ -273,7 +290,7 @@ void GcodeHost::readNextCommand() { } else { _processedSize++; _currentPosition++; - if (!(((char)c == '\n') || ((char)c == '\r'))) { + if (!(char)c == '\n' ) { _currentCommand += (char)c; } else { processing = false; @@ -313,17 +330,19 @@ void GcodeHost::processCommand() { _step = HOST_READ_LINE; } else { esp3d_log("Command %s is valid", _currentCommand.c_str()); - String cmd = _currentCommand + "\n"; + if (!_currentCommand.endsWith("\n")) { + _currentCommand += "\n"; + } bool isESPcmd = esp3d_commands.is_esp_command( (uint8_t *)_currentCommand.c_str(), _currentCommand.length()); if (isESPcmd) { - ESP3DMessage *msg = ESP3DMessageManager::newMsg( + ESP3DMessage *msg = esp3d_message_manager.newMsg( ESP3DClientType::no_client, esp3d_commands.getOutputClient(), (uint8_t *)_currentCommand.c_str(), _currentCommand.length(), _auth); if (msg) { // process command esp3d_commands.process(msg); - esp3d_log("Command is ESP command: %s", cmd.c_str()); + esp3d_log("Command is ESP command: %s", _currentCommand.c_str()); _step = HOST_READ_LINE; } else { esp3d_log_e("Cannot create message"); @@ -331,13 +350,13 @@ void GcodeHost::processCommand() { } } else { - ESP3DMessage *msg = ESP3DMessageManager::newMsg( + ESP3DMessage *msg = esp3d_message_manager.newMsg( ESP3DClientType::stream, esp3d_commands.getOutputClient(), (uint8_t *)_currentCommand.c_str(), _currentCommand.length(), _auth); if (msg) { // process command esp3d_commands.process(msg); - esp3d_log("Command is GCODE command: %s", cmd.c_str()); + esp3d_log("Command is GCODE command: %s", _currentCommand.c_str()); _startTimeOut = millis(); if (isAckNeeded()) { _step = HOST_WAIT4_ACK; @@ -494,10 +513,10 @@ uint32_t GcodeHost::getCommandNumber(String &response) { bool GcodeHost::processScript(const char *line, ESP3DAuthenticationLevel auth_type) { if (_step != HOST_NO_STREAM) { - esp3d_log("Streaming already in progress"); - while (_step != HOST_NO_STREAM) { - handle(); - } + esp3d_log("Streaming already in progress, put to queue"); + String s = line; + _scriptList.push(line, auth_type); + return true; } _script = line; _script.trim(); diff --git a/src/modules/gcode_host/gcode_host.h b/src/modules/gcode_host/gcode_host.h index 9b066a5..f18c5ae 100644 --- a/src/modules/gcode_host/gcode_host.h +++ b/src/modules/gcode_host/gcode_host.h @@ -22,8 +22,9 @@ #define _GCODE_HOST_H #include - +#include "../../core/esp3d_message.h" #include "../authentication/authentication_service.h" +#include "./gcode_script_fifo.h" #define ERROR_NO_ERROR 0 #define ERROR_TIME_OUT 1 @@ -40,16 +41,16 @@ #define ERROR_FILE_NOT_FOUND 12 #define ERROR_STREAM_ABORTED 13 -#define HOST_NO_STREAM 0 -#define HOST_START_STREAM 1 -#define HOST_READ_LINE 2 -#define HOST_PROCESS_LINE 3 -#define HOST_WAIT4_ACK 4 -#define HOST_PAUSE_STREAM 5 -#define HOST_RESUME_STREAM 6 -#define HOST_STOP_STREAM 7 -#define HOST_ERROR_STREAM 8 -#define HOST_ABORT_STREAM 9 +#define HOST_NO_STREAM 100 +#define HOST_START_STREAM 101 +#define HOST_READ_LINE 102 +#define HOST_PROCESS_LINE 103 +#define HOST_WAIT4_ACK 104 +#define HOST_PAUSE_STREAM 105 +#define HOST_RESUME_STREAM 106 +#define HOST_STOP_STREAM 107 +#define HOST_ERROR_STREAM 108 +#define HOST_ABORT_STREAM 109 #define TYPE_SCRIPT_STREAM 0 #define TYPE_FS_STREAM 1 @@ -74,6 +75,8 @@ class GcodeHost { uint8_t Checksum(const char* command, uint32_t commandSize); String CheckSumCommand(const char* command, uint32_t commandnb); + bool dispatch(ESP3DMessage* message); + /*bool wait_for_ack(uint32_t timeout = DEFAULT_TIMOUT, bool checksum=false, * const char * ack=nullptr);*/ @@ -110,6 +113,7 @@ class GcodeHost { bool isAck(String& line); private: + ESP3DScriptFIFO _scriptList; ESP3DAuthenticationLevel _auth; uint8_t _buffer[ESP_HOST_BUFFER_SIZE + 1]; size_t _bufferSize; diff --git a/src/modules/gcode_host/gcode_script_fifo.h b/src/modules/gcode_host/gcode_script_fifo.h new file mode 100644 index 0000000..c9210c6 --- /dev/null +++ b/src/modules/gcode_host/gcode_script_fifo.h @@ -0,0 +1,134 @@ +/* + gcode_script_fifo.h - class for managing script list, thread safe + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#pragma once +#include +#include + +#include "../../include/esp3d_config.h" +#include "../authentication/authentication_service.h" +#if defined(ARDUINO_ARCH_ESP32) +#include "freertos/FreeRTOS.h" +#include "freertos/semphr.h" +#endif // ARDUINO_ARCH_ESP32 + +#if defined(ARDUINO_ARCH_ESP8266) +// Définitions pour ESP8266 comme dans votre code original +#ifndef pdTRUE +#define pdTRUE true +#define xSemaphoreTake(A, B) true +#define xSemaphoreGive(A) +#define xSemaphoreCreateMutex(A) 0 +#define vSemaphoreDelete(A) +#define SemaphoreHandle_t void* +#endif // pdTRUE +#endif // ESP8266 + +struct ScriptEntry { + String script; + ESP3DAuthenticationLevel auth_type; + + ScriptEntry(String s, ESP3DAuthenticationLevel a) : script(std::move(s)), auth_type(a) {} +}; + +class ESP3DScriptFIFO { + public: + ESP3DScriptFIFO(size_t maxSize = 5) : _maxSize(maxSize) { + _mutex = xSemaphoreCreateMutex(); + } + + ~ESP3DScriptFIFO() { + clear(); + vSemaphoreDelete(_mutex); + } + + void setMaxSize(size_t maxSize) { _maxSize = maxSize; } + size_t getMaxSize() const { return _maxSize; } + + void push(String script, ESP3DAuthenticationLevel auth_type) { + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + esp3d_log("push to list [%s] auth: %d, size: %d", script.c_str(), auth_type, fifo.size()); + if (fifo.size() >= _maxSize && _maxSize != 0) { + esp3d_log("remove oldest script to make room for new one"); + fifo.pop(); + esp3d_log("oldest message removed, list size: %d", fifo.size()); + } + fifo.emplace(std::move(script), auth_type); + esp3d_log("push to list size: %d", fifo.size()); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("push to list [%s] id: %d failed, list size: %d", script.c_str(), auth_type, fifo.size()); + } + } + + ScriptEntry pop() { + ScriptEntry entry{String(""), ESP3DAuthenticationLevel::guest}; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + if (!fifo.empty()) { + esp3d_log("pop from list size: %d", fifo.size()); + entry = std::move(fifo.front()); + fifo.pop(); + esp3d_log("Now list size: %d", fifo.size()); + esp3d_log("Script: %s, ID: %d", entry.script.c_str(), entry.auth_type); + } + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("pop from list failed, list size: %d", fifo.size()); + } + return entry; + } + + bool isEmpty() const { + bool empty = true; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + empty = fifo.empty(); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + return empty; + } + + size_t size() const { + size_t s = 0; + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + s = fifo.size(); + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + return s; + } + + void clear() { + if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) { + while (!fifo.empty()) { + fifo.pop(); + } + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } + } + + private: + std::queue fifo; + SemaphoreHandle_t _mutex; + size_t _maxSize; +}; diff --git a/src/modules/http/embedded.h b/src/modules/http/embedded.h index b399d32..f8247d4 100644 --- a/src/modules/http/embedded.h +++ b/src/modules/http/embedded.h @@ -20,978 +20,733 @@ #ifndef __embedded_h #define __embedded_h -#define tool_html_gz_size 11662 -const unsigned char tool_html_gz[11662] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xed, 0x7d, - 0x8b, 0x56, 0xe3, 0x48, 0xb2, 0xe0, 0xaf, 0xc8, 0x9a, 0x69, 0x23, 0x8d, - 0xd3, 0x42, 0x7e, 0xf1, 0x90, 0x11, 0x2c, 0xc5, 0xa3, 0x8b, 0xb9, 0x55, - 0x0d, 0x03, 0x54, 0x57, 0xcf, 0x30, 0x5c, 0x8e, 0xb0, 0xd3, 0xb6, 0x0a, - 0x59, 0xf2, 0x48, 0x32, 0xe0, 0x06, 0x7f, 0xd0, 0xfe, 0xc6, 0x7e, 0xd9, - 0x46, 0x64, 0xa6, 0xa4, 0x94, 0x2d, 0x19, 0x53, 0x5d, 0x33, 0x7b, 0xce, - 0x3d, 0x7b, 0xfb, 0x4e, 0x21, 0xe5, 0x33, 0x32, 0xde, 0x11, 0x99, 0x4a, - 0xef, 0x55, 0xfa, 0x41, 0x2f, 0x9e, 0x4d, 0xa8, 0x32, 0x8a, 0xc7, 0xde, - 0xfe, 0x1e, 0xfe, 0xab, 0x78, 0x8e, 0x3f, 0xb4, 0x55, 0xea, 0xab, 0xf0, - 0x4e, 0x9d, 0xfe, 0xfe, 0xde, 0x98, 0xc6, 0x8e, 0xd2, 0x1b, 0x39, 0x61, - 0x44, 0x63, 0x5b, 0xfd, 0x72, 0x7d, 0x5a, 0xdf, 0x51, 0x45, 0xe9, 0x28, - 0x8e, 0x27, 0x75, 0xfa, 0xaf, 0xa9, 0xfb, 0x68, 0xab, 0xbf, 0xd5, 0xbf, - 0x1c, 0xd6, 0x8f, 0x82, 0xf1, 0xc4, 0x89, 0xdd, 0x7b, 0x8f, 0xaa, 0x4a, - 0x2f, 0xf0, 0x63, 0xea, 0x43, 0x97, 0xb3, 0x13, 0x9b, 0xf6, 0x87, 0x34, - 0xe9, 0xe4, 0x3b, 0x63, 0x6a, 0xab, 0x8f, 0x2e, 0x7d, 0x9a, 0x04, 0x61, - 0x2c, 0xb5, 0x7b, 0x72, 0xfb, 0xf1, 0xc8, 0xee, 0xd3, 0x47, 0xb7, 0x47, - 0xeb, 0xec, 0x85, 0xb8, 0xbe, 0x1b, 0xbb, 0x8e, 0x57, 0x8f, 0x7a, 0x8e, - 0x47, 0xed, 0x46, 0x7e, 0x88, 0x78, 0x44, 0xc7, 0xb4, 0xde, 0x0b, 0xbc, - 0x20, 0x94, 0x46, 0xf9, 0x53, 0x67, 0xbb, 0xd3, 0xe9, 0xef, 0xe6, 0x9b, - 0x8e, 0x23, 0x67, 0x32, 0xf1, 0xdc, 0x1e, 0xc0, 0x16, 0xf8, 0x75, 0xdf, - 0x79, 0xbc, 0x9f, 0xc6, 0x31, 0x3c, 0xad, 0xd5, 0x19, 0xbb, 0xd2, 0xfa, - 0x38, 0xb8, 0x77, 0xe1, 0xcf, 0x13, 0xbd, 0xaf, 0x43, 0x41, 0x3d, 0x8a, - 0x9d, 0x78, 0x1a, 0xd5, 0xef, 0x9d, 0x10, 0x1e, 0x67, 0xb9, 0xf5, 0x66, - 0x83, 0xc4, 0x6e, 0xec, 0xd1, 0xfd, 0xe3, 0xa0, 0x37, 0x1d, 0x43, 0xcd, - 0xde, 0x26, 0x7f, 0xdf, 0x63, 0x1d, 0x14, 0x44, 0x3c, 0x2c, 0x82, 0x3e, - 0xc7, 0x9b, 0xbd, 0x28, 0x52, 0xf7, 0xff, 0xf2, 0x32, 0x80, 0x11, 0xea, - 0x03, 0x67, 0xec, 0x7a, 0x33, 0x2b, 0x72, 0xfc, 0xa8, 0x1e, 0xd1, 0xd0, - 0x1d, 0x74, 0x19, 0x90, 0x96, 0x18, 0xb5, 0x7b, 0xef, 0xf4, 0x1e, 0x86, - 0x61, 0x30, 0xf5, 0xfb, 0x75, 0x51, 0x41, 0xe9, 0xc0, 0x1c, 0xb4, 0xba, - 0x08, 0xda, 0x83, 0x1b, 0xd7, 0xa7, 0xd0, 0x0b, 0x7a, 0x7a, 0xb4, 0x17, - 0x5b, 0x7e, 0xe0, 0xd3, 0x2e, 0x80, 0xfe, 0x7b, 0x51, 0x69, 0xb4, 0x5c, - 0xb8, 0x58, 0x30, 0xbf, 0x0f, 0xfa, 0xb3, 0x97, 0xb1, 0xeb, 0x73, 0x7a, - 0x58, 0xad, 0x2d, 0x73, 0xf2, 0x3c, 0x1f, 0x85, 0x2f, 0xf7, 0x41, 0xd8, - 0x87, 0xa6, 0x71, 0x30, 0xb1, 0x1a, 0x93, 0x67, 0x25, 0x0a, 0x3c, 0xb7, - 0xaf, 0x08, 0x10, 0xe7, 0x06, 0xa2, 0x22, 0x0c, 0xbc, 0x0f, 0x4e, 0xf8, - 0xd2, 0x77, 0xa3, 0x89, 0xe7, 0xcc, 0xac, 0x81, 0x47, 0x9f, 0xbb, 0xf8, - 0x4f, 0xfd, 0x29, 0x74, 0x26, 0x16, 0xfe, 0xd3, 0x9d, 0x38, 0xfd, 0xbe, - 0xeb, 0x0f, 0xad, 0x06, 0x0c, 0x9a, 0xbc, 0xd4, 0x3d, 0x3a, 0x88, 0xad, - 0x46, 0x07, 0x4a, 0x96, 0x57, 0x3a, 0x18, 0x0c, 0xba, 0x63, 0x27, 0x1c, - 0x02, 0x3c, 0xf7, 0x01, 0x10, 0x70, 0x6c, 0x6d, 0x01, 0x38, 0x46, 0x6f, - 0xdc, 0x7f, 0x49, 0x90, 0xd4, 0xe9, 0xcc, 0x3d, 0xe7, 0x9e, 0x7a, 0xe9, - 0xc4, 0xf7, 0x5e, 0xd0, 0x7b, 0xe8, 0x72, 0xf0, 0x9d, 0x69, 0x1c, 0xa4, - 0xb3, 0xb6, 0x00, 0xee, 0x46, 0x13, 0xe6, 0x79, 0x0b, 0xbf, 0x38, 0x6b, - 0x6f, 0x1a, 0x46, 0xf0, 0x3c, 0x09, 0x5c, 0x20, 0x72, 0x38, 0x9f, 0x84, - 0xf4, 0x25, 0x07, 0x70, 0x47, 0x5a, 0x41, 0xe8, 0x0e, 0x47, 0xac, 0x64, - 0x6e, 0x8c, 0x83, 0xbe, 0xe3, 0xbd, 0x4c, 0x82, 0xc8, 0x45, 0xc6, 0xb3, - 0x06, 0xee, 0x33, 0xed, 0x77, 0x7f, 0xaf, 0xbb, 0x7e, 0x9f, 0x3e, 0xc3, - 0xb2, 0xe1, 0xff, 0xd2, 0x5e, 0x0c, 0x95, 0x26, 0x62, 0x82, 0x0d, 0x68, - 0x76, 0xb1, 0xc0, 0x14, 0x80, 0x43, 0xc5, 0x4f, 0xdd, 0x11, 0x65, 0x03, - 0xb3, 0xe7, 0xe0, 0x91, 0x86, 0x03, 0x2f, 0x78, 0xe2, 0x4b, 0x5a, 0x86, - 0x19, 0x47, 0x5e, 0x2a, 0x0d, 0x87, 0xf7, 0x8e, 0x66, 0x12, 0xfc, 0xcf, - 0x68, 0xeb, 0x02, 0xba, 0xba, 0xe0, 0x5b, 0x89, 0xa4, 0x6c, 0x49, 0xf5, - 0xd0, 0xe9, 0xbb, 0xd3, 0x88, 0x13, 0x47, 0xaa, 0x63, 0xab, 0x2b, 0xaa, - 0xe4, 0x14, 0x29, 0xed, 0x2b, 0xaa, 0x0b, 0xba, 0x2f, 0x01, 0x9f, 0x50, - 0x82, 0x75, 0x5c, 0xe6, 0xaf, 0x6e, 0x8a, 0xcf, 0x90, 0x7a, 0x20, 0xd1, - 0x8f, 0x54, 0x30, 0x45, 0x9e, 0xbe, 0x26, 0x94, 0x3e, 0x0b, 0xbe, 0x6d, - 0x77, 0xcc, 0x94, 0x1c, 0x75, 0x54, 0x6b, 0x34, 0x7c, 0x49, 0xb9, 0x6f, - 0x0b, 0x19, 0x61, 0x2b, 0x63, 0x04, 0xa4, 0xf7, 0x1b, 0x40, 0xfd, 0x51, - 0x2c, 0x15, 0x2c, 0x4a, 0x50, 0xb7, 0x69, 0x74, 0x42, 0x3a, 0xee, 0x7a, - 0xae, 0x4f, 0xeb, 0xf9, 0x22, 0xa6, 0x1d, 0x22, 0xf7, 0x77, 0x6a, 0x35, - 0x58, 0x41, 0xb2, 0x1c, 0x26, 0xa2, 0xb2, 0x28, 0xf1, 0xc5, 0x14, 0xf2, - 0x71, 0xd2, 0x67, 0x10, 0x04, 0x71, 0x21, 0x0a, 0xb2, 0x29, 0x61, 0xc6, - 0x62, 0x51, 0x58, 0x25, 0xfa, 0x7f, 0x94, 0x17, 0x96, 0xb5, 0x45, 0xdf, - 0x0d, 0x41, 0x19, 0x31, 0x62, 0x07, 0x4f, 0xf5, 0x90, 0x02, 0xdf, 0x47, - 0x74, 0xee, 0xfa, 0x93, 0x69, 0x5c, 0x2e, 0xe2, 0x89, 0xa4, 0x70, 0xc4, - 0x25, 0xab, 0xdc, 0x4a, 0x04, 0x5e, 0x46, 0x6e, 0xc3, 0x68, 0x37, 0x77, - 0x3a, 0xdb, 0x8d, 0x76, 0x2b, 0x01, 0x4e, 0xc0, 0xd3, 0x5e, 0x53, 0x33, - 0x04, 0xd3, 0x18, 0xc7, 0xb3, 0x4c, 0x01, 0x54, 0x19, 0xd7, 0xce, 0xb9, - 0xc9, 0x79, 0x13, 0xe8, 0xa6, 0xd1, 0x7e, 0x0f, 0xd0, 0x80, 0x8f, 0x18, - 0xec, 0x9a, 0x57, 0x77, 0x3c, 0x77, 0xe8, 0x5b, 0x63, 0xb7, 0xdf, 0xf7, - 0xe8, 0x82, 0xba, 0x2a, 0x90, 0x24, 0xd4, 0x0f, 0x4f, 0x23, 0x37, 0xa6, - 0xf5, 0x68, 0xe2, 0xf4, 0x28, 0x28, 0x7b, 0xa6, 0x91, 0x4b, 0x51, 0xb0, - 0x4a, 0x26, 0xe6, 0x96, 0xc5, 0x4c, 0xcc, 0x24, 0x0c, 0x86, 0x21, 0x8d, - 0x98, 0x51, 0x7c, 0x59, 0xd5, 0x58, 0x18, 0xaa, 0xb4, 0xfd, 0xa3, 0xe3, - 0x4d, 0xe9, 0xbb, 0x7a, 0x14, 0xcf, 0x30, 0x68, 0xe0, 0x7f, 0x73, 0x03, - 0x9b, 0x41, 0x0b, 0x92, 0x34, 0x7f, 0x11, 0x36, 0x83, 0xab, 0xd8, 0x8c, - 0xcb, 0x1b, 0x61, 0x31, 0x93, 0xb3, 0x61, 0x4a, 0xd5, 0xcf, 0xdc, 0xe0, - 0x06, 0xe6, 0x47, 0xd2, 0x2b, 0x61, 0x0a, 0xd7, 0x67, 0xdd, 0x96, 0x78, - 0x63, 0x2d, 0x46, 0x14, 0x26, 0x81, 0x1b, 0x58, 0xc7, 0x9f, 0x3d, 0x8d, - 0x68, 0x48, 0x65, 0x63, 0xbc, 0x2f, 0x58, 0x50, 0xa0, 0x83, 0xdb, 0x29, - 0x34, 0xb5, 0x73, 0xf0, 0x76, 0x68, 0x21, 0x46, 0x41, 0x65, 0xf0, 0x4e, - 0x96, 0xd3, 0x43, 0x4d, 0x5b, 0xd0, 0xc6, 0xbc, 0x37, 0x77, 0x76, 0x77, - 0xe7, 0x53, 0x6f, 0xa5, 0xad, 0xf7, 0xdc, 0x28, 0xe6, 0x9e, 0x52, 0x1d, - 0x1d, 0x1f, 0xee, 0x6e, 0x08, 0xb5, 0xdd, 0xca, 0x8c, 0x27, 0x3e, 0x33, - 0xeb, 0x2a, 0xaa, 0xb8, 0x3e, 0x43, 0x9a, 0xa1, 0x13, 0x22, 0xd0, 0xd9, - 0xea, 0xb0, 0x02, 0xd0, 0xee, 0xb9, 0x82, 0x52, 0x7b, 0x91, 0x62, 0x66, - 0xc6, 0xb1, 0x59, 0x82, 0x29, 0xcf, 0x4d, 0x15, 0xe2, 0x2e, 0xce, 0xda, - 0x66, 0x93, 0x30, 0x30, 0x4c, 0x85, 0xf3, 0x4a, 0x36, 0xc3, 0x08, 0x08, - 0x47, 0x7d, 0xd0, 0xa7, 0xd4, 0x9f, 0x32, 0x11, 0x0a, 0x5f, 0xd8, 0x8a, - 0x01, 0x37, 0x4f, 0x56, 0xa3, 0x2b, 0x24, 0xaf, 0x0e, 0xfa, 0xca, 0x8f, - 0x23, 0xee, 0x4b, 0x19, 0x13, 0xc7, 0x07, 0xbe, 0x59, 0x5a, 0x59, 0x5e, - 0xe8, 0x1a, 0xcc, 0x52, 0xa1, 0x5b, 0x08, 0xec, 0xee, 0x42, 0xe3, 0xd9, - 0x4b, 0x5e, 0x1c, 0x78, 0x1d, 0x0d, 0xc3, 0x20, 0x14, 0x35, 0x21, 0xed, - 0xcb, 0xa5, 0x75, 0x2f, 0x80, 0x09, 0x5e, 0x4a, 0x1c, 0x99, 0xa4, 0x47, - 0x97, 0x75, 0xe0, 0x5c, 0xd8, 0xa3, 0xcc, 0xab, 0x31, 0x80, 0x80, 0x0e, - 0xf8, 0xee, 0xfd, 0x97, 0x72, 0xf0, 0x13, 0xeb, 0xf9, 0xfd, 0x76, 0xb0, - 0xcc, 0xb2, 0x4a, 0x40, 0x26, 0xa2, 0xb5, 0x64, 0x09, 0x65, 0x49, 0x6b, - 0x22, 0xfe, 0xd0, 0xef, 0x5a, 0xf0, 0xcd, 0x0c, 0x3f, 0xf8, 0xe3, 0x40, - 0xae, 0x74, 0x6f, 0x61, 0x02, 0x61, 0x40, 0xff, 0xa8, 0xeb, 0xb3, 0xda, - 0x27, 0x48, 0x50, 0xfe, 0x23, 0x27, 0x2b, 0xb2, 0xd9, 0xc5, 0x7e, 0x76, - 0x26, 0x6f, 0x6b, 0xd2, 0x21, 0x95, 0x15, 0x33, 0xd5, 0x67, 0x18, 0x64, - 0xa0, 0x58, 0xdc, 0x07, 0x0b, 0xb6, 0x3d, 0xa9, 0x90, 0x34, 0x44, 0xfe, - 0x35, 0xbf, 0x76, 0x05, 0x44, 0xac, 0x84, 0xa3, 0x93, 0x86, 0x69, 0xa4, - 0x22, 0x60, 0xec, 0x98, 0xa5, 0x21, 0x44, 0x22, 0x70, 0x5c, 0xff, 0x95, - 0xf9, 0x30, 0x3c, 0x10, 0x29, 0xa4, 0xfe, 0xa2, 0x07, 0x99, 0x88, 0xf2, - 0xdc, 0x00, 0xb5, 0x40, 0x53, 0x3d, 0xc8, 0xc5, 0x66, 0x00, 0x61, 0xa3, - 0x0b, 0x4a, 0x98, 0xf0, 0xa7, 0x98, 0x8e, 0xf9, 0x13, 0xba, 0x72, 0xfc, - 0x09, 0x15, 0x62, 0x3a, 0x18, 0x60, 0x52, 0xe9, 0x2c, 0x69, 0x85, 0xb4, - 0xb4, 0x18, 0x05, 0x38, 0xca, 0x27, 0x20, 0xd0, 0xb5, 0xe3, 0x7a, 0x25, - 0x82, 0x9f, 0x43, 0xff, 0xb7, 0x69, 0x14, 0xbb, 0x83, 0x59, 0xe2, 0xfb, - 0x5b, 0x4c, 0x83, 0xd5, 0xef, 0x69, 0xfc, 0x44, 0xa9, 0x8f, 0x92, 0x38, - 0x1d, 0xfb, 0xf5, 0xa1, 0x33, 0x11, 0xda, 0x28, 0x19, 0xfe, 0x23, 0xac, - 0xfb, 0xdf, 0x38, 0xfc, 0xcb, 0x3b, 0x06, 0x59, 0xcf, 0xbc, 0x72, 0xc5, - 0xf6, 0x86, 0xcb, 0x5a, 0xb8, 0x9e, 0x84, 0x1c, 0x3b, 0x00, 0x60, 0xf4, - 0x38, 0x7c, 0x59, 0x81, 0x78, 0x24, 0xae, 0x35, 0x42, 0xa3, 0xf2, 0xb2, - 0xe8, 0x77, 0xbd, 0xa1, 0xeb, 0x12, 0x96, 0x4a, 0x18, 0x83, 0x8f, 0x42, - 0x3c, 0x57, 0x58, 0x5b, 0x7c, 0xfa, 0xae, 0x81, 0x71, 0x05, 0x05, 0xfa, - 0x3d, 0x9d, 0xe7, 0x2d, 0x63, 0xbe, 0xb0, 0xae, 0x7d, 0xc4, 0xc0, 0x77, - 0xae, 0x6d, 0x5c, 0x6f, 0x24, 0x0e, 0x07, 0x97, 0x28, 0xd4, 0x1d, 0x79, - 0x0f, 0x04, 0x83, 0x19, 0xee, 0x65, 0xec, 0x17, 0xa3, 0x5a, 0x8c, 0xcc, - 0x56, 0xd4, 0xa7, 0xbd, 0x20, 0xe4, 0x79, 0x9c, 0x6c, 0xb1, 0x99, 0x65, - 0xc3, 0xb7, 0x8a, 0x3b, 0xc6, 0xd4, 0x92, 0xe3, 0xc7, 0xd2, 0x42, 0x04, - 0x46, 0x17, 0x0b, 0x70, 0x46, 0x92, 0x73, 0x71, 0x4a, 0x60, 0x10, 0x98, - 0xf9, 0xd3, 0xe7, 0xab, 0x9f, 0x5f, 0x96, 0x51, 0xfb, 0xa7, 0x71, 0xe0, - 0xbb, 0x71, 0x10, 0xde, 0x51, 0x1f, 0x2d, 0xe8, 0x1d, 0xfa, 0x19, 0x51, - 0x0f, 0xdc, 0xae, 0xd4, 0xde, 0xa3, 0x5a, 0x5c, 0xb0, 0x54, 0xff, 0x6b, - 0x4c, 0xfb, 0xae, 0xa3, 0x40, 0x3b, 0xe0, 0x68, 0xc5, 0xf1, 0xfb, 0x8a, - 0x96, 0x85, 0xac, 0x5b, 0x98, 0x0b, 0xd0, 0x5f, 0x64, 0x07, 0x23, 0xa7, - 0x57, 0xe6, 0x7b, 0x9b, 0xcc, 0x9d, 0xda, 0xdf, 0xdb, 0xe4, 0x79, 0x3a, - 0x54, 0x80, 0xfb, 0x7b, 0x7d, 0xf7, 0x71, 0x7f, 0x6f, 0xea, 0xed, 0xef, - 0x79, 0xae, 0xe2, 0xf6, 0x6d, 0xf5, 0xf4, 0x2b, 0x48, 0xd6, 0x83, 0xba, - 0x7f, 0xea, 0x86, 0xe3, 0x27, 0x27, 0xa4, 0x7b, 0x9b, 0x9e, 0x9b, 0x56, - 0x7e, 0x71, 0x79, 0xe5, 0x19, 0x82, 0x33, 0x80, 0x39, 0x72, 0xb5, 0x23, - 0x6f, 0xc2, 0xab, 0x3f, 0x52, 0x6f, 0x92, 0xab, 0xa1, 0x11, 0xaf, 0x51, - 0x7a, 0x9e, 0x13, 0x45, 0xd0, 0x12, 0xb4, 0x9e, 0xba, 0x7f, 0x72, 0x75, - 0xd1, 0x3a, 0x4e, 0xdb, 0x89, 0xaa, 0x0c, 0x7c, 0x75, 0x3f, 0x37, 0x06, - 0x73, 0x52, 0x0a, 0x46, 0xf9, 0x84, 0xe5, 0xb9, 0x96, 0xc0, 0x80, 0xbc, - 0x5d, 0xe2, 0x9e, 0xd8, 0x6a, 0xf2, 0x94, 0x8c, 0xb9, 0x89, 0x2b, 0xde, - 0x64, 0x6b, 0x1f, 0x85, 0xfb, 0x7b, 0x9c, 0x28, 0x0c, 0x19, 0x6c, 0x04, - 0xa0, 0xd9, 0x27, 0x77, 0x0c, 0x9c, 0xcf, 0x3a, 0xb0, 0x66, 0x52, 0x55, - 0x5a, 0xb6, 0xb9, 0xd8, 0x0f, 0xd8, 0x04, 0x74, 0x05, 0xbd, 0x40, 0x03, - 0x93, 0x82, 0xc9, 0xcc, 0x8d, 0xc2, 0x81, 0x5d, 0x6c, 0xf9, 0x91, 0x19, - 0x86, 0x7c, 0x53, 0x61, 0x2d, 0xd4, 0xfd, 0x6b, 0x1a, 0x82, 0x7d, 0x72, - 0xbc, 0x05, 0x08, 0x44, 0xd7, 0x0f, 0x40, 0xbe, 0x85, 0x8e, 0x48, 0x51, - 0x25, 0x75, 0x36, 0xc4, 0x6c, 0xa2, 0x45, 0xe6, 0xd5, 0x43, 0x39, 0x8b, - 0x3c, 0x93, 0x9a, 0x41, 0x10, 0x8e, 0x8f, 0x78, 0xad, 0x0a, 0x76, 0x93, - 0x7a, 0x5e, 0x6f, 0x44, 0x7b, 0x0f, 0x50, 0xe1, 0x78, 0x11, 0x55, 0x15, - 0x64, 0x4d, 0x10, 0x21, 0x0c, 0xab, 0x6d, 0x35, 0x18, 0x0c, 0x92, 0x92, - 0xf1, 0x04, 0x2c, 0x11, 0x15, 0x45, 0x2c, 0x24, 0xb3, 0x55, 0x95, 0x43, - 0x08, 0x9a, 0x38, 0x18, 0x1f, 0x8d, 0xfb, 0xd7, 0xcf, 0xb1, 0xba, 0xaf, - 0xec, 0x71, 0x71, 0x49, 0xe6, 0xbb, 0x8f, 0x7d, 0xd1, 0x6c, 0xdc, 0xff, - 0x00, 0xcf, 0xfb, 0x57, 0xd4, 0xef, 0xef, 0x6d, 0x0a, 0x81, 0x7e, 0x03, - 0x66, 0x9e, 0x04, 0x65, 0x00, 0x82, 0x8f, 0xc0, 0xc7, 0x29, 0x15, 0x25, - 0x40, 0x0f, 0x36, 0x44, 0x06, 0x10, 0x0f, 0x08, 0x0d, 0x8b, 0xc6, 0x14, - 0x58, 0xf5, 0xaa, 0x9e, 0xfb, 0x87, 0xe9, 0x33, 0x70, 0x0c, 0xf6, 0x48, - 0x89, 0xce, 0xfe, 0x85, 0x90, 0x43, 0x26, 0xc6, 0x11, 0xb7, 0x39, 0xc8, - 0x19, 0x50, 0x93, 0x6f, 0x9a, 0xd0, 0x0d, 0x15, 0xc9, 0xd5, 0x2c, 0x02, - 0x75, 0xba, 0x9a, 0x35, 0xb2, 0x76, 0x2b, 0xb9, 0xe3, 0x34, 0x6d, 0x56, - 0x3a, 0xcf, 0x0f, 0x63, 0x11, 0x06, 0xa1, 0xc0, 0x3d, 0x0e, 0xbf, 0x40, - 0x6f, 0xe6, 0x9d, 0xa8, 0xca, 0x78, 0xea, 0xc5, 0x2e, 0x30, 0x05, 0xe0, - 0x55, 0x3c, 0xad, 0x20, 0x7e, 0x48, 0x07, 0x10, 0x6a, 0x8f, 0xd4, 0xfd, - 0x4b, 0xfe, 0x90, 0x32, 0x40, 0x39, 0xbb, 0x84, 0xd4, 0x01, 0x89, 0x74, - 0x01, 0x21, 0x2c, 0x2f, 0x6e, 0xab, 0x47, 0xac, 0x44, 0xe1, 0x29, 0x9f, - 0x20, 0x9c, 0xa9, 0xfb, 0xb5, 0xb7, 0x87, 0x99, 0x4e, 0xbc, 0xc0, 0xe9, - 0x9f, 0x72, 0x90, 0xc5, 0x40, 0xbc, 0x4c, 0xe1, 0xeb, 0x90, 0x06, 0x91, - 0xb1, 0xc3, 0xd9, 0x86, 0x63, 0x02, 0xc7, 0x99, 0x84, 0x43, 0xe6, 0x8b, - 0x51, 0xe4, 0x71, 0xf3, 0xa7, 0x94, 0x2f, 0x78, 0x0a, 0x21, 0xc5, 0x3a, - 0x4f, 0x2d, 0x2c, 0xf7, 0x03, 0x74, 0x39, 0xcf, 0xb6, 0xda, 0x30, 0xcd, - 0x14, 0x99, 0x1d, 0x93, 0xf3, 0x0f, 0x1f, 0xa1, 0x88, 0x7d, 0x84, 0x6b, - 0x93, 0xa7, 0xa9, 0x5a, 0xd8, 0xe6, 0xbe, 0x9c, 0xf6, 0x09, 0x07, 0x2d, - 0xad, 0x4e, 0x00, 0xe8, 0xc4, 0x40, 0x96, 0xcd, 0x82, 0xe9, 0x3f, 0x41, - 0x4c, 0xae, 0x96, 0x33, 0xb7, 0x98, 0xf9, 0x94, 0xb3, 0x56, 0x7e, 0xee, - 0x94, 0xdf, 0xe4, 0xce, 0xc5, 0x03, 0x71, 0xbb, 0xf3, 0x96, 0x8c, 0xf0, - 0x56, 0x6f, 0x48, 0x08, 0x6f, 0xa4, 0x4c, 0x27, 0x7d, 0xe0, 0x93, 0x92, - 0x89, 0xfe, 0x13, 0x42, 0xe2, 0xf4, 0x7a, 0x74, 0x02, 0xda, 0xd3, 0xb8, - 0x77, 0xfd, 0x4c, 0x64, 0x06, 0x4f, 0xea, 0x1b, 0x6c, 0x3a, 0x39, 0xfd, - 0x8a, 0xea, 0x11, 0xb7, 0x57, 0x14, 0xe4, 0xd8, 0x75, 0x19, 0x93, 0x2f, - 0xf8, 0x7b, 0x58, 0x93, 0xf7, 0x5c, 0x9b, 0x39, 0xe5, 0x7f, 0xef, 0x25, - 0x43, 0xc8, 0x8c, 0xf5, 0xc4, 0x19, 0x66, 0x64, 0x64, 0x79, 0x64, 0x99, - 0x8c, 0x72, 0x79, 0xe2, 0xb3, 0x17, 0x55, 0x25, 0xd4, 0x3c, 0xeb, 0x43, - 0x03, 0x77, 0x20, 0xf6, 0xe4, 0x24, 0x62, 0xe6, 0x5a, 0x33, 0xb6, 0x2f, - 0x27, 0xd8, 0x12, 0xc7, 0xef, 0x7f, 0x89, 0x20, 0xc6, 0x15, 0xa3, 0x71, - 0x72, 0xa6, 0xf0, 0x9f, 0xe1, 0xeb, 0x77, 0x9b, 0x44, 0xd9, 0xbf, 0x58, - 0x1f, 0x9c, 0x0b, 0x78, 0x79, 0x82, 0xe8, 0x23, 0x0f, 0x12, 0x67, 0xaa, - 0x89, 0xa8, 0x4b, 0xc4, 0x94, 0xbf, 0xfd, 0x18, 0x28, 0xf3, 0xb2, 0xc1, - 0x96, 0xff, 0x39, 0x1a, 0xe6, 0x5c, 0x2d, 0x65, 0x31, 0x63, 0x84, 0x7e, - 0x20, 0x70, 0x07, 0x84, 0x46, 0xb8, 0x0d, 0xa8, 0x04, 0xa1, 0x92, 0xc0, - 0x54, 0x46, 0x9d, 0x54, 0xa0, 0x04, 0xd3, 0xf3, 0x75, 0xf1, 0x17, 0x55, - 0x12, 0x01, 0x05, 0x82, 0x00, 0xbe, 0x4a, 0x70, 0xdc, 0x00, 0x63, 0x3e, - 0x2c, 0x41, 0xb4, 0xda, 0x3f, 0x4e, 0x4b, 0x96, 0x75, 0xfd, 0xdb, 0xe3, - 0x31, 0xc0, 0x93, 0xa1, 0x84, 0xeb, 0x98, 0xc8, 0xd4, 0x32, 0x4b, 0x83, - 0x03, 0xe0, 0x4e, 0x62, 0xa5, 0x4f, 0x07, 0x14, 0xbc, 0x05, 0xf6, 0x47, - 0xdd, 0xd7, 0x34, 0xdd, 0xde, 0x7f, 0x51, 0x61, 0xcd, 0x4a, 0x14, 0x87, - 0x6e, 0x2f, 0x56, 0xbb, 0x8f, 0x20, 0x46, 0xd4, 0x7e, 0xd9, 0xdd, 0xda, - 0x6a, 0x5a, 0x1a, 0x25, 0x31, 0xf1, 0xb1, 0x09, 0x96, 0x86, 0xb6, 0xaf, - 0x6d, 0x35, 0xda, 0x3a, 0x09, 0xf0, 0xa1, 0xd5, 0x32, 0x75, 0xe2, 0xda, - 0xd7, 0x00, 0xe6, 0x09, 0xe2, 0xb1, 0x4b, 0x0d, 0xfa, 0x8c, 0xa1, 0x47, - 0x64, 0x0f, 0xa6, 0x3e, 0xdb, 0xb6, 0xd0, 0xa8, 0xfe, 0xe2, 0x0e, 0xb4, - 0x10, 0xfe, 0xea, 0x21, 0x8d, 0xa7, 0xa1, 0xaf, 0xd0, 0x6e, 0x3c, 0x0a, - 0x83, 0x27, 0xc5, 0xa7, 0x4f, 0x8a, 0xab, 0x05, 0x50, 0x53, 0x83, 0xc5, - 0x44, 0xa0, 0xa1, 0x62, 0xc5, 0x51, 0x92, 0x8e, 0xaa, 0x3e, 0x9f, 0x93, - 0x2d, 0x73, 0x7b, 0xbb, 0x1c, 0x82, 0x2b, 0x00, 0xd7, 0x1f, 0xae, 0x07, - 0x80, 0x1a, 0xdc, 0x7f, 0x03, 0x1c, 0xab, 0xb6, 0x8d, 0x48, 0x0d, 0x06, - 0x0a, 0x7d, 0x7d, 0x2d, 0x07, 0x4a, 0x3d, 0x72, 0xfc, 0x8d, 0x58, 0x89, - 0x68, 0xac, 0xa8, 0x35, 0x01, 0xa1, 0x13, 0x01, 0x74, 0xa0, 0x30, 0xe2, - 0x00, 0x47, 0x60, 0xe0, 0xed, 0x6e, 0x6d, 0x9b, 0x05, 0xe0, 0x35, 0x1a, - 0x8d, 0xf7, 0x82, 0xb7, 0x36, 0x7e, 0x7c, 0x45, 0x2c, 0x04, 0xe7, 0x6f, - 0x99, 0x8d, 0x96, 0x45, 0x61, 0xe6, 0x6c, 0x5c, 0x15, 0x42, 0x36, 0x3a, - 0x70, 0x7d, 0xf0, 0x0d, 0x2b, 0xc9, 0x52, 0x0f, 0xc3, 0xd0, 0x99, 0x7d, - 0x98, 0x0e, 0x80, 0xdc, 0xd5, 0x6a, 0x51, 0x83, 0x63, 0x27, 0x76, 0x7e, - 0x75, 0xe9, 0xd3, 0x9c, 0x34, 0xb7, 0x96, 0x16, 0x44, 0x02, 0xe2, 0x12, - 0x07, 0x96, 0x85, 0xb3, 0xe9, 0x24, 0x82, 0xa7, 0xdd, 0xed, 0x1d, 0x58, - 0xa1, 0x07, 0x4f, 0xdb, 0x3b, 0x1d, 0x20, 0x45, 0x2f, 0xa1, 0x49, 0x3f, - 0x59, 0xfd, 0x14, 0x1e, 0x9a, 0x9d, 0xdd, 0x6d, 0x9d, 0x4c, 0xb0, 0xae, - 0xbd, 0xa3, 0x93, 0x41, 0xca, 0x31, 0x63, 0x78, 0xda, 0xd9, 0xd9, 0x81, - 0xa7, 0x19, 0x3e, 0x99, 0x9d, 0xa6, 0x4e, 0x86, 0x38, 0x98, 0xd9, 0xee, - 0xe8, 0x64, 0x84, 0x4f, 0xbb, 0xdb, 0x5b, 0x3a, 0x79, 0xc4, 0xa9, 0x3a, - 0x0d, 0xe8, 0xfb, 0x84, 0x65, 0x5b, 0xdb, 0x30, 0xc3, 0x3d, 0x3c, 0x75, - 0x1a, 0x0d, 0xe8, 0x71, 0xc2, 0x00, 0xc1, 0xc9, 0x3e, 0xe1, 0xd3, 0xae, - 0xb9, 0xab, 0x93, 0x67, 0xfb, 0x93, 0x41, 0x7d, 0xf0, 0x85, 0x7b, 0x94, - 0x9c, 0xc1, 0xf3, 0x90, 0xc6, 0xe4, 0xc1, 0xf6, 0x0c, 0x08, 0xf0, 0x76, - 0x18, 0x16, 0xc8, 0x95, 0xfd, 0x50, 0xad, 0x3e, 0x18, 0x29, 0x1d, 0xc9, - 0x07, 0xa8, 0xfe, 0x02, 0xf1, 0xe8, 0xce, 0x91, 0xe7, 0x8c, 0x27, 0xb4, - 0xcf, 0x9b, 0x5d, 0xdb, 0x1f, 0xaa, 0xd5, 0x0f, 0x52, 0xb3, 0x43, 0xec, - 0xf7, 0xa8, 0x3d, 0xe8, 0xe4, 0xdc, 0xbe, 0xc2, 0xa7, 0x2b, 0x9d, 0x7c, - 0xb6, 0xcf, 0x19, 0x2d, 0xa4, 0x66, 0xdf, 0x60, 0xb4, 0x94, 0xdc, 0xe4, - 0xc2, 0xbe, 0xd7, 0xd4, 0x38, 0xe0, 0x8c, 0x70, 0xed, 0x0c, 0x55, 0x9d, - 0x9c, 0xda, 0x27, 0x9a, 0x7a, 0xfd, 0xf7, 0x8b, 0x93, 0xe3, 0xbb, 0xc3, - 0xcb, 0xcb, 0xc3, 0xbf, 0xdf, 0x5d, 0x1f, 0xfe, 0x0c, 0xc5, 0x1f, 0x6d, - 0x15, 0xbb, 0xf1, 0xd9, 0xc1, 0xfb, 0x06, 0x49, 0x9c, 0xa2, 0x0f, 0xa8, - 0x92, 0x3b, 0xdb, 0xa9, 0x56, 0x2b, 0x95, 0x27, 0xa0, 0xdc, 0xf9, 0x84, - 0x86, 0x0e, 0x50, 0xcd, 0x9e, 0x68, 0x9e, 0x11, 0xe0, 0x8b, 0x4e, 0x8e, - 0xec, 0x4a, 0x83, 0x1c, 0xdb, 0x2f, 0xe9, 0x0a, 0xad, 0x06, 0x61, 0xcb, - 0xc9, 0xbd, 0xc8, 0x6b, 0x83, 0x32, 0x68, 0xdc, 0xd8, 0xe2, 0x2f, 0x4d, - 0xd6, 0x20, 0x7b, 0x83, 0xaa, 0x56, 0x93, 0xbf, 0xb4, 0x59, 0x55, 0xf6, - 0x76, 0x0a, 0x16, 0x7c, 0xf1, 0x75, 0xab, 0xcd, 0x5f, 0x77, 0xe6, 0xe4, - 0xd2, 0x7e, 0xf9, 0xe0, 0x0e, 0xa1, 0x7f, 0x5a, 0x46, 0xe0, 0x1d, 0x87, - 0x90, 0x1a, 0x7d, 0xc9, 0x31, 0x3e, 0xf2, 0x57, 0x6c, 0x3f, 0xc2, 0x63, - 0x17, 0x64, 0xa0, 0xaf, 0xc5, 0x3a, 0x2f, 0xf3, 0xed, 0x33, 0x78, 0xee, - 0x0a, 0x79, 0xf0, 0xab, 0xd5, 0xa9, 0xe6, 0x93, 0x8f, 0xfa, 0x81, 0x7f, - 0xf3, 0xf1, 0xd6, 0xfa, 0x02, 0x55, 0xc0, 0xfb, 0x5f, 0x17, 0x45, 0xa8, - 0xd2, 0xcf, 0x64, 0xa8, 0xd2, 0xe8, 0xf2, 0xb1, 0x27, 0x38, 0xb6, 0x18, - 0x67, 0xaa, 0x1d, 0x93, 0x58, 0x7f, 0x7d, 0x9d, 0x6a, 0x97, 0xf0, 0x77, - 0xde, 0x05, 0x36, 0xd1, 0x42, 0xc5, 0xf5, 0x95, 0x63, 0x5d, 0x73, 0x6d, - 0x2d, 0xb0, 0xbd, 0x9b, 0xf0, 0x56, 0xaf, 0x56, 0x83, 0x8c, 0x9e, 0xfa, - 0xc1, 0xb3, 0xe6, 0xea, 0x30, 0xab, 0x1d, 0x58, 0x77, 0x80, 0xe9, 0xac, - 0xcf, 0x65, 0x79, 0x9f, 0x6a, 0x55, 0x4b, 0x7b, 0xb1, 0x85, 0x69, 0x95, - 0xbb, 0xd7, 0xd7, 0x4a, 0x4f, 0x3b, 0x84, 0xc9, 0x0f, 0x6d, 0xdb, 0x3e, - 0x15, 0x80, 0xe7, 0xfb, 0x1c, 0x66, 0x0b, 0xd2, 0x5f, 0x32, 0x0d, 0xf0, - 0x4d, 0x53, 0xcf, 0x7c, 0x61, 0xf6, 0x60, 0xe2, 0xc7, 0x80, 0x3b, 0x0c, - 0x20, 0xff, 0xe4, 0x4e, 0xd7, 0xa5, 0x35, 0x20, 0x24, 0xd5, 0xea, 0x93, - 0x86, 0x7f, 0xc9, 0xa1, 0x34, 0xf1, 0xf9, 0xeb, 0xeb, 0x39, 0xcc, 0xfa, - 0x19, 0x27, 0x39, 0xb7, 0x0f, 0x25, 0x6e, 0x2d, 0x1f, 0x40, 0x6a, 0x74, - 0xce, 0x86, 0xba, 0x43, 0x9e, 0xbf, 0xd6, 0x81, 0xf9, 0xce, 0xb1, 0xcd, - 0x35, 0x14, 0x93, 0x08, 0x18, 0x73, 0xaa, 0x9d, 0x93, 0x0b, 0x69, 0x18, - 0xe0, 0x47, 0x93, 0x0c, 0xb1, 0x90, 0xbc, 0x80, 0x5d, 0x1b, 0xb8, 0xc3, - 0x69, 0x88, 0xc1, 0xa8, 0x85, 0xc5, 0x34, 0xb6, 0xa4, 0x35, 0x0a, 0xb2, - 0x00, 0xd9, 0x47, 0x6e, 0xa4, 0x1f, 0xe0, 0xbf, 0x37, 0xa7, 0xb7, 0xd6, - 0x63, 0x00, 0x16, 0xd8, 0x9c, 0xcf, 0x75, 0x92, 0x80, 0x34, 0xe6, 0x6b, - 0x3a, 0x25, 0xa1, 0x2e, 0x69, 0xd0, 0x97, 0x5f, 0x0e, 0xaf, 0xcf, 0x7e, - 0x3d, 0x11, 0x62, 0xf4, 0xe1, 0xcb, 0xe9, 0xe9, 0xc9, 0xe5, 0xdd, 0xaf, - 0x67, 0x27, 0x5f, 0xaf, 0xac, 0x3b, 0xb2, 0x20, 0x61, 0xd6, 0x51, 0xb5, - 0x7a, 0x4a, 0x9c, 0x4c, 0xc4, 0xac, 0x05, 0xe6, 0xf9, 0x5a, 0xa2, 0x7f, - 0x01, 0xfb, 0xd7, 0x4e, 0x08, 0x80, 0x67, 0x06, 0x0a, 0x91, 0xd2, 0x57, - 0x1c, 0x1c, 0x05, 0x89, 0xe0, 0x14, 0xca, 0xed, 0xe2, 0xf8, 0x3d, 0x8d, - 0xd1, 0xb8, 0xf2, 0xf4, 0xfa, 0x3a, 0xd2, 0x0e, 0x09, 0x4c, 0x56, 0x3c, - 0xdb, 0x60, 0xc1, 0x1a, 0x4a, 0x93, 0xe1, 0x01, 0xab, 0x54, 0x2d, 0xc0, - 0xc4, 0x1c, 0x0f, 0xd9, 0xec, 0x9f, 0x69, 0x3c, 0x0a, 0xfa, 0xd2, 0xc4, - 0xa8, 0xc5, 0x01, 0x65, 0x38, 0x7d, 0xc4, 0xfe, 0xf5, 0x19, 0x99, 0x50, - 0x30, 0x02, 0x4e, 0x71, 0x26, 0x6c, 0x2e, 0xf0, 0x70, 0x70, 0x8b, 0x34, - 0x76, 0x51, 0xd0, 0x5c, 0x89, 0xf4, 0x00, 0x66, 0x1c, 0xce, 0x5e, 0xfa, - 0x14, 0x1d, 0x2c, 0x45, 0xaa, 0xb9, 0xa1, 0xb7, 0x73, 0xe0, 0xc3, 0xde, - 0x08, 0xc6, 0x7c, 0xc1, 0x26, 0xf9, 0x3a, 0x3b, 0x16, 0xb5, 0xb0, 0xf8, - 0xf9, 0x7c, 0x7e, 0x0e, 0x45, 0xc0, 0x2a, 0xfe, 0xeb, 0xeb, 0x0c, 0x18, - 0x83, 0x12, 0xff, 0x20, 0xb6, 0x80, 0x9f, 0xae, 0xa0, 0xf8, 0xf5, 0x35, - 0x06, 0x10, 0xe7, 0xcb, 0xab, 0xb9, 0x8a, 0x81, 0xcd, 0x7b, 0x85, 0x6b, - 0xd2, 0x13, 0xbb, 0xd4, 0x4d, 0x57, 0xf6, 0x24, 0xad, 0x4f, 0x70, 0x33, - 0xb2, 0x7f, 0x2a, 0x9e, 0x53, 0x2d, 0x58, 0x58, 0x4c, 0x90, 0x2d, 0x01, - 0x81, 0x84, 0xd6, 0x87, 0x02, 0x4a, 0x41, 0x98, 0x2e, 0x36, 0x16, 0x34, - 0x9a, 0x21, 0xc9, 0x12, 0xb0, 0x0f, 0x39, 0xd8, 0xba, 0xbc, 0x44, 0x69, - 0xde, 0x4a, 0x32, 0xeb, 0xeb, 0x6b, 0x20, 0xad, 0x1b, 0xe6, 0x27, 0x4c, - 0x6f, 0x01, 0x2f, 0x15, 0x73, 0xcc, 0x17, 0xe2, 0x46, 0x68, 0x84, 0xad, - 0x77, 0xea, 0x35, 0x35, 0xb1, 0xde, 0xe0, 0xdb, 0xd8, 0x31, 0xaa, 0xb7, - 0x9c, 0x9a, 0x83, 0x51, 0x25, 0xb6, 0xff, 0x4a, 0xa4, 0x97, 0x43, 0xe9, - 0xe5, 0x22, 0x21, 0x9f, 0x75, 0x0e, 0x40, 0xb6, 0x5b, 0xcd, 0xad, 0x22, - 0xc7, 0x66, 0xdb, 0x6c, 0xa2, 0x67, 0x13, 0x6a, 0x2f, 0x73, 0x23, 0xb1, - 0x6b, 0xe8, 0x01, 0x86, 0x9a, 0xaa, 0x1a, 0x91, 0xe7, 0xf6, 0xa8, 0x5e, - 0xe2, 0xe3, 0x08, 0x4c, 0x72, 0x7f, 0x86, 0xec, 0x90, 0x7a, 0x83, 0xf9, - 0x77, 0xed, 0x9d, 0xa2, 0x69, 0xb6, 0x76, 0x13, 0x0f, 0x13, 0x9d, 0x0a, - 0x17, 0x1e, 0x10, 0x20, 0x9d, 0x79, 0x21, 0xcc, 0xf8, 0x2f, 0x5a, 0xd5, - 0x48, 0x58, 0x62, 0xf0, 0x49, 0xd4, 0x43, 0x88, 0xfa, 0xf0, 0xb8, 0x61, - 0x84, 0xf8, 0x70, 0xb5, 0x65, 0x85, 0xe3, 0x24, 0x0d, 0xe6, 0x9a, 0x2e, - 0x83, 0x1b, 0x1e, 0xb8, 0xd6, 0x92, 0x75, 0x42, 0x11, 0x4a, 0x0c, 0x08, - 0xd7, 0x4c, 0x30, 0x2a, 0x3d, 0x50, 0xbf, 0xa4, 0x5e, 0x94, 0xe5, 0x4f, - 0x3d, 0x8f, 0x17, 0xfe, 0x02, 0x4f, 0xaa, 0xa5, 0x46, 0x0c, 0xb2, 0xd4, - 0xd5, 0xd4, 0x7c, 0x5b, 0x66, 0x60, 0x2e, 0x30, 0x89, 0xf4, 0xdf, 0xc4, - 0x32, 0x1b, 0xce, 0xb5, 0xd8, 0x8e, 0x10, 0x41, 0x8e, 0x0e, 0xd6, 0xce, - 0xf2, 0x0e, 0x5c, 0x30, 0x76, 0x96, 0x7a, 0x9e, 0xf8, 0xae, 0xb6, 0x16, - 0xda, 0x58, 0x84, 0x16, 0x47, 0x8b, 0x8d, 0x9e, 0xe3, 0x79, 0x14, 0x8c, - 0x94, 0xb4, 0x66, 0x2b, 0x44, 0xbf, 0x74, 0xb7, 0x59, 0xe4, 0x97, 0x6e, - 0x37, 0x77, 0x5b, 0xf2, 0x82, 0x2b, 0xa1, 0x26, 0xa3, 0x27, 0x79, 0x54, - 0x28, 0xbc, 0xcc, 0x13, 0x00, 0x33, 0xc1, 0x36, 0x24, 0x05, 0x64, 0xe3, - 0xa2, 0x89, 0x70, 0x7f, 0x80, 0xa5, 0x53, 0xf6, 0x39, 0x87, 0xe5, 0x82, - 0x26, 0xa3, 0x68, 0x29, 0xa4, 0xbe, 0x73, 0x1d, 0x38, 0x11, 0x7d, 0xbe, - 0x02, 0xb0, 0xb8, 0x37, 0x19, 0x30, 0x0f, 0x73, 0xdb, 0xe4, 0xf4, 0xde, - 0x6d, 0x00, 0xe5, 0x73, 0xb4, 0x59, 0xd4, 0x01, 0x02, 0xbe, 0xc0, 0x18, - 0xb0, 0x12, 0x57, 0x6b, 0x40, 0xa9, 0x3e, 0xb7, 0x4a, 0xda, 0x21, 0xa2, - 0x6d, 0x9f, 0x50, 0xc4, 0x0e, 0x8c, 0xbd, 0xe0, 0x35, 0xe7, 0xe9, 0xc3, - 0xbb, 0xbc, 0x50, 0x1f, 0x70, 0x2a, 0x8c, 0x97, 0xd6, 0xa8, 0x02, 0x55, - 0xf2, 0x06, 0x4d, 0x6b, 0x62, 0xd9, 0x53, 0xe8, 0xc6, 0xe2, 0xbd, 0x8d, - 0xef, 0x2c, 0xbf, 0x60, 0xc5, 0xa0, 0xf6, 0x08, 0xfa, 0xb3, 0x45, 0xd1, - 0x4b, 0xab, 0xb5, 0x2b, 0xad, 0xb7, 0x5b, 0x0c, 0x86, 0x04, 0xbb, 0x8f, - 0x18, 0xae, 0x56, 0x43, 0x8d, 0x3d, 0x40, 0xd5, 0x0b, 0xfc, 0x81, 0xc0, - 0x13, 0x6c, 0x2a, 0x58, 0x49, 0xdf, 0x88, 0x92, 0xda, 0x88, 0xd7, 0x46, - 0x52, 0x6d, 0x82, 0x1f, 0x1f, 0xc5, 0x0d, 0x5d, 0xed, 0x55, 0x01, 0x5d, - 0x86, 0x7f, 0x0e, 0x23, 0xf7, 0xfa, 0xb7, 0x9b, 0xe5, 0x30, 0x12, 0xd0, - 0xbf, 0xd1, 0xeb, 0xab, 0x06, 0xe6, 0x78, 0xae, 0x33, 0xdd, 0xe4, 0xd9, - 0x91, 0x91, 0x61, 0x0e, 0x42, 0x03, 0x2e, 0x35, 0xc0, 0x0e, 0x91, 0x81, - 0xe7, 0x89, 0x0f, 0xf8, 0x1f, 0x2b, 0xee, 0xb2, 0xb0, 0xc7, 0x07, 0x56, - 0x76, 0xc1, 0xbb, 0xeb, 0xc1, 0x48, 0x24, 0x32, 0x86, 0x5e, 0x70, 0xef, - 0x78, 0xba, 0x77, 0xc0, 0xe9, 0x65, 0x39, 0x1a, 0xc2, 0xda, 0xa5, 0x5e, - 0x44, 0x99, 0xd8, 0x44, 0xc6, 0xd4, 0x8f, 0x9c, 0x01, 0x65, 0xf5, 0x60, - 0x50, 0x3d, 0x70, 0x37, 0x74, 0x4b, 0xe8, 0xf4, 0x05, 0x61, 0x4a, 0x07, - 0x49, 0x70, 0xf0, 0xc2, 0x69, 0x03, 0x5c, 0x20, 0x51, 0xb6, 0xb1, 0x40, - 0x55, 0x00, 0x2f, 0xf0, 0x8f, 0xa4, 0x22, 0x89, 0xc2, 0xac, 0xee, 0xab, - 0x78, 0x9d, 0xeb, 0xa9, 0x8c, 0xb0, 0x50, 0x6c, 0xbb, 0x08, 0xb5, 0x3c, - 0x3e, 0x0a, 0x92, 0x40, 0x81, 0xeb, 0x0c, 0x10, 0x16, 0x70, 0xde, 0xe3, - 0x59, 0xb7, 0x8c, 0x01, 0x71, 0xa5, 0x81, 0x16, 0x82, 0xc9, 0x10, 0x20, - 0xc7, 0x64, 0xd1, 0x97, 0xca, 0x80, 0x02, 0x2a, 0x67, 0xb6, 0x38, 0xe4, - 0xd6, 0x57, 0x00, 0x16, 0x23, 0xb7, 0x83, 0x74, 0xbd, 0x5f, 0x17, 0x88, - 0x01, 0xb6, 0xd1, 0xdf, 0x2b, 0x02, 0x1d, 0x0c, 0x00, 0x69, 0x30, 0x3e, - 0x2c, 0xf0, 0xe8, 0xb6, 0xc1, 0x79, 0xbb, 0x69, 0xdc, 0x32, 0x99, 0x6f, - 0x37, 0x3a, 0x5c, 0xd8, 0xb8, 0xdd, 0x5a, 0x0a, 0xc3, 0xfb, 0xe2, 0x70, - 0x78, 0xb5, 0x9a, 0x3c, 0x19, 0xa0, 0xd4, 0x88, 0x6f, 0xa7, 0xca, 0x16, - 0xaa, 0x52, 0x16, 0x8a, 0x65, 0xff, 0x0f, 0xda, 0x01, 0x62, 0xce, 0xae, - 0xee, 0x3e, 0x5e, 0x7f, 0xfe, 0x74, 0x7c, 0x7c, 0x68, 0xf9, 0x48, 0x87, - 0xc6, 0xf6, 0x0a, 0x32, 0x88, 0xe8, 0x14, 0x0c, 0x96, 0x91, 0x4c, 0x07, - 0x4c, 0x1e, 0x80, 0xb7, 0x8e, 0x0a, 0xd5, 0x35, 0x78, 0x4e, 0xfe, 0xc4, - 0xa3, 0x58, 0xf3, 0x86, 0x29, 0x73, 0x0e, 0x16, 0xda, 0x43, 0x9d, 0x85, - 0xee, 0x0e, 0xd9, 0x69, 0xac, 0x15, 0x96, 0xfb, 0xce, 0xa3, 0x3b, 0x74, - 0x40, 0x99, 0x82, 0x2b, 0xc4, 0x2c, 0x86, 0x96, 0x96, 0x18, 0x98, 0x81, - 0x3a, 0x1c, 0x22, 0x10, 0xaf, 0xaf, 0xaa, 0x0a, 0xaa, 0xa4, 0xb5, 0xdb, - 0x2c, 0x0a, 0xcc, 0xd3, 0xb5, 0xa1, 0xa8, 0xe2, 0xbc, 0x68, 0x0b, 0x99, - 0x33, 0xd6, 0xa3, 0x51, 0x04, 0xe6, 0xd0, 0x35, 0x8e, 0xa9, 0x1f, 0x80, - 0x18, 0x82, 0xb3, 0x1e, 0x19, 0x78, 0x7a, 0x14, 0x56, 0x01, 0x12, 0xeb, - 0x55, 0xab, 0x5e, 0xf2, 0x0a, 0x61, 0x7b, 0xaf, 0x5a, 0xed, 0x19, 0x8f, - 0x3b, 0xdd, 0x3e, 0xc8, 0x54, 0x80, 0x56, 0xa6, 0x6f, 0x44, 0x13, 0xcf, - 0x8d, 0x35, 0xd5, 0x50, 0x75, 0xfd, 0xc6, 0xbc, 0xdd, 0x37, 0x41, 0xc5, - 0xc0, 0xdf, 0xbd, 0xf6, 0x41, 0xc3, 0xaa, 0x69, 0xf8, 0x58, 0x0b, 0x81, - 0xc8, 0xba, 0x4e, 0x2a, 0x41, 0xb5, 0xea, 0xa0, 0x73, 0x0b, 0xdd, 0x1c, - 0x63, 0xcc, 0x58, 0x71, 0xf3, 0xa4, 0x3f, 0xa4, 0xff, 0xdc, 0xd4, 0xfe, - 0xd9, 0xaf, 0xe9, 0x9b, 0x3a, 0x2c, 0x02, 0xdb, 0xee, 0xdb, 0x10, 0xc1, - 0x43, 0x43, 0xa9, 0xd9, 0x11, 0xf8, 0xbe, 0x63, 0xa9, 0x21, 0x9b, 0x9e, - 0x0f, 0x4c, 0x32, 0xec, 0x05, 0x80, 0x00, 0xe0, 0xd7, 0x52, 0xa5, 0x2d, - 0x9b, 0xd4, 0x4a, 0x05, 0xcc, 0x57, 0xa6, 0x05, 0x44, 0xa1, 0x39, 0x67, - 0x5e, 0xcd, 0x76, 0xfb, 0xfd, 0xa2, 0xc0, 0x93, 0x61, 0x52, 0xc1, 0x1c, - 0xd3, 0xde, 0x7d, 0x2d, 0xf5, 0xbf, 0xd2, 0x8c, 0x55, 0x45, 0xca, 0x2d, - 0x51, 0x63, 0xe4, 0x44, 0xe7, 0x4f, 0x7e, 0x2a, 0x30, 0xaa, 0x9c, 0x3a, - 0x42, 0xc9, 0xd8, 0xda, 0x6d, 0x14, 0xf9, 0x58, 0x08, 0x24, 0xb2, 0xea, - 0x72, 0x90, 0xc8, 0xcc, 0x7d, 0xce, 0x26, 0x06, 0x1c, 0x92, 0x40, 0x2f, - 0x10, 0xc2, 0xc0, 0xc0, 0xef, 0x36, 0xd0, 0xf1, 0x4c, 0xfd, 0x1d, 0xe6, - 0x71, 0x75, 0x5a, 0xab, 0x6d, 0x30, 0xcf, 0xda, 0xb8, 0x05, 0xf3, 0x03, - 0x8f, 0x01, 0xab, 0x66, 0x36, 0x5f, 0x5a, 0xdd, 0x31, 0xe5, 0xa9, 0xc5, - 0x20, 0x04, 0xf6, 0x03, 0x41, 0x22, 0x2a, 0xea, 0x78, 0x15, 0x73, 0x44, - 0xc0, 0x77, 0x6a, 0x04, 0x34, 0x86, 0xf0, 0x8e, 0xf9, 0x44, 0x79, 0x4c, - 0x62, 0x33, 0xce, 0x9c, 0x5a, 0x25, 0x04, 0x2e, 0x01, 0x4e, 0xca, 0x7a, - 0x1b, 0xb2, 0xd2, 0xcb, 0x85, 0x7e, 0x27, 0xbf, 0x9d, 0x5d, 0x5d, 0x5f, - 0x59, 0x11, 0xb9, 0xb8, 0x3c, 0xbf, 0x38, 0xb9, 0xb4, 0x3c, 0x72, 0x74, - 0xfe, 0xcb, 0xe9, 0xd9, 0xcf, 0x5f, 0x2e, 0x0f, 0x3f, 0x7c, 0x3a, 0xb1, - 0x7a, 0xb0, 0xd0, 0xce, 0xd6, 0xd6, 0xce, 0x0a, 0x17, 0x16, 0x96, 0xbc, - 0xb5, 0xd5, 0x5c, 0x65, 0x7c, 0x25, 0x2f, 0x2d, 0x04, 0xaf, 0xf5, 0x8d, - 0x75, 0x33, 0xc5, 0x7d, 0xe3, 0x83, 0x3c, 0xe4, 0x42, 0x1f, 0x82, 0xf3, - 0xbd, 0x8b, 0xca, 0x80, 0xfa, 0x80, 0x51, 0x9a, 0xa3, 0x9b, 0x93, 0x98, - 0xd3, 0xd9, 0x25, 0x6e, 0xde, 0x27, 0x72, 0xac, 0x02, 0xbd, 0xb4, 0xcc, - 0x0a, 0xae, 0x60, 0x05, 0x9a, 0x63, 0x05, 0x40, 0x91, 0x69, 0x76, 0x56, - 0x2a, 0xcb, 0xad, 0xbc, 0x13, 0x56, 0xe4, 0x25, 0x65, 0xde, 0xb4, 0xe1, - 0x51, 0x7f, 0x18, 0x8f, 0xf6, 0x9a, 0x07, 0xe0, 0xf0, 0xa2, 0x1d, 0x22, - 0x01, 0x58, 0x24, 0xf0, 0x62, 0xb9, 0xf6, 0xd6, 0xad, 0x90, 0x85, 0x43, - 0xf8, 0x2f, 0x98, 0x65, 0xe6, 0x2b, 0xf8, 0x4c, 0x59, 0x6e, 0xb7, 0x8a, - 0x18, 0x12, 0xa9, 0xc3, 0x80, 0xd8, 0xe9, 0x74, 0x56, 0x40, 0xc1, 0xd3, - 0x45, 0x68, 0xe8, 0x13, 0x2f, 0x9d, 0xcd, 0xca, 0xe7, 0xb4, 0xd0, 0xbf, - 0x40, 0x47, 0x0c, 0x56, 0x54, 0x1c, 0x44, 0x16, 0x29, 0x76, 0x5a, 0xad, - 0x52, 0xe3, 0xb3, 0x13, 0x8f, 0x30, 0x69, 0x02, 0x7f, 0xe0, 0x75, 0x2e, - 0xa3, 0x7d, 0x39, 0x97, 0xcc, 0xbd, 0x96, 0xeb, 0x91, 0x0b, 0x7c, 0x9c, - 0x3d, 0xa3, 0xd6, 0x5b, 0x6e, 0xfb, 0x04, 0x94, 0x0c, 0x9e, 0xaa, 0x55, - 0xfe, 0xb7, 0xb8, 0x4d, 0x44, 0xbd, 0x01, 0xa8, 0x6b, 0xf8, 0xb7, 0xb8, - 0x1e, 0xfc, 0xc0, 0x6a, 0x15, 0xfe, 0x81, 0xda, 0x65, 0x6a, 0x63, 0x1e, - 0x05, 0x22, 0x1b, 0x08, 0x51, 0xe1, 0xe1, 0xf5, 0x35, 0xe1, 0x30, 0x4d, - 0x95, 0xea, 0x55, 0x1d, 0x74, 0x24, 0x41, 0x51, 0x5f, 0x29, 0x22, 0xdb, - 0xbb, 0xe6, 0x0e, 0x0f, 0xef, 0x40, 0x54, 0xf3, 0xfa, 0x4c, 0xa6, 0x88, - 0x10, 0x0d, 0xde, 0x40, 0x02, 0x49, 0x66, 0x13, 0x11, 0xf8, 0xb1, 0x10, - 0xb8, 0xd5, 0x31, 0x1b, 0x0b, 0xba, 0xfc, 0x05, 0xd5, 0xf3, 0xd6, 0x56, - 0x7b, 0xa5, 0x6a, 0x62, 0x8a, 0x9a, 0xd9, 0x3c, 0xb0, 0xf2, 0x79, 0x8d, - 0x0d, 0x61, 0x76, 0xf0, 0x3e, 0x07, 0xc6, 0xd5, 0xd4, 0xbe, 0xfb, 0x08, - 0x2a, 0x4a, 0x75, 0xd4, 0x55, 0x8e, 0x8c, 0xe1, 0x30, 0x6d, 0xdd, 0xdc, - 0xde, 0x59, 0xad, 0x4e, 0xd2, 0x50, 0xb5, 0xd3, 0xde, 0xea, 0xa0, 0x3d, - 0x0e, 0xb5, 0x54, 0xb8, 0xd3, 0x50, 0xb9, 0x8b, 0x4e, 0x86, 0xeb, 0x47, - 0x13, 0x00, 0xe8, 0x2a, 0x98, 0x86, 0x10, 0x2f, 0x83, 0xf3, 0xbc, 0x50, - 0x54, 0xe8, 0x6c, 0xc0, 0xf3, 0x5c, 0x36, 0x89, 0x0b, 0x7d, 0x30, 0xe6, - 0x33, 0x77, 0x4b, 0x53, 0xf7, 0xed, 0x1d, 0x74, 0x7b, 0xa2, 0x54, 0xb8, - 0xbd, 0xc4, 0x13, 0xea, 0xa5, 0xa9, 0xf8, 0x7e, 0xaa, 0xfb, 0xa7, 0xe9, - 0x22, 0x58, 0xee, 0xbe, 0x69, 0x9a, 0x3c, 0x79, 0x8f, 0x64, 0xc3, 0xe4, - 0xbd, 0x08, 0x47, 0x15, 0xc7, 0x03, 0xef, 0xa7, 0x3f, 0x53, 0xc4, 0x47, - 0x8a, 0xee, 0xef, 0xe0, 0xdc, 0x90, 0x19, 0xb8, 0xf9, 0x59, 0x02, 0x7c, - 0x08, 0x6f, 0x5f, 0xa9, 0xf3, 0xf0, 0xd9, 0x99, 0xa0, 0xbb, 0xef, 0xbc, - 0xbe, 0x4e, 0x0d, 0xfc, 0x72, 0x50, 0x44, 0xd7, 0x23, 0x5b, 0xbc, 0x02, - 0x12, 0xc4, 0x93, 0x8d, 0xd1, 0x23, 0x20, 0x6a, 0x84, 0x9a, 0xd6, 0x66, - 0xff, 0x92, 0x11, 0xb2, 0x96, 0xcd, 0xfe, 0x85, 0xe7, 0x88, 0x95, 0x63, - 0xa8, 0x13, 0x2e, 0xe8, 0x02, 0x98, 0x81, 0x35, 0xc2, 0x7c, 0x49, 0x96, - 0x54, 0x9b, 0x69, 0xe3, 0x34, 0x05, 0x1c, 0x1b, 0x03, 0xa7, 0xe7, 0xf4, - 0xa9, 0x4d, 0xf9, 0x40, 0xac, 0x1f, 0x89, 0xe7, 0x40, 0xc1, 0x02, 0xa4, - 0xb3, 0xd9, 0x35, 0x24, 0x11, 0xb2, 0xa7, 0x5b, 0xdc, 0x84, 0xcf, 0x37, - 0x9f, 0xb3, 0x10, 0x05, 0x17, 0xf5, 0x68, 0x4f, 0x34, 0x95, 0xad, 0x45, - 0xd5, 0xbb, 0x83, 0x9b, 0xc7, 0x5b, 0xcc, 0x88, 0x16, 0x80, 0xda, 0x87, - 0xa7, 0xc7, 0x35, 0x00, 0xed, 0x61, 0xbb, 0x55, 0x60, 0xf2, 0x81, 0x20, - 0xd8, 0x79, 0xbc, 0xb5, 0x4a, 0x01, 0xe5, 0x8d, 0x00, 0xcc, 0x4c, 0xe4, - 0x60, 0xfd, 0x56, 0xc8, 0x92, 0xb2, 0x01, 0x81, 0x55, 0x58, 0x2e, 0x11, - 0x5b, 0x27, 0x56, 0x61, 0xe2, 0x86, 0xea, 0x07, 0x28, 0xc2, 0x16, 0x9a, - 0x3a, 0x08, 0xf6, 0x58, 0x26, 0x0b, 0xc2, 0xcc, 0xd3, 0x85, 0x64, 0xe7, - 0xa2, 0x15, 0x4a, 0x74, 0x34, 0xd2, 0xbf, 0xe2, 0x69, 0xe8, 0xd0, 0x82, - 0x7d, 0x08, 0x30, 0x89, 0x61, 0xa0, 0x3a, 0xc3, 0x3c, 0x41, 0x0e, 0x09, - 0x2c, 0xdd, 0x9d, 0x7c, 0x46, 0xab, 0x84, 0xb4, 0x47, 0x5d, 0x3c, 0x14, - 0xaa, 0xa8, 0x35, 0x5a, 0x53, 0xe1, 0xfd, 0x5f, 0x53, 0x37, 0x04, 0x4e, - 0xcb, 0xb6, 0x07, 0xe6, 0x68, 0xcb, 0x40, 0xfc, 0x8a, 0xcc, 0x6c, 0x83, - 0x9b, 0xb2, 0xd0, 0x58, 0x70, 0x9d, 0x8c, 0x2c, 0x6c, 0x38, 0x58, 0x86, - 0x3e, 0x73, 0xe9, 0xe4, 0xed, 0x42, 0x0a, 0xf6, 0x20, 0x98, 0x5b, 0xeb, - 0x35, 0x47, 0xcb, 0xd6, 0xe9, 0xb4, 0x57, 0xb8, 0xac, 0x09, 0xf8, 0x2c, - 0x7b, 0x84, 0xed, 0x41, 0x20, 0x57, 0x05, 0xe7, 0x7c, 0x2d, 0xe8, 0x1d, - 0xe4, 0xd7, 0x12, 0xbc, 0xb1, 0x96, 0xa5, 0x8d, 0xcf, 0x03, 0x9c, 0x12, - 0xd1, 0x8e, 0xa4, 0xd4, 0xf9, 0xba, 0xdc, 0xc2, 0x75, 0xbd, 0xd1, 0x15, - 0x61, 0xde, 0x5d, 0x0a, 0x75, 0x2a, 0x0d, 0xd0, 0x96, 0x8d, 0xdd, 0x22, - 0x2f, 0x13, 0x1d, 0x8e, 0x05, 0x6d, 0xc9, 0x77, 0xfa, 0x58, 0xa2, 0x01, - 0x42, 0xe8, 0x2c, 0x93, 0x27, 0x2d, 0xd0, 0x29, 0x5a, 0x55, 0x34, 0x1b, - 0xdf, 0x07, 0x9e, 0x8c, 0xf0, 0xe5, 0xdc, 0x1d, 0x9a, 0xea, 0x2b, 0xde, - 0x4e, 0xcf, 0xbc, 0x83, 0x98, 0x65, 0x1c, 0xe4, 0x4d, 0x3b, 0xa6, 0x30, - 0x90, 0x87, 0x9a, 0xed, 0xc2, 0xf8, 0x00, 0x0c, 0xd3, 0x1b, 0xb1, 0x20, - 0x60, 0x43, 0xb8, 0x3f, 0x6c, 0x9c, 0x56, 0x6b, 0x77, 0xb5, 0x5d, 0x4d, - 0x0d, 0x19, 0xc3, 0x83, 0x93, 0xaa, 0xde, 0xfc, 0xe6, 0x2a, 0xfa, 0xea, - 0xba, 0x21, 0x7b, 0xb6, 0x4c, 0x5f, 0xa3, 0x29, 0xe2, 0xfa, 0x9a, 0x6f, - 0x7a, 0x4e, 0x21, 0x58, 0x4b, 0x36, 0x3d, 0x27, 0xf0, 0x8c, 0x2a, 0x73, - 0x90, 0xec, 0x3e, 0x8f, 0x8b, 0xcd, 0x1f, 0xe8, 0x69, 0x29, 0x67, 0x0b, - 0x7a, 0x9a, 0xbd, 0x85, 0x74, 0xe2, 0x39, 0xf8, 0x3e, 0x82, 0xf7, 0x9b, - 0x5b, 0xe3, 0x5b, 0xe0, 0xfa, 0xb8, 0x0d, 0x1b, 0x95, 0x99, 0xd7, 0x1d, - 0xe0, 0x85, 0x71, 0xae, 0x02, 0x8c, 0x94, 0xca, 0x31, 0xa1, 0x26, 0xc9, - 0x8b, 0x1d, 0x30, 0xa2, 0xbc, 0x08, 0x2c, 0x29, 0x79, 0x12, 0x90, 0x69, - 0xc2, 0x24, 0x26, 0x71, 0x26, 0x7f, 0x55, 0x71, 0x87, 0xb7, 0xdc, 0x27, - 0x17, 0xe4, 0xd4, 0x30, 0x8e, 0x98, 0x69, 0x03, 0xa0, 0x25, 0x31, 0xc9, - 0x36, 0x46, 0x8d, 0xb1, 0xad, 0xde, 0xa8, 0xb5, 0x21, 0x2f, 0xdb, 0xfc, - 0x6f, 0xde, 0xee, 0x9f, 0x9a, 0x76, 0xf3, 0xdf, 0xfa, 0xed, 0x5f, 0xf4, - 0x7f, 0xea, 0x9b, 0x44, 0xfd, 0x73, 0x43, 0xd5, 0x6b, 0xea, 0x2d, 0x4c, - 0xe1, 0x33, 0xef, 0x89, 0xa9, 0x2f, 0xde, 0x75, 0xc8, 0x36, 0xfa, 0x63, - 0x51, 0x13, 0x49, 0x35, 0x51, 0x52, 0xa3, 0x55, 0xc0, 0x06, 0x27, 0x91, - 0x09, 0x8b, 0x9f, 0x29, 0x8b, 0x5e, 0x30, 0x2b, 0x81, 0x00, 0x44, 0x07, - 0xe3, 0xb4, 0xbe, 0x34, 0x6d, 0x33, 0xd7, 0x2d, 0xde, 0x0b, 0xfa, 0x90, - 0x47, 0x98, 0x0b, 0xe3, 0x1d, 0x1f, 0x5c, 0x90, 0xd0, 0x8d, 0x67, 0xaa, - 0x8e, 0x63, 0x72, 0x4c, 0xc1, 0xa8, 0xbe, 0xc1, 0x4a, 0x71, 0xfb, 0x8b, - 0x2e, 0xe1, 0x54, 0x54, 0xce, 0x75, 0xb6, 0x4d, 0x91, 0x0c, 0x93, 0xdb, - 0x21, 0xc2, 0x95, 0x48, 0x05, 0x07, 0x91, 0x18, 0x29, 0x8b, 0x43, 0xc9, - 0x4b, 0x96, 0x45, 0x6a, 0x30, 0xd0, 0xd2, 0x3a, 0x58, 0x90, 0xf4, 0x26, - 0x92, 0x31, 0x72, 0x68, 0xc3, 0x99, 0x7a, 0x2a, 0x6d, 0xaf, 0x3a, 0x5a, - 0x48, 0x20, 0xd2, 0x43, 0x6f, 0x04, 0x11, 0xa4, 0x85, 0x06, 0x7f, 0xb1, - 0x47, 0xda, 0x13, 0x59, 0xcc, 0x89, 0x2b, 0xf1, 0x41, 0x6c, 0xa9, 0x2a, - 0xf0, 0x03, 0xf8, 0xd6, 0x05, 0xa1, 0x6e, 0xe2, 0x31, 0xd9, 0xf7, 0x45, - 0x6c, 0xe7, 0xf2, 0x2d, 0xc3, 0x6a, 0x75, 0xc2, 0x1f, 0xc4, 0x4c, 0xaf, - 0xaf, 0x3d, 0xfe, 0x8e, 0x4c, 0x98, 0x8c, 0x80, 0x5b, 0x65, 0xed, 0xed, - 0xce, 0x8e, 0x94, 0x84, 0x42, 0xa7, 0xde, 0x00, 0xb3, 0x82, 0x69, 0x26, - 0xf6, 0x3c, 0xf0, 0x82, 0xdc, 0xe1, 0x0c, 0x56, 0x08, 0x78, 0xf3, 0x7b, - 0xb2, 0x37, 0x9b, 0x84, 0x0c, 0x35, 0x2a, 0x96, 0xac, 0x85, 0xfb, 0x26, - 0xc4, 0x37, 0xb1, 0xae, 0x85, 0xfc, 0x34, 0xc6, 0xf6, 0xea, 0xd0, 0x1a, - 0x1d, 0x5c, 0xe1, 0xbf, 0xb6, 0x3a, 0x2d, 0x2e, 0xf7, 0x78, 0x84, 0x84, - 0xcb, 0x7d, 0x7b, 0x17, 0x4f, 0x49, 0x78, 0xd9, 0x69, 0x11, 0x10, 0xf6, - 0x62, 0xd9, 0xed, 0xdb, 0x6f, 0x05, 0xe1, 0x53, 0xbc, 0xc1, 0x22, 0xc9, - 0x71, 0xaa, 0xa0, 0x15, 0x54, 0x99, 0x11, 0x55, 0x50, 0x0f, 0x6a, 0x42, - 0x7a, 0xb5, 0x0b, 0xbe, 0x06, 0xee, 0x7d, 0x2c, 0x65, 0xd8, 0xd1, 0x61, - 0x63, 0x3e, 0xbb, 0x1d, 0xa1, 0x50, 0x01, 0x87, 0x01, 0x5a, 0x0b, 0x4c, - 0x1d, 0x04, 0xf8, 0x19, 0x4f, 0xf1, 0x84, 0x9d, 0xca, 0xb8, 0x54, 0x75, - 0xd9, 0xe6, 0xfd, 0x40, 0xe1, 0x7f, 0x2b, 0xfe, 0xcd, 0xe0, 0x36, 0x41, - 0x62, 0x9f, 0xf9, 0x41, 0xdd, 0x10, 0x03, 0xc2, 0x01, 0x66, 0x72, 0x79, - 0xae, 0xd6, 0x60, 0x1d, 0x81, 0x2e, 0xf9, 0xcd, 0xe3, 0x09, 0x1b, 0xe2, - 0xc0, 0xbf, 0x99, 0xdc, 0x42, 0x18, 0x39, 0xb9, 0x95, 0x33, 0xb8, 0xd3, - 0xa4, 0x6e, 0x8a, 0x75, 0xd3, 0x5b, 0x92, 0x63, 0xea, 0x24, 0x15, 0xda, - 0x4b, 0xb2, 0xe0, 0x56, 0xcf, 0x5a, 0x67, 0xa1, 0x81, 0x2e, 0xc5, 0xff, - 0x69, 0xe7, 0xdc, 0x86, 0x21, 0x6a, 0x0d, 0xb6, 0xc4, 0xd7, 0x57, 0x54, - 0x13, 0xec, 0x51, 0xf2, 0x64, 0x40, 0x4b, 0x1d, 0xf6, 0x30, 0x0b, 0x17, - 0x84, 0x7c, 0x37, 0x37, 0x9a, 0x4e, 0x90, 0xbd, 0x24, 0xdf, 0x25, 0x87, - 0xa6, 0x1c, 0x06, 0x74, 0xbe, 0x53, 0xd1, 0x69, 0x14, 0x05, 0x1d, 0xdc, - 0x56, 0x2c, 0x98, 0x51, 0x8c, 0xd4, 0x9c, 0xd4, 0x5f, 0x67, 0x86, 0x64, - 0xb7, 0x69, 0x22, 0x43, 0x39, 0xe0, 0x52, 0x9d, 0xdc, 0x5d, 0x5c, 0x9e, - 0x5f, 0x9f, 0xab, 0x7a, 0xca, 0x54, 0x98, 0xf4, 0xcb, 0x04, 0x4e, 0x62, - 0xfe, 0xe8, 0xa0, 0xb7, 0xb0, 0xa3, 0x53, 0x60, 0x59, 0x5d, 0x71, 0x66, - 0x23, 0xd4, 0x62, 0xe2, 0xa5, 0x7b, 0xd9, 0xf1, 0x8d, 0x27, 0x02, 0x7b, - 0x3b, 0x96, 0x75, 0x8f, 0x1c, 0x9a, 0x57, 0xab, 0x78, 0x8c, 0x01, 0xfc, - 0x63, 0xbf, 0xc7, 0x42, 0xd9, 0x03, 0x49, 0xec, 0xad, 0x5c, 0x55, 0xef, - 0xa0, 0xcf, 0xf6, 0xd6, 0x30, 0x80, 0x07, 0x2f, 0xa1, 0xcc, 0xa2, 0xe6, - 0x42, 0x73, 0x88, 0x53, 0xdd, 0x48, 0x02, 0x1d, 0x84, 0x1f, 0xcf, 0x0d, - 0x15, 0xf9, 0x22, 0x5b, 0x5b, 0x3b, 0x49, 0x22, 0x28, 0xdd, 0xf5, 0x30, - 0xb7, 0xb7, 0x0b, 0x02, 0xdb, 0x28, 0x87, 0x0d, 0x50, 0x6d, 0xea, 0xdd, - 0x1d, 0x83, 0xf9, 0xee, 0x0e, 0x68, 0xf7, 0x32, 0x3f, 0x58, 0xcc, 0x16, - 0x02, 0x27, 0x55, 0x1a, 0xc8, 0xc4, 0x73, 0xa6, 0x9e, 0x35, 0x0a, 0x90, - 0x2d, 0x1d, 0x15, 0x92, 0x06, 0x21, 0x8c, 0x7f, 0x74, 0x1d, 0x74, 0xf8, - 0xcd, 0x2d, 0xf2, 0xa1, 0x2f, 0xe3, 0x81, 0xed, 0xcf, 0x4a, 0xac, 0xb7, - 0xe8, 0x61, 0xb3, 0x4d, 0x7e, 0x09, 0xc3, 0xc4, 0x05, 0x7d, 0x44, 0xe2, - 0x03, 0xca, 0x6a, 0xc0, 0x54, 0xa4, 0x13, 0xd9, 0x21, 0x01, 0x6f, 0x59, - 0xd3, 0x93, 0x94, 0x0c, 0x3a, 0x6a, 0xed, 0x22, 0x9d, 0x85, 0xb9, 0xc9, - 0x05, 0x0e, 0x63, 0xe1, 0xa2, 0xf3, 0xc6, 0x59, 0xb6, 0x34, 0x23, 0x43, - 0x22, 0xe4, 0x8e, 0x4c, 0xeb, 0xa3, 0x52, 0x00, 0xd8, 0xec, 0x4c, 0xb3, - 0x03, 0x23, 0x54, 0x5c, 0x0d, 0x69, 0xe6, 0xcb, 0xc7, 0x21, 0x58, 0x3f, - 0xde, 0x92, 0x09, 0x02, 0x90, 0x70, 0x45, 0xc3, 0x64, 0x82, 0xca, 0x7b, - 0x26, 0xc8, 0x44, 0xd4, 0x49, 0x0e, 0xfa, 0x01, 0xaf, 0xe2, 0x97, 0x73, - 0xe2, 0x6c, 0x9d, 0x12, 0x07, 0x0a, 0x7e, 0x7b, 0xec, 0xe2, 0xe7, 0x50, - 0xfc, 0xc0, 0x30, 0x3b, 0x6e, 0xd7, 0x6e, 0x17, 0xe6, 0x00, 0x58, 0x82, - 0x0a, 0x90, 0xb5, 0xee, 0x31, 0xbf, 0x6c, 0xfe, 0x20, 0x9d, 0x1f, 0x5c, - 0x7a, 0x65, 0xcc, 0x0e, 0x3b, 0x28, 0x81, 0x8f, 0xa1, 0x4e, 0x6a, 0x56, - 0x29, 0x73, 0x4c, 0xcd, 0x22, 0x2a, 0x35, 0x5b, 0xa6, 0xd8, 0x48, 0xe4, - 0xe7, 0xe0, 0xd8, 0x3e, 0xfc, 0x03, 0x9d, 0x45, 0xea, 0x5b, 0xbb, 0xf0, - 0xec, 0x08, 0x83, 0x86, 0x7f, 0xec, 0x40, 0x38, 0xbf, 0x18, 0xf1, 0xaf, - 0x4c, 0x06, 0xb2, 0x8d, 0x40, 0x98, 0x03, 0xf8, 0xb6, 0x17, 0x84, 0xb4, - 0xfe, 0x2d, 0xba, 0x8b, 0x46, 0x0e, 0x84, 0x62, 0xc8, 0xc0, 0x8e, 0x1d, - 0xde, 0xb8, 0x30, 0x26, 0xe6, 0x7e, 0x71, 0x27, 0x50, 0xf2, 0xde, 0x81, - 0xc9, 0x5a, 0x66, 0xa1, 0x3f, 0xbc, 0x8b, 0xdb, 0x15, 0x41, 0x92, 0x6d, - 0xe8, 0x6a, 0x6f, 0x64, 0x1a, 0x03, 0x0e, 0x35, 0xfe, 0xc9, 0x36, 0x15, - 0xd1, 0x8f, 0xc0, 0x68, 0x54, 0xd7, 0xd4, 0x64, 0x73, 0x43, 0x45, 0x21, - 0x32, 0x26, 0xd3, 0x68, 0xa4, 0xbd, 0x88, 0x32, 0x4b, 0x6d, 0x19, 0xad, - 0x96, 0x61, 0xaa, 0x64, 0x1c, 0xf4, 0x21, 0x78, 0x39, 0x50, 0x27, 0xd3, - 0x90, 0xaa, 0x96, 0xca, 0xb3, 0x75, 0x2a, 0xf8, 0x69, 0x93, 0x19, 0xff, - 0x1a, 0x4f, 0xfd, 0x3f, 0xff, 0x5b, 0x69, 0x9a, 0x8d, 0x76, 0xbd, 0x69, - 0x36, 0x5b, 0xca, 0x31, 0xf5, 0xdd, 0x48, 0xb9, 0x80, 0xb1, 0x1e, 0x60, - 0xa9, 0x8f, 0x8a, 0xf6, 0xbb, 0x17, 0xb8, 0x61, 0xd0, 0x7b, 0x30, 0xc2, - 0xa9, 0xae, 0x12, 0xf4, 0x9e, 0xfd, 0x88, 0x5a, 0x2a, 0xde, 0x04, 0x15, - 0x59, 0x9b, 0x9b, 0x43, 0x37, 0x1e, 0x4d, 0xef, 0x41, 0xf7, 0x8d, 0x37, - 0x93, 0x96, 0x9b, 0x02, 0x5b, 0x9b, 0xf7, 0x30, 0xd7, 0xe6, 0x23, 0x07, - 0x64, 0xf3, 0xd3, 0xd9, 0xd1, 0xc9, 0x2f, 0x57, 0x27, 0x2a, 0xe1, 0xae, - 0xcb, 0x5a, 0x23, 0xa8, 0x18, 0x75, 0x6f, 0xe1, 0x46, 0x48, 0x01, 0x9d, - 0x5a, 0xbb, 0x4b, 0xc1, 0x05, 0xa3, 0x9d, 0xc1, 0xa5, 0x41, 0xce, 0x96, - 0x55, 0x0a, 0xdd, 0x07, 0xee, 0x32, 0x2f, 0xbb, 0xfa, 0x7c, 0xff, 0x23, - 0x71, 0xbc, 0x79, 0xdc, 0xa5, 0xf4, 0x69, 0x4c, 0xc5, 0x31, 0x5d, 0xc1, - 0xa8, 0x15, 0x97, 0x05, 0x93, 0x15, 0xa1, 0xe8, 0xe0, 0x45, 0x52, 0x61, - 0xbc, 0x37, 0x56, 0xf3, 0x27, 0x03, 0x38, 0x67, 0x0c, 0xa6, 0x1f, 0xfe, - 0x7f, 0xaf, 0xdd, 0x60, 0x09, 0xb6, 0xdd, 0x96, 0x59, 0xb4, 0x2e, 0x74, - 0xdd, 0xca, 0xb8, 0x99, 0x9b, 0xa2, 0xd4, 0x1d, 0x53, 0xe2, 0x0a, 0x9e, - 0x7f, 0x61, 0x7b, 0x86, 0x07, 0x98, 0xfb, 0x65, 0xc9, 0x46, 0x8c, 0xde, - 0x8a, 0xbc, 0x32, 0x98, 0x0e, 0xf1, 0xc5, 0x5c, 0xbd, 0xb1, 0xeb, 0xaf, - 0x16, 0x18, 0x0a, 0x8e, 0x5e, 0xc0, 0xa4, 0x97, 0xec, 0x9a, 0xe6, 0x76, - 0x03, 0x4c, 0x6b, 0xa7, 0xbd, 0xdd, 0x36, 0x77, 0x77, 0x1b, 0xba, 0x65, - 0x32, 0x03, 0x65, 0x16, 0xa9, 0x06, 0xd4, 0x18, 0xd9, 0xf6, 0xef, 0xea, - 0x39, 0xf8, 0xf8, 0x4c, 0xcf, 0x74, 0x0a, 0xa3, 0xe7, 0x96, 0xc9, 0xe3, - 0xc7, 0x4b, 0xc7, 0x1f, 0xae, 0xa3, 0x83, 0xed, 0x50, 0x18, 0x69, 0xff, - 0xa7, 0x38, 0xaf, 0x74, 0xbe, 0x86, 0x81, 0x3f, 0x54, 0x82, 0xc1, 0x80, - 0x99, 0x1d, 0x29, 0x91, 0x42, 0x70, 0x8e, 0x15, 0xd8, 0x7a, 0x63, 0xea, - 0x2c, 0xee, 0xe6, 0x13, 0xc7, 0x7b, 0x66, 0x7e, 0xe2, 0xeb, 0x11, 0x4d, - 0x37, 0x0c, 0x40, 0xe9, 0xa1, 0xea, 0xbb, 0xa7, 0x8a, 0x87, 0x5f, 0x71, - 0xc4, 0x23, 0xc7, 0x57, 0xcc, 0x0c, 0x1a, 0xdc, 0xbb, 0xde, 0xee, 0x14, - 0xf2, 0x7a, 0x66, 0x9d, 0xc4, 0x6e, 0x2e, 0xa8, 0xc2, 0xc6, 0xae, 0x99, - 0x6c, 0x82, 0x6e, 0x8b, 0x53, 0xca, 0x68, 0xdb, 0x78, 0x20, 0xcd, 0x0f, - 0x0c, 0xf7, 0x24, 0xd7, 0xba, 0x6f, 0x7b, 0x78, 0x86, 0xe8, 0x22, 0xd1, - 0xf2, 0x6a, 0xf9, 0x0e, 0x03, 0xe6, 0xad, 0x02, 0xc6, 0xdb, 0x6e, 0xee, - 0x90, 0x20, 0xb7, 0x73, 0xe8, 0x5e, 0x51, 0xd2, 0x67, 0xcb, 0xf5, 0x58, - 0x63, 0x79, 0xe3, 0x1a, 0x23, 0x48, 0x70, 0xde, 0x9d, 0xa9, 0x17, 0x63, - 0xd8, 0x09, 0x88, 0xf1, 0xd8, 0x39, 0x30, 0x52, 0x41, 0x43, 0x8d, 0x23, - 0xfa, 0xe9, 0x88, 0xbe, 0x64, 0x98, 0x7a, 0xef, 0x31, 0x4c, 0x8b, 0xa7, - 0x93, 0xc4, 0xbc, 0xe0, 0x21, 0xdf, 0xd3, 0x10, 0x0f, 0x47, 0x69, 0xe2, - 0xe8, 0x19, 0x46, 0x18, 0x45, 0xaa, 0xa3, 0xb3, 0x2b, 0xf4, 0x30, 0xc3, - 0xe2, 0x5b, 0x94, 0x4d, 0x63, 0xb9, 0x5c, 0x4e, 0x05, 0xd4, 0x70, 0x5c, - 0x53, 0x55, 0x4c, 0x09, 0x6d, 0xed, 0x2e, 0xfb, 0x5b, 0xe0, 0x09, 0x85, - 0x37, 0xc5, 0x87, 0xb7, 0x6e, 0x6d, 0xf5, 0x77, 0x55, 0xca, 0x6c, 0xab, - 0x37, 0x62, 0xb1, 0xbf, 0xdf, 0xa2, 0xe3, 0x20, 0xb2, 0x05, 0xa1, 0xce, - 0xf2, 0x2a, 0xa6, 0x14, 0xc6, 0x2d, 0x29, 0xb6, 0xe2, 0x0d, 0x61, 0x05, - 0x75, 0xd1, 0xe2, 0x86, 0x70, 0x72, 0xa4, 0x6a, 0xce, 0x4e, 0x48, 0x14, - 0x26, 0xde, 0x92, 0x74, 0x8d, 0x09, 0x0c, 0xc6, 0xb4, 0x44, 0xe8, 0xf8, - 0xfd, 0x60, 0xac, 0xf1, 0xdc, 0x7e, 0xc3, 0x90, 0xb2, 0xfa, 0xab, 0xe4, - 0x3a, 0x4d, 0x59, 0xd4, 0x34, 0xf9, 0xfc, 0x98, 0x6a, 0xe1, 0x41, 0x4f, - 0xfd, 0x4e, 0xad, 0x39, 0x5a, 0xad, 0x16, 0xd4, 0x5c, 0xd2, 0xda, 0x62, - 0x41, 0x24, 0x98, 0xd9, 0x22, 0x96, 0x5f, 0xd8, 0xa3, 0xc6, 0x0d, 0x8f, - 0x9c, 0x2a, 0x5d, 0x4a, 0x88, 0x89, 0x5a, 0x37, 0x86, 0x30, 0x09, 0x5c, - 0x70, 0x1c, 0xb9, 0xd3, 0x7a, 0x7b, 0x7b, 0x25, 0x3f, 0x47, 0x61, 0xd2, - 0xa7, 0xdd, 0x2c, 0xdd, 0x54, 0x59, 0xcc, 0x04, 0xc9, 0xb9, 0x06, 0x9e, - 0xb8, 0x68, 0x37, 0xf3, 0xf1, 0xd9, 0xc2, 0x11, 0x31, 0xdc, 0xa8, 0x78, - 0x73, 0x4b, 0x92, 0x9d, 0xdf, 0x48, 0xb6, 0x15, 0xa4, 0x44, 0x28, 0x3b, - 0xc6, 0xb1, 0xe9, 0xb3, 0x2b, 0xd1, 0x40, 0x72, 0xfa, 0x74, 0xd3, 0x88, - 0x69, 0x14, 0x8b, 0x4c, 0x13, 0xd4, 0xc2, 0x04, 0xc8, 0x81, 0x2b, 0x27, - 0xe0, 0x4e, 0x95, 0x9b, 0x86, 0x59, 0x4e, 0xea, 0x5e, 0x45, 0x09, 0x1d, - 0x98, 0x4e, 0xe1, 0xe9, 0xca, 0x1e, 0x40, 0xc2, 0x31, 0x0d, 0x2a, 0x05, - 0x14, 0xdc, 0xd3, 0x03, 0x38, 0x5f, 0x10, 0x7e, 0x7b, 0x10, 0x44, 0x0d, - 0x82, 0xf0, 0xf5, 0xb5, 0x67, 0xb1, 0xa3, 0x15, 0x4f, 0x60, 0xd5, 0x83, - 0x69, 0x7c, 0xc5, 0x32, 0x4b, 0xaf, 0xaf, 0xce, 0x5b, 0xa7, 0x24, 0xfb, - 0x84, 0xed, 0x0c, 0xf5, 0xd1, 0xd7, 0x89, 0x30, 0x5f, 0xd9, 0x83, 0x82, - 0x83, 0x1e, 0xbc, 0x5a, 0xd3, 0x24, 0xa9, 0x69, 0xa0, 0x9b, 0xa8, 0x13, - 0x6c, 0x83, 0x8c, 0xd3, 0xde, 0x5a, 0xbd, 0x30, 0xae, 0x35, 0xd9, 0xc2, - 0xb6, 0xcc, 0x24, 0x56, 0x6c, 0xb7, 0x45, 0xf2, 0xa1, 0xb3, 0x2b, 0x74, - 0x25, 0x8f, 0x24, 0x7b, 0xa9, 0x23, 0xd1, 0x87, 0x15, 0x66, 0x6a, 0x1f, - 0x96, 0x16, 0x4a, 0x5f, 0x53, 0x4c, 0xec, 0x69, 0xb5, 0x3a, 0x95, 0x82, - 0x9a, 0x81, 0x3d, 0xa9, 0x56, 0x27, 0x6c, 0x77, 0x66, 0x6c, 0xbb, 0x86, - 0x74, 0x38, 0x9a, 0xcc, 0xe0, 0xbd, 0xf8, 0xcc, 0x32, 0x19, 0xda, 0x95, - 0x5e, 0x81, 0xcf, 0x81, 0x9a, 0x70, 0xe9, 0xf3, 0x05, 0xad, 0x29, 0xe9, - 0x9d, 0x01, 0x1e, 0x91, 0xe2, 0xa9, 0x31, 0xab, 0x41, 0x4c, 0xab, 0x05, - 0xea, 0x47, 0x27, 0x2d, 0xcc, 0x50, 0xf3, 0x03, 0x48, 0x64, 0x64, 0x0f, - 0x01, 0x7d, 0x46, 0xe9, 0x59, 0x71, 0x20, 0x4e, 0xc9, 0xcc, 0x53, 0x69, - 0x26, 0xca, 0x36, 0x8b, 0x1a, 0xb8, 0x01, 0x87, 0x0f, 0x6a, 0x53, 0xc5, - 0x79, 0x4c, 0x36, 0x8f, 0x09, 0x4e, 0x69, 0x33, 0x9b, 0xb1, 0x3b, 0xd3, - 0x58, 0x34, 0x47, 0x34, 0x99, 0xb0, 0x63, 0x9e, 0x98, 0x12, 0xa7, 0x77, - 0x23, 0x6d, 0x71, 0xd7, 0x7c, 0xbf, 0x71, 0x90, 0x16, 0xc1, 0x38, 0x22, - 0x40, 0xc3, 0x49, 0x7c, 0xb0, 0x54, 0xdc, 0x9a, 0x0e, 0x75, 0x69, 0xdd, - 0x38, 0x1c, 0xf1, 0x31, 0x85, 0xc2, 0x29, 0x8d, 0xef, 0x62, 0x2c, 0xa0, - 0x31, 0x4b, 0x61, 0xf4, 0x6c, 0x93, 0x9d, 0xea, 0xae, 0xc5, 0xfb, 0xa1, - 0x64, 0x86, 0xfb, 0x89, 0xfd, 0x17, 0x29, 0x45, 0x9d, 0x7d, 0xd4, 0xd0, - 0xed, 0xed, 0xb9, 0x5d, 0x9d, 0x9d, 0xc1, 0x8f, 0x6b, 0xbd, 0x5b, 0xdb, - 0xbf, 0xe9, 0xd5, 0x6a, 0xb0, 0x1e, 0x52, 0x19, 0xbe, 0xbe, 0xb2, 0xac, - 0x76, 0x8c, 0x4a, 0x3c, 0x3d, 0x23, 0xea, 0x83, 0x46, 0x66, 0xc8, 0x0a, - 0xec, 0xf8, 0x26, 0x64, 0xc7, 0xc7, 0x53, 0x9f, 0x3c, 0x48, 0x01, 0x4d, - 0x98, 0xbc, 0xcb, 0x0f, 0x9a, 0x63, 0x4b, 0xfb, 0x45, 0x94, 0xe1, 0x5e, - 0x55, 0x8a, 0x5f, 0xfc, 0xe4, 0x00, 0x83, 0x20, 0x2d, 0xe1, 0x91, 0x88, - 0xb8, 0x24, 0x7b, 0xc6, 0xa0, 0x36, 0x79, 0x99, 0xfb, 0xc6, 0x50, 0x3e, - 0x44, 0x52, 0xf4, 0x71, 0x97, 0xb4, 0x09, 0x2f, 0x66, 0xc8, 0x4a, 0xe4, - 0x83, 0xdd, 0x7c, 0x8b, 0x1c, 0xb1, 0x52, 0xbe, 0x4d, 0x9e, 0x5a, 0x8e, - 0xa2, 0x89, 0xc4, 0x2e, 0xbe, 0xe8, 0xc3, 0xdf, 0x30, 0xc2, 0x26, 0xfc, - 0xab, 0x3a, 0x50, 0x13, 0x6d, 0x3c, 0x65, 0xe2, 0xd1, 0x18, 0xb3, 0x02, - 0x44, 0xec, 0xc8, 0x92, 0x88, 0x78, 0xa4, 0x47, 0xfa, 0x64, 0x4a, 0x26, - 0x64, 0x40, 0xc6, 0x64, 0x46, 0x86, 0x64, 0x44, 0x1e, 0xc9, 0x13, 0xb9, - 0x27, 0x27, 0x98, 0x3b, 0xf8, 0x84, 0x9b, 0x86, 0xcf, 0xf6, 0xcd, 0x2d, - 0x39, 0xc3, 0xa7, 0x07, 0x2c, 0xbb, 0xc2, 0x7f, 0x3e, 0xd8, 0xaa, 0x4a, - 0xae, 0xf1, 0xe9, 0x10, 0x9f, 0xce, 0x6d, 0x75, 0x53, 0x65, 0xc3, 0x7f, - 0x26, 0xdf, 0xc8, 0x05, 0x39, 0x25, 0x1f, 0xc9, 0x1d, 0x39, 0x22, 0xc7, - 0x60, 0xb6, 0x2e, 0xb1, 0xc1, 0x17, 0x68, 0xc0, 0xbf, 0x03, 0x27, 0x5f, - 0x59, 0xdb, 0x94, 0x82, 0xbf, 0x02, 0xee, 0xee, 0x0c, 0xf6, 0x51, 0x21, - 0x7e, 0x08, 0x6d, 0x84, 0x74, 0x1c, 0x3c, 0x52, 0x8d, 0x7f, 0xf7, 0xab, - 0x93, 0x8f, 0xe5, 0x55, 0x97, 0x09, 0xd3, 0x9a, 0x07, 0x47, 0xa5, 0xad, - 0x2c, 0xb9, 0xca, 0xe9, 0xf7, 0xd3, 0xde, 0x41, 0x49, 0x79, 0x58, 0x52, - 0x1e, 0x17, 0x97, 0xcf, 0xd3, 0x85, 0xfc, 0x9e, 0x8b, 0x12, 0xb3, 0x04, - 0x80, 0x06, 0xc6, 0xc5, 0xe9, 0x5f, 0xc5, 0x4e, 0x18, 0x6b, 0x31, 0x51, - 0x4d, 0xb9, 0xcf, 0x2f, 0xb0, 0xf8, 0x4f, 0x2c, 0xc9, 0xcd, 0x2f, 0x45, - 0xb8, 0x0e, 0x26, 0x76, 0xf2, 0xfc, 0x91, 0xdd, 0xaa, 0x23, 0x35, 0xfe, - 0x59, 0x50, 0x1f, 0xfe, 0x7d, 0xb6, 0x9f, 0x31, 0xb1, 0x05, 0x3c, 0x81, - 0xb1, 0x00, 0xbe, 0xb1, 0x1d, 0x14, 0xad, 0x0e, 0x8e, 0x33, 0x27, 0x33, - 0x78, 0x5e, 0x2a, 0x93, 0x28, 0x46, 0x73, 0x10, 0x41, 0xba, 0xf7, 0x2c, - 0xf0, 0xd5, 0xa5, 0xb5, 0x9a, 0x1e, 0xd7, 0xec, 0x67, 0xd0, 0xd8, 0xdd, - 0xf4, 0xb8, 0x23, 0x44, 0x61, 0xe2, 0x00, 0xe1, 0x87, 0xd9, 0x19, 0x2c, - 0x6f, 0xe1, 0x0a, 0x06, 0xdd, 0x70, 0x7d, 0x9f, 0x86, 0xb8, 0xc1, 0x67, - 0xc7, 0x04, 0xe0, 0x9e, 0x67, 0x80, 0xfd, 0x1d, 0x41, 0x62, 0x93, 0x32, - 0xa6, 0x8e, 0xed, 0xbf, 0x5e, 0x9d, 0xff, 0x02, 0x8b, 0x0e, 0x23, 0x8a, - 0xe0, 0xfd, 0xac, 0xb1, 0x77, 0xee, 0xae, 0xb9, 0x83, 0x19, 0x9e, 0xa5, - 0xc5, 0x63, 0xdb, 0xaa, 0x82, 0x1b, 0x21, 0xff, 0xc4, 0x6f, 0x88, 0x38, - 0x73, 0x03, 0xf6, 0x60, 0x8d, 0xa2, 0x28, 0x1b, 0xfe, 0x5f, 0xc9, 0xf0, - 0xfc, 0x63, 0x08, 0x3f, 0x3f, 0x7c, 0xd6, 0x57, 0x60, 0xfe, 0xcf, 0x9a, - 0xca, 0x6c, 0x84, 0xa5, 0x7c, 0x8b, 0xa0, 0x77, 0xdf, 0x89, 0x1d, 0x05, - 0x3f, 0x57, 0x77, 0x93, 0xcf, 0x97, 0x2a, 0x7b, 0xf7, 0xe1, 0xe6, 0x3e, - 0x5a, 0x2d, 0xc2, 0x74, 0x05, 0xe2, 0x15, 0x13, 0xa9, 0x15, 0xdf, 0xe0, - 0xd7, 0x09, 0x43, 0x7c, 0xe8, 0xe3, 0x6d, 0xb6, 0xec, 0x2f, 0xf6, 0xd7, - 0xb3, 0xa1, 0xb9, 0xce, 0x12, 0xf1, 0xbc, 0x82, 0xa2, 0x47, 0xef, 0xbf, - 0x9c, 0xa9, 0xd2, 0x50, 0x2c, 0xd4, 0xb1, 0x79, 0x47, 0xe2, 0x1b, 0xa7, - 0x5f, 0x7f, 0xe5, 0x8d, 0xf5, 0x97, 0x17, 0x4e, 0x8b, 0x52, 0x94, 0x27, - 0x37, 0xac, 0xa0, 0xf7, 0x93, 0x61, 0x5b, 0x7d, 0x54, 0x6b, 0xd2, 0x30, - 0xa0, 0xfb, 0x81, 0xfd, 0x4e, 0xf0, 0x46, 0x38, 0xe4, 0x45, 0x0a, 0xcd, - 0x80, 0x58, 0x40, 0xfd, 0x07, 0x59, 0xd7, 0xeb, 0x62, 0x2e, 0x66, 0xbb, - 0x2e, 0x3f, 0x69, 0x2c, 0xae, 0x87, 0xb0, 0x5e, 0xad, 0x71, 0xe5, 0x60, - 0x78, 0xe2, 0x03, 0x2e, 0x63, 0x14, 0x44, 0xe0, 0x31, 0x6f, 0xf2, 0x3c, - 0x37, 0x4c, 0x2d, 0xea, 0xc1, 0x93, 0xc2, 0xc0, 0x43, 0xbd, 0xbb, 0xf7, - 0x1c, 0x04, 0x09, 0xdd, 0x22, 0x3c, 0x2d, 0x50, 0x06, 0x7b, 0x72, 0x17, - 0x8d, 0xfe, 0xe3, 0xa1, 0x5b, 0x80, 0x09, 0x41, 0xc9, 0x49, 0xe3, 0x82, - 0x5a, 0xd0, 0x00, 0x59, 0x50, 0x37, 0xca, 0x6e, 0xf2, 0x00, 0xb7, 0x14, - 0xef, 0xea, 0x51, 0x2b, 0xf6, 0x52, 0x15, 0x68, 0x5d, 0xe3, 0xea, 0xf8, - 0x88, 0x7f, 0xf9, 0x0c, 0x13, 0xca, 0x4d, 0xe5, 0x72, 0x76, 0x5e, 0xb4, - 0x7c, 0xce, 0xd2, 0x29, 0x6d, 0xbb, 0xa0, 0x4a, 0x43, 0x6d, 0x18, 0xf5, - 0xb9, 0x3e, 0x84, 0xc5, 0xa8, 0x27, 0x3e, 0xbf, 0x46, 0x07, 0x5b, 0x7f, - 0x05, 0x7e, 0x62, 0xb7, 0x05, 0xe0, 0xa1, 0xbb, 0xd2, 0x09, 0x53, 0x23, - 0xe7, 0x1b, 0x1f, 0x01, 0x45, 0x17, 0xec, 0x7c, 0x98, 0xf6, 0x55, 0x7a, - 0x65, 0x9f, 0x09, 0xa0, 0x04, 0x03, 0x32, 0x87, 0x9a, 0x9a, 0x14, 0x5b, - 0x8a, 0x5a, 0xfb, 0x8a, 0x00, 0x7f, 0x75, 0x4f, 0xdd, 0xcf, 0xe0, 0x9c, - 0xe2, 0xfe, 0x1c, 0xcc, 0x79, 0x15, 0xf4, 0x1e, 0x68, 0x7c, 0x76, 0x51, - 0xad, 0xca, 0xfe, 0x02, 0xd7, 0x24, 0x37, 0x48, 0x41, 0x74, 0x09, 0x5a, - 0xc6, 0x30, 0x08, 0x86, 0x1e, 0x7e, 0x82, 0x31, 0x56, 0xd9, 0x3e, 0x1f, - 0x43, 0xcf, 0xa3, 0x1b, 0xcf, 0xd8, 0x37, 0xf2, 0x06, 0x14, 0xb2, 0x6b, - 0xba, 0x45, 0x03, 0xc3, 0x79, 0x70, 0xc6, 0x0e, 0xf8, 0xfe, 0xbd, 0x91, - 0x1f, 0xe0, 0x37, 0xe2, 0x34, 0x12, 0x35, 0x4f, 0x4f, 0x4f, 0xec, 0x34, - 0x20, 0x75, 0x27, 0x23, 0xc0, 0x53, 0x8f, 0x7a, 0x9e, 0x54, 0xe3, 0xc6, - 0x41, 0xe0, 0x45, 0x20, 0x03, 0x83, 0x20, 0x29, 0xb9, 0x0f, 0x82, 0x07, - 0xb9, 0xc0, 0x71, 0x43, 0x34, 0xc3, 0xc6, 0x34, 0x12, 0x05, 0x78, 0xb0, - 0xf3, 0xa1, 0xef, 0xe2, 0xd7, 0xc5, 0xc8, 0x9f, 0xac, 0x5c, 0xcc, 0x8f, - 0xd7, 0x9e, 0x1b, 0x3e, 0x3a, 0x43, 0xaa, 0x31, 0x8e, 0x06, 0xb1, 0xdf, - 0x8b, 0x5c, 0x31, 0xdb, 0xd8, 0x05, 0x5d, 0x1b, 0x05, 0x83, 0x98, 0xbd, - 0x33, 0xff, 0x41, 0x3d, 0xbc, 0x00, 0xf2, 0xd3, 0xec, 0x53, 0xa7, 0xbc, - 0x16, 0x8d, 0x65, 0x2d, 0x0a, 0xcd, 0xeb, 0x8d, 0x4a, 0x26, 0xd1, 0x39, - 0xbe, 0x35, 0xd8, 0xfd, 0xd2, 0xe7, 0x03, 0x2d, 0x06, 0x45, 0x9b, 0x7e, - 0x3a, 0x65, 0x26, 0x89, 0xaa, 0xc6, 0x5c, 0xcb, 0xa8, 0xa0, 0x27, 0x22, - 0x91, 0x89, 0x42, 0x8e, 0x2c, 0x35, 0x6d, 0x07, 0x22, 0xb6, 0x45, 0xe9, - 0x40, 0x0c, 0x60, 0x0c, 0x07, 0xff, 0xd5, 0x8a, 0xea, 0x40, 0x17, 0xd9, - 0xea, 0x19, 0x7e, 0x40, 0x4e, 0xc7, 0x91, 0x32, 0x0b, 0xa6, 0x42, 0x11, - 0x2a, 0x1e, 0xbf, 0x86, 0x49, 0xa1, 0xfe, 0xa3, 0x0b, 0x0a, 0x8d, 0x1d, - 0x40, 0xc7, 0x9b, 0x26, 0x14, 0xa0, 0x88, 0x13, 0x51, 0x05, 0x25, 0x4d, - 0x71, 0x94, 0x7b, 0x70, 0xd6, 0xf0, 0x0e, 0x82, 0x69, 0x04, 0x9a, 0x7b, - 0xef, 0xc3, 0xe5, 0x3e, 0x3b, 0xfc, 0x82, 0x0d, 0xe3, 0x40, 0xc1, 0xcd, - 0x6a, 0xcc, 0x17, 0x0f, 0x28, 0xe8, 0xcc, 0x90, 0x46, 0xca, 0x53, 0x10, - 0x3e, 0x60, 0x40, 0x4e, 0x9e, 0x24, 0xed, 0xe5, 0xc2, 0x1b, 0xe3, 0xe2, - 0x5f, 0xf8, 0x65, 0xf1, 0xe9, 0x65, 0x07, 0x2a, 0xdb, 0xbb, 0x75, 0xbb, - 0x9c, 0x63, 0x71, 0x33, 0x1a, 0x18, 0x38, 0x45, 0x24, 0xbf, 0x41, 0x26, - 0xab, 0xd3, 0xc9, 0x5f, 0xb5, 0x1c, 0x42, 0x88, 0xf4, 0x76, 0x01, 0x4b, - 0xe5, 0xef, 0x47, 0xc1, 0x78, 0x3c, 0xf5, 0xc5, 0x65, 0x16, 0x3a, 0xf9, - 0x87, 0xa6, 0xe2, 0x85, 0xa7, 0xc8, 0x95, 0x9e, 0x07, 0x3a, 0x0c, 0x0f, - 0x47, 0xad, 0x6f, 0x1f, 0x16, 0xac, 0x96, 0x2f, 0xac, 0x16, 0xab, 0x05, - 0xd3, 0x25, 0x59, 0xe6, 0xbf, 0x82, 0xa6, 0xf4, 0x89, 0xab, 0xbf, 0x80, - 0x1f, 0x7f, 0x0f, 0xcb, 0x0d, 0xc0, 0x32, 0xb1, 0x6f, 0xc4, 0x41, 0xbf, - 0xa5, 0x50, 0x42, 0x54, 0x16, 0x31, 0xc2, 0x02, 0x0a, 0x81, 0x5e, 0x7e, - 0x0d, 0x38, 0x2d, 0x9a, 0xf9, 0x3d, 0xf0, 0x88, 0xfd, 0x60, 0x8a, 0x9f, - 0x89, 0xb9, 0x07, 0xea, 0xe6, 0x53, 0xa4, 0xe2, 0x86, 0x34, 0xb9, 0x51, - 0xc1, 0xb0, 0x4c, 0xdd, 0xfa, 0x63, 0x4b, 0xbd, 0x85, 0xa1, 0xf0, 0xe4, - 0xad, 0x13, 0xce, 0xae, 0xd9, 0x4d, 0x0c, 0xec, 0x3b, 0xcc, 0x7b, 0xf6, - 0x21, 0xbd, 0x0a, 0x55, 0xd0, 0x1d, 0xc8, 0x95, 0x0b, 0xe0, 0xc0, 0x47, - 0x33, 0xe7, 0xac, 0x8a, 0x01, 0x63, 0xcb, 0xc7, 0xa0, 0x98, 0xff, 0x76, - 0xfd, 0xfa, 0x0a, 0xd1, 0xc1, 0xb5, 0x3b, 0xa6, 0x10, 0x0e, 0x6a, 0xdc, - 0x4b, 0x4c, 0x56, 0x01, 0xde, 0x76, 0x8b, 0xb6, 0x74, 0xde, 0x9f, 0xd1, - 0x2a, 0x37, 0x76, 0x86, 0x3f, 0x80, 0x30, 0x62, 0x4b, 0x53, 0x58, 0x2b, - 0x81, 0xb7, 0x05, 0xc5, 0x53, 0xd2, 0x56, 0x15, 0xe3, 0x8f, 0x69, 0x14, - 0x39, 0xc3, 0xfc, 0x61, 0x43, 0x66, 0xeb, 0xd1, 0x7f, 0x41, 0x67, 0x87, - 0xd9, 0xd1, 0xa5, 0x7d, 0x28, 0x7e, 0x8d, 0x40, 0xa2, 0xa0, 0xd2, 0x08, - 0x8d, 0x87, 0x66, 0xbc, 0x8f, 0xbe, 0x4a, 0x70, 0xfd, 0x9a, 0xc8, 0xdb, - 0x18, 0x83, 0x30, 0x18, 0x1f, 0x8d, 0x9c, 0xf0, 0x08, 0xa4, 0x90, 0x4b, - 0x2a, 0x69, 0x80, 0x62, 0x8d, 0xd9, 0x29, 0xe1, 0x46, 0x8b, 0x3f, 0x41, - 0x0c, 0xfc, 0xa1, 0x66, 0xfb, 0xe4, 0x03, 0x7a, 0x08, 0xe0, 0xfc, 0x7f, - 0x85, 0x38, 0x1a, 0x96, 0x86, 0x37, 0xad, 0x29, 0x91, 0x33, 0x8b, 0x2c, - 0x88, 0xf3, 0xc7, 0x63, 0xbc, 0x3a, 0x0e, 0xe6, 0x7c, 0x72, 0xc2, 0x3e, - 0xee, 0xae, 0xbe, 0xbe, 0xfe, 0xac, 0x7d, 0xd0, 0xb9, 0xab, 0x8c, 0xcb, - 0xd1, 0xbb, 0x38, 0x06, 0x3f, 0xa1, 0x87, 0x3b, 0x44, 0x08, 0x24, 0xf3, - 0xd5, 0x20, 0x18, 0x4e, 0x8e, 0x9f, 0x58, 0xd0, 0xca, 0x4d, 0xfc, 0x5a, - 0xbb, 0x09, 0x22, 0xa1, 0xf6, 0xa6, 0x21, 0x6a, 0xb4, 0xb3, 0x63, 0xe4, - 0x10, 0x08, 0xf3, 0xd8, 0x37, 0xda, 0x2e, 0xfb, 0x34, 0x41, 0xe5, 0x57, - 0xe5, 0x49, 0x55, 0x87, 0x15, 0x56, 0x05, 0x6d, 0xae, 0xd1, 0x61, 0xcf, - 0x98, 0xf1, 0xbf, 0x34, 0xce, 0xb8, 0xec, 0x9f, 0x25, 0x95, 0x20, 0x34, - 0xb9, 0x82, 0xc8, 0x50, 0x1c, 0x3f, 0x88, 0x47, 0x20, 0xf5, 0x89, 0x2a, - 0x21, 0x69, 0x33, 0x1f, 0x62, 0xb7, 0xec, 0xea, 0x10, 0xda, 0x37, 0x80, - 0xd8, 0x0b, 0x22, 0x9b, 0x7f, 0xad, 0xa9, 0x9a, 0xdc, 0x5e, 0x57, 0xcb, - 0xdc, 0xe8, 0x77, 0xbb, 0xe3, 0x6f, 0x3b, 0x51, 0x8b, 0x1d, 0xd3, 0xcb, - 0xea, 0x74, 0x72, 0x57, 0x32, 0x28, 0x0b, 0x55, 0x4a, 0x47, 0x96, 0x6e, - 0xaf, 0xd1, 0x8d, 0xe4, 0x12, 0xa2, 0xf2, 0xe6, 0xf9, 0x9b, 0x64, 0x8a, - 0x7a, 0xf4, 0xc0, 0xa6, 0xb9, 0x58, 0x84, 0x2e, 0xc0, 0xe5, 0xe5, 0xf9, - 0x65, 0x46, 0xe1, 0xcf, 0x86, 0x73, 0x0f, 0x5a, 0x0d, 0x08, 0xf7, 0x9b, - 0xe6, 0xde, 0x34, 0x6f, 0x09, 0x23, 0x38, 0xa6, 0xe5, 0x33, 0xad, 0xf3, - 0x1b, 0x0f, 0x38, 0x84, 0xb4, 0x7c, 0x11, 0x97, 0x6d, 0x39, 0x2e, 0xae, - 0x11, 0x45, 0x07, 0xb9, 0x58, 0xfe, 0x68, 0x09, 0x86, 0x05, 0xb6, 0x03, - 0x92, 0xa8, 0x35, 0xf0, 0xf8, 0x74, 0x98, 0xd5, 0xf1, 0x28, 0xcc, 0xe1, - 0xd7, 0x54, 0x10, 0x47, 0xd2, 0xb0, 0xed, 0xe3, 0xc4, 0x0a, 0xf5, 0x32, - 0x0d, 0xde, 0xa5, 0x59, 0x98, 0xd5, 0x93, 0xdd, 0xd2, 0x2b, 0xe6, 0x2b, - 0xa3, 0x3f, 0x01, 0x03, 0x54, 0xfd, 0xfb, 0x68, 0xc2, 0xfe, 0x01, 0xfd, - 0x66, 0x44, 0xd3, 0x7b, 0xae, 0x37, 0x35, 0x9a, 0x1a, 0x41, 0xf5, 0x15, - 0x54, 0xa6, 0x25, 0x8f, 0xc0, 0x45, 0x41, 0x69, 0xc2, 0xbc, 0x00, 0x5a, - 0xee, 0x7e, 0x25, 0xb9, 0x95, 0xa4, 0x67, 0xff, 0xcc, 0x32, 0xc0, 0x52, - 0x25, 0x25, 0x8f, 0x65, 0xd6, 0x25, 0xed, 0xf4, 0x5f, 0xeb, 0x74, 0x12, - 0x77, 0x3c, 0x4b, 0xdd, 0xfe, 0xf6, 0x3d, 0x3e, 0x34, 0xd3, 0x01, 0xcc, - 0x7f, 0x8f, 0xa8, 0x13, 0xf6, 0x46, 0x17, 0x4e, 0xe8, 0x8c, 0x23, 0xf4, - 0x74, 0xa8, 0x8f, 0x31, 0xd5, 0xb8, 0x0f, 0xb6, 0xe8, 0x06, 0xf4, 0xc6, - 0x8e, 0x69, 0xde, 0xa2, 0xf9, 0xb1, 0xff, 0x7e, 0x72, 0x95, 0x44, 0x13, - 0x76, 0xcb, 0x30, 0xe1, 0x3f, 0x67, 0x4b, 0x89, 0x5d, 0x04, 0xac, 0x56, - 0xe8, 0x2f, 0x1f, 0x03, 0x8a, 0xb2, 0x7c, 0x10, 0x30, 0xdd, 0x29, 0x58, - 0xa5, 0xbf, 0xc3, 0x6c, 0x1a, 0x04, 0x53, 0x75, 0xb5, 0x06, 0x61, 0x28, - 0x96, 0x7e, 0x86, 0xb8, 0x6d, 0x04, 0x45, 0x0d, 0xd2, 0xcc, 0x95, 0x63, - 0x77, 0xe0, 0x2a, 0x2c, 0xbc, 0x4e, 0x0b, 0x3f, 0x06, 0xd3, 0x30, 0x12, - 0xa5, 0x56, 0x36, 0x84, 0xeb, 0x4f, 0x63, 0xba, 0x5c, 0x7e, 0x85, 0x57, - 0x92, 0xf5, 0x79, 0x39, 0x7e, 0xbb, 0x4c, 0x42, 0x88, 0xc3, 0xc8, 0xbf, - 0x24, 0x3a, 0xfd, 0x43, 0xe6, 0xcc, 0x35, 0xd1, 0xf7, 0x45, 0xef, 0xfa, - 0xc5, 0x58, 0x73, 0xf8, 0x0e, 0x1f, 0xa1, 0xfc, 0x23, 0xd3, 0x82, 0x16, - 0xe8, 0x49, 0xf3, 0x13, 0x6f, 0x71, 0x69, 0x1b, 0x76, 0xff, 0x1a, 0x5e, - 0x17, 0x11, 0xe2, 0x81, 0x04, 0x9f, 0x4a, 0xe0, 0x52, 0x80, 0x1f, 0x8c, - 0x62, 0x9a, 0x2a, 0xdf, 0x8b, 0x1e, 0x87, 0xca, 0xf3, 0xd8, 0xf3, 0x23, - 0x7b, 0x43, 0x00, 0x8d, 0x1e, 0xe6, 0x53, 0xcb, 0x08, 0xc2, 0xe1, 0x66, - 0xd3, 0x34, 0xcd, 0x4d, 0x68, 0xb1, 0xa1, 0xf0, 0x5f, 0xca, 0xd9, 0x68, - 0xb6, 0x37, 0x14, 0x7e, 0x05, 0x2e, 0x7f, 0xc6, 0xdf, 0xd4, 0xf9, 0x10, - 0x3c, 0xdb, 0x1b, 0xa6, 0x62, 0x2a, 0xcd, 0xb6, 0x82, 0x65, 0x00, 0xa1, - 0x67, 0x6f, 0x60, 0x48, 0xb0, 0x81, 0xd7, 0x1b, 0x05, 0x0f, 0xd4, 0xde, - 0x50, 0x6b, 0x1a, 0x3d, 0x50, 0xd9, 0xf5, 0xff, 0x80, 0x5d, 0xa1, 0xe6, - 0x8f, 0xd8, 0x4f, 0xe1, 0x00, 0xbe, 0x93, 0x76, 0xf5, 0x64, 0x96, 0xb4, - 0x00, 0xef, 0xdc, 0xed, 0x39, 0x13, 0x7b, 0x83, 0x5d, 0x8c, 0x9a, 0x2b, - 0xc6, 0x93, 0x92, 0x49, 0xf9, 0xfe, 0x1e, 0x2e, 0x59, 0xe9, 0xdb, 0x1b, - 0x9f, 0x1b, 0x2d, 0xa5, 0xf9, 0x71, 0xcb, 0x69, 0x2a, 0x4d, 0x05, 0x61, - 0x32, 0xeb, 0xf0, 0xf4, 0xd8, 0x90, 0x0a, 0xe0, 0x6f, 0x73, 0xd4, 0x68, - 0xca, 0x05, 0xf5, 0xe6, 0xaf, 0xbb, 0xbf, 0x6f, 0xe0, 0xe5, 0x64, 0x30, - 0x0a, 0x8c, 0x15, 0x78, 0x33, 0x9c, 0x41, 0x61, 0xb7, 0xa6, 0x02, 0x62, - 0x70, 0x4c, 0x05, 0xfe, 0xd9, 0x55, 0x9a, 0xa6, 0xb2, 0xcb, 0x1a, 0x8a, - 0x26, 0xfb, 0x7c, 0x61, 0x7b, 0xac, 0xf9, 0x73, 0x03, 0x9a, 0x02, 0xec, - 0x33, 0xfc, 0xdb, 0xd8, 0x50, 0x9e, 0x9b, 0xe2, 0x1d, 0xff, 0x6e, 0x6f, - 0xb0, 0x8b, 0x43, 0xa1, 0x4b, 0xd6, 0x78, 0x57, 0xb4, 0x6d, 0x8b, 0xb6, - 0x1d, 0xd1, 0xb6, 0x9d, 0xb6, 0x65, 0x0e, 0x12, 0xb8, 0xa1, 0x48, 0x84, - 0x7d, 0x49, 0x62, 0xe3, 0xff, 0xe9, 0x64, 0x6c, 0x02, 0xc2, 0x77, 0x53, - 0x1a, 0x35, 0x90, 0x8a, 0x1f, 0xdb, 0xf2, 0x3b, 0xd0, 0xac, 0x93, 0xbd, - 0x23, 0x0d, 0x47, 0x1d, 0xaf, 0xa9, 0xb4, 0x46, 0xbb, 0x72, 0xa9, 0xd2, - 0xcc, 0xe8, 0xfa, 0xff, 0x88, 0x54, 0x3e, 0x4d, 0xa3, 0x4b, 0x70, 0x8d, - 0xce, 0x41, 0xf2, 0x41, 0x46, 0x85, 0x57, 0xb5, 0xc9, 0x8e, 0x6d, 0x82, - 0x83, 0x86, 0x4f, 0x04, 0xfe, 0x7e, 0x25, 0xa5, 0xd5, 0xcc, 0x7d, 0x0a, - 0xc1, 0x7d, 0x12, 0x47, 0x86, 0x0f, 0x3d, 0x0f, 0x5a, 0x6c, 0x82, 0x92, - 0xc5, 0x4a, 0xdf, 0x0e, 0xf3, 0xbe, 0xa8, 0x20, 0xce, 0x44, 0xc4, 0xc1, - 0x3e, 0xef, 0x1f, 0x60, 0x7e, 0xd3, 0xc5, 0x6b, 0x75, 0x8a, 0xb2, 0x57, - 0x39, 0x9b, 0xb7, 0x87, 0x17, 0xa0, 0xef, 0x67, 0x96, 0x2f, 0x16, 0x19, - 0x23, 0x61, 0x00, 0xbb, 0xfc, 0x5f, 0x58, 0x2e, 0x36, 0xe3, 0x8d, 0x5f, - 0xe5, 0x9a, 0xeb, 0x20, 0x76, 0x3c, 0x85, 0xff, 0xd6, 0x07, 0xeb, 0x1e, - 0x63, 0xc1, 0xba, 0xbd, 0xbf, 0x44, 0x10, 0xb2, 0x49, 0x9d, 0xa7, 0xf0, - 0xbe, 0x6e, 0xdf, 0xf3, 0x5e, 0x6f, 0x3a, 0x61, 0xea, 0xd6, 0x52, 0xf6, - 0xd8, 0xef, 0x4c, 0x28, 0x63, 0x64, 0x32, 0x73, 0x83, 0x5d, 0x4a, 0xb8, - 0xd1, 0x30, 0xe1, 0x69, 0x04, 0xdc, 0x0f, 0x64, 0x85, 0x27, 0xee, 0xac, - 0x6c, 0xe0, 0x2c, 0x41, 0xda, 0x13, 0xb8, 0x19, 0x08, 0xcb, 0x3a, 0xef, - 0xf3, 0x51, 0x17, 0xeb, 0x7f, 0x12, 0x00, 0xa0, 0x9f, 0xc7, 0xd2, 0x1b, - 0x46, 0x84, 0x5e, 0x8c, 0x56, 0x78, 0x90, 0xa6, 0xb0, 0x90, 0xb2, 0xa3, - 0x53, 0x9f, 0x82, 0x27, 0x1a, 0x1e, 0x39, 0xcc, 0x73, 0x8d, 0xed, 0x78, - 0xa1, 0x04, 0x7c, 0xf9, 0x83, 0x7a, 0xc3, 0xa2, 0xfb, 0xf1, 0x41, 0xc3, - 0x32, 0xe7, 0x1a, 0x3f, 0xcb, 0x0c, 0x53, 0xb2, 0x48, 0x11, 0x37, 0x3f, - 0x38, 0x5b, 0xf0, 0x08, 0x62, 0x85, 0x83, 0x86, 0xdb, 0x0e, 0x12, 0x79, - 0xcf, 0x91, 0x6d, 0x2a, 0xf6, 0xb9, 0x30, 0xb7, 0x30, 0xf3, 0xb9, 0x01, - 0x7e, 0x42, 0x7c, 0x96, 0xb8, 0x30, 0xc8, 0x54, 0x10, 0x4c, 0xe0, 0xc1, - 0x0e, 0x78, 0xb6, 0xce, 0x25, 0x47, 0xc7, 0x44, 0xd3, 0x93, 0x63, 0x36, - 0xb0, 0x7b, 0x8c, 0xd1, 0x58, 0xa2, 0x31, 0x04, 0x7e, 0x95, 0x2e, 0xee, - 0xdb, 0x48, 0xee, 0x5a, 0xdf, 0xd8, 0x2f, 0x2a, 0xc5, 0xfb, 0x37, 0x97, - 0x6b, 0x30, 0xd7, 0x0f, 0xa5, 0xff, 0x19, 0xad, 0x26, 0xeb, 0xb1, 0x3f, - 0xac, 0xc3, 0x94, 0x22, 0xfb, 0x01, 0x56, 0x43, 0x69, 0x74, 0x94, 0xf6, - 0xb2, 0xfd, 0xc8, 0x34, 0x1e, 0x56, 0x8e, 0xb6, 0x9d, 0x36, 0xb4, 0xe2, - 0x66, 0xa9, 0x5d, 0x6f, 0xff, 0xda, 0xce, 0xac, 0x12, 0xd3, 0x2b, 0x4b, - 0xd7, 0x22, 0x6e, 0x24, 0x17, 0xac, 0x6f, 0xe0, 0xe5, 0x84, 0x1b, 0xe0, - 0x56, 0xba, 0xe1, 0xc6, 0xbe, 0xf2, 0x65, 0x62, 0x18, 0xcb, 0xb7, 0x11, - 0xaa, 0x10, 0x7a, 0xf0, 0x43, 0x5a, 0xdc, 0xcf, 0xb0, 0x54, 0xd6, 0x5e, - 0x25, 0x6e, 0x3f, 0x7d, 0x8c, 0xd9, 0xdd, 0x4b, 0x16, 0xde, 0xb5, 0xb0, - 0x18, 0x53, 0x72, 0x2e, 0x97, 0x22, 0x4b, 0xb5, 0xde, 0x50, 0xd3, 0xe3, - 0x02, 0xa2, 0x1e, 0x22, 0x48, 0x03, 0x7f, 0x67, 0x80, 0x65, 0x11, 0x7f, - 0x18, 0x27, 0x80, 0xf0, 0x51, 0x8d, 0x69, 0xd7, 0xd5, 0xeb, 0x3f, 0x86, - 0x25, 0x60, 0xd2, 0x81, 0xf5, 0xc8, 0x00, 0x42, 0x61, 0x49, 0x3b, 0x17, - 0x0f, 0x01, 0xfc, 0xbc, 0xa1, 0x24, 0x63, 0x1c, 0x53, 0x4f, 0x0c, 0xf3, - 0x1f, 0x62, 0xc1, 0x90, 0xf6, 0xff, 0x38, 0xe7, 0x25, 0xcb, 0xa1, 0x0e, - 0x8b, 0x69, 0xc5, 0xdf, 0x7a, 0x1c, 0x3a, 0xd1, 0xa8, 0xde, 0xdc, 0x28, - 0x60, 0xcc, 0x96, 0xb2, 0xa5, 0x74, 0xe0, 0x7f, 0xcd, 0x86, 0xb2, 0x55, - 0xc2, 0x96, 0x8d, 0x5d, 0x65, 0xeb, 0xb1, 0xd1, 0x5e, 0x30, 0xc5, 0xdb, - 0x0b, 0xa6, 0x78, 0x6b, 0xdc, 0x52, 0xcc, 0x5f, 0xdb, 0x0b, 0x06, 0xb9, - 0x9d, 0x37, 0xc5, 0x8f, 0xcd, 0x8c, 0x9b, 0x33, 0x2b, 0x6c, 0x2e, 0x58, - 0x61, 0x73, 0x85, 0x15, 0x46, 0xf3, 0x9b, 0x6b, 0xdc, 0x5e, 0x6e, 0x2c, - 0xcb, 0x49, 0x09, 0xd7, 0xa7, 0x3c, 0xcf, 0xd9, 0x25, 0xe1, 0xf9, 0x05, - 0x86, 0x61, 0x57, 0xb9, 0x2c, 0x75, 0xec, 0x03, 0x6b, 0x24, 0x7d, 0x39, - 0x9b, 0x94, 0x76, 0x5f, 0xce, 0xca, 0x14, 0x4a, 0x50, 0x65, 0x85, 0x04, - 0x71, 0x25, 0xfd, 0xfa, 0xaa, 0xb2, 0xd0, 0xd2, 0xc0, 0x9f, 0xcb, 0x34, - 0x86, 0xbf, 0xe3, 0xb5, 0x07, 0xf9, 0xc9, 0xaa, 0x55, 0xa9, 0xc5, 0x72, - 0x35, 0x9e, 0x3c, 0xc5, 0x6b, 0x5b, 0xca, 0x75, 0xb3, 0xf2, 0x1d, 0x22, - 0x49, 0xdf, 0x14, 0x49, 0x26, 0x4f, 0xb8, 0x1d, 0xf0, 0x7d, 0x42, 0x99, - 0xfc, 0xbe, 0xc8, 0x32, 0x08, 0x88, 0x9f, 0x85, 0xe1, 0xb0, 0xa8, 0x14, - 0x9a, 0x4c, 0xba, 0x11, 0x9a, 0xff, 0x2f, 0xde, 0xff, 0x83, 0xc4, 0xbb, - 0x4c, 0xc8, 0xd9, 0x05, 0xda, 0x4c, 0x52, 0x05, 0x03, 0xae, 0x2f, 0xe6, - 0x58, 0x9f, 0xca, 0x79, 0xc6, 0x30, 0x2b, 0x04, 0xbd, 0xd4, 0xf1, 0x4a, - 0x2f, 0x3d, 0x97, 0x9d, 0xaf, 0x70, 0x41, 0x31, 0x04, 0xb2, 0x4a, 0x88, - 0x9e, 0x5c, 0xdc, 0xe4, 0xc5, 0x33, 0xd7, 0x06, 0x07, 0x48, 0x7f, 0xe9, - 0x81, 0x33, 0x28, 0x0c, 0xb4, 0x55, 0x36, 0x15, 0xeb, 0xe0, 0xf6, 0xd7, - 0xdc, 0x94, 0x3c, 0xb7, 0x59, 0x7b, 0xbe, 0xa2, 0x9c, 0x33, 0x77, 0xbe, - 0xbc, 0x97, 0x00, 0x0b, 0xbc, 0x0f, 0xa9, 0xf3, 0xd0, 0x65, 0x70, 0x30, - 0xc4, 0xfe, 0x20, 0x30, 0xa4, 0x9c, 0xf6, 0xdb, 0x69, 0x13, 0xbf, 0x26, - 0xc1, 0x9c, 0xdf, 0x29, 0x8d, 0x73, 0xbb, 0xb7, 0x8b, 0xd0, 0x22, 0x2d, - 0x7f, 0x10, 0xc0, 0x6c, 0xef, 0x38, 0x1c, 0x6b, 0xea, 0x11, 0x7f, 0x50, - 0xd8, 0x45, 0x58, 0x62, 0x7f, 0x1c, 0xe7, 0xc2, 0x70, 0x45, 0x06, 0xb3, - 0x5a, 0x05, 0x6c, 0xf2, 0xdb, 0xb2, 0x80, 0x47, 0xa5, 0x8a, 0x05, 0x38, - 0x7f, 0x24, 0x6d, 0x6b, 0x36, 0x1a, 0x0e, 0xdb, 0x3e, 0x67, 0x1b, 0x66, - 0xe0, 0xc9, 0xd7, 0xbe, 0x9b, 0xd8, 0xc2, 0xe2, 0xfd, 0x27, 0xb0, 0x97, - 0xfe, 0x08, 0xc3, 0x0a, 0x14, 0x32, 0xcb, 0xbd, 0x80, 0xc5, 0xf9, 0xd2, - 0xb1, 0x08, 0x96, 0x07, 0x7e, 0xc7, 0xd9, 0x88, 0xf9, 0x00, 0x7f, 0x24, - 0xc5, 0x9b, 0xbd, 0xb8, 0x07, 0x6b, 0x6c, 0xfa, 0x97, 0x1e, 0xbf, 0x79, - 0x57, 0x5f, 0xf9, 0x5c, 0x4d, 0x96, 0x2c, 0x60, 0xe9, 0xc5, 0x5c, 0x3a, - 0xf1, 0xb7, 0xcf, 0x9f, 0x3e, 0x82, 0x54, 0x5c, 0xd2, 0x7f, 0x4d, 0x69, - 0x14, 0x77, 0x7d, 0x23, 0xf0, 0xd9, 0x1d, 0x10, 0xec, 0xba, 0x83, 0xde, - 0x08, 0x8f, 0x09, 0xca, 0x47, 0xb3, 0xda, 0x36, 0xcb, 0x10, 0x40, 0x03, - 0x8c, 0xdc, 0x71, 0x9f, 0x11, 0x8c, 0x18, 0x96, 0xf1, 0xe0, 0xfd, 0x40, - 0x03, 0xb4, 0xe0, 0x09, 0x1f, 0x0d, 0x5b, 0x45, 0x13, 0x60, 0x05, 0x7a, - 0x4d, 0x9f, 0x63, 0x5d, 0xb7, 0xda, 0x66, 0x43, 0x6a, 0xf7, 0xab, 0xa6, - 0x5b, 0x9a, 0xcc, 0x29, 0x49, 0x8d, 0x4e, 0x32, 0xc4, 0xde, 0x07, 0x4e, - 0xd8, 0x57, 0xfa, 0x01, 0x4d, 0x6e, 0xca, 0x8e, 0x20, 0x70, 0x85, 0xb8, - 0x7d, 0xc2, 0x0e, 0xa7, 0x7a, 0x33, 0xcc, 0x3b, 0x24, 0xdd, 0xf0, 0x24, - 0xa8, 0xcf, 0x85, 0x55, 0xfd, 0xf9, 0xe4, 0x5a, 0x25, 0x94, 0xa0, 0x43, - 0x82, 0x19, 0x4c, 0xbc, 0xd9, 0x69, 0x9e, 0x48, 0xb3, 0x8f, 0xa9, 0xfd, - 0xdc, 0xbd, 0xbc, 0xf6, 0x5b, 0xe7, 0x76, 0xf8, 0x8f, 0xe5, 0x80, 0x73, - 0x63, 0xaf, 0x54, 0xc3, 0xe2, 0x97, 0x53, 0xf0, 0x68, 0xe6, 0x8a, 0x76, - 0xe2, 0xb7, 0x23, 0xf0, 0xd8, 0xe6, 0x5b, 0xf3, 0x8a, 0x9f, 0x8e, 0xc0, - 0x83, 0x9d, 0x6f, 0x35, 0x65, 0x3f, 0x11, 0x81, 0xe7, 0x3e, 0xd7, 0x80, - 0x30, 0x1d, 0xd6, 0x5b, 0xa7, 0xb5, 0x18, 0xb9, 0xb7, 0xba, 0x6d, 0xfe, - 0x87, 0x35, 0xf0, 0x88, 0xe9, 0x9b, 0x28, 0x48, 0xc1, 0x98, 0xbe, 0xdd, - 0x56, 0x00, 0x41, 0xed, 0xb5, 0x8f, 0x58, 0x91, 0xc1, 0x6a, 0x80, 0x07, - 0x4f, 0x2a, 0x5e, 0x86, 0xb2, 0xb2, 0x0d, 0x9e, 0xfb, 0x7d, 0x2c, 0x6f, - 0x82, 0xbf, 0xb3, 0x84, 0x1f, 0xbf, 0xaf, 0x6a, 0x90, 0xfc, 0x46, 0x93, - 0x4e, 0xbe, 0x95, 0xb7, 0x93, 0x7f, 0xa7, 0x45, 0x27, 0x17, 0x6f, 0x36, - 0x5c, 0xb5, 0x65, 0x27, 0x7e, 0xb1, 0xe8, 0x5d, 0x47, 0x87, 0xca, 0x07, - 0x93, 0x7f, 0x25, 0x89, 0x1d, 0xc6, 0x32, 0xed, 0xe4, 0x2b, 0x3e, 0x03, - 0x62, 0x8a, 0xb1, 0x96, 0x5c, 0x03, 0x90, 0xdc, 0xb0, 0xfb, 0x2e, 0x7b, - 0x2b, 0xef, 0xf2, 0xc4, 0x2b, 0x76, 0x79, 0xf2, 0x33, 0xb2, 0x5d, 0x87, - 0x98, 0xfc, 0x1d, 0x0f, 0xc3, 0xf1, 0x24, 0x62, 0xe2, 0xb9, 0x42, 0x63, - 0x16, 0x36, 0xe4, 0x9a, 0xb3, 0x8c, 0x29, 0xe6, 0xd1, 0xf0, 0x24, 0x5c, - 0x32, 0x94, 0xad, 0xaa, 0x78, 0xf2, 0x69, 0xbd, 0xed, 0xc9, 0x65, 0x4c, - 0x3e, 0xd0, 0x19, 0xac, 0xc6, 0x5f, 0x38, 0x10, 0xdc, 0x68, 0xe1, 0x77, - 0x00, 0x06, 0x54, 0x1e, 0xb1, 0xb3, 0x40, 0x6b, 0xef, 0x66, 0x0e, 0xa0, - 0x61, 0xa4, 0xe9, 0x2b, 0x21, 0x5a, 0xec, 0xf3, 0xc3, 0x81, 0x92, 0x7f, - 0x76, 0x02, 0xed, 0x08, 0xf0, 0xca, 0x1b, 0x20, 0xe5, 0xb9, 0xa3, 0x18, - 0xa2, 0xe9, 0xe4, 0x7b, 0xe1, 0x49, 0x19, 0x59, 0x02, 0xc5, 0x5d, 0x8f, - 0xab, 0x4f, 0xec, 0xca, 0x09, 0x71, 0x0c, 0xf6, 0x5b, 0x72, 0x86, 0xf8, - 0x85, 0x39, 0xfb, 0xe4, 0x40, 0x65, 0xbf, 0x41, 0x0c, 0x0e, 0x0b, 0x3b, - 0x4d, 0x86, 0xe3, 0x1d, 0xd9, 0xab, 0xd1, 0x81, 0xbf, 0x2f, 0x82, 0x17, - 0xf9, 0xaf, 0x6e, 0xc5, 0x4d, 0x2f, 0xb9, 0x7b, 0xa3, 0x19, 0xfb, 0xad, - 0x19, 0x3c, 0x84, 0xbb, 0xd6, 0x1a, 0xca, 0x8f, 0xf1, 0xae, 0xa4, 0xc9, - 0xd2, 0x8f, 0x91, 0xac, 0xa9, 0x08, 0x7e, 0xd4, 0x46, 0xfd, 0xfb, 0xb9, - 0x28, 0xdf, 0xe3, 0xdd, 0xb8, 0x91, 0xdc, 0x9c, 0xee, 0x1b, 0xda, 0x6c, - 0x79, 0x29, 0x42, 0x45, 0x74, 0x2f, 0x6d, 0x2a, 0x34, 0xd7, 0xfb, 0x4e, - 0x20, 0x88, 0xfe, 0xc4, 0x5f, 0x5f, 0xe3, 0xf1, 0x9f, 0xa5, 0x29, 0xdd, - 0x9f, 0xfd, 0x72, 0x75, 0x72, 0xb9, 0x6a, 0x77, 0xf6, 0xe2, 0xf0, 0xea, - 0xea, 0xeb, 0xf9, 0xe5, 0xf1, 0xaa, 0xdd, 0xd9, 0xab, 0x2f, 0x1f, 0x3e, - 0x9f, 0x81, 0x03, 0xa4, 0xce, 0xd0, 0x82, 0x25, 0xdb, 0x3a, 0xcb, 0xae, - 0x5e, 0xf8, 0xb6, 0xab, 0x17, 0x2e, 0xb9, 0x7a, 0x15, 0x28, 0x13, 0x2e, - 0x1c, 0x73, 0xe8, 0xc2, 0x52, 0x87, 0x2e, 0xfc, 0x3e, 0x87, 0x2e, 0xed, - 0xa6, 0x5b, 0x7f, 0xd3, 0xd0, 0xa9, 0x0b, 0x65, 0xa7, 0xce, 0x67, 0x4e, - 0x5d, 0x28, 0x9c, 0xba, 0xf7, 0x1f, 0x18, 0x41, 0x56, 0x1c, 0x96, 0x53, - 0x39, 0xf9, 0xc9, 0x37, 0x68, 0xb4, 0x1e, 0x2b, 0x2e, 0x07, 0x37, 0x64, - 0x56, 0x3e, 0x7c, 0xfa, 0x8b, 0x59, 0xd0, 0x6a, 0xbd, 0xf1, 0xcb, 0x4e, - 0x72, 0x80, 0x0c, 0x0e, 0x64, 0xf1, 0x1a, 0xbf, 0x31, 0xa9, 0xf8, 0x35, - 0x39, 0x68, 0x28, 0x1f, 0xde, 0xa0, 0x1a, 0x62, 0x73, 0xbc, 0x26, 0x28, - 0xf2, 0x7c, 0x83, 0xa2, 0x3e, 0x8c, 0x83, 0xf2, 0x9d, 0xc0, 0x65, 0x18, - 0x88, 0xeb, 0x2f, 0xd8, 0x57, 0x97, 0x4b, 0x01, 0x5a, 0xfa, 0x0b, 0x68, - 0xfc, 0xa0, 0xae, 0x72, 0xa0, 0xa6, 0x5f, 0x4f, 0xe6, 0x76, 0x80, 0xd8, - 0x11, 0x1e, 0x71, 0x58, 0x37, 0x19, 0x92, 0x9d, 0x03, 0xab, 0x2c, 0xb9, - 0x33, 0x03, 0x9e, 0x3e, 0x49, 0xdd, 0x95, 0x65, 0x0f, 0x85, 0xcb, 0xeb, - 0x69, 0x10, 0x8e, 0xf1, 0xa2, 0xfd, 0xee, 0xb1, 0xdd, 0x04, 0x7a, 0x14, - 0x1f, 0x63, 0xca, 0x13, 0xa0, 0xf4, 0x0c, 0x71, 0xda, 0x6c, 0x9d, 0x26, - 0x1c, 0x78, 0x93, 0x94, 0x12, 0x97, 0x9f, 0x3f, 0x72, 0xfd, 0xa1, 0x62, - 0x18, 0x86, 0xf9, 0x13, 0xb0, 0xfd, 0xd2, 0xd1, 0x0b, 0x71, 0xd8, 0xed, - 0xbc, 0xeb, 0x2e, 0xed, 0xe7, 0xba, 0x62, 0x3f, 0x37, 0xc9, 0x01, 0xc5, - 0xb6, 0xd9, 0x8d, 0xf7, 0x12, 0x3c, 0x74, 0xe3, 0x5a, 0x8d, 0x63, 0x2a, - 0x64, 0x77, 0x6c, 0x42, 0xb4, 0xe2, 0x82, 0xd0, 0xf1, 0x64, 0xe9, 0x95, - 0xda, 0x4d, 0xa7, 0x0a, 0x50, 0xcc, 0x30, 0x4d, 0x2c, 0xcd, 0x3e, 0x9e, - 0x89, 0x0f, 0x4f, 0x42, 0x92, 0x74, 0x92, 0xce, 0x7e, 0x38, 0xc9, 0x47, - 0x15, 0x62, 0xaa, 0xa3, 0x60, 0x0c, 0xd2, 0xc7, 0x6e, 0x7a, 0x15, 0x89, - 0x18, 0x24, 0x26, 0x78, 0xfd, 0xfd, 0x4d, 0xca, 0x77, 0x6b, 0xff, 0xd2, - 0x30, 0xcd, 0xee, 0x22, 0x62, 0xe2, 0x35, 0x11, 0xc3, 0xf7, 0x7c, 0x4f, - 0xdd, 0x67, 0xda, 0xd7, 0x4c, 0xf0, 0xf3, 0x7e, 0x52, 0xf9, 0x21, 0xa8, - 0x1c, 0xdf, 0x04, 0xc1, 0x04, 0xd8, 0x7e, 0xfe, 0xb9, 0x40, 0x01, 0x92, - 0xcf, 0x42, 0xb3, 0x5c, 0x9c, 0x5f, 0xa1, 0xba, 0xdc, 0xe4, 0x73, 0x42, - 0x64, 0xc0, 0x94, 0xcc, 0x67, 0x83, 0x4b, 0x4e, 0x01, 0xa7, 0x27, 0xbf, - 0x31, 0xa7, 0x12, 0x87, 0x54, 0x1a, 0xd8, 0x94, 0x87, 0x95, 0x80, 0x23, - 0x59, 0x81, 0xce, 0xde, 0xc7, 0x2f, 0x32, 0xdb, 0x65, 0x1c, 0x4e, 0x58, - 0x7c, 0x6d, 0x7f, 0x4e, 0x03, 0xec, 0x32, 0x8e, 0x5c, 0xe7, 0x04, 0x60, - 0xfc, 0x6f, 0x3f, 0x19, 0xf8, 0x56, 0xc7, 0x37, 0x52, 0x15, 0xe4, 0xd4, - 0x6e, 0x9b, 0xe9, 0x01, 0xcb, 0x4b, 0xca, 0x8e, 0x88, 0xe2, 0xd1, 0x52, - 0xc3, 0x48, 0xce, 0x53, 0x3f, 0x39, 0x6e, 0xac, 0xb4, 0x4d, 0x54, 0x66, - 0x11, 0x8d, 0xd9, 0xef, 0xfc, 0x02, 0xae, 0x72, 0x5f, 0xfc, 0x9d, 0xd6, - 0xeb, 0x6b, 0x8c, 0xa1, 0xd6, 0x4e, 0x6b, 0x2a, 0x0e, 0x03, 0xf8, 0x3d, - 0xad, 0x56, 0x53, 0x4b, 0x1d, 0x52, 0xa4, 0x25, 0xea, 0x39, 0xd2, 0xa0, - 0xad, 0x24, 0x73, 0xf1, 0x3c, 0xf6, 0xd0, 0xb6, 0xcb, 0xe6, 0xee, 0x37, - 0x61, 0xd7, 0x54, 0x92, 0x50, 0x07, 0xcc, 0xd5, 0x67, 0x6e, 0x9b, 0x7c, - 0x3c, 0xce, 0x35, 0x47, 0x55, 0x39, 0x59, 0x53, 0x55, 0xe6, 0xd8, 0x96, - 0xb3, 0x1e, 0x32, 0x0a, 0x67, 0x04, 0xe9, 0x53, 0x82, 0x44, 0xcd, 0x4d, - 0xde, 0x54, 0x73, 0xf1, 0xa2, 0x9a, 0x6b, 0x80, 0xae, 0x2f, 0x46, 0xfb, - 0xa8, 0xa4, 0x7c, 0x58, 0x52, 0xfe, 0xad, 0x9c, 0xb5, 0x2f, 0x56, 0x55, - 0x25, 0xaa, 0xef, 0xdb, 0x4a, 0x75, 0x17, 0x17, 0xab, 0xbb, 0x95, 0xa7, - 0x5b, 0xba, 0x3f, 0xf2, 0x74, 0x8b, 0x9f, 0x69, 0xcf, 0x10, 0xb4, 0x67, - 0x98, 0x69, 0xcf, 0x30, 0xd1, 0x9e, 0x81, 0x8d, 0x5f, 0x38, 0xe2, 0xc7, - 0xb7, 0xb5, 0x20, 0xd3, 0x9e, 0x29, 0xe4, 0x2e, 0xc8, 0x20, 0xd7, 0x9e, - 0xf1, 0xb2, 0xf6, 0x0c, 0x48, 0xd2, 0x49, 0xd2, 0x9e, 0xc1, 0xf7, 0x69, - 0xcf, 0x8b, 0x54, 0x6b, 0x7e, 0xfb, 0x4f, 0x69, 0xca, 0x2f, 0xeb, 0xeb, - 0xc7, 0x60, 0x95, 0x7e, 0x1c, 0x97, 0x73, 0xca, 0xa8, 0xbc, 0x6a, 0xb8, - 0x1e, 0xeb, 0x95, 0x71, 0x6b, 0xce, 0xb8, 0x97, 0x6a, 0x59, 0x9f, 0x6a, - 0x9f, 0xf3, 0x09, 0xcc, 0xef, 0xd2, 0x02, 0x31, 0xd3, 0x02, 0xab, 0xc2, - 0x9f, 0xf2, 0xdf, 0x77, 0xfe, 0xa3, 0x91, 0xdb, 0xaa, 0x91, 0xc5, 0x6f, - 0x4d, 0x1f, 0x68, 0xec, 0xa3, 0xd4, 0x5f, 0xc0, 0xcf, 0xb6, 0x3e, 0xe1, - 0x2d, 0x9f, 0x00, 0xe9, 0x62, 0xdc, 0xcc, 0xa3, 0x65, 0x12, 0xad, 0x07, - 0xcd, 0x99, 0x5d, 0x39, 0x23, 0x67, 0x07, 0x9a, 0xb7, 0x38, 0x0a, 0x8f, - 0xbd, 0x89, 0x27, 0x3e, 0xc8, 0x04, 0xb5, 0x1d, 0xe0, 0x0f, 0x1c, 0xe1, - 0xcc, 0x5e, 0xe1, 0x8c, 0x0c, 0x6b, 0xeb, 0x4d, 0xfa, 0x60, 0x57, 0x1e, - 0xc8, 0xc3, 0x01, 0xbb, 0x6f, 0xb8, 0x68, 0xd2, 0x69, 0xc1, 0xa4, 0xd3, - 0xd2, 0x49, 0x8b, 0x6b, 0xc8, 0x68, 0x45, 0x9a, 0x2c, 0xfd, 0xd9, 0x67, - 0x64, 0x5c, 0xe9, 0xdb, 0x4e, 0xee, 0x5f, 0x8f, 0xde, 0x93, 0x8b, 0x03, - 0xd1, 0x19, 0x4f, 0x62, 0x0d, 0x77, 0xff, 0xf9, 0x66, 0x85, 0xc2, 0x0f, - 0xe3, 0xa2, 0xab, 0xcb, 0x6f, 0x6a, 0x65, 0x77, 0x99, 0xe7, 0x92, 0x6f, - 0xf8, 0x43, 0x0e, 0xff, 0x90, 0xc1, 0x20, 0x69, 0xae, 0x0c, 0x17, 0xf4, - 0xb7, 0x55, 0x81, 0xd2, 0xe9, 0xd7, 0xf7, 0x7c, 0x6a, 0x28, 0x6f, 0x89, - 0x15, 0x5d, 0x6f, 0xe4, 0x4d, 0x7b, 0x75, 0xfe, 0xba, 0xc9, 0x3e, 0xe8, - 0xd8, 0x8c, 0x43, 0x4a, 0x37, 0xd9, 0x2d, 0x4d, 0xf2, 0xfe, 0x59, 0x39, - 0x38, 0x5f, 0xdc, 0x7f, 0x27, 0x38, 0xf5, 0xaf, 0x27, 0x1f, 0xbe, 0x9c, - 0xbd, 0x1b, 0xa8, 0x91, 0x37, 0xf9, 0xb7, 0x22, 0xe9, 0xc9, 0x7d, 0x70, - 0xf3, 0xb0, 0x80, 0xe3, 0x80, 0x7a, 0x43, 0xd3, 0xf7, 0x36, 0xf9, 0x05, - 0x90, 0xfb, 0x7b, 0x9b, 0xf8, 0xbb, 0xc1, 0xf0, 0x07, 0x0f, 0x60, 0xec, - 0xff, 0x5f, 0x02, 0x5e, 0x01, 0x8c, 0xe7, 0x94, 0x00, 0x00}; -#endif //__embedded_h \ No newline at end of file +#define tool_html_gz_size 11612 +const unsigned char tool_html_gz[11612] PROGMEM = { + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xed, 0x7d, 0x8b, 0x56, 0xe3, 0x48, + 0x92, 0xe8, 0xaf, 0x08, 0xcd, 0xb6, 0x91, 0xc6, 0x69, 0xe1, 0x17, 0x2f, 0x19, 0xc1, 0x52, 0x3c, + 0xa6, 0x98, 0xa9, 0x6a, 0x58, 0xa0, 0xba, 0x7a, 0x96, 0x61, 0x39, 0xb2, 0x95, 0xb6, 0x55, 0xc8, + 0x92, 0x47, 0x92, 0x31, 0x2e, 0xf0, 0x07, 0xdd, 0xdf, 0xb8, 0x5f, 0x76, 0x23, 0x32, 0x53, 0x52, + 0xca, 0x96, 0x8c, 0xa9, 0xae, 0x9d, 0x3d, 0x67, 0xcf, 0xdd, 0xde, 0x29, 0xa4, 0x7c, 0x46, 0xc6, + 0x3b, 0x22, 0x53, 0xe9, 0x83, 0x0d, 0x27, 0xe8, 0xc5, 0xb3, 0x31, 0x55, 0x86, 0xf1, 0xc8, 0x3b, + 0x3c, 0xc0, 0x7f, 0x15, 0xcf, 0xf6, 0x07, 0x96, 0x4a, 0x7d, 0x15, 0xde, 0xa9, 0xed, 0x1c, 0x1e, + 0x8c, 0x68, 0x6c, 0x2b, 0xbd, 0xa1, 0x1d, 0x46, 0x34, 0xb6, 0xd4, 0x2f, 0xb7, 0xe7, 0xb5, 0x3d, + 0x55, 0x94, 0x0e, 0xe3, 0x78, 0x5c, 0xa3, 0xff, 0x9c, 0xb8, 0x4f, 0x96, 0xfa, 0x7b, 0xed, 0xcb, + 0x71, 0xed, 0x24, 0x18, 0x8d, 0xed, 0xd8, 0xed, 0x7a, 0x54, 0x55, 0x7a, 0x81, 0x1f, 0x53, 0x1f, + 0xba, 0x5c, 0x9c, 0x59, 0xd4, 0x19, 0xd0, 0xa4, 0x93, 0x6f, 0x8f, 0xa8, 0xa5, 0x3e, 0xb9, 0x74, + 0x3a, 0x0e, 0xc2, 0x58, 0x6a, 0x37, 0x75, 0x9d, 0x78, 0x68, 0x39, 0xf4, 0xc9, 0xed, 0xd1, 0x1a, + 0x7b, 0x21, 0xae, 0xef, 0xc6, 0xae, 0xed, 0xd5, 0xa2, 0x9e, 0xed, 0x51, 0xab, 0x91, 0x1f, 0x22, + 0x1e, 0xd2, 0x11, 0xad, 0xf5, 0x02, 0x2f, 0x08, 0xa5, 0x51, 0xfe, 0xb4, 0xbd, 0xbb, 0xbd, 0xed, + 0xec, 0xe7, 0x9b, 0x8e, 0x22, 0x7b, 0x3c, 0xf6, 0xdc, 0x1e, 0xc0, 0x16, 0xf8, 0x35, 0xdf, 0x7e, + 0xea, 0x4e, 0xe2, 0x18, 0x9e, 0xd6, 0xea, 0x8c, 0x5d, 0x69, 0x6d, 0x14, 0x74, 0x5d, 0xf8, 0x33, + 0xa5, 0xdd, 0x1a, 0x14, 0xd4, 0xa2, 0xd8, 0x8e, 0x27, 0x51, 0xad, 0x6b, 0x87, 0xf0, 0x38, 0xcb, + 0xad, 0x37, 0x1b, 0x24, 0x76, 0x63, 0x8f, 0x1e, 0x9e, 0x06, 0xbd, 0xc9, 0x08, 0x6a, 0x0e, 0xb6, + 0xf8, 0xfb, 0x01, 0xeb, 0xa0, 0x20, 0xe2, 0x61, 0x11, 0xf4, 0x39, 0xde, 0xea, 0x45, 0x91, 0x7a, + 0xf8, 0xe7, 0x97, 0x3e, 0x8c, 0x50, 0xeb, 0xdb, 0x23, 0xd7, 0x9b, 0x99, 0x91, 0xed, 0x47, 0xb5, + 0x88, 0x86, 0x6e, 0xbf, 0xc3, 0x80, 0x34, 0xc5, 0xa8, 0x9d, 0xae, 0xdd, 0x7b, 0x1c, 0x84, 0xc1, + 0xc4, 0x77, 0x6a, 0xa2, 0x82, 0xd2, 0x7e, 0xbd, 0xdf, 0xea, 0x20, 0x68, 0x8f, 0x6e, 0x5c, 0x9b, + 0x40, 0x2f, 0xe8, 0xe9, 0xd1, 0x5e, 0x6c, 0xfa, 0x81, 0x4f, 0x3b, 0x00, 0xfa, 0xf7, 0xa2, 0xd2, + 0x68, 0xb9, 0x70, 0xb1, 0x60, 0xde, 0x0d, 0x9c, 0xd9, 0xcb, 0xc8, 0xf5, 0x39, 0x3d, 0xcc, 0xd6, + 0x4e, 0x7d, 0xfc, 0x3c, 0x1f, 0x86, 0x2f, 0xdd, 0x20, 0x74, 0xa0, 0x69, 0x1c, 0x8c, 0xcd, 0xc6, + 0xf8, 0x59, 0x89, 0x02, 0xcf, 0x75, 0x14, 0x01, 0xe2, 0xdc, 0x40, 0x54, 0x84, 0x81, 0xf7, 0xc1, + 0x0e, 0x5f, 0x1c, 0x37, 0x1a, 0x7b, 0xf6, 0xcc, 0xec, 0x7b, 0xf4, 0xb9, 0x83, 0xff, 0xd4, 0xa6, + 0xa1, 0x3d, 0x36, 0xf1, 0x9f, 0xce, 0xd8, 0x76, 0x1c, 0xd7, 0x1f, 0x98, 0x0d, 0x18, 0x34, 0x79, + 0xa9, 0x79, 0xb4, 0x1f, 0x9b, 0x8d, 0x6d, 0x28, 0x59, 0x5e, 0x69, 0xbf, 0xdf, 0xef, 0x8c, 0xec, + 0x70, 0x00, 0xf0, 0x74, 0x03, 0x20, 0xe0, 0xc8, 0xdc, 0x01, 0x70, 0x8c, 0xde, 0xc8, 0x79, 0x49, + 0x90, 0xb4, 0xbd, 0x3d, 0xf7, 0xec, 0x2e, 0xf5, 0xd2, 0x89, 0xbb, 0x5e, 0xd0, 0x7b, 0xec, 0x70, + 0xf0, 0xed, 0x49, 0x1c, 0xa4, 0xb3, 0xb6, 0x00, 0xee, 0x46, 0x13, 0xe6, 0x79, 0x0b, 0xbf, 0x38, + 0x6b, 0x6f, 0x12, 0x46, 0xf0, 0x3c, 0x0e, 0x5c, 0x20, 0x72, 0x38, 0x1f, 0x87, 0xf4, 0x25, 0x07, + 0xf0, 0xb6, 0xb4, 0x82, 0xd0, 0x1d, 0x0c, 0x59, 0xc9, 0xdc, 0x18, 0x05, 0x8e, 0xed, 0xbd, 0x8c, + 0x83, 0xc8, 0x45, 0xc6, 0x33, 0xfb, 0xee, 0x33, 0x75, 0x3a, 0xdf, 0x6b, 0xae, 0xef, 0xd0, 0x67, + 0x58, 0x36, 0xfc, 0x5f, 0xda, 0x8b, 0xa1, 0xb2, 0x8e, 0x98, 0x60, 0x03, 0xd6, 0x3b, 0x58, 0x50, + 0x17, 0x80, 0x43, 0xc5, 0x2f, 0x9d, 0x21, 0x65, 0x03, 0xb3, 0xe7, 0xe0, 0x89, 0x86, 0x7d, 0x2f, + 0x98, 0xf2, 0x25, 0x2d, 0xc3, 0x8c, 0x23, 0x2f, 0x95, 0x86, 0x83, 0xae, 0xad, 0xd5, 0x09, 0xfe, + 0x67, 0xb4, 0x75, 0x01, 0x5d, 0x4d, 0xf0, 0xad, 0x44, 0x52, 0xb6, 0xa4, 0x5a, 0x68, 0x3b, 0xee, + 0x24, 0xe2, 0xc4, 0x91, 0xea, 0xd8, 0xea, 0x8a, 0x2a, 0x39, 0x45, 0x4a, 0xfb, 0x8a, 0xea, 0x82, + 0xee, 0x4b, 0xc0, 0x27, 0x94, 0x60, 0x1d, 0x97, 0xf9, 0xab, 0x93, 0xe2, 0x33, 0xa4, 0x1e, 0x48, + 0xf4, 0x13, 0x15, 0x4c, 0x91, 0xa7, 0x6f, 0x1d, 0x4a, 0x9f, 0x05, 0xdf, 0xb6, 0xb7, 0xeb, 0x29, + 0x39, 0x6a, 0xa8, 0xd6, 0x68, 0xf8, 0x92, 0x72, 0xdf, 0x0e, 0x32, 0xc2, 0x4e, 0xc6, 0x08, 0x48, + 0xef, 0x37, 0x80, 0xfa, 0xa3, 0x58, 0x2a, 0x58, 0x94, 0xa0, 0x6e, 0xd3, 0xd8, 0x0e, 0xe9, 0xa8, + 0xe3, 0xb9, 0x3e, 0xad, 0xe5, 0x8b, 0x98, 0x76, 0x88, 0xdc, 0xef, 0xd4, 0x6c, 0xb0, 0x82, 0x64, + 0x39, 0x4c, 0x44, 0x65, 0x51, 0xe2, 0x8b, 0x29, 0xe4, 0xe3, 0xa4, 0x4f, 0x3f, 0x08, 0xe2, 0x42, + 0x14, 0x64, 0x53, 0xc2, 0x8c, 0xc5, 0xa2, 0xb0, 0x4a, 0xf4, 0xff, 0x28, 0x2f, 0x2c, 0x6b, 0x0b, + 0xc7, 0x0d, 0x41, 0x19, 0x31, 0x62, 0x07, 0xd3, 0x5a, 0x48, 0x81, 0xef, 0x23, 0x3a, 0x77, 0xfd, + 0xf1, 0x24, 0x2e, 0x17, 0xf1, 0x44, 0x52, 0x38, 0xe2, 0x92, 0x55, 0xee, 0x24, 0x02, 0x2f, 0x23, + 0xb7, 0x61, 0xb4, 0x9b, 0x7b, 0xdb, 0xbb, 0x8d, 0x76, 0x2b, 0x01, 0x4e, 0xc0, 0xd3, 0x5e, 0x53, + 0x33, 0x04, 0x93, 0x18, 0xc7, 0x33, 0xeb, 0x02, 0xa8, 0x32, 0xae, 0x9d, 0x73, 0x93, 0xf3, 0x26, + 0xd0, 0x4d, 0xa3, 0xfd, 0x1e, 0xa0, 0x01, 0x1f, 0x31, 0xd8, 0x35, 0xaf, 0x66, 0x7b, 0xee, 0xc0, + 0x37, 0x47, 0xae, 0xe3, 0x78, 0x74, 0x41, 0x5d, 0x15, 0x48, 0x12, 0xea, 0x87, 0xe9, 0xd0, 0x8d, + 0x69, 0x2d, 0x1a, 0xdb, 0x3d, 0x0a, 0xca, 0x9e, 0x69, 0xe4, 0x52, 0x14, 0xac, 0x92, 0x89, 0xb9, + 0x69, 0x32, 0x13, 0x33, 0x0e, 0x83, 0x41, 0x48, 0x23, 0x66, 0x14, 0x5f, 0x56, 0x35, 0x16, 0x86, + 0x2a, 0x6d, 0xff, 0x64, 0x7b, 0x13, 0xfa, 0xae, 0x1e, 0xc5, 0x33, 0xf4, 0x1b, 0xf8, 0xdf, 0xdc, + 0xc0, 0x66, 0xd0, 0x82, 0x24, 0xcd, 0x5f, 0x84, 0xcd, 0xe0, 0x2a, 0x36, 0xe3, 0xf2, 0x46, 0x58, + 0xcc, 0xe4, 0x6c, 0x98, 0x52, 0xf5, 0x33, 0x37, 0xb8, 0x81, 0xf9, 0x99, 0xf4, 0x4a, 0x98, 0xc2, + 0xf5, 0x59, 0xb7, 0x25, 0xde, 0x58, 0x8b, 0x11, 0x85, 0x49, 0xe0, 0x06, 0xd6, 0xf6, 0x67, 0xd3, + 0x21, 0x0d, 0xa9, 0x6c, 0x8c, 0x0f, 0x05, 0x0b, 0x0a, 0x74, 0x70, 0x3b, 0x85, 0xa6, 0x76, 0x0e, + 0xde, 0x0e, 0x2d, 0xc4, 0x28, 0xa8, 0x0c, 0xde, 0xc9, 0xb4, 0x7b, 0xa8, 0x69, 0x0b, 0xda, 0xd4, + 0xbb, 0xf5, 0xbd, 0xfd, 0xfd, 0xf9, 0xc4, 0x5b, 0x69, 0xeb, 0x3d, 0x37, 0x8a, 0xb9, 0xa7, 0x54, + 0x43, 0xc7, 0x87, 0xbb, 0x1b, 0x42, 0x6d, 0xb7, 0x32, 0xe3, 0x89, 0xcf, 0xcc, 0xba, 0x8a, 0x2a, + 0xae, 0xcf, 0x90, 0x66, 0xe8, 0x84, 0x08, 0x74, 0xb6, 0xb6, 0x59, 0x01, 0x68, 0xf7, 0x5c, 0x41, + 0xa9, 0xbd, 0x48, 0x31, 0x33, 0xe3, 0xd8, 0x2c, 0xc1, 0x94, 0xe7, 0xa6, 0x0a, 0x71, 0x1f, 0x67, + 0x6d, 0xb3, 0x49, 0x18, 0x18, 0x75, 0x85, 0xf3, 0x4a, 0x36, 0xc3, 0x10, 0x08, 0x47, 0x7d, 0xd0, + 0xa7, 0xd4, 0x9f, 0x30, 0x11, 0x0a, 0x5f, 0xd8, 0x8a, 0x01, 0x37, 0x53, 0xb3, 0xd1, 0x11, 0x92, + 0x57, 0x03, 0x7d, 0xe5, 0xc7, 0x11, 0xf7, 0xa5, 0x8c, 0xb1, 0xed, 0x03, 0xdf, 0x2c, 0xad, 0x2c, + 0x2f, 0x74, 0x0d, 0x66, 0xa9, 0xd0, 0x2d, 0x04, 0x76, 0x77, 0xa1, 0xf1, 0xec, 0x25, 0x2f, 0x0e, + 0xbc, 0x8e, 0x86, 0x61, 0x10, 0x8a, 0x9a, 0x90, 0x3a, 0x72, 0x69, 0xcd, 0x0b, 0x60, 0x82, 0x97, + 0x12, 0x47, 0x26, 0xe9, 0xd1, 0x61, 0x1d, 0x38, 0x17, 0xf6, 0x28, 0xf3, 0x6a, 0x0c, 0x20, 0xa0, + 0x0d, 0xbe, 0xbb, 0xf3, 0x52, 0x0e, 0x7e, 0x62, 0x3d, 0x7f, 0xdc, 0x0e, 0x96, 0x59, 0x56, 0x09, + 0xc8, 0x44, 0xb4, 0x96, 0x2c, 0xa1, 0x2c, 0x69, 0x4d, 0xc4, 0x1f, 0xfa, 0x5d, 0x0b, 0xbe, 0x99, + 0xe1, 0x07, 0x7f, 0x1c, 0xc8, 0x95, 0xee, 0x2d, 0x4c, 0x20, 0x0c, 0xe8, 0x1f, 0x75, 0x7d, 0x56, + 0xfb, 0x04, 0x09, 0xca, 0x7f, 0xe6, 0x64, 0x45, 0x36, 0xbb, 0xd8, 0xcf, 0xce, 0xe4, 0x6d, 0x4d, + 0x3a, 0xa4, 0xb2, 0x52, 0x4f, 0xf5, 0x19, 0x06, 0x19, 0x28, 0x16, 0xdd, 0x60, 0xc1, 0xb6, 0x27, + 0x15, 0x92, 0x86, 0xc8, 0xbf, 0xe6, 0xd7, 0xae, 0x80, 0x88, 0x95, 0x70, 0x74, 0xd2, 0x30, 0x8d, + 0x54, 0x04, 0x8c, 0xdb, 0xf5, 0xd2, 0x10, 0x22, 0x11, 0x38, 0xae, 0xff, 0xca, 0x7c, 0x18, 0x1e, + 0x88, 0x14, 0x52, 0x7f, 0xd1, 0x83, 0x4c, 0x44, 0x79, 0x6e, 0x80, 0x5a, 0xa0, 0xa9, 0x1e, 0xe4, + 0x62, 0xd3, 0x87, 0xb0, 0xd1, 0x05, 0x25, 0x4c, 0xf8, 0x53, 0x4c, 0x47, 0xfc, 0x09, 0x5d, 0x39, + 0xfe, 0x84, 0x0a, 0x31, 0x1d, 0x0c, 0x30, 0xa9, 0x6c, 0x2f, 0x69, 0x85, 0xb4, 0xb4, 0x18, 0x05, + 0x38, 0xca, 0x27, 0x20, 0xd0, 0xad, 0xed, 0x7a, 0x25, 0x82, 0x9f, 0x43, 0xff, 0xb7, 0x49, 0x14, + 0xbb, 0xfd, 0x59, 0xe2, 0xfb, 0x9b, 0x4c, 0x83, 0xd5, 0xba, 0x34, 0x9e, 0x52, 0xea, 0xa3, 0x24, + 0x4e, 0x46, 0x7e, 0x6d, 0x60, 0x8f, 0x85, 0x36, 0x4a, 0x86, 0xff, 0x08, 0xeb, 0xfe, 0x6f, 0x1c, + 0xfe, 0xe5, 0x1d, 0x83, 0xac, 0x67, 0x5e, 0xb9, 0x62, 0x7b, 0xc3, 0x65, 0x2d, 0x5c, 0x4f, 0x42, + 0x8e, 0x3d, 0x00, 0x30, 0x7a, 0x1a, 0xbc, 0xac, 0x40, 0x3c, 0x12, 0xd7, 0x1c, 0xa2, 0x51, 0x79, + 0x59, 0xf4, 0xbb, 0xde, 0xd0, 0x75, 0x09, 0x4b, 0x25, 0x8c, 0xc1, 0x47, 0x21, 0x9e, 0x2b, 0xac, + 0x2d, 0x3e, 0xfd, 0xd0, 0xc0, 0xb8, 0x82, 0x02, 0xfd, 0x9e, 0xce, 0xf3, 0x96, 0x31, 0x5f, 0x58, + 0xd7, 0x21, 0x62, 0xe0, 0x07, 0xd7, 0x36, 0xaa, 0x35, 0x12, 0x87, 0x83, 0x4b, 0x14, 0xea, 0x8e, + 0xbc, 0x07, 0x82, 0xc1, 0x0c, 0xf7, 0x32, 0x0e, 0x8b, 0x51, 0x2d, 0x46, 0x66, 0x2b, 0x72, 0x68, + 0x2f, 0x08, 0x79, 0x1e, 0x27, 0x5b, 0x6c, 0x66, 0xd9, 0xf0, 0x6d, 0xc3, 0x1d, 0x61, 0x6a, 0xc9, + 0xf6, 0x63, 0x69, 0x21, 0x02, 0xa3, 0x8b, 0x05, 0x38, 0x23, 0xc9, 0xb9, 0x38, 0x25, 0x30, 0x08, + 0xcc, 0xfc, 0xe9, 0xf3, 0xcd, 0x5f, 0x5e, 0x96, 0x51, 0xfb, 0xa7, 0x51, 0xe0, 0xbb, 0x71, 0x10, + 0x3e, 0x50, 0x1f, 0x2d, 0xe8, 0x03, 0xfa, 0x19, 0x51, 0x0f, 0xdc, 0xae, 0xd4, 0xde, 0xa3, 0x5a, + 0x5c, 0xb0, 0x54, 0xff, 0x3e, 0xa2, 0x8e, 0x6b, 0x2b, 0xd0, 0x0e, 0x38, 0x5a, 0xb1, 0x7d, 0x47, + 0xd1, 0xb2, 0x90, 0x75, 0x07, 0x73, 0x01, 0xfa, 0x8b, 0xec, 0x60, 0xe4, 0xf4, 0xca, 0xfc, 0x60, + 0x8b, 0xb9, 0x53, 0x87, 0x07, 0x5b, 0x3c, 0x4f, 0x87, 0x0a, 0xf0, 0xf0, 0xc0, 0x71, 0x9f, 0x0e, + 0x0f, 0x26, 0xde, 0xe1, 0x81, 0xe7, 0x2a, 0xae, 0x63, 0xa9, 0xe7, 0x5f, 0x41, 0xb2, 0x1e, 0xd5, + 0xc3, 0x73, 0x37, 0x1c, 0x4d, 0xed, 0x90, 0x1e, 0x6c, 0x79, 0x6e, 0x5a, 0xf9, 0xc5, 0xe5, 0x95, + 0x17, 0x08, 0x4e, 0x1f, 0xe6, 0xc8, 0xd5, 0x0e, 0xbd, 0x31, 0xaf, 0xfe, 0x48, 0xbd, 0x71, 0xae, + 0x86, 0x46, 0xbc, 0x46, 0xe9, 0x79, 0x76, 0x14, 0x41, 0x4b, 0xd0, 0x7a, 0xea, 0xe1, 0xd9, 0xcd, + 0x55, 0xeb, 0x34, 0x6d, 0x27, 0xaa, 0x32, 0xf0, 0xd5, 0xc3, 0xdc, 0x18, 0xcc, 0x49, 0x29, 0x18, + 0xe5, 0x13, 0x96, 0xe7, 0x5a, 0x02, 0x03, 0xf2, 0x76, 0x89, 0x7b, 0x62, 0xa9, 0xc9, 0x53, 0x32, + 0xe6, 0x16, 0xae, 0x78, 0x8b, 0xad, 0x7d, 0x18, 0x1e, 0x1e, 0x70, 0xa2, 0x30, 0x64, 0xb0, 0x11, + 0x80, 0x66, 0x9f, 0xdc, 0x11, 0x70, 0x3e, 0xeb, 0xc0, 0x9a, 0x49, 0x55, 0x69, 0xd9, 0xd6, 0x62, + 0x3f, 0x60, 0x13, 0xd0, 0x15, 0xf4, 0x0a, 0x0d, 0x4c, 0x0a, 0x26, 0x33, 0x37, 0x0a, 0x07, 0x76, + 0xb1, 0xe5, 0x47, 0x66, 0x18, 0xf2, 0x4d, 0x85, 0xb5, 0x50, 0x0f, 0x6f, 0x69, 0x08, 0xf6, 0xc9, + 0xf6, 0x16, 0x20, 0x10, 0x5d, 0x3f, 0x00, 0xf9, 0x16, 0x3a, 0x22, 0x45, 0x95, 0xd4, 0xd9, 0x10, + 0xb3, 0x89, 0x16, 0x99, 0x57, 0x0f, 0xe5, 0x2c, 0xf2, 0x4c, 0x6a, 0xfa, 0x41, 0x38, 0x3a, 0xe1, + 0xb5, 0x2a, 0xd8, 0x4d, 0xea, 0x79, 0xbd, 0x21, 0xed, 0x3d, 0x42, 0x85, 0xed, 0x45, 0x54, 0x55, + 0x90, 0x35, 0x41, 0x84, 0x30, 0xac, 0xb6, 0xd4, 0xa0, 0xdf, 0x4f, 0x4a, 0x46, 0x63, 0xb0, 0x44, + 0x54, 0x14, 0xb1, 0x90, 0xcc, 0x52, 0x55, 0x0e, 0x21, 0x68, 0xe2, 0x60, 0x74, 0x32, 0x72, 0x6e, + 0x9f, 0x63, 0xf5, 0x50, 0x39, 0xe0, 0xe2, 0x92, 0xcc, 0xd7, 0x8d, 0x7d, 0xd1, 0x6c, 0xe4, 0x7c, + 0x80, 0xe7, 0xc3, 0x1b, 0xea, 0x3b, 0x07, 0x5b, 0x42, 0xa0, 0xdf, 0x80, 0x99, 0x27, 0x41, 0x19, + 0x80, 0xe0, 0x23, 0xf0, 0x71, 0x4a, 0x45, 0x09, 0xd0, 0x83, 0x0d, 0x91, 0x01, 0xc4, 0x03, 0x42, + 0xc3, 0xa2, 0x31, 0x05, 0x56, 0xbd, 0xaa, 0xe7, 0xe1, 0x71, 0xfa, 0x0c, 0x1c, 0x83, 0x3d, 0x52, + 0xa2, 0xb3, 0x7f, 0x21, 0xe4, 0x90, 0x89, 0x71, 0xc2, 0x6d, 0x0e, 0x72, 0x06, 0xd4, 0xe4, 0x9b, + 0x26, 0x74, 0x43, 0x45, 0x72, 0x33, 0x8b, 0x40, 0x9d, 0xae, 0x66, 0x8d, 0xac, 0xdd, 0x4a, 0xee, + 0x38, 0x4f, 0x9b, 0x95, 0xce, 0xf3, 0xd3, 0x58, 0x84, 0x41, 0x28, 0x70, 0x8f, 0xc3, 0x2f, 0xd0, + 0x9b, 0x79, 0x27, 0xaa, 0x32, 0x9a, 0x78, 0xb1, 0x0b, 0x4c, 0x01, 0x78, 0x15, 0x4f, 0x2b, 0x88, + 0x1f, 0xd2, 0x3e, 0x84, 0xda, 0x43, 0xf5, 0xf0, 0x9a, 0x3f, 0xa4, 0x0c, 0x50, 0xce, 0x2e, 0x21, + 0xb5, 0x41, 0x22, 0x5d, 0x40, 0x08, 0xcb, 0x8b, 0x5b, 0xea, 0x09, 0x2b, 0x51, 0x78, 0xca, 0x27, + 0x08, 0x67, 0xea, 0x61, 0xf5, 0xed, 0x61, 0x26, 0x63, 0x2f, 0xb0, 0x9d, 0x73, 0x0e, 0xb2, 0x18, + 0x88, 0x97, 0x29, 0x7c, 0x1d, 0xd2, 0x20, 0x32, 0x76, 0x38, 0xdb, 0x70, 0x4c, 0xe0, 0x38, 0xe3, + 0x70, 0xc0, 0x7c, 0x31, 0x8a, 0x3c, 0x5e, 0xff, 0x25, 0xe5, 0x0b, 0x9e, 0x42, 0x48, 0xb1, 0xce, + 0x53, 0x0b, 0xcb, 0xfd, 0x00, 0x5d, 0xf6, 0xb3, 0xa5, 0x36, 0xea, 0xf5, 0x14, 0x99, 0xdb, 0x75, + 0xce, 0x3f, 0x7c, 0x84, 0x22, 0xf6, 0x11, 0xae, 0x4d, 0x9e, 0xa6, 0x6a, 0x61, 0x9b, 0x6e, 0x39, + 0xed, 0x13, 0x0e, 0x5a, 0x5a, 0x9d, 0x00, 0xd0, 0x8e, 0x81, 0x2c, 0x5b, 0x05, 0xd3, 0x7f, 0x82, + 0x98, 0x5c, 0x2d, 0x67, 0x6e, 0x31, 0xf3, 0x39, 0x67, 0xad, 0xfc, 0xdc, 0x29, 0xbf, 0xc9, 0x9d, + 0x8b, 0x07, 0xe2, 0x76, 0xe7, 0x2d, 0x19, 0xe1, 0xad, 0xde, 0x90, 0x10, 0xde, 0x48, 0x99, 0x8c, + 0x1d, 0xe0, 0x93, 0x92, 0x89, 0xfe, 0x15, 0x42, 0x62, 0xf7, 0x7a, 0x74, 0x0c, 0xda, 0xd3, 0xe8, + 0xba, 0x7e, 0x26, 0x32, 0xfd, 0xa9, 0xfa, 0x06, 0x9b, 0x8e, 0xcf, 0xbf, 0xa2, 0x7a, 0xc4, 0xed, + 0x15, 0x05, 0x39, 0x76, 0x5d, 0xc6, 0xe4, 0x0b, 0xfe, 0x11, 0xd6, 0xe4, 0x3d, 0xd7, 0x66, 0x4e, + 0xf9, 0xdf, 0xae, 0x64, 0x08, 0x99, 0xb1, 0x1e, 0xdb, 0x83, 0x8c, 0x8c, 0x2c, 0x8f, 0x2c, 0x93, + 0x51, 0x2e, 0x4f, 0x7c, 0xf6, 0xa2, 0xaa, 0x84, 0x9a, 0x17, 0x0e, 0x34, 0x70, 0xfb, 0x62, 0x4f, + 0x4e, 0x22, 0x66, 0xae, 0x35, 0x63, 0xfb, 0x72, 0x82, 0x2d, 0x71, 0xfc, 0xe1, 0x97, 0x08, 0x62, + 0x5c, 0x31, 0x1a, 0x27, 0x67, 0x0a, 0xff, 0x05, 0xbe, 0xfe, 0xb0, 0x49, 0x94, 0xfd, 0x8b, 0xf5, + 0xc1, 0xb9, 0x82, 0x97, 0x29, 0x44, 0x1f, 0x79, 0x90, 0x38, 0x53, 0x8d, 0x45, 0x5d, 0x22, 0xa6, + 0xfc, 0xed, 0xe7, 0x40, 0x99, 0x97, 0x0d, 0xb6, 0xfc, 0xcf, 0xd1, 0x20, 0xe7, 0x6a, 0x29, 0x8b, + 0x19, 0x23, 0xf4, 0x03, 0x81, 0x3b, 0x20, 0x34, 0xc2, 0x6d, 0x40, 0x25, 0x08, 0x95, 0x04, 0xa6, + 0x32, 0xea, 0xa4, 0x02, 0x25, 0x98, 0x9e, 0xaf, 0x8b, 0xbf, 0xa8, 0x92, 0x08, 0x28, 0x10, 0x04, + 0xf0, 0x55, 0x82, 0xe3, 0x06, 0x18, 0xf3, 0x61, 0x09, 0xa2, 0xd5, 0xe1, 0x69, 0x5a, 0xb2, 0xac, + 0xeb, 0xdf, 0x1e, 0x8f, 0x01, 0x9e, 0x0c, 0x25, 0x5c, 0xc7, 0x44, 0xa6, 0x96, 0x59, 0x1a, 0x1c, + 0x00, 0x77, 0x1c, 0x2b, 0x0e, 0xed, 0x53, 0xf0, 0x16, 0xd8, 0x1f, 0xf5, 0x50, 0xd3, 0x74, 0xeb, + 0xf0, 0x45, 0x85, 0x35, 0x2b, 0x51, 0x1c, 0xba, 0xbd, 0x58, 0xed, 0x3c, 0x81, 0x18, 0x51, 0xeb, + 0xa5, 0xbd, 0x53, 0x6f, 0x98, 0x1a, 0x25, 0x31, 0xf1, 0xb1, 0x09, 0x96, 0x86, 0x96, 0xaf, 0xed, + 0xb5, 0x9b, 0x75, 0x9d, 0x04, 0xf0, 0xd4, 0xda, 0x6b, 0xed, 0xe9, 0xc4, 0xb5, 0x6e, 0x01, 0xce, + 0x33, 0x44, 0x64, 0x87, 0x1a, 0xf4, 0x19, 0x63, 0x8f, 0xc8, 0xea, 0x4f, 0x7c, 0xb6, 0x6f, 0xa1, + 0x51, 0xfd, 0xc5, 0xed, 0x6b, 0x21, 0xfc, 0xd5, 0x43, 0x1a, 0x4f, 0x42, 0x5f, 0xa1, 0x9d, 0x78, + 0x18, 0x06, 0x53, 0xc5, 0xa7, 0x53, 0xc5, 0xd5, 0x02, 0xa8, 0xa9, 0xc2, 0x6a, 0x22, 0x50, 0x51, + 0xb1, 0x62, 0x2b, 0x49, 0x47, 0x55, 0x9f, 0xcf, 0xc9, 0x6e, 0x7b, 0xb7, 0xb5, 0x02, 0x84, 0x1b, + 0x00, 0xd8, 0x1f, 0xac, 0x07, 0x81, 0x1a, 0x74, 0xbf, 0x01, 0x96, 0x55, 0xcb, 0x42, 0xb4, 0x06, + 0x7d, 0x85, 0xbe, 0xbe, 0x96, 0x43, 0xa5, 0x9e, 0xd8, 0xfe, 0x66, 0xac, 0x44, 0x34, 0x56, 0xd4, + 0xaa, 0x00, 0xd1, 0x8e, 0x00, 0x3c, 0x50, 0x19, 0x71, 0x80, 0x23, 0x30, 0xf8, 0x5a, 0xfb, 0xad, + 0xbd, 0x02, 0xf8, 0xb6, 0x5b, 0xad, 0xed, 0xf7, 0xc2, 0xb7, 0x36, 0x86, 0x7c, 0x45, 0xac, 0x04, + 0x01, 0x80, 0x30, 0xa9, 0x6d, 0x52, 0x98, 0x3a, 0x1b, 0x57, 0x85, 0xa8, 0x8d, 0xf6, 0x5d, 0x1f, + 0xdc, 0xc3, 0x8d, 0x64, 0xad, 0xc7, 0x61, 0x68, 0xcf, 0x3e, 0x4c, 0xfa, 0x40, 0xf1, 0x4a, 0xa5, + 0xa8, 0xc1, 0xa9, 0x1d, 0xdb, 0xbf, 0xb9, 0x74, 0x3a, 0x27, 0xdb, 0xad, 0xf6, 0x12, 0xca, 0x49, + 0x40, 0x5c, 0x62, 0xc3, 0xc2, 0x70, 0x3a, 0x9d, 0x44, 0xb8, 0xc4, 0xfa, 0xee, 0xae, 0x4e, 0x3c, + 0x78, 0x6a, 0xd6, 0x81, 0x16, 0xbd, 0x94, 0x2a, 0x4e, 0xba, 0xfe, 0x09, 0x76, 0x68, 0xef, 0x43, + 0xd9, 0x18, 0x99, 0xa5, 0xbe, 0xd3, 0xd4, 0x49, 0x3f, 0x65, 0x9b, 0x11, 0x3c, 0xed, 0xee, 0x36, + 0xa0, 0x6c, 0x86, 0x4f, 0xed, 0x3d, 0xe8, 0x31, 0x60, 0x3d, 0x70, 0xe0, 0x27, 0x2c, 0xdb, 0xd9, + 0x86, 0x76, 0x43, 0x7c, 0xda, 0xdf, 0x85, 0x51, 0xa6, 0xf0, 0xb4, 0xbf, 0xb3, 0xb7, 0xa3, 0x93, + 0x2e, 0x3c, 0x35, 0x76, 0xea, 0xd0, 0xf7, 0x0c, 0x7b, 0xec, 0x40, 0xd7, 0x4f, 0x58, 0xd9, 0xac, + 0x43, 0xe5, 0xb3, 0xf5, 0xc9, 0xa0, 0x3e, 0x38, 0xc4, 0x3d, 0x4a, 0x2e, 0xe0, 0x79, 0x40, 0x63, + 0xf2, 0x68, 0x79, 0x06, 0x44, 0x79, 0x7b, 0x0c, 0x0f, 0xe4, 0xc6, 0x7a, 0xac, 0x54, 0x1e, 0x8d, + 0x94, 0x94, 0xe4, 0x03, 0x54, 0x7f, 0x81, 0xa0, 0x74, 0xef, 0xc4, 0xb3, 0x47, 0x63, 0xea, 0xf0, + 0x66, 0xb7, 0xd6, 0x87, 0x4a, 0xe5, 0x83, 0xd4, 0xec, 0x18, 0xfb, 0x0d, 0xb5, 0x47, 0x9d, 0x5c, + 0x5a, 0x37, 0xf8, 0x74, 0xa3, 0x93, 0xcf, 0xd6, 0x25, 0xa3, 0x86, 0xd4, 0xec, 0x1b, 0x8c, 0x96, + 0x12, 0x9c, 0x5c, 0x59, 0x5d, 0x4d, 0x8d, 0x03, 0xce, 0x0a, 0xb7, 0xf6, 0x40, 0xd5, 0xc9, 0xb9, + 0x75, 0xa6, 0xa9, 0xb7, 0x7f, 0xbf, 0x3a, 0x3b, 0x7d, 0x38, 0xbe, 0xbe, 0x3e, 0xfe, 0xfb, 0xc3, + 0xed, 0xf1, 0x5f, 0xa0, 0xf8, 0xa3, 0xa5, 0x62, 0x37, 0x3e, 0x3b, 0xb8, 0xe0, 0x20, 0x8e, 0x13, + 0x74, 0x04, 0x55, 0xf2, 0x60, 0xd9, 0x95, 0xca, 0xc6, 0xc6, 0x14, 0x68, 0x77, 0x39, 0xa6, 0xa1, + 0x0d, 0x74, 0xb3, 0xc6, 0x9a, 0x67, 0x04, 0xf8, 0xa2, 0x93, 0x13, 0x6b, 0xa3, 0x41, 0xae, 0xad, + 0x97, 0x74, 0x85, 0x66, 0x83, 0xb0, 0xe5, 0xe4, 0x5e, 0xe4, 0xb5, 0x41, 0x19, 0x34, 0x6e, 0xec, + 0xf0, 0x97, 0x26, 0x6b, 0x90, 0xbd, 0x41, 0x55, 0xab, 0xc9, 0x5f, 0xda, 0xac, 0x2a, 0x7b, 0x3b, + 0x07, 0x33, 0xbe, 0xf8, 0xba, 0xd3, 0xe6, 0xaf, 0x7b, 0x73, 0x72, 0x6a, 0xbd, 0x7c, 0x70, 0x07, + 0xd0, 0x3f, 0x2d, 0x23, 0xf0, 0x8e, 0x43, 0x48, 0x8d, 0xbe, 0xe4, 0x58, 0x1f, 0x19, 0x2c, 0xb6, + 0x86, 0xf0, 0xd8, 0x01, 0x29, 0x70, 0xb4, 0x58, 0xe7, 0x65, 0xbe, 0x75, 0x01, 0xcf, 0x1d, 0x21, + 0x11, 0x7e, 0xa5, 0x32, 0xd1, 0x7c, 0xf2, 0x51, 0x3f, 0xf2, 0xef, 0x3e, 0xde, 0x9b, 0x5f, 0xa0, + 0x0a, 0xb8, 0xff, 0xeb, 0xa2, 0x10, 0x6d, 0x38, 0x99, 0x14, 0x6d, 0x34, 0x3a, 0x7c, 0xec, 0x31, + 0x8e, 0x2d, 0xc6, 0x99, 0x68, 0xd7, 0x24, 0xd6, 0x5f, 0x5f, 0x27, 0xda, 0x29, 0xfc, 0x9d, 0x77, + 0x80, 0x4d, 0xb4, 0x50, 0x71, 0x7d, 0xe5, 0x5a, 0xd7, 0x5c, 0x4b, 0x0b, 0x2c, 0xef, 0x2e, 0xbc, + 0xd7, 0x2b, 0x95, 0x20, 0xa3, 0xa7, 0x7e, 0xf4, 0xac, 0xb9, 0x3a, 0xcc, 0x6a, 0x05, 0xe6, 0x03, + 0x60, 0x3a, 0xeb, 0x73, 0x5a, 0xde, 0xa7, 0x52, 0xd1, 0xd2, 0x5e, 0x6c, 0x61, 0xda, 0xc6, 0xc3, + 0xeb, 0xeb, 0x46, 0x4f, 0x3b, 0x86, 0xc9, 0x8f, 0x2d, 0xcb, 0x3a, 0x17, 0x80, 0xe7, 0xfb, 0x1c, + 0x67, 0x0b, 0xd2, 0x5f, 0x32, 0x1d, 0xf0, 0x4d, 0x53, 0x2f, 0x7c, 0x61, 0xfb, 0x60, 0xe2, 0xa7, + 0x80, 0x7b, 0x0d, 0xa0, 0x01, 0xc8, 0x83, 0xae, 0x4b, 0x6b, 0x40, 0x48, 0x2a, 0x95, 0xa9, 0x86, + 0x7f, 0xc9, 0xb1, 0x34, 0xf1, 0xe5, 0xeb, 0xeb, 0x25, 0xcc, 0xfa, 0x19, 0x27, 0xb9, 0xb4, 0x8e, + 0x25, 0x6e, 0x2d, 0x1f, 0x40, 0x6a, 0x74, 0xc9, 0x86, 0x7a, 0x40, 0x9e, 0xbf, 0xd5, 0x81, 0xf9, + 0x2e, 0xb1, 0xcd, 0x2d, 0x14, 0x93, 0x08, 0x18, 0x73, 0xa2, 0x5d, 0x92, 0x2b, 0x69, 0x18, 0xe0, + 0xc7, 0x3a, 0x19, 0x60, 0x21, 0x79, 0x01, 0xe3, 0xd6, 0x77, 0x07, 0x93, 0x10, 0x23, 0x52, 0x13, + 0x8b, 0x69, 0x6c, 0x4a, 0x6b, 0x14, 0x64, 0x01, 0xb2, 0x0f, 0xdd, 0x48, 0x3f, 0xc2, 0x7f, 0xef, + 0xce, 0xef, 0xcd, 0xa7, 0x00, 0xcc, 0x70, 0x7d, 0x3e, 0xd7, 0x49, 0x02, 0xd2, 0x88, 0xaf, 0xe9, + 0x9c, 0x84, 0xba, 0xa4, 0x43, 0x5f, 0x7e, 0x3d, 0xbe, 0xbd, 0xf8, 0xed, 0x4c, 0x88, 0xd1, 0x87, + 0x2f, 0xe7, 0xe7, 0x67, 0xd7, 0x0f, 0xbf, 0x5d, 0x9c, 0x7d, 0xbd, 0x31, 0x1f, 0xc8, 0x82, 0x84, + 0x99, 0x27, 0x95, 0xca, 0x39, 0xb1, 0x33, 0x11, 0x33, 0x17, 0x98, 0xe7, 0x6b, 0x89, 0x06, 0x06, + 0xec, 0xdf, 0xda, 0x21, 0x00, 0x9e, 0x19, 0x29, 0x44, 0x8a, 0xa3, 0xd8, 0x38, 0x0a, 0x12, 0xc1, + 0x2e, 0x94, 0xdb, 0xc5, 0xf1, 0x7b, 0x1a, 0xa3, 0xf1, 0xc6, 0xf4, 0xf5, 0xf5, 0x49, 0x3b, 0x26, + 0x30, 0x59, 0xf1, 0x6c, 0xfd, 0x05, 0x8b, 0x28, 0x4d, 0x86, 0xa7, 0xac, 0x52, 0xb5, 0x00, 0x13, + 0x73, 0x3c, 0x64, 0xb3, 0x7f, 0xa6, 0xf1, 0x30, 0x70, 0xa4, 0x89, 0x51, 0x8d, 0x03, 0xca, 0x70, + 0xfa, 0x88, 0xfd, 0xeb, 0x33, 0x32, 0xa1, 0x60, 0x04, 0x9c, 0xe2, 0x4c, 0xd8, 0x5c, 0xe0, 0xe1, + 0xe0, 0x1e, 0x69, 0xec, 0xa2, 0xa0, 0xb9, 0x12, 0xe9, 0x01, 0xcc, 0x38, 0x9c, 0xbd, 0x38, 0x14, + 0xbd, 0x2c, 0x45, 0xaa, 0xb9, 0xa3, 0xf7, 0x73, 0xe0, 0xc3, 0xde, 0x10, 0xc6, 0x7c, 0xc1, 0x26, + 0xf9, 0x3a, 0x2b, 0x16, 0xb5, 0xb0, 0xf8, 0xf9, 0x7c, 0x7e, 0x09, 0x45, 0xc0, 0x2a, 0xfe, 0xeb, + 0xeb, 0x0c, 0x18, 0x83, 0x12, 0xff, 0x28, 0x36, 0x81, 0x9f, 0x6e, 0xa0, 0xf8, 0xf5, 0x35, 0x06, + 0x10, 0xe7, 0xcb, 0xab, 0xb9, 0x89, 0x81, 0xcd, 0x7b, 0x85, 0x6b, 0xd2, 0x13, 0xc3, 0xd4, 0x49, + 0x57, 0x36, 0x95, 0xd6, 0x27, 0xb8, 0x19, 0xd9, 0x3f, 0x15, 0xcf, 0x89, 0x16, 0x2c, 0x2c, 0x26, + 0xc8, 0x96, 0x80, 0x40, 0x42, 0xeb, 0x63, 0x01, 0xa5, 0x20, 0x4c, 0x07, 0x1b, 0x0b, 0x1a, 0xcd, + 0x90, 0x64, 0x09, 0xd8, 0xc7, 0x1c, 0x6c, 0x5d, 0x5e, 0xa2, 0x34, 0xef, 0x46, 0x32, 0xeb, 0xeb, + 0x6b, 0x20, 0xad, 0x1b, 0xe6, 0x27, 0x4c, 0x6f, 0x01, 0x2f, 0x15, 0x73, 0xcc, 0x17, 0xe2, 0x46, + 0x68, 0x86, 0xcd, 0x77, 0xea, 0x35, 0x35, 0xb1, 0xdf, 0xe0, 0xde, 0x58, 0x31, 0xaa, 0xb7, 0x9c, + 0x9a, 0x83, 0x51, 0x25, 0xb6, 0xff, 0x4a, 0xa4, 0x97, 0x63, 0xe9, 0xe5, 0x2a, 0x21, 0x9f, 0x79, + 0x09, 0x40, 0xee, 0x6d, 0xef, 0xec, 0x17, 0xf8, 0x36, 0xcd, 0xbd, 0x06, 0xba, 0x36, 0xa1, 0xf6, + 0x32, 0x37, 0x12, 0xb3, 0x86, 0x4e, 0x60, 0xa8, 0xa9, 0xaa, 0x11, 0x79, 0x6e, 0x8f, 0xea, 0x25, + 0x4e, 0x8e, 0x40, 0x24, 0x77, 0x68, 0xc8, 0x1e, 0xa9, 0x35, 0x98, 0x0b, 0x05, 0x7e, 0x41, 0xc1, + 0x34, 0xad, 0x46, 0x73, 0x9f, 0x7b, 0x99, 0xdc, 0xad, 0x70, 0xf1, 0x09, 0x20, 0xd2, 0x99, 0x1f, + 0xc2, 0x8c, 0xff, 0xa2, 0x59, 0x8d, 0x84, 0x29, 0x06, 0xaf, 0x44, 0x3d, 0x86, 0xd8, 0x0f, 0x0f, + 0x1d, 0x46, 0x88, 0x10, 0x57, 0x5b, 0xd6, 0x38, 0x76, 0xd2, 0x60, 0xae, 0xe9, 0x32, 0xc0, 0xe1, + 0x91, 0x6b, 0x2e, 0x99, 0x27, 0x94, 0xa1, 0xc4, 0x82, 0x70, 0xd5, 0x04, 0xa3, 0xd2, 0x23, 0xf5, + 0x4b, 0xea, 0x48, 0x99, 0xfe, 0xc4, 0xf3, 0x78, 0xe1, 0xaf, 0xf0, 0xa4, 0x9a, 0x6a, 0xc4, 0x20, + 0x4b, 0xdd, 0x4d, 0xcd, 0xb7, 0x64, 0x0e, 0xe6, 0x12, 0x93, 0x88, 0xff, 0x5d, 0x2c, 0xf3, 0xe1, + 0x5c, 0x8b, 0xad, 0x08, 0x51, 0x64, 0xeb, 0x60, 0xee, 0x4c, 0xef, 0xc8, 0x05, 0x6b, 0x67, 0xaa, + 0x97, 0x89, 0xff, 0x6a, 0x69, 0xa1, 0x85, 0x45, 0x68, 0x72, 0xb4, 0xd8, 0xe8, 0xd9, 0x9e, 0x47, + 0xc1, 0x4a, 0x49, 0x6b, 0x36, 0x43, 0xf4, 0x9d, 0x1b, 0x3b, 0x45, 0xbe, 0x69, 0xb3, 0xbe, 0xdb, + 0x96, 0x17, 0xbc, 0x11, 0x6a, 0x32, 0x7a, 0x92, 0x47, 0x85, 0xc2, 0xcb, 0x3c, 0x01, 0x30, 0x93, + 0x6c, 0x43, 0xd2, 0x40, 0x16, 0x2e, 0x9a, 0x08, 0xff, 0x07, 0x78, 0x3a, 0xe5, 0x9f, 0x4b, 0x58, + 0x2e, 0xa8, 0x32, 0x8a, 0xa6, 0x42, 0xea, 0x3b, 0xd7, 0x81, 0x15, 0xd1, 0xe7, 0x2b, 0x72, 0x99, + 0x99, 0x3f, 0xc9, 0xa2, 0x8a, 0x9d, 0x86, 0xa0, 0xf7, 0xce, 0x5e, 0xbb, 0x95, 0xa7, 0xcd, 0xa2, + 0x12, 0x10, 0xf0, 0x05, 0x46, 0x9f, 0x95, 0xb8, 0x5a, 0x03, 0x4a, 0xf5, 0xb9, 0x59, 0xd2, 0x0e, + 0x11, 0x6d, 0xf9, 0x84, 0xa2, 0xe3, 0x0c, 0x63, 0x2f, 0x38, 0xce, 0x79, 0xfa, 0xf0, 0x2e, 0x2f, + 0xd4, 0x07, 0x9c, 0x0a, 0xeb, 0xa5, 0x35, 0x2a, 0x40, 0x95, 0xbc, 0x45, 0xd3, 0x9a, 0x58, 0x36, + 0x0d, 0xdd, 0x58, 0xbc, 0xb7, 0xf1, 0x9d, 0x65, 0x19, 0xcc, 0x78, 0x8e, 0x13, 0x81, 0x3f, 0x5b, + 0x14, 0xc2, 0x34, 0x1b, 0x7b, 0xd2, 0x7a, 0x3b, 0xc5, 0x60, 0x48, 0xb0, 0xfb, 0x88, 0xe1, 0x4a, + 0x25, 0xd4, 0xd8, 0x03, 0x54, 0xbd, 0xc0, 0x1f, 0x08, 0x3f, 0xc1, 0xa8, 0x82, 0x99, 0xf4, 0x8d, + 0x28, 0xa9, 0x8d, 0x78, 0x6d, 0x24, 0xd5, 0x26, 0xf8, 0xf1, 0x79, 0x4c, 0xb5, 0xb7, 0xbd, 0x3a, + 0xac, 0x4b, 0x09, 0xc0, 0x81, 0x44, 0x81, 0xdb, 0x6f, 0xb7, 0x56, 0x00, 0x49, 0x40, 0x03, 0x47, + 0xaf, 0xaf, 0x1a, 0x18, 0xe4, 0xb9, 0xce, 0xb4, 0x93, 0x67, 0x45, 0x46, 0x86, 0x3a, 0x08, 0x0f, + 0xb8, 0xd8, 0x00, 0x3f, 0x44, 0x06, 0x1e, 0x2b, 0x3e, 0xe2, 0x7f, 0xcc, 0xb8, 0xc3, 0x42, 0x1f, + 0x1f, 0x78, 0xd9, 0x05, 0xff, 0xae, 0x07, 0x23, 0x91, 0xc8, 0x18, 0x78, 0x41, 0xd7, 0xf6, 0x74, + 0xef, 0x88, 0x13, 0xcc, 0xb4, 0x35, 0x04, 0xb6, 0x43, 0xbd, 0x88, 0x32, 0xb9, 0x89, 0x8c, 0x89, + 0x1f, 0xd9, 0x7d, 0xca, 0xea, 0xc1, 0xa4, 0x7a, 0xe0, 0x70, 0xe8, 0xa6, 0xd0, 0xea, 0x0b, 0xd2, + 0x94, 0x0e, 0x92, 0x20, 0xe1, 0x85, 0x13, 0x07, 0xd8, 0x40, 0x22, 0x6d, 0x63, 0x81, 0xac, 0x00, + 0x5e, 0xe0, 0x9f, 0x48, 0x45, 0x12, 0x89, 0x59, 0xdd, 0x57, 0xf1, 0x3a, 0xd7, 0x53, 0x21, 0x01, + 0xdc, 0x22, 0x9a, 0x0a, 0x65, 0x8e, 0xa1, 0x56, 0x48, 0x0a, 0xd7, 0x19, 0x20, 0x2c, 0xe0, 0xbd, + 0xc7, 0xb3, 0x4e, 0x19, 0x03, 0xe2, 0x42, 0x03, 0x2d, 0x04, 0x9b, 0x21, 0x20, 0x8e, 0xc9, 0xa2, + 0x33, 0x95, 0xc1, 0x04, 0x54, 0xce, 0x8c, 0x71, 0xc8, 0xcd, 0xaf, 0x80, 0x0b, 0xb8, 0x90, 0xa0, + 0x74, 0xbd, 0x5f, 0x17, 0x88, 0x01, 0x76, 0xd1, 0xe1, 0x2b, 0x02, 0x1d, 0x4c, 0x00, 0x69, 0x30, + 0x3e, 0x2c, 0x70, 0xe9, 0x76, 0xc1, 0x7b, 0xbb, 0x6b, 0xdc, 0x33, 0x99, 0xdf, 0xd9, 0x06, 0x55, + 0x44, 0xc5, 0xc4, 0x98, 0xbd, 0x59, 0x08, 0xc5, 0x1d, 0x71, 0x44, 0xbc, 0x52, 0x49, 0x9e, 0x0c, + 0x50, 0x6a, 0xc4, 0xb7, 0x52, 0x65, 0x0b, 0x55, 0x29, 0x07, 0xc5, 0xb2, 0x03, 0x08, 0xed, 0x00, + 0x31, 0x17, 0x37, 0x0f, 0x1f, 0x6f, 0x3f, 0x7f, 0x3a, 0x3d, 0x3d, 0x36, 0x7d, 0xb4, 0x29, 0xcd, + 0x42, 0x9b, 0x22, 0xc8, 0x90, 0xc4, 0xa7, 0x60, 0xb3, 0x8c, 0x64, 0x3e, 0x60, 0xf2, 0x00, 0xfc, + 0x75, 0xd4, 0xa8, 0xae, 0xc1, 0x53, 0xf3, 0x67, 0x1e, 0xc5, 0x9a, 0x37, 0xac, 0x99, 0x7d, 0xb4, + 0xd0, 0x1e, 0xea, 0x4c, 0x74, 0x78, 0xc8, 0x6e, 0x7d, 0xa7, 0xb1, 0x46, 0x68, 0xee, 0xdb, 0x4f, + 0xee, 0xc0, 0x06, 0x6d, 0x0a, 0xce, 0x10, 0x33, 0x19, 0x5a, 0x5a, 0x62, 0x60, 0x22, 0xea, 0x78, + 0x80, 0x40, 0xbc, 0xbe, 0xaa, 0x2a, 0x53, 0x5a, 0xdb, 0x45, 0xb1, 0x79, 0xb2, 0x36, 0x94, 0x54, + 0x9c, 0x16, 0x6d, 0x21, 0xf3, 0xc6, 0x7a, 0x34, 0x8a, 0xc0, 0x1c, 0xba, 0xc6, 0x29, 0xf5, 0x03, + 0x90, 0x42, 0xf0, 0xd6, 0x23, 0x03, 0xcf, 0x90, 0xc2, 0x22, 0x40, 0x60, 0xbd, 0x4a, 0xc5, 0x4b, + 0x5e, 0x21, 0x70, 0xef, 0x55, 0x2a, 0x3d, 0xe3, 0x69, 0xaf, 0xe3, 0x80, 0x48, 0x05, 0x68, 0x65, + 0x1c, 0x23, 0x1a, 0x7b, 0x6e, 0xac, 0xa9, 0x86, 0xaa, 0xeb, 0x77, 0xf5, 0xfb, 0xc3, 0x3a, 0xa8, + 0x18, 0xf8, 0x7b, 0xd0, 0x3e, 0x6a, 0x98, 0x55, 0x0d, 0x1f, 0xab, 0x21, 0x10, 0x59, 0xd7, 0xc9, + 0x46, 0x50, 0xa9, 0xd8, 0xe8, 0xdd, 0x42, 0x37, 0xdb, 0x18, 0x31, 0x56, 0xdc, 0x3a, 0x73, 0x06, + 0xf4, 0x1f, 0x5b, 0xda, 0x3f, 0x9c, 0xaa, 0xbe, 0xa5, 0xc3, 0x1a, 0xb0, 0xed, 0xa1, 0x05, 0x3c, + 0x07, 0x0d, 0xa5, 0x66, 0x27, 0xe0, 0xfc, 0x8e, 0xa4, 0x86, 0x6c, 0x7a, 0x3e, 0x30, 0xc9, 0x90, + 0x17, 0xcc, 0x09, 0xf2, 0x6b, 0xa9, 0xd2, 0x96, 0x4d, 0xea, 0xc6, 0x06, 0x98, 0xaf, 0x4c, 0x09, + 0x88, 0xc2, 0x3a, 0x92, 0x65, 0x6f, 0xaf, 0xd9, 0x7a, 0xbf, 0x28, 0xf0, 0x94, 0x98, 0x54, 0x30, + 0xc7, 0xe4, 0xb7, 0xa3, 0xa5, 0x0e, 0x58, 0x9a, 0xb6, 0xda, 0x90, 0xf2, 0x4b, 0xd4, 0x18, 0xda, + 0xd1, 0xe5, 0xd4, 0x4f, 0x05, 0x46, 0x95, 0xd3, 0x47, 0x28, 0x19, 0xcd, 0x56, 0xa1, 0x91, 0x46, + 0x20, 0x91, 0x55, 0x97, 0xa3, 0x44, 0x66, 0xee, 0x73, 0x36, 0x31, 0xe0, 0x90, 0x04, 0x7a, 0x81, + 0x10, 0x06, 0x06, 0x7e, 0xbd, 0x81, 0x9e, 0x67, 0xea, 0xef, 0xa0, 0x09, 0x80, 0xc5, 0x36, 0x56, + 0xda, 0x60, 0x9e, 0xb6, 0x71, 0x0b, 0xe6, 0x07, 0x1e, 0x03, 0x4e, 0xcd, 0x6c, 0xbe, 0xb4, 0xba, + 0x53, 0xca, 0x13, 0x8c, 0x41, 0x08, 0xec, 0x07, 0x72, 0x44, 0x54, 0x54, 0xf1, 0x2a, 0x66, 0x89, + 0x80, 0xef, 0xd4, 0x08, 0x68, 0x0c, 0xf1, 0x1d, 0xf3, 0x89, 0xf2, 0x98, 0xc4, 0x66, 0x9c, 0x39, + 0xb5, 0x8d, 0x10, 0xb8, 0x04, 0x38, 0x29, 0xeb, 0x6d, 0xc8, 0x4a, 0x2f, 0x17, 0xfb, 0x9d, 0xfd, + 0x7e, 0x71, 0x73, 0x7b, 0x63, 0x46, 0xe4, 0xea, 0xfa, 0xf2, 0xea, 0xec, 0xda, 0xf4, 0xc8, 0xc9, + 0xe5, 0xaf, 0xe7, 0x17, 0x7f, 0xf9, 0x72, 0x7d, 0xfc, 0xe1, 0xd3, 0x99, 0xd9, 0x83, 0x85, 0x36, + 0x5a, 0x85, 0xb6, 0x4e, 0xf8, 0xb0, 0xbe, 0x86, 0x29, 0xce, 0x55, 0xb6, 0x57, 0x72, 0xd2, 0x42, + 0x70, 0x5b, 0xdf, 0x58, 0x36, 0xd3, 0xdb, 0x77, 0x3e, 0x88, 0x43, 0x2e, 0xf4, 0x21, 0x30, 0xdd, + 0xbb, 0x68, 0x0c, 0x88, 0x0f, 0x18, 0x9d, 0x39, 0xb2, 0x39, 0x81, 0x39, 0x95, 0x5d, 0xe2, 0xe6, + 0x3d, 0x22, 0xdb, 0x2c, 0x50, 0x4a, 0xcb, 0x8c, 0xe0, 0x0a, 0x46, 0xa0, 0x39, 0x46, 0x40, 0xef, + 0x64, 0x7f, 0xa5, 0xa6, 0x64, 0x5e, 0x41, 0x67, 0xb5, 0x8f, 0x94, 0xf9, 0xd2, 0x86, 0x47, 0xfd, + 0x41, 0x3c, 0x3c, 0x68, 0x1e, 0x81, 0xbb, 0x8b, 0x56, 0x88, 0x04, 0x60, 0x8f, 0xc0, 0x87, 0xe5, + 0xba, 0x5b, 0x37, 0x43, 0x16, 0x0d, 0xe1, 0xbf, 0x60, 0x93, 0x99, 0xa3, 0xe0, 0x33, 0x20, 0xb6, + 0x8b, 0xac, 0x13, 0x23, 0x8e, 0x80, 0xa2, 0xbe, 0x53, 0x0e, 0x05, 0xcf, 0x16, 0xa1, 0x95, 0x4f, + 0x7c, 0x74, 0x36, 0x2b, 0x9f, 0xd3, 0x44, 0xe7, 0x82, 0xb1, 0x7c, 0xbd, 0x38, 0x84, 0x2c, 0x52, + 0xea, 0xb4, 0x52, 0xa1, 0xc6, 0x67, 0x3b, 0x1e, 0x62, 0xca, 0x04, 0xfe, 0xc0, 0xeb, 0x5c, 0xc6, + 0xfa, 0x72, 0x32, 0x99, 0x7b, 0x2c, 0xb7, 0x43, 0x17, 0x98, 0x38, 0x7b, 0x46, 0x95, 0xb7, 0xdc, + 0x76, 0x0a, 0x84, 0x0c, 0xa6, 0x95, 0x0a, 0xff, 0x5b, 0xdc, 0x26, 0xa2, 0x5e, 0x1f, 0x74, 0x35, + 0xfc, 0x5b, 0x5c, 0x0f, 0x4e, 0x60, 0xa5, 0x02, 0xff, 0x40, 0xed, 0x32, 0xb1, 0x31, 0x8b, 0x02, + 0x61, 0x0d, 0x04, 0xa8, 0xf0, 0xf0, 0xfa, 0x9a, 0x30, 0x98, 0xa6, 0x4a, 0xf5, 0xaa, 0xae, 0xe9, + 0x8c, 0xfc, 0xf5, 0x55, 0xf2, 0xd1, 0xdc, 0xc1, 0x04, 0xad, 0xcb, 0xa3, 0xbd, 0xbc, 0x2e, 0x93, + 0xe9, 0x21, 0xe4, 0x82, 0x37, 0x90, 0x20, 0x92, 0x99, 0x44, 0x84, 0x7d, 0x2c, 0xfe, 0xdd, 0xdd, + 0xad, 0xef, 0x2d, 0xe8, 0xf1, 0x17, 0x2c, 0xde, 0xd9, 0x6f, 0xaf, 0x54, 0x4b, 0x4c, 0x49, 0x33, + 0x73, 0x87, 0x16, 0x3e, 0xaf, 0xae, 0x21, 0xc8, 0x0e, 0xde, 0xe7, 0xbd, 0xb8, 0x9a, 0xea, 0xb8, + 0x4f, 0xa0, 0x9f, 0x54, 0x5b, 0x5d, 0xe5, 0xc5, 0x18, 0x36, 0x53, 0xd5, 0xfb, 0xfb, 0x3b, 0x2b, + 0x75, 0x49, 0x16, 0xa7, 0xee, 0xb7, 0x1a, 0xcc, 0x18, 0x87, 0x5a, 0x2a, 0xdb, 0x69, 0xa4, 0xdc, + 0x41, 0x07, 0xc3, 0xf5, 0xa3, 0x31, 0x00, 0x74, 0x13, 0x4c, 0x42, 0x08, 0x97, 0xc1, 0x71, 0x5e, + 0x28, 0x2a, 0x74, 0x34, 0xe0, 0x79, 0x2e, 0xdb, 0xc3, 0x85, 0x3e, 0x00, 0x60, 0xb3, 0xbe, 0x53, + 0x9a, 0xb9, 0xdf, 0x6b, 0x61, 0xec, 0x1c, 0x25, 0xb2, 0xed, 0xa5, 0x5e, 0x50, 0x2f, 0xcd, 0xc3, + 0x3b, 0xa9, 0xe2, 0x9f, 0xa4, 0x8b, 0xc0, 0xcc, 0xfd, 0xf6, 0x3e, 0x26, 0xfd, 0xfb, 0xac, 0x5d, + 0x9d, 0x65, 0xee, 0x45, 0x2c, 0xaa, 0xd8, 0x1e, 0x78, 0x3e, 0xce, 0x4c, 0x11, 0xdf, 0x29, 0xba, + 0xdf, 0xc1, 0xb1, 0x21, 0x33, 0x70, 0xf1, 0xb3, 0xf4, 0xf7, 0x00, 0xde, 0xbe, 0x52, 0xfb, 0xf1, + 0xb3, 0x3d, 0x46, 0x57, 0xdf, 0x7e, 0x7d, 0x9d, 0x18, 0xf8, 0xf1, 0xa0, 0x08, 0xad, 0x9f, 0x2c, + 0xf1, 0x0a, 0x48, 0x10, 0x4f, 0x16, 0x86, 0x8e, 0x80, 0xa8, 0x27, 0xd4, 0xb3, 0x16, 0xfb, 0x97, + 0x3c, 0x21, 0x6f, 0x59, 0xec, 0x5f, 0x78, 0x8e, 0x58, 0x39, 0xc6, 0x39, 0xe1, 0x82, 0x2a, 0x80, + 0x19, 0x58, 0x23, 0xcc, 0x96, 0x64, 0x29, 0xb5, 0x99, 0x36, 0x4a, 0x13, 0xc0, 0xb1, 0xd1, 0xb7, + 0x7b, 0xb6, 0x43, 0x2d, 0xca, 0x07, 0x62, 0xfd, 0x48, 0x3c, 0x07, 0x12, 0x16, 0x20, 0x9d, 0xcd, + 0xae, 0x21, 0x89, 0x90, 0x3f, 0xdd, 0xe2, 0x26, 0x7c, 0xbe, 0xf9, 0x9c, 0x85, 0x27, 0xb8, 0xa8, + 0xa1, 0x35, 0xd6, 0x54, 0xb6, 0x16, 0x55, 0xef, 0xf4, 0xef, 0x86, 0xf7, 0x98, 0x0f, 0x2d, 0x00, + 0xd5, 0x81, 0xa7, 0xe1, 0x1a, 0x80, 0xf6, 0xb0, 0xdd, 0x2a, 0x30, 0xf9, 0x40, 0x10, 0xe8, 0x0c, + 0xef, 0xcd, 0x52, 0x40, 0x79, 0x23, 0x00, 0x33, 0x93, 0x39, 0x58, 0xbf, 0x19, 0xb2, 0x94, 0x6c, + 0x40, 0x60, 0x15, 0xa6, 0x4b, 0xc4, 0xc6, 0x89, 0x59, 0x98, 0xb7, 0xa1, 0xfa, 0x11, 0xca, 0xb0, + 0x89, 0x86, 0x0e, 0x02, 0x3d, 0x96, 0xc7, 0x82, 0x18, 0xf3, 0x7c, 0x21, 0xd5, 0xb9, 0x68, 0x84, + 0x12, 0x15, 0x8d, 0xf4, 0xdf, 0xf0, 0x34, 0x74, 0x66, 0xc1, 0x3c, 0x04, 0x98, 0xc1, 0x30, 0x50, + 0x9d, 0x61, 0x92, 0x20, 0x87, 0x04, 0x96, 0xec, 0x4e, 0xbe, 0xa4, 0x55, 0x42, 0xda, 0xa3, 0x2e, + 0x9e, 0x0b, 0x55, 0xd4, 0x2a, 0xad, 0xaa, 0xf0, 0xfe, 0xcf, 0x89, 0x1b, 0x02, 0xa7, 0x65, 0x9b, + 0x03, 0x73, 0xe6, 0xd8, 0x81, 0xfc, 0x15, 0xc8, 0x27, 0xc6, 0x1e, 0x2c, 0x61, 0x65, 0x2c, 0x38, + 0x4e, 0x46, 0x16, 0x34, 0x1c, 0x2d, 0x83, 0x9f, 0x39, 0x74, 0xf2, 0x86, 0x21, 0x05, 0x83, 0x10, + 0xcc, 0xcd, 0xf5, 0x9a, 0x33, 0x98, 0x40, 0x24, 0xcb, 0x1d, 0xd6, 0x04, 0x7e, 0x96, 0x3b, 0xc2, + 0xf6, 0x28, 0x92, 0x2b, 0x63, 0x73, 0xbe, 0x1a, 0xf4, 0x0f, 0xf2, 0xab, 0x09, 0xde, 0x58, 0xcd, + 0xd2, 0xe6, 0xe7, 0x11, 0x4e, 0x8a, 0x98, 0x47, 0x6a, 0xea, 0x7c, 0x65, 0x6e, 0xe1, 0xca, 0xde, + 0xe8, 0x8a, 0xf6, 0x7b, 0xbf, 0xb9, 0xb8, 0xca, 0x8d, 0x06, 0xfa, 0xb6, 0xcd, 0x22, 0xdf, 0x16, + 0x5d, 0x8e, 0x45, 0x8d, 0xc9, 0xb7, 0xfa, 0x50, 0x4f, 0x6d, 0x37, 0x9b, 0xdb, 0x59, 0x2a, 0x4f, + 0x5a, 0xa1, 0x5d, 0xb4, 0xac, 0x68, 0x36, 0xea, 0x06, 0x9e, 0x8c, 0xf3, 0xe5, 0xe4, 0x1d, 0x9a, + 0xeb, 0x1b, 0xde, 0x4e, 0xcf, 0x1c, 0x84, 0x98, 0x65, 0x1c, 0xe4, 0x6d, 0x3b, 0xa6, 0x34, 0x30, + 0x78, 0x6c, 0xef, 0x17, 0x05, 0x08, 0xad, 0xdd, 0xf6, 0xee, 0x1b, 0xb1, 0x20, 0xa0, 0x43, 0x78, + 0x40, 0x38, 0x0e, 0x26, 0x4f, 0x56, 0xda, 0xd6, 0xd4, 0x98, 0x71, 0x3c, 0xd8, 0xa9, 0xfa, 0x5d, + 0xdc, 0x5f, 0xdd, 0x6d, 0xe8, 0x86, 0xec, 0xda, 0x32, 0x9d, 0x8d, 0xe6, 0x88, 0xeb, 0x6c, 0xbe, + 0xed, 0x39, 0x81, 0x68, 0x2d, 0xd9, 0xf6, 0x1c, 0xc3, 0x33, 0xaa, 0xcd, 0x7e, 0xb2, 0x03, 0x3d, + 0x2a, 0x36, 0x81, 0xa0, 0xab, 0xa5, 0xb4, 0x2d, 0xe8, 0x6a, 0xf6, 0x16, 0xd2, 0xb1, 0x67, 0xe3, + 0xfb, 0x13, 0xbc, 0xdf, 0xdd, 0x1b, 0xdf, 0x02, 0xd7, 0xc7, 0x7d, 0xd8, 0xa8, 0xcc, 0xc4, 0xee, + 0x01, 0x33, 0x8c, 0x72, 0x15, 0x60, 0xa8, 0x54, 0x8e, 0x09, 0x35, 0xc9, 0x5e, 0xec, 0x81, 0x21, + 0xe5, 0x45, 0x60, 0x4d, 0xc9, 0x54, 0x40, 0xa6, 0x09, 0xb3, 0x98, 0x04, 0x9a, 0xfc, 0x55, 0xc5, + 0x2d, 0xde, 0x72, 0xaf, 0x5c, 0x90, 0x53, 0xc3, 0x40, 0x62, 0xa6, 0xf5, 0x81, 0x96, 0xa4, 0x4e, + 0x76, 0x31, 0x6c, 0x8c, 0x2d, 0xf5, 0x4e, 0xad, 0x0e, 0x78, 0xd9, 0xd6, 0x7f, 0xf1, 0x76, 0xff, + 0xd0, 0xb4, 0xbb, 0xff, 0xd2, 0xef, 0xff, 0xac, 0xff, 0x43, 0xdf, 0x22, 0xea, 0xbf, 0x35, 0x54, + 0xbd, 0xaa, 0xde, 0xc3, 0x14, 0x3e, 0xf3, 0xa0, 0x98, 0x0a, 0xe3, 0x5d, 0x07, 0x6c, 0xb7, 0x3f, + 0x16, 0x35, 0x91, 0x54, 0x13, 0x25, 0x35, 0xda, 0x06, 0xd8, 0xe1, 0x24, 0x34, 0x61, 0x01, 0x34, + 0x65, 0xe1, 0x0b, 0xa6, 0x25, 0x10, 0x80, 0xe8, 0x68, 0x94, 0xd6, 0x97, 0xe6, 0x6d, 0xe6, 0xba, + 0xc9, 0x7b, 0x41, 0x1f, 0x02, 0xce, 0xa5, 0x8f, 0x01, 0x8f, 0x0f, 0x6e, 0x48, 0xe8, 0xc6, 0x33, + 0x55, 0xc7, 0x31, 0x39, 0xa6, 0x60, 0x54, 0xdf, 0x60, 0xa5, 0xb8, 0x01, 0x46, 0x97, 0x70, 0x2a, + 0x2a, 0xe7, 0x3a, 0xdb, 0xa8, 0x48, 0x86, 0xc9, 0xed, 0x11, 0xe1, 0x4a, 0xa4, 0x82, 0xa3, 0x48, + 0x8c, 0x94, 0x05, 0xa2, 0xe4, 0x25, 0x4b, 0x23, 0x35, 0x18, 0x68, 0x69, 0x1d, 0x2c, 0x48, 0x7a, + 0x13, 0xd9, 0x18, 0x39, 0xb8, 0xe1, 0x4c, 0x3d, 0x91, 0x36, 0x58, 0x6d, 0x2d, 0x24, 0x10, 0xea, + 0xa1, 0x47, 0x82, 0x08, 0xd2, 0x42, 0x83, 0xbf, 0x58, 0x4f, 0xda, 0x94, 0x2c, 0x26, 0xc5, 0x95, + 0xf8, 0x28, 0x36, 0x55, 0x15, 0xf8, 0x01, 0xfc, 0xeb, 0x82, 0x58, 0x37, 0xf1, 0x9a, 0xac, 0x6e, + 0x11, 0xdb, 0xb9, 0x7c, 0xd3, 0xb0, 0x52, 0x19, 0xf3, 0x07, 0x31, 0xd3, 0xeb, 0x6b, 0x8f, 0xbf, + 0x23, 0x13, 0x26, 0x23, 0xe0, 0x66, 0xd9, 0xfe, 0x5e, 0xab, 0x2e, 0x65, 0xa1, 0xd0, 0xb1, 0x37, + 0xc0, 0xb4, 0x60, 0x9e, 0x89, 0x3d, 0xf7, 0xbd, 0x20, 0x77, 0x40, 0x83, 0x15, 0x02, 0xde, 0xfc, + 0x9e, 0xec, 0xd2, 0x26, 0x61, 0x43, 0x95, 0x8a, 0x25, 0x6b, 0xe1, 0x61, 0x1d, 0x42, 0x9c, 0x58, + 0xd7, 0xd8, 0x26, 0x16, 0x66, 0x4f, 0x57, 0x3a, 0xb1, 0xe8, 0xe5, 0x72, 0xb9, 0x6f, 0xb7, 0xf7, + 0x1b, 0x5c, 0xee, 0xf1, 0x1c, 0x09, 0x97, 0xfb, 0x9d, 0x7a, 0xab, 0x89, 0x72, 0x9f, 0x79, 0x50, + 0xbd, 0x12, 0xd9, 0x75, 0xac, 0xb7, 0xa2, 0xf0, 0x09, 0x5e, 0x64, 0x91, 0xe4, 0x38, 0x55, 0xd0, + 0x0a, 0xaa, 0xcc, 0x88, 0x2a, 0xa8, 0x07, 0x35, 0x21, 0xbd, 0xda, 0x01, 0x7f, 0x03, 0x37, 0x3f, + 0x96, 0x52, 0xec, 0xe8, 0xb4, 0x31, 0xc7, 0xdd, 0x8a, 0x50, 0xa8, 0x80, 0xc3, 0x00, 0xad, 0x05, + 0xd6, 0x0e, 0x22, 0xfc, 0x8c, 0xa7, 0x78, 0xc6, 0x4e, 0x65, 0x5c, 0xaa, 0xba, 0x6c, 0xfb, 0xbe, + 0xaf, 0xf0, 0xbf, 0x1b, 0xfe, 0x5d, 0xff, 0x3e, 0x41, 0xa2, 0xc3, 0x7c, 0xa1, 0x4e, 0x88, 0x31, + 0x61, 0x1f, 0x33, 0xb9, 0x3c, 0x57, 0x6b, 0xb0, 0x8e, 0x40, 0x97, 0xfc, 0xf6, 0xf1, 0x98, 0x0d, + 0x71, 0xe4, 0xdf, 0x8d, 0xef, 0x21, 0x92, 0x1c, 0xdf, 0xcb, 0x19, 0xdc, 0x49, 0x52, 0x37, 0xc1, + 0xba, 0xc9, 0x3d, 0xc9, 0x31, 0x75, 0x92, 0x0b, 0xed, 0x25, 0x69, 0x70, 0xb3, 0x67, 0xae, 0xb3, + 0xd0, 0x40, 0x97, 0x32, 0x00, 0x69, 0xe7, 0xdc, 0x96, 0x21, 0x6a, 0x0d, 0xb6, 0xc4, 0xd7, 0x57, + 0x54, 0x13, 0xec, 0x51, 0xf2, 0x66, 0x40, 0x4b, 0x1d, 0xf7, 0x30, 0x0d, 0x17, 0x84, 0x7c, 0x3f, + 0x37, 0x9a, 0x8c, 0x91, 0xbd, 0x24, 0xff, 0x25, 0x87, 0xa6, 0x1c, 0x06, 0x74, 0xb6, 0x55, 0x81, + 0xa7, 0x5f, 0x8a, 0xed, 0x68, 0x7d, 0xd1, 0x8e, 0xf2, 0x78, 0xcd, 0x4e, 0x9d, 0x76, 0xe4, 0x28, + 0xdc, 0x07, 0x42, 0x8e, 0xb2, 0xc1, 0xaf, 0x3a, 0x7b, 0xb8, 0xba, 0xbe, 0xbc, 0xbd, 0x54, 0xf5, + 0x94, 0xab, 0x30, 0xed, 0x97, 0x49, 0x9c, 0xc4, 0xfd, 0xd1, 0x51, 0x6f, 0x61, 0x4f, 0xa7, 0xc0, + 0xb4, 0xba, 0xe2, 0xd8, 0x46, 0xa8, 0xc5, 0xc4, 0x4b, 0xb7, 0xb3, 0xe3, 0x3b, 0x4f, 0x04, 0xf7, + 0x56, 0x2c, 0x2b, 0x1f, 0x39, 0x3c, 0xaf, 0x54, 0xf0, 0x24, 0x03, 0x38, 0xc9, 0x7e, 0x8f, 0xc5, + 0xb3, 0x47, 0x92, 0xdc, 0x9b, 0xb9, 0xaa, 0xde, 0x91, 0xc3, 0x76, 0xd7, 0x58, 0x80, 0xb8, 0x5d, + 0x66, 0x52, 0x73, 0xe1, 0x39, 0x04, 0xab, 0x6e, 0x24, 0x41, 0x8e, 0xc2, 0xbf, 0xb3, 0xb7, 0x53, + 0xd0, 0x15, 0x13, 0x44, 0x62, 0xd7, 0x63, 0x9f, 0x1f, 0x66, 0xc3, 0xb3, 0x48, 0xbb, 0xad, 0x82, + 0xe8, 0x36, 0xca, 0x21, 0x03, 0x54, 0x9b, 0xfa, 0xf0, 0xc0, 0x40, 0x7e, 0x78, 0x00, 0xda, 0xbd, + 0xcc, 0x8f, 0x16, 0xd3, 0x85, 0xc0, 0x49, 0x1b, 0x0d, 0x64, 0xe2, 0x39, 0x53, 0xcf, 0x1a, 0x05, + 0xc8, 0x96, 0x0e, 0x0b, 0x49, 0x83, 0x10, 0xc6, 0x3f, 0xba, 0x0e, 0x3a, 0xfc, 0xee, 0x1e, 0xf9, + 0xd0, 0x97, 0xd1, 0xc0, 0x76, 0x68, 0x25, 0xd6, 0x5b, 0xf4, 0xb2, 0xd9, 0x36, 0xbf, 0x84, 0x60, + 0xe2, 0x82, 0x3e, 0x22, 0xf1, 0x11, 0x65, 0x35, 0x60, 0x2a, 0xd2, 0x89, 0xac, 0x90, 0x80, 0xc7, + 0xac, 0xe9, 0x49, 0x56, 0x06, 0x90, 0xb3, 0xbb, 0x5d, 0x94, 0xa1, 0xc2, 0xe4, 0xe4, 0x22, 0x87, + 0xf1, 0xa0, 0xd1, 0x7e, 0xe3, 0x44, 0x5b, 0x9a, 0x96, 0x21, 0x11, 0xb2, 0x47, 0xa6, 0xf7, 0x51, + 0x2d, 0x00, 0x74, 0x56, 0xa6, 0xdb, 0x81, 0x13, 0x36, 0x5c, 0x0d, 0xa9, 0xe6, 0xcb, 0x47, 0x22, + 0x58, 0x3f, 0xde, 0x92, 0x89, 0x02, 0x10, 0x71, 0x45, 0xc3, 0x64, 0x82, 0x8d, 0xf7, 0x4c, 0x90, + 0x09, 0xa9, 0x9d, 0x9c, 0xf7, 0x03, 0x66, 0xc5, 0x4f, 0xe8, 0xc4, 0x09, 0x3b, 0x25, 0x0e, 0x14, + 0xfc, 0x08, 0xd9, 0xc5, 0xef, 0xa2, 0xf8, 0xc9, 0x61, 0x76, 0xe8, 0xae, 0xd1, 0x6c, 0xee, 0x17, + 0x7a, 0xe9, 0xe8, 0x87, 0x05, 0x6b, 0x1f, 0xf6, 0xcb, 0xe6, 0x0f, 0xd2, 0xf9, 0xc1, 0xab, 0x57, + 0x46, 0xec, 0xc0, 0x83, 0x12, 0xf8, 0x18, 0xf0, 0xa4, 0x86, 0x95, 0x85, 0x07, 0x20, 0xd4, 0x45, + 0x74, 0x12, 0xb1, 0xc1, 0xce, 0xb6, 0xd8, 0x88, 0x7f, 0xa4, 0xb3, 0x48, 0x7d, 0x6b, 0x1b, 0x9e, + 0x1d, 0x61, 0xd0, 0xf0, 0x8f, 0x15, 0x08, 0xd7, 0x17, 0x63, 0xfe, 0x55, 0xd9, 0x40, 0xb6, 0x0b, + 0x08, 0x53, 0x00, 0xd3, 0xf6, 0x82, 0x90, 0xd6, 0xbe, 0x45, 0x0f, 0xd1, 0xd0, 0x86, 0x58, 0x0c, + 0xb9, 0xd7, 0xb6, 0xc2, 0x3b, 0x17, 0x86, 0xc4, 0xcc, 0x2f, 0x6e, 0x03, 0x4a, 0xae, 0x3b, 0xc4, + 0x02, 0x45, 0x0a, 0x0c, 0xc2, 0x06, 0x31, 0x2e, 0xe6, 0x1a, 0x3a, 0xda, 0x1b, 0x69, 0xc6, 0x80, + 0x43, 0x8c, 0x7f, 0xb2, 0xed, 0x44, 0xf4, 0x20, 0x30, 0x16, 0xd5, 0x35, 0x35, 0xd9, 0xd7, 0x50, + 0x51, 0x7c, 0x8c, 0xf1, 0x24, 0x1a, 0x6a, 0x2f, 0xa2, 0xcc, 0x54, 0x5b, 0x46, 0xab, 0x65, 0xd4, + 0x55, 0x32, 0x0a, 0x1c, 0x88, 0x5b, 0x8e, 0xd4, 0xf1, 0x24, 0xa4, 0xaa, 0xa9, 0xf2, 0x5c, 0x9d, + 0x0a, 0x1e, 0xda, 0x78, 0xc6, 0x3f, 0xc7, 0x53, 0xff, 0xef, 0xff, 0x51, 0x9a, 0xf5, 0x46, 0xbb, + 0xd6, 0xac, 0x37, 0x5b, 0xca, 0x29, 0xf5, 0xdd, 0x48, 0xb9, 0x82, 0xb1, 0x1e, 0x61, 0x9d, 0x4f, + 0x8a, 0xf6, 0xdd, 0x0b, 0xdc, 0x30, 0xe8, 0x3d, 0x1a, 0xe1, 0x44, 0x57, 0x09, 0xfa, 0xcd, 0x7e, + 0x44, 0x4d, 0x15, 0xaf, 0x82, 0x8a, 0xcc, 0xad, 0xad, 0x81, 0x1b, 0x0f, 0x27, 0x5d, 0x50, 0x7a, + 0xa3, 0xad, 0xa4, 0xe5, 0x96, 0x40, 0xd5, 0x56, 0x17, 0xe6, 0xda, 0x7a, 0xe2, 0x80, 0x6c, 0x7d, + 0xba, 0x38, 0x39, 0xfb, 0xf5, 0xe6, 0x4c, 0x25, 0xdc, 0x69, 0x59, 0x6b, 0x04, 0x15, 0x63, 0x6e, + 0x08, 0x07, 0x0a, 0x91, 0xb9, 0xd7, 0xde, 0x5e, 0x8c, 0x2b, 0x90, 0x6e, 0x06, 0x17, 0x02, 0x39, + 0x55, 0xb6, 0x51, 0xe8, 0x37, 0x70, 0x5f, 0x79, 0xd9, 0xc7, 0xe7, 0x3b, 0x1f, 0x89, 0xc7, 0xcd, + 0x03, 0x2e, 0xc5, 0xa1, 0x31, 0x15, 0xa7, 0x74, 0x05, 0x7f, 0x6e, 0xb8, 0x2c, 0x8c, 0xdc, 0x10, + 0x1a, 0x0e, 0x5e, 0x24, 0xdd, 0xc5, 0x7b, 0x63, 0x35, 0x7f, 0x32, 0x80, 0x6b, 0x46, 0x60, 0xf3, + 0xe1, 0xff, 0x0f, 0xda, 0x0d, 0x9e, 0x5d, 0x2b, 0x0e, 0x16, 0xd1, 0x67, 0x2b, 0x63, 0x64, 0x6e, + 0x82, 0x52, 0x3f, 0x4c, 0x89, 0x37, 0xf0, 0xe8, 0x0b, 0xdb, 0x2d, 0x3c, 0xc2, 0xbc, 0x2f, 0x4b, + 0x35, 0x62, 0xd8, 0x56, 0x34, 0x2e, 0x4c, 0x87, 0xe8, 0x62, 0x3e, 0xde, 0xc8, 0xf5, 0x57, 0xcb, + 0x0a, 0x05, 0x0f, 0x2f, 0x60, 0x42, 0x4b, 0xf6, 0xeb, 0x10, 0x8e, 0xed, 0xef, 0x37, 0xb7, 0xdb, + 0xbb, 0xed, 0xfa, 0x3e, 0xf8, 0x6f, 0x66, 0x1d, 0xb3, 0xcb, 0x3b, 0x85, 0x87, 0x1a, 0x50, 0x51, + 0x64, 0x1b, 0xbf, 0xab, 0xe7, 0xe0, 0xe3, 0x73, 0x90, 0x0b, 0x13, 0x19, 0xdb, 0xfb, 0xdb, 0x8c, + 0xc2, 0xd7, 0xb6, 0x3f, 0x58, 0x47, 0xf5, 0x5a, 0xa1, 0x30, 0xce, 0xfe, 0x2f, 0x71, 0x5e, 0xd7, + 0x7c, 0x0d, 0x03, 0x7f, 0xa0, 0x04, 0xfd, 0x3e, 0xb3, 0x37, 0x52, 0x16, 0x85, 0xe0, 0x1c, 0x2b, + 0xb0, 0xf5, 0xc6, 0xd4, 0x59, 0xc0, 0xcd, 0x27, 0x8e, 0x0f, 0xea, 0xf9, 0x89, 0x6f, 0x87, 0x34, + 0xdd, 0x2c, 0x00, 0x5d, 0x87, 0x1a, 0xaf, 0x4b, 0x15, 0x0f, 0xbf, 0xe2, 0x88, 0x87, 0xb6, 0xaf, + 0xd4, 0x33, 0x68, 0x70, 0xd7, 0x7a, 0x6f, 0xb7, 0xbd, 0xd2, 0x2a, 0x25, 0xdb, 0xb8, 0x58, 0xd6, + 0xdc, 0x4b, 0x22, 0xe8, 0xed, 0x5d, 0xee, 0xf7, 0xa0, 0x51, 0xe3, 0x11, 0x34, 0x3f, 0x2a, 0xdc, + 0x93, 0x7c, 0x6a, 0xc7, 0xf2, 0xf0, 0xf4, 0xd0, 0x55, 0xa2, 0xdc, 0xd5, 0xf2, 0xdd, 0x05, 0x4c, + 0x5a, 0x05, 0x8c, 0xb7, 0xdd, 0xdc, 0xf9, 0x40, 0x6e, 0xde, 0xd0, 0xad, 0xa2, 0xc4, 0x61, 0xcb, + 0xf5, 0x78, 0xfe, 0x51, 0xda, 0xb2, 0xc6, 0xd0, 0x11, 0xbc, 0x76, 0x7b, 0xe2, 0xc5, 0x18, 0x6f, + 0x02, 0x62, 0x3c, 0x76, 0x04, 0x8c, 0x6c, 0xa0, 0x85, 0xc6, 0x11, 0xfd, 0x74, 0x44, 0x5f, 0xb2, + 0x47, 0xbd, 0xf7, 0xd8, 0xa3, 0xc5, 0x73, 0x49, 0x62, 0x5e, 0x70, 0x8d, 0xbb, 0x34, 0xc4, 0x63, + 0x51, 0x9a, 0x38, 0x75, 0x86, 0xa1, 0x45, 0x91, 0xd9, 0x42, 0x75, 0x11, 0x24, 0x48, 0x7c, 0x8b, + 0xb0, 0x69, 0x0c, 0x97, 0xcb, 0xa5, 0x80, 0x12, 0x8e, 0xab, 0xaa, 0x8a, 0xcc, 0xdb, 0x28, 0xb0, + 0x8d, 0xe0, 0x01, 0x85, 0x77, 0xc5, 0xa7, 0xb6, 0xee, 0x2d, 0xf5, 0xbb, 0x2a, 0x65, 0xb5, 0xd5, + 0x3b, 0xb1, 0xd6, 0xef, 0xf7, 0xe8, 0x2e, 0x88, 0x2c, 0x01, 0x44, 0x56, 0x04, 0x8f, 0x8d, 0x4b, + 0xe1, 0xdb, 0x92, 0x5e, 0x2b, 0xde, 0x09, 0x56, 0x50, 0x15, 0x2d, 0xee, 0x04, 0x27, 0x67, 0xa9, + 0xd8, 0x0e, 0xd8, 0xaa, 0xac, 0x7e, 0x1d, 0xb8, 0x8b, 0xa9, 0x88, 0xd0, 0xf6, 0x9d, 0x60, 0xa4, + 0xf1, 0xac, 0x7e, 0xc3, 0x90, 0xf2, 0xf9, 0xab, 0x84, 0x3a, 0x4d, 0x54, 0x54, 0x35, 0xf9, 0xd8, + 0x98, 0x6a, 0xe2, 0x01, 0x4f, 0xfd, 0x41, 0xad, 0xda, 0x5a, 0xb5, 0x1a, 0x54, 0x5d, 0x08, 0x1a, + 0x91, 0x40, 0x98, 0xfb, 0x2a, 0xde, 0x9a, 0xce, 0xed, 0x75, 0xe0, 0x56, 0x47, 0x4e, 0x8f, 0x2e, + 0xa5, 0xc1, 0x44, 0xad, 0x1b, 0x43, 0x70, 0x04, 0x7e, 0xf7, 0x9c, 0x60, 0xa4, 0xf9, 0xf6, 0xce, + 0x4a, 0x7e, 0x8e, 0xc2, 0x54, 0x4f, 0xbb, 0x59, 0xba, 0x9d, 0xb2, 0x98, 0xff, 0x91, 0x33, 0x0c, + 0x3c, 0x5d, 0xd1, 0x6e, 0xe6, 0xa3, 0xb2, 0x85, 0x93, 0x61, 0xb8, 0x45, 0xf1, 0xe6, 0x5e, 0x24, + 0x3b, 0xb5, 0x91, 0x6c, 0x28, 0x48, 0xf9, 0x4f, 0x76, 0x78, 0x63, 0xcb, 0x67, 0xf7, 0xa1, 0x81, + 0xd8, 0x38, 0x74, 0xcb, 0x88, 0x69, 0x14, 0x8b, 0xfc, 0x12, 0xd4, 0xc2, 0x04, 0xc8, 0x7f, 0xab, + 0x26, 0x68, 0x8a, 0x63, 0x67, 0x2c, 0xb0, 0xb2, 0x13, 0x8f, 0x2a, 0x4a, 0x48, 0xc0, 0x37, 0x4d, + 0x58, 0x7e, 0xb2, 0x07, 0x40, 0x70, 0x24, 0x83, 0x2a, 0x01, 0xc5, 0x36, 0x7d, 0x04, 0x7f, 0x0b, + 0xe2, 0x6d, 0x0f, 0x82, 0xa6, 0x7e, 0x10, 0xbe, 0xbe, 0xf6, 0x4c, 0x76, 0x98, 0x62, 0x0a, 0xc6, + 0x3c, 0x98, 0xc4, 0x37, 0x2c, 0x95, 0xf4, 0xfa, 0x6a, 0xbf, 0x75, 0x32, 0xd2, 0x21, 0x6c, 0x3b, + 0xc8, 0x41, 0x17, 0x27, 0xc2, 0x04, 0x65, 0x0f, 0x0a, 0x8e, 0x7a, 0xf0, 0x6a, 0x4e, 0x92, 0x2c, + 0xa6, 0x81, 0x5e, 0xa1, 0x4e, 0xb0, 0x0d, 0x3f, 0xea, 0xb2, 0xb3, 0x72, 0x4d, 0xad, 0x9d, 0xbd, + 0xc4, 0x73, 0x6f, 0xb7, 0x44, 0xb6, 0xa1, 0xbd, 0xdf, 0xe2, 0xeb, 0x42, 0x53, 0x23, 0xb2, 0x8c, + 0x2c, 0x72, 0xec, 0xa5, 0xfe, 0x83, 0x03, 0x2b, 0xcc, 0xd4, 0x3d, 0x2c, 0x2d, 0x94, 0x3e, 0xa0, + 0x18, 0x5b, 0x93, 0x4a, 0x65, 0x22, 0x45, 0x31, 0x7d, 0x6b, 0x5c, 0xa9, 0x8c, 0xd9, 0x96, 0xcc, + 0xc8, 0x72, 0x0d, 0xe9, 0x3c, 0x34, 0x99, 0xc1, 0x7b, 0xf1, 0x31, 0x65, 0x32, 0xb0, 0x36, 0x7a, + 0x05, 0xbe, 0x06, 0x6a, 0xc0, 0xa5, 0x2f, 0x16, 0x80, 0x38, 0x99, 0xc2, 0xe9, 0xe3, 0xa1, 0x28, + 0x9e, 0x0b, 0x33, 0x1b, 0xa4, 0x6e, 0xb6, 0x80, 0xb6, 0x3a, 0x69, 0x61, 0x4e, 0x9a, 0x1f, 0x39, + 0x22, 0x4f, 0xd6, 0x00, 0xd0, 0x67, 0x94, 0x1e, 0x0f, 0x07, 0xe2, 0x94, 0xcc, 0x3c, 0x91, 0x66, + 0xa2, 0x6c, 0x87, 0xa8, 0x81, 0xbb, 0x6e, 0xf8, 0xa0, 0x36, 0x55, 0x9c, 0xa7, 0xce, 0xe6, 0xa9, + 0x83, 0x2f, 0xda, 0xcc, 0x66, 0xec, 0xcc, 0x34, 0x16, 0xbe, 0x11, 0x4d, 0x26, 0xec, 0x88, 0x67, + 0xa2, 0xc4, 0x81, 0xdd, 0x48, 0x5b, 0xdc, 0x29, 0x3f, 0x6c, 0x1c, 0xa5, 0x45, 0x30, 0x8e, 0x88, + 0xc8, 0x70, 0x12, 0x1f, 0x2c, 0x14, 0xb7, 0xa2, 0x03, 0x5d, 0x5a, 0x37, 0x0e, 0x47, 0x7c, 0xcc, + 0x99, 0x70, 0x4a, 0xe3, 0xbb, 0x18, 0x0b, 0x88, 0xcc, 0x72, 0x16, 0x3d, 0xab, 0xce, 0x0e, 0x72, + 0x57, 0xe3, 0xc3, 0x50, 0x32, 0xbf, 0x4e, 0x62, 0xf7, 0x45, 0x0e, 0x51, 0x67, 0xdf, 0x31, 0x74, + 0x7a, 0x07, 0x6e, 0x47, 0x67, 0xc7, 0xee, 0xe3, 0x6a, 0xef, 0xde, 0xf2, 0xef, 0x7a, 0xd5, 0x2a, + 0xac, 0x87, 0x6c, 0x0c, 0x5e, 0x5f, 0x9f, 0x50, 0x29, 0xc5, 0xa8, 0xbd, 0xd3, 0x53, 0xa1, 0x3e, + 0xa8, 0x62, 0x86, 0xac, 0xc0, 0x8a, 0xef, 0x42, 0x76, 0x62, 0x3c, 0x75, 0xc5, 0x83, 0x14, 0xd0, + 0x84, 0xc9, 0x3b, 0xfc, 0x6c, 0x39, 0xb6, 0xb4, 0x5e, 0x44, 0x19, 0x6e, 0x50, 0xa5, 0xf8, 0xc5, + 0xaf, 0x0c, 0x30, 0xe6, 0xd1, 0x12, 0x1e, 0x89, 0x88, 0x4b, 0xb2, 0x67, 0x8c, 0x62, 0x93, 0x97, + 0xb9, 0x6f, 0x0c, 0xe4, 0x63, 0x23, 0x45, 0x9f, 0x74, 0x49, 0x3b, 0xef, 0x62, 0x86, 0xac, 0x44, + 0x3e, 0xcb, 0xcd, 0xf7, 0xc5, 0x11, 0x2b, 0xe5, 0x7b, 0xe3, 0xa9, 0xc9, 0x28, 0x9a, 0x48, 0x6c, + 0xdd, 0x8b, 0x3e, 0xfc, 0x0d, 0x43, 0xea, 0x0e, 0xdb, 0x99, 0xde, 0xd1, 0x3b, 0x1e, 0x8d, 0x93, + 0xcd, 0x57, 0x12, 0x11, 0x8f, 0xf4, 0x88, 0x43, 0x26, 0x64, 0x4c, 0xfa, 0x64, 0x44, 0x66, 0x64, + 0x40, 0x9e, 0xc8, 0x90, 0x4c, 0x49, 0x97, 0x9c, 0x91, 0x4f, 0xe4, 0x19, 0xd3, 0x04, 0x17, 0xb8, + 0x47, 0xf8, 0x68, 0xdd, 0xdd, 0x93, 0x1b, 0x7c, 0xfa, 0x80, 0x65, 0xb7, 0xf8, 0xcf, 0xb1, 0xa5, + 0xaa, 0xe4, 0x12, 0x9f, 0x3e, 0xe3, 0xd3, 0x37, 0x4b, 0xdd, 0x52, 0xd9, 0xf0, 0x57, 0xe4, 0x9c, + 0x7c, 0x24, 0x0f, 0xe4, 0x84, 0x5c, 0x93, 0x53, 0xf2, 0x05, 0x6c, 0xd5, 0x57, 0x6c, 0xf0, 0x1b, + 0x34, 0xe0, 0x5f, 0x7e, 0x93, 0xef, 0xac, 0x6d, 0x4a, 0xbb, 0x5f, 0x01, 0x6b, 0xd7, 0x06, 0xfb, + 0x8c, 0x10, 0x3f, 0x7d, 0x36, 0x42, 0x3a, 0x0a, 0x9e, 0xa8, 0xc6, 0xbf, 0xf4, 0xd5, 0xc9, 0x49, + 0x79, 0xd5, 0xd7, 0x84, 0x5d, 0xeb, 0x47, 0xa7, 0xa5, 0xad, 0x4c, 0xb9, 0xca, 0x76, 0x9c, 0xb4, + 0xb7, 0x5d, 0x52, 0xee, 0x96, 0x94, 0x07, 0xc5, 0xe5, 0xf3, 0x74, 0x21, 0x7f, 0xc9, 0x85, 0x85, + 0x59, 0xa4, 0xaf, 0x81, 0x45, 0xb1, 0x9d, 0x9b, 0xd8, 0x0e, 0x63, 0x2d, 0x26, 0x6a, 0x5d, 0xee, + 0xf3, 0x77, 0x58, 0xfc, 0x05, 0x1e, 0x3b, 0x33, 0xf8, 0x35, 0x08, 0xb7, 0xc1, 0xd8, 0x4a, 0x9e, + 0x3f, 0xb2, 0x7b, 0x74, 0xa4, 0xc6, 0xbf, 0x0b, 0xba, 0xc3, 0xbf, 0x8f, 0xd6, 0x23, 0xa6, 0xb0, + 0x80, 0x1b, 0xd0, 0xfb, 0xc7, 0x37, 0xb6, 0x59, 0xa2, 0xd5, 0x5a, 0xa0, 0x61, 0x19, 0x1d, 0xc0, + 0xd7, 0x52, 0x99, 0x2c, 0xe1, 0x0b, 0x05, 0xe1, 0xa3, 0x07, 0x8f, 0x02, 0x5f, 0x1d, 0x5a, 0xad, + 0xea, 0x71, 0xd5, 0x7a, 0x04, 0x5d, 0xdd, 0x49, 0x8f, 0x36, 0x42, 0xdc, 0x25, 0xce, 0x0a, 0x7e, + 0x98, 0x5d, 0xc0, 0xf2, 0x16, 0x2e, 0x5d, 0xd0, 0x0d, 0xd7, 0xf7, 0x69, 0x88, 0x9b, 0x79, 0x56, + 0x4c, 0x00, 0xee, 0x79, 0x06, 0xd8, 0x3f, 0x11, 0x24, 0x36, 0x29, 0x63, 0xe7, 0xd8, 0xfa, 0xeb, + 0xcd, 0xe5, 0xaf, 0xb0, 0xe8, 0x30, 0xa2, 0x08, 0xde, 0xef, 0x1a, 0x7b, 0xe7, 0x1e, 0x9a, 0xdb, + 0x9f, 0xe1, 0xb1, 0x59, 0x3c, 0xa2, 0xad, 0x2a, 0xb8, 0xe7, 0xf1, 0x0f, 0xfc, 0x60, 0x88, 0xb3, + 0x35, 0x60, 0x0f, 0xd6, 0x28, 0x8a, 0xb2, 0xe1, 0xff, 0xba, 0x72, 0xf8, 0xac, 0xaf, 0xc0, 0xfc, + 0x7f, 0x68, 0x2a, 0xb3, 0x0e, 0xa6, 0xf2, 0x2d, 0x82, 0xde, 0x8e, 0x1d, 0xdb, 0x0a, 0x7e, 0xa0, + 0xee, 0x26, 0xdf, 0x2a, 0x6d, 0x1c, 0x74, 0xc3, 0xad, 0x43, 0xb4, 0x57, 0x84, 0x69, 0x09, 0xc4, + 0x2b, 0xe6, 0x4c, 0x37, 0x62, 0x83, 0x5f, 0x20, 0x0c, 0x11, 0x61, 0x8c, 0xf7, 0xd7, 0xb2, 0xbf, + 0xd8, 0x5f, 0xcf, 0x86, 0xe6, 0xda, 0x4a, 0x04, 0xf0, 0x0a, 0x0a, 0x1d, 0xed, 0x7e, 0xb9, 0x50, + 0xa5, 0xa1, 0x58, 0x8c, 0x61, 0xf1, 0x8e, 0x24, 0x36, 0xce, 0xbf, 0xfe, 0xc6, 0x1b, 0xeb, 0x2f, + 0x2f, 0x9c, 0x16, 0xa5, 0x28, 0x4f, 0xee, 0x54, 0x41, 0x97, 0x27, 0xc3, 0xb6, 0xfa, 0xa4, 0x56, + 0xa5, 0x61, 0x40, 0xeb, 0x03, 0xfb, 0x9d, 0xe1, 0x1d, 0x70, 0xc8, 0x8b, 0x14, 0x9a, 0x01, 0xb1, + 0x80, 0xfa, 0x8f, 0xb2, 0x96, 0xd7, 0xc5, 0x5c, 0xcc, 0x6a, 0x5d, 0x7f, 0xd2, 0x58, 0x20, 0x0f, + 0x71, 0xbc, 0x5a, 0xe5, 0x6a, 0xc1, 0xf0, 0xc4, 0xd7, 0x5a, 0xc6, 0x30, 0x88, 0xc0, 0x49, 0xde, + 0xe2, 0x29, 0x6d, 0x98, 0x5a, 0xd4, 0x83, 0xfb, 0x84, 0xa1, 0x86, 0xfa, 0xd0, 0xf5, 0x6c, 0x04, + 0x09, 0x7d, 0x21, 0x3c, 0x1c, 0x50, 0x06, 0x7b, 0x72, 0xfb, 0x8c, 0xfe, 0xf3, 0xa1, 0x5b, 0x80, + 0x09, 0x41, 0xc9, 0x49, 0xe3, 0x82, 0x5a, 0xd0, 0x00, 0x59, 0x50, 0x37, 0xcc, 0xee, 0xee, 0x00, + 0x5f, 0x14, 0x6f, 0xe7, 0xc1, 0x43, 0x90, 0x8b, 0x55, 0xaf, 0xaf, 0xb1, 0x71, 0x73, 0x7a, 0xc2, + 0xbf, 0x75, 0x86, 0x09, 0xe5, 0xa6, 0x72, 0x39, 0xee, 0xa2, 0xb9, 0xe5, 0x73, 0x96, 0x4e, 0x69, + 0x59, 0x05, 0x55, 0x1a, 0x6a, 0xc3, 0xc8, 0xe1, 0xfa, 0x10, 0x16, 0xa3, 0x9e, 0xf9, 0xfc, 0xe2, + 0x1c, 0x6c, 0xfd, 0x15, 0xf8, 0x89, 0xdd, 0x0f, 0x50, 0xa9, 0xd8, 0xe5, 0x13, 0x66, 0x99, 0x26, + 0xe3, 0x23, 0xa0, 0xe8, 0x8a, 0x1d, 0x07, 0xd3, 0xbe, 0x4b, 0xaf, 0xec, 0x93, 0x00, 0x94, 0x60, + 0x40, 0xe6, 0x40, 0x53, 0x93, 0x62, 0x53, 0x51, 0xab, 0xdf, 0x11, 0xe0, 0xaf, 0xee, 0xb9, 0xfb, + 0x19, 0x3c, 0xd2, 0x4a, 0x85, 0xcd, 0x79, 0x13, 0xf4, 0x1e, 0x69, 0x7c, 0x71, 0x55, 0xa9, 0xc8, + 0x9e, 0x02, 0xd7, 0x24, 0x77, 0x48, 0x41, 0x74, 0x06, 0x5a, 0xc6, 0x20, 0x08, 0x06, 0x1e, 0x7e, + 0x6e, 0x31, 0x52, 0xd9, 0x96, 0x1e, 0x43, 0xcf, 0x93, 0x1b, 0xcf, 0xd8, 0x57, 0xf1, 0x06, 0x14, + 0xb2, 0x8b, 0xb9, 0x45, 0x03, 0xc3, 0x7e, 0xb4, 0x47, 0x36, 0x38, 0xfc, 0xbd, 0xa1, 0x1f, 0xe0, + 0x57, 0xe1, 0x34, 0x12, 0x35, 0xd3, 0xe9, 0x94, 0x9d, 0xfd, 0xa3, 0xee, 0x78, 0x08, 0x78, 0xea, + 0x51, 0xcf, 0x93, 0x6a, 0xdc, 0x38, 0x08, 0xbc, 0x08, 0x64, 0xa0, 0x1f, 0x24, 0x25, 0xdd, 0x20, + 0x78, 0x94, 0x0b, 0x6c, 0x37, 0x44, 0x03, 0x6c, 0x4c, 0x22, 0x51, 0x80, 0x87, 0x38, 0x1f, 0x1d, + 0x17, 0x3f, 0x26, 0x46, 0xfe, 0x64, 0xe5, 0x62, 0x7e, 0xbc, 0xe8, 0xdc, 0xf0, 0xd1, 0x0d, 0x52, + 0x8d, 0x51, 0xd4, 0x8f, 0xfd, 0x5e, 0xe4, 0x8a, 0xd9, 0x46, 0x2e, 0xe8, 0xda, 0x28, 0xe8, 0xc7, + 0xec, 0x9d, 0x79, 0x0e, 0xea, 0xf1, 0x15, 0x90, 0x9f, 0x66, 0xdf, 0x35, 0xe5, 0xb5, 0x68, 0x2c, + 0x6b, 0x51, 0x68, 0x5e, 0x6b, 0x6c, 0x64, 0x12, 0x9d, 0xe3, 0x5b, 0x83, 0xdd, 0x28, 0x7d, 0x09, + 0xda, 0x00, 0x14, 0x6d, 0xfa, 0x9d, 0x54, 0x3d, 0x49, 0x4d, 0x35, 0xe6, 0x5a, 0x46, 0x05, 0x3d, + 0x11, 0x89, 0x4c, 0x14, 0x72, 0x64, 0xa9, 0x6a, 0x7b, 0x10, 0xa6, 0x2d, 0x4a, 0x07, 0x62, 0x00, + 0x03, 0x37, 0xf8, 0xaf, 0x5a, 0x54, 0x07, 0x96, 0xdf, 0x52, 0x2f, 0xf0, 0x83, 0x71, 0x3a, 0x8a, + 0x94, 0x59, 0x30, 0x11, 0x8a, 0x50, 0xf1, 0xf8, 0xc5, 0x4b, 0x0a, 0xf5, 0x9f, 0x5c, 0x50, 0x68, + 0xec, 0xac, 0x39, 0xde, 0x2d, 0xa1, 0x00, 0x45, 0xec, 0x88, 0x2a, 0x28, 0x69, 0x8a, 0xad, 0x74, + 0xc1, 0x4d, 0xc3, 0x5b, 0x07, 0x26, 0x11, 0x68, 0xee, 0x83, 0x0f, 0xd7, 0x87, 0xec, 0xac, 0x0b, + 0x36, 0x84, 0x98, 0x1f, 0xf7, 0xa5, 0x31, 0x31, 0xdc, 0xa7, 0xa0, 0x33, 0x43, 0x1a, 0x29, 0xd3, + 0x20, 0x7c, 0xc4, 0x18, 0x9c, 0x9c, 0x49, 0xda, 0xcb, 0x87, 0x37, 0xc6, 0xc5, 0xbf, 0xf2, 0xeb, + 0xe1, 0xd3, 0xeb, 0x0d, 0xd4, 0x39, 0x3f, 0x7e, 0xc3, 0x39, 0x16, 0xf7, 0x9d, 0x81, 0x81, 0x53, + 0x44, 0xf2, 0x3b, 0x63, 0xb2, 0x3a, 0x9d, 0xfc, 0x9b, 0x96, 0x43, 0x08, 0x91, 0xde, 0xae, 0x60, + 0xa9, 0xfc, 0xfd, 0x24, 0x18, 0x8d, 0x26, 0xbe, 0xb8, 0xbe, 0x02, 0xb8, 0x1c, 0x04, 0x06, 0xef, + 0x38, 0x45, 0xb6, 0xf4, 0x3c, 0x50, 0x62, 0x78, 0x18, 0x6a, 0x7d, 0x03, 0x51, 0x62, 0xb6, 0x58, + 0x2d, 0xd8, 0x2e, 0xc9, 0x34, 0xff, 0x5b, 0xb2, 0x5d, 0x77, 0x5b, 0xa9, 0x7c, 0x82, 0xf5, 0x06, + 0x60, 0x9a, 0xd8, 0xd7, 0xdf, 0xa0, 0xe0, 0x52, 0x30, 0x21, 0x20, 0x8b, 0x18, 0x65, 0x01, 0x87, + 0x40, 0xb0, 0xb8, 0x0a, 0xac, 0x16, 0xcd, 0xfc, 0x1e, 0x38, 0xc3, 0x7e, 0x30, 0xc1, 0x6f, 0xc2, + 0xfc, 0x23, 0x75, 0x6b, 0x1a, 0xa9, 0xb8, 0xf9, 0x4c, 0xee, 0x54, 0xb0, 0x2c, 0x13, 0xb7, 0xf6, + 0xd4, 0x52, 0xef, 0x61, 0x28, 0x3c, 0x68, 0x6b, 0x87, 0xb3, 0x5b, 0x76, 0xf9, 0x02, 0xfb, 0xea, + 0xb2, 0xcb, 0x3e, 0x9c, 0x57, 0xa1, 0x0a, 0xba, 0x03, 0xbd, 0x72, 0xb1, 0x1b, 0x38, 0x69, 0xf5, + 0x39, 0xab, 0x62, 0xc0, 0x64, 0x75, 0x21, 0xab, 0x6b, 0x90, 0xcb, 0xd7, 0x57, 0x08, 0x0c, 0x6e, + 0xdd, 0x11, 0x85, 0x48, 0x50, 0xe3, 0xd7, 0x2d, 0x24, 0xab, 0x00, 0x47, 0xbb, 0x45, 0x5b, 0x3a, + 0xef, 0xcf, 0x88, 0x95, 0x1b, 0x3b, 0xc3, 0x1f, 0x40, 0x18, 0xb1, 0xa5, 0x29, 0xac, 0x95, 0xc0, + 0xdb, 0x82, 0xe6, 0x29, 0x69, 0xab, 0x8a, 0xf1, 0x47, 0x34, 0x8a, 0xec, 0x41, 0xfe, 0x70, 0x61, + 0xea, 0xc0, 0xa0, 0xb7, 0xc3, 0x0c, 0xe9, 0xd2, 0x9e, 0x13, 0xbf, 0x36, 0x80, 0x37, 0xf5, 0xb3, + 0xe0, 0x8c, 0x47, 0x65, 0xbc, 0x8f, 0xbe, 0x20, 0xb9, 0xfe, 0x82, 0xff, 0xc3, 0xdd, 0x33, 0xa3, + 0x1f, 0x06, 0xa3, 0x93, 0xa1, 0x1d, 0x9e, 0x80, 0x18, 0x6a, 0x3e, 0x8a, 0x2a, 0x69, 0x80, 0x66, + 0xf5, 0xd9, 0xa1, 0xe0, 0x46, 0x8b, 0x3f, 0x41, 0xf8, 0x7b, 0x5c, 0x05, 0xc7, 0xe7, 0x18, 0x5d, + 0x04, 0xf0, 0xfb, 0xbf, 0x42, 0x08, 0x0d, 0x4b, 0xc3, 0xcb, 0xd5, 0x94, 0xc8, 0x9e, 0x45, 0x26, + 0x44, 0xf7, 0xa3, 0x11, 0xde, 0x16, 0x07, 0x73, 0x4e, 0xed, 0xd0, 0xc1, 0x9d, 0xd4, 0xd7, 0xd7, + 0xdf, 0xb5, 0x63, 0x9d, 0xfb, 0xca, 0xb8, 0x1c, 0xbd, 0x83, 0x63, 0xf0, 0x13, 0x79, 0xb1, 0xc5, + 0x81, 0xec, 0xf0, 0x05, 0xc4, 0xc9, 0x51, 0x13, 0x13, 0x5a, 0x25, 0x80, 0x1e, 0x5a, 0x4d, 0x90, + 0x09, 0xb5, 0x37, 0x09, 0x51, 0xa5, 0x5d, 0x9c, 0x22, 0x87, 0x40, 0x84, 0x07, 0x65, 0x9f, 0xe1, + 0x01, 0xbf, 0x43, 0x50, 0xf9, 0xed, 0x78, 0x52, 0xd5, 0xe7, 0x0d, 0x56, 0xc5, 0x3e, 0xa8, 0x06, + 0x8f, 0x3d, 0x63, 0xc6, 0xff, 0xd4, 0x38, 0xe3, 0xb2, 0x7f, 0x96, 0x74, 0x82, 0x50, 0xe5, 0x0a, + 0x22, 0x43, 0xb1, 0xfd, 0x20, 0x1e, 0x82, 0xd8, 0x27, 0xba, 0x84, 0xa4, 0xcd, 0x7c, 0x08, 0xdb, + 0xb2, 0xdb, 0x42, 0xa8, 0x63, 0x00, 0xb1, 0x17, 0x64, 0x36, 0xff, 0x5a, 0x55, 0x35, 0xb9, 0xbd, + 0xae, 0x96, 0xf9, 0xd1, 0xef, 0xf6, 0xc7, 0xdf, 0xf6, 0xa2, 0x16, 0x3b, 0xa6, 0xf7, 0xd3, 0xe9, + 0xe4, 0xba, 0x64, 0x50, 0x16, 0xab, 0x94, 0x8e, 0x2c, 0x5d, 0x58, 0xa3, 0x1b, 0xc9, 0xbd, 0x43, + 0xe5, 0xcd, 0xf3, 0x97, 0xc7, 0x14, 0xf5, 0xe8, 0x81, 0x51, 0x73, 0xb1, 0x08, 0x7d, 0x80, 0xeb, + 0xeb, 0xcb, 0xeb, 0x8c, 0xc2, 0x57, 0x86, 0xdd, 0x05, 0xb5, 0x06, 0x84, 0xfb, 0x1b, 0x30, 0x65, + 0xf3, 0x9e, 0x30, 0x82, 0x63, 0x26, 0x3e, 0xd3, 0x3a, 0x7f, 0xe3, 0x11, 0x07, 0xe7, 0x20, 0xf5, + 0x8b, 0xb8, 0x5f, 0xcb, 0x76, 0x71, 0x8d, 0x28, 0x3a, 0xc0, 0xc5, 0xb9, 0x2f, 0x94, 0x60, 0x58, + 0xdf, 0x42, 0x92, 0xa0, 0xf2, 0x51, 0x75, 0x44, 0xba, 0x47, 0x61, 0x0e, 0xbf, 0xaa, 0x82, 0x38, + 0x92, 0x86, 0x65, 0x7d, 0x49, 0xcc, 0xd0, 0x24, 0x53, 0xe1, 0x1d, 0x9a, 0xc5, 0x59, 0x13, 0xd9, + 0x2f, 0xbd, 0x61, 0xce, 0x32, 0x3a, 0x14, 0x30, 0x40, 0xc5, 0xef, 0x46, 0x63, 0xf6, 0x0f, 0xe8, + 0x37, 0x23, 0x9a, 0x74, 0xb9, 0xde, 0xd4, 0x68, 0x6a, 0x05, 0xd5, 0x57, 0x50, 0x99, 0xa6, 0x3c, + 0x82, 0xcf, 0xf5, 0x71, 0x13, 0xe6, 0x05, 0xd0, 0x72, 0x57, 0x2a, 0xc9, 0xad, 0x24, 0x3d, 0xfb, + 0x1f, 0xa8, 0x1d, 0xba, 0x52, 0x25, 0x25, 0xdd, 0x32, 0xf3, 0x92, 0x76, 0xfa, 0xcf, 0x75, 0x3a, + 0x89, 0x6b, 0x9d, 0xa5, 0x6e, 0x94, 0xfe, 0x88, 0x17, 0xcd, 0x94, 0x00, 0xf3, 0xe0, 0x23, 0x6a, + 0x87, 0xbd, 0xe1, 0x95, 0x1d, 0xda, 0xa3, 0x08, 0x7d, 0x1d, 0xea, 0x63, 0x54, 0x35, 0x72, 0xc0, + 0x18, 0xdd, 0x81, 0xe2, 0xd8, 0xab, 0xd7, 0xef, 0xd1, 0xfe, 0x58, 0x7f, 0x3f, 0xbb, 0x49, 0xe2, + 0x09, 0xab, 0x65, 0xd4, 0xe1, 0x3f, 0x7b, 0x47, 0x89, 0x5d, 0x84, 0xac, 0x5a, 0xe8, 0x31, 0x9f, + 0x02, 0x8e, 0xb2, 0x5c, 0x10, 0x70, 0xdd, 0x39, 0x98, 0xa5, 0xbf, 0xc3, 0x6c, 0x1a, 0x84, 0x53, + 0x35, 0xb5, 0x0a, 0x81, 0x28, 0x96, 0x7e, 0x86, 0xc8, 0x6d, 0x08, 0x45, 0x0d, 0xd2, 0xcc, 0x95, + 0x63, 0x77, 0x60, 0x2b, 0x2c, 0xbc, 0x4d, 0x0b, 0x3f, 0x06, 0x93, 0x30, 0x12, 0xa5, 0x66, 0x36, + 0x84, 0xeb, 0x4f, 0x62, 0xba, 0x5c, 0x7e, 0x83, 0xd7, 0x90, 0x39, 0xbc, 0x1c, 0xbf, 0x54, 0x26, + 0x2e, 0x44, 0x62, 0xe4, 0xaf, 0x12, 0xa1, 0x62, 0x2a, 0xf3, 0xe6, 0x9a, 0xf8, 0xfb, 0x0d, 0x55, + 0x5f, 0x21, 0xda, 0x6c, 0xbe, 0xad, 0x47, 0x28, 0xff, 0xa6, 0xb4, 0xa0, 0x05, 0x3a, 0xd3, 0xfc, + 0x7c, 0x5b, 0x5c, 0xda, 0x86, 0x5d, 0xba, 0x46, 0xbe, 0x31, 0x70, 0x7d, 0x12, 0x50, 0x09, 0x5e, + 0x1f, 0xe0, 0x05, 0xb3, 0x98, 0xa6, 0xc8, 0x0f, 0xa2, 0xa7, 0x81, 0xf2, 0x3c, 0xf2, 0xfc, 0xc8, + 0xda, 0x14, 0x40, 0xa3, 0x93, 0x39, 0x6d, 0x19, 0x41, 0x38, 0xd8, 0x6a, 0xd6, 0xeb, 0xf5, 0x2d, + 0x68, 0xb1, 0xa9, 0xf0, 0x9f, 0xc7, 0xd9, 0x6c, 0xb6, 0x37, 0x15, 0x7e, 0xef, 0x2d, 0x7f, 0xc6, + 0x1f, 0xd2, 0xf9, 0x10, 0x3c, 0x5b, 0x9b, 0x75, 0xa5, 0xae, 0x34, 0xdb, 0x0a, 0x96, 0x01, 0x84, + 0x9e, 0xb5, 0x89, 0x51, 0xc1, 0x26, 0xde, 0x69, 0x14, 0x3c, 0x52, 0x6b, 0x53, 0xad, 0x6a, 0xf4, + 0x48, 0x65, 0x77, 0xfe, 0x03, 0x7a, 0x85, 0xa2, 0x3f, 0x61, 0xbf, 0x7f, 0x03, 0x08, 0x4f, 0xda, + 0xd5, 0x92, 0x59, 0xd2, 0x02, 0xbc, 0x68, 0xb7, 0x67, 0x8f, 0xad, 0x4d, 0x76, 0x1b, 0x6a, 0xae, + 0x18, 0xcf, 0x45, 0x26, 0xe5, 0x87, 0x07, 0xb8, 0x64, 0xc5, 0xb1, 0x36, 0x3f, 0x37, 0x5a, 0x4a, + 0xf3, 0xe3, 0x8e, 0xdd, 0x54, 0x9a, 0x0a, 0xc2, 0x54, 0xaf, 0xc1, 0xd3, 0x53, 0x43, 0x2a, 0x80, + 0xbf, 0xcd, 0x61, 0xa3, 0x29, 0x17, 0xd4, 0x9a, 0xbf, 0xed, 0x7f, 0xdf, 0xc4, 0x1b, 0xc9, 0x60, + 0x14, 0x18, 0x2b, 0xf0, 0x66, 0x38, 0x83, 0xc2, 0xae, 0x4a, 0x05, 0xc4, 0xe0, 0x98, 0x0a, 0xfc, + 0xb3, 0xaf, 0x34, 0xeb, 0xca, 0x3e, 0x6b, 0x28, 0x9a, 0x1c, 0xf2, 0x85, 0x1d, 0xb0, 0xe6, 0xcf, + 0x0d, 0x68, 0x0a, 0xb0, 0xcf, 0xf0, 0x6f, 0x63, 0x53, 0x79, 0x6e, 0x8a, 0x77, 0xfc, 0xbb, 0xbb, + 0xc9, 0x6e, 0x0b, 0x85, 0x2e, 0x59, 0xe3, 0x7d, 0xd1, 0xb6, 0x2d, 0xda, 0x6e, 0x8b, 0xb6, 0xed, + 0xb4, 0x2d, 0x73, 0x91, 0xc0, 0x13, 0x45, 0x22, 0x1c, 0x4a, 0x32, 0x1b, 0xfe, 0x6f, 0x27, 0x63, + 0x13, 0x10, 0xbe, 0x9f, 0xd2, 0xa8, 0x81, 0x54, 0xfc, 0xd8, 0x96, 0xdf, 0x81, 0x66, 0xdb, 0xd9, + 0x3b, 0xd2, 0x70, 0xb8, 0xed, 0x35, 0x95, 0xd6, 0x70, 0x5f, 0x2e, 0x55, 0x9a, 0x19, 0x5d, 0xff, + 0x87, 0x48, 0x15, 0xd0, 0xd4, 0xd3, 0x23, 0xbe, 0xf5, 0x0d, 0x24, 0x1f, 0x64, 0x54, 0xf8, 0x55, + 0x5b, 0xec, 0x90, 0xa6, 0x5f, 0xc5, 0x4c, 0x21, 0x48, 0x73, 0xd5, 0xfa, 0x4e, 0x4a, 0xab, 0x79, + 0x52, 0xd3, 0xf2, 0x93, 0x03, 0xc2, 0xc7, 0x9e, 0x07, 0x2d, 0xb6, 0x40, 0xcb, 0x62, 0xa5, 0x6f, + 0x85, 0x79, 0x6f, 0x54, 0x10, 0x67, 0x2c, 0x42, 0x61, 0x9f, 0xf7, 0x0f, 0x30, 0xc5, 0xe9, 0xe2, + 0x35, 0x3a, 0x45, 0x09, 0xac, 0x9c, 0xd5, 0x3b, 0xc0, 0x5b, 0xcf, 0x0f, 0x33, 0xdb, 0x97, 0x24, + 0x8d, 0x84, 0x09, 0xec, 0xf0, 0x7f, 0x61, 0xb9, 0xd8, 0x8c, 0x37, 0x7e, 0x95, 0x6b, 0x6e, 0x83, + 0xd8, 0xf6, 0x14, 0xfe, 0x03, 0x1f, 0xac, 0x7b, 0x8c, 0x05, 0xeb, 0xf6, 0xfe, 0x12, 0x41, 0xd4, + 0x26, 0x75, 0x9e, 0xc0, 0xfb, 0xba, 0x7d, 0x2f, 0x7b, 0xbd, 0xc9, 0x98, 0xa9, 0x5b, 0x53, 0x39, + 0x60, 0x3f, 0x2e, 0xa1, 0x8c, 0x90, 0xc9, 0xea, 0x9b, 0xec, 0x26, 0xc2, 0xcd, 0x46, 0x1d, 0x9e, + 0x86, 0xc0, 0xfd, 0x40, 0x56, 0x78, 0xe2, 0xee, 0xca, 0x26, 0xce, 0x12, 0xa4, 0x3d, 0x81, 0x9b, + 0x81, 0xb0, 0xac, 0xf3, 0x21, 0x1f, 0x75, 0xb1, 0xfe, 0x17, 0x01, 0x00, 0x28, 0x62, 0x7e, 0xa3, + 0xba, 0x11, 0xa1, 0x1f, 0xa3, 0x15, 0x1e, 0x9e, 0x29, 0x2c, 0xa4, 0xec, 0x98, 0xd4, 0xa7, 0x60, + 0x4a, 0xc3, 0x13, 0x9b, 0xf9, 0xae, 0x98, 0x4e, 0xcb, 0x97, 0x40, 0x1c, 0x7e, 0x54, 0x6b, 0x98, + 0xf4, 0x30, 0x3e, 0x6a, 0x98, 0xf5, 0xb9, 0xc6, 0x4f, 0x2e, 0xc3, 0x94, 0x2c, 0x58, 0xc4, 0x9d, + 0x0f, 0xce, 0x16, 0x3c, 0x86, 0x58, 0xe1, 0xa2, 0xe1, 0x9e, 0x83, 0x44, 0xde, 0x6f, 0xc8, 0x36, + 0x1b, 0xd6, 0x37, 0x61, 0x6f, 0x61, 0xe6, 0x6f, 0x06, 0x78, 0x0a, 0xf1, 0x45, 0xe2, 0xc4, 0x20, + 0x53, 0x41, 0x38, 0x81, 0xa7, 0x39, 0xe0, 0xd9, 0xfc, 0x26, 0xb9, 0x3a, 0x75, 0x34, 0x3d, 0x39, + 0x66, 0x03, 0xbb, 0xc7, 0x18, 0x8d, 0xe5, 0x1a, 0x43, 0xe0, 0x57, 0xe9, 0xb6, 0xbe, 0xcd, 0xe4, + 0x82, 0xf5, 0xcd, 0xc3, 0xa2, 0x52, 0xbc, 0x74, 0x73, 0xb9, 0x06, 0x13, 0xfd, 0x50, 0xfa, 0xaf, + 0xd1, 0x6a, 0xb2, 0x1e, 0xfb, 0xc3, 0x3a, 0x4c, 0x29, 0xb2, 0x1f, 0x60, 0x35, 0x94, 0xc6, 0xb6, + 0xd2, 0x5e, 0xb6, 0x1f, 0x99, 0xc6, 0xc3, 0xca, 0xe1, 0xae, 0xdd, 0x86, 0x56, 0xdc, 0x2c, 0xb5, + 0x6b, 0xed, 0xdf, 0xda, 0x99, 0x55, 0x62, 0x7a, 0x65, 0xe9, 0x2e, 0xc4, 0xcd, 0xe4, 0x56, 0xf5, + 0x4d, 0xbc, 0x91, 0x70, 0x13, 0x1c, 0x4b, 0x37, 0xdc, 0x3c, 0x54, 0xbe, 0x8c, 0x0d, 0x63, 0xf9, + 0x0a, 0x42, 0x0c, 0x4a, 0xf8, 0xc1, 0x2c, 0xee, 0x67, 0x98, 0x2a, 0x6b, 0xaf, 0x12, 0xd7, 0x49, + 0x1f, 0x63, 0x76, 0xd7, 0x92, 0x89, 0x37, 0x2b, 0x2c, 0xe6, 0x83, 0x38, 0x97, 0x4b, 0xb1, 0xa5, + 0x5a, 0x6b, 0xa8, 0xe9, 0x21, 0x01, 0x51, 0x0f, 0x31, 0xa4, 0x81, 0x3f, 0x2e, 0xc0, 0x3e, 0x32, + 0xff, 0x69, 0x9c, 0xa0, 0x56, 0xc1, 0xe2, 0x31, 0xed, 0xba, 0x7a, 0xfd, 0xa7, 0xb0, 0x04, 0x4c, + 0x3b, 0x60, 0x0f, 0x09, 0x20, 0x14, 0x96, 0xb4, 0x73, 0xf1, 0x10, 0xc0, 0xcf, 0x9b, 0x4a, 0x32, + 0xc6, 0x29, 0xf5, 0xc4, 0x30, 0xff, 0x22, 0x16, 0x0c, 0xa9, 0xf3, 0xc7, 0x39, 0x2f, 0x59, 0x0e, + 0xb5, 0x59, 0x54, 0x2b, 0xfe, 0xd6, 0xe2, 0xd0, 0x8e, 0x86, 0xb5, 0xe6, 0x66, 0x01, 0x63, 0xb6, + 0x94, 0x1d, 0x65, 0x1b, 0xfe, 0xd7, 0x6c, 0x28, 0x3b, 0x25, 0x6c, 0xd9, 0xd8, 0x57, 0x76, 0x9e, + 0x1a, 0xed, 0x05, 0x53, 0xbc, 0xbb, 0x60, 0x8a, 0x77, 0x46, 0x2d, 0xa5, 0xfe, 0x5b, 0x7b, 0xc1, + 0x20, 0xb7, 0xf3, 0xa6, 0xf8, 0xa9, 0x99, 0x71, 0x73, 0x66, 0x85, 0xeb, 0x0b, 0x56, 0xb8, 0xbe, + 0xc2, 0x0a, 0xa3, 0xf9, 0xcd, 0x35, 0x6e, 0x2f, 0x37, 0x96, 0xe5, 0xa4, 0x84, 0xeb, 0x53, 0x9e, + 0xe7, 0xec, 0x92, 0xf0, 0xfc, 0x02, 0xc3, 0xb0, 0x9b, 0x5b, 0x96, 0x3a, 0x3a, 0xc0, 0x1a, 0x49, + 0x5f, 0xce, 0x26, 0xa5, 0xdd, 0xf5, 0xce, 0x5a, 0x12, 0xb4, 0xb1, 0x42, 0x82, 0xb8, 0x92, 0x7e, + 0x7d, 0x55, 0x59, 0x70, 0x69, 0xe0, 0x6f, 0x64, 0x1a, 0x83, 0xef, 0x2c, 0x6b, 0x9f, 0x9b, 0xac, + 0x52, 0x91, 0x5a, 0x2c, 0x57, 0xe3, 0x49, 0x53, 0xbc, 0xa4, 0xa5, 0x5c, 0x37, 0x2b, 0x3f, 0x20, + 0x92, 0xfe, 0x9b, 0x22, 0xc9, 0xe4, 0x09, 0x77, 0x04, 0x7e, 0x4c, 0x28, 0x93, 0x1f, 0x15, 0x59, + 0x06, 0x01, 0xf1, 0xb3, 0x30, 0x1c, 0x16, 0x95, 0x42, 0x93, 0x49, 0x37, 0x42, 0xf3, 0xff, 0xc5, + 0xfb, 0x7f, 0x91, 0x78, 0x97, 0x09, 0x39, 0xbb, 0x35, 0x9b, 0x49, 0xaa, 0x60, 0xc0, 0xf5, 0xc5, + 0x1c, 0xeb, 0x53, 0x39, 0xcf, 0x18, 0x66, 0x85, 0xa0, 0x97, 0x3a, 0x5e, 0xe9, 0x4d, 0xe7, 0xb2, + 0xf3, 0x15, 0x2e, 0x28, 0x86, 0x40, 0x56, 0x09, 0xd1, 0xd4, 0xc5, 0x7d, 0x5e, 0x3c, 0x67, 0x6d, + 0x70, 0x80, 0xf4, 0x97, 0x1e, 0x38, 0x83, 0xc2, 0x40, 0x9b, 0x65, 0x53, 0xb1, 0x0e, 0xae, 0xb3, + 0xe6, 0xbe, 0xe4, 0x37, 0x8b, 0xb5, 0xe7, 0x2b, 0xca, 0x39, 0x73, 0xdf, 0x0a, 0xb6, 0x13, 0x60, + 0x85, 0xdd, 0x90, 0xda, 0x8f, 0x1d, 0x06, 0x08, 0xc3, 0xec, 0x4f, 0x82, 0x83, 0x67, 0xc0, 0xd7, + 0xcc, 0x9b, 0xf8, 0x55, 0x09, 0xe8, 0xfc, 0x6e, 0x69, 0x9c, 0xdb, 0xc1, 0x5d, 0x84, 0x16, 0x89, + 0xf9, 0x93, 0x00, 0x66, 0xfb, 0xc7, 0xe1, 0x48, 0x53, 0x4f, 0xf8, 0x83, 0xc2, 0xee, 0xbd, 0x12, + 0x7b, 0xe4, 0x38, 0x17, 0xc6, 0x2b, 0x32, 0x98, 0x95, 0x0a, 0xa2, 0x93, 0xdf, 0x8e, 0x05, 0x5c, + 0x2a, 0xd5, 0x2c, 0x00, 0xfa, 0x33, 0xa9, 0x5b, 0xb5, 0xd0, 0x74, 0x58, 0xd6, 0x37, 0xb6, 0x6b, + 0x06, 0xbe, 0x7c, 0xf5, 0xc7, 0xc9, 0x2d, 0x8c, 0xde, 0xbf, 0x02, 0x7f, 0xe9, 0x8f, 0x2f, 0xac, + 0x42, 0x22, 0xb3, 0xde, 0x0b, 0x78, 0x9c, 0x2f, 0x9d, 0x8e, 0x60, 0xd9, 0xe0, 0x77, 0x1c, 0x91, + 0x98, 0xf7, 0xf1, 0xd7, 0x51, 0xbc, 0xd9, 0x8b, 0x7b, 0xb4, 0xc6, 0xde, 0x7f, 0xe9, 0x29, 0x9c, + 0x77, 0xf5, 0x95, 0x8f, 0xd7, 0x64, 0x09, 0x03, 0x77, 0x29, 0xa5, 0xf8, 0xfb, 0xe7, 0x4f, 0x1f, + 0x41, 0x30, 0xae, 0xe9, 0x3f, 0x27, 0x34, 0x8a, 0x3b, 0xbe, 0x11, 0xf8, 0xec, 0xe6, 0x07, 0x76, + 0xc9, 0x41, 0x6f, 0x88, 0xe7, 0x04, 0xe5, 0xb3, 0x59, 0x6d, 0x8b, 0x65, 0x09, 0xa0, 0x01, 0x46, + 0xef, 0xb8, 0xdd, 0x08, 0x86, 0x0c, 0xcb, 0x78, 0x00, 0x7f, 0xa4, 0x01, 0x5a, 0x70, 0x2f, 0x5f, + 0xc3, 0x56, 0xd1, 0x18, 0x98, 0x81, 0xde, 0xd2, 0xe7, 0x58, 0xd7, 0xcd, 0x76, 0xbd, 0x21, 0xb5, + 0xfb, 0x55, 0xd3, 0x4d, 0x4d, 0xe6, 0x95, 0xa4, 0x46, 0x27, 0x19, 0x62, 0xbb, 0x81, 0x1d, 0x3a, + 0x8a, 0x13, 0xd0, 0xe4, 0x7e, 0xec, 0x08, 0x82, 0x57, 0x88, 0xdd, 0xc7, 0xec, 0x60, 0xaa, 0x37, + 0xc3, 0xdc, 0x43, 0xd2, 0x0d, 0x4f, 0x81, 0xfa, 0x5c, 0x5e, 0xd5, 0xbf, 0x9c, 0xdd, 0xaa, 0x84, + 0x12, 0x74, 0x4a, 0x30, 0x8b, 0x89, 0x97, 0x39, 0xcd, 0x13, 0x81, 0xf6, 0x31, 0xc1, 0x2f, 0xaf, + 0x28, 0xb0, 0xde, 0x3a, 0xbe, 0xc3, 0x7f, 0x25, 0x07, 0x8f, 0x5a, 0xae, 0x54, 0xc5, 0xe2, 0x27, + 0x53, 0xf0, 0x20, 0xe6, 0x8a, 0x76, 0xe2, 0x47, 0x23, 0xf0, 0x90, 0xe6, 0x5b, 0xf3, 0x8a, 0xdf, + 0x8c, 0xc0, 0x53, 0x9c, 0x6f, 0x35, 0x65, 0xbf, 0x0d, 0x81, 0x07, 0x04, 0xd7, 0x80, 0x30, 0x1d, + 0xd6, 0x59, 0xa7, 0xb5, 0x18, 0x79, 0xb2, 0xba, 0x6d, 0xfe, 0x17, 0x35, 0xf0, 0x72, 0x91, 0x37, + 0x51, 0x90, 0x82, 0xd1, 0x7f, 0xbb, 0xad, 0x00, 0x22, 0xb4, 0xd6, 0x3e, 0x69, 0x45, 0x66, 0xab, + 0x01, 0xee, 0x4f, 0x55, 0xbc, 0xee, 0x64, 0x65, 0x9b, 0x88, 0x7d, 0xac, 0x5e, 0xda, 0x04, 0x7f, + 0x60, 0x09, 0xaf, 0x29, 0x5f, 0xd5, 0x20, 0xf9, 0x71, 0x26, 0xbc, 0x19, 0xbc, 0x3c, 0x81, 0x22, + 0xfd, 0x40, 0x0b, 0xde, 0x15, 0xfe, 0x56, 0xc3, 0x55, 0x1b, 0x77, 0xe2, 0xa7, 0x8a, 0xde, 0x75, + 0x82, 0xa8, 0x7c, 0x30, 0xf9, 0xe7, 0x91, 0xd8, 0x99, 0xac, 0xba, 0x95, 0x7c, 0xb5, 0x67, 0x40, + 0x5c, 0x31, 0xd2, 0x92, 0x0f, 0xff, 0x93, 0x5b, 0x75, 0xdf, 0x65, 0x72, 0xe5, 0xad, 0x9e, 0x78, + 0xc5, 0x56, 0x4f, 0x7e, 0x46, 0xb6, 0xf3, 0x10, 0x93, 0x7f, 0xe2, 0x99, 0x38, 0x9e, 0x48, 0x4c, + 0xbc, 0x57, 0x68, 0x8c, 0x7e, 0x7b, 0xbe, 0x39, 0xcb, 0x9a, 0x62, 0x2e, 0x0d, 0x0f, 0xc4, 0x25, + 0x43, 0x59, 0xaa, 0x8a, 0x07, 0xa0, 0xd6, 0xdb, 0xa4, 0x5c, 0xc6, 0xe4, 0x23, 0x9d, 0xc1, 0x6a, + 0xfc, 0x85, 0x13, 0xc1, 0x8d, 0x16, 0x7e, 0x03, 0x60, 0x40, 0xe5, 0x09, 0x3b, 0x12, 0xb4, 0xf6, + 0x9e, 0x66, 0x1f, 0x1a, 0x46, 0x9a, 0xbe, 0x12, 0xa2, 0xc5, 0x3e, 0x3f, 0x1d, 0x28, 0xf9, 0xf7, + 0x26, 0xd0, 0x8e, 0x00, 0xaf, 0xbc, 0x01, 0x52, 0x9e, 0x3b, 0x8a, 0x21, 0x9a, 0x8c, 0x7f, 0x14, + 0x9e, 0x94, 0x91, 0x25, 0x50, 0xa2, 0xf5, 0xb8, 0xfa, 0xd9, 0xda, 0x78, 0x26, 0x9e, 0xc1, 0x7e, + 0x44, 0xce, 0x10, 0x3f, 0x2d, 0x67, 0x3d, 0x1f, 0xa9, 0xec, 0xc7, 0x87, 0xc1, 0x65, 0x61, 0x87, + 0xca, 0x70, 0xbc, 0x53, 0x6b, 0x35, 0x3a, 0xf0, 0x87, 0x45, 0xf0, 0x0e, 0xfe, 0xd5, 0xad, 0xb8, + 0xe9, 0x25, 0xd7, 0x6f, 0x34, 0x63, 0x3f, 0x32, 0x83, 0x67, 0x71, 0xd7, 0x5a, 0x43, 0xf9, 0x69, + 0xde, 0x95, 0x34, 0x59, 0xfa, 0x15, 0x92, 0x35, 0x15, 0xc1, 0xcf, 0xda, 0xae, 0x7f, 0x3f, 0x17, + 0xe5, 0x7b, 0xbc, 0x1b, 0x37, 0x92, 0x9b, 0xd3, 0x79, 0x43, 0x9b, 0x2d, 0x2f, 0x45, 0xa8, 0x88, + 0xce, 0x57, 0x8b, 0x0a, 0xcd, 0xf5, 0xbe, 0x73, 0x08, 0xa2, 0x3f, 0xf1, 0xd7, 0xd7, 0x78, 0xfc, + 0xf7, 0x68, 0x4a, 0xf7, 0x68, 0xbf, 0xdc, 0x9c, 0x5d, 0xaf, 0xda, 0xa1, 0xbd, 0x3a, 0xbe, 0xb9, + 0xf9, 0x7a, 0x79, 0x7d, 0xba, 0x6a, 0x87, 0xf6, 0xe6, 0xcb, 0x87, 0xcf, 0x17, 0xe0, 0x00, 0xa9, + 0x33, 0xb4, 0x60, 0xc9, 0xd6, 0xce, 0xb2, 0xab, 0x17, 0xbe, 0xed, 0xea, 0x85, 0x4b, 0xae, 0xde, + 0x06, 0x1e, 0xad, 0xe6, 0x2e, 0x1c, 0x73, 0xe8, 0xc2, 0x52, 0x87, 0x2e, 0xfc, 0x31, 0x87, 0x2e, + 0xed, 0xa6, 0x9b, 0x78, 0x78, 0x00, 0xbc, 0xba, 0x50, 0xf6, 0xea, 0x7c, 0xe6, 0xd5, 0x85, 0xc2, + 0xab, 0x7b, 0xff, 0xb9, 0x11, 0xe4, 0xc5, 0x61, 0x39, 0x99, 0x93, 0x1f, 0x7b, 0x83, 0x46, 0xeb, + 0xf1, 0x62, 0x41, 0x7c, 0x43, 0x9e, 0xca, 0xc7, 0x4f, 0x7f, 0x2c, 0x0b, 0x5a, 0xad, 0x37, 0x41, + 0xd9, 0x89, 0x0e, 0x90, 0xc2, 0x99, 0x2c, 0x60, 0x83, 0x37, 0x26, 0x15, 0x3f, 0x24, 0x07, 0x0d, + 0xe5, 0x63, 0x21, 0x54, 0x43, 0x74, 0x0e, 0xd6, 0x03, 0x65, 0x24, 0xcf, 0x37, 0x2b, 0xea, 0xc3, + 0x78, 0x28, 0xdf, 0x09, 0x9c, 0x86, 0x99, 0xb8, 0xf2, 0x82, 0x7d, 0x70, 0xb9, 0x14, 0xa3, 0xa5, + 0x3f, 0x7e, 0xc6, 0x4f, 0xec, 0x2a, 0x47, 0x6a, 0xfa, 0xe1, 0x64, 0x6e, 0x1f, 0x88, 0x1d, 0xe5, + 0x11, 0xa7, 0x76, 0x93, 0x21, 0xd9, 0x79, 0xb0, 0x8d, 0x25, 0x87, 0x66, 0xc6, 0x93, 0x28, 0xa9, + 0xc3, 0x52, 0xe6, 0xa3, 0x9c, 0x07, 0xe1, 0x08, 0xaf, 0xd7, 0xef, 0x7c, 0xb1, 0x9a, 0x40, 0x8f, + 0xe2, 0xe3, 0x4c, 0x79, 0x02, 0x94, 0x1e, 0x26, 0x4e, 0x9b, 0xad, 0xd3, 0x84, 0x03, 0x5f, 0x27, + 0xa5, 0xc4, 0xe5, 0xe7, 0x90, 0x5c, 0x7f, 0xa0, 0x18, 0x86, 0x51, 0xff, 0x05, 0xf7, 0x01, 0x17, + 0x0f, 0x60, 0x88, 0x43, 0x6f, 0x2b, 0x36, 0x7d, 0xd3, 0x4c, 0x50, 0x68, 0xd5, 0x3b, 0xe1, 0x41, + 0x82, 0x87, 0x4e, 0x58, 0xad, 0x72, 0x4c, 0x05, 0x16, 0x7e, 0xa6, 0x83, 0x9f, 0x90, 0x55, 0x03, + 0x91, 0x32, 0xbd, 0xc1, 0xeb, 0x62, 0xc4, 0x54, 0x2e, 0x09, 0x78, 0xb2, 0x58, 0x9a, 0x7d, 0x34, + 0x13, 0x5f, 0xa0, 0x04, 0x24, 0xe9, 0x24, 0x9d, 0x00, 0x09, 0x93, 0xaf, 0x2b, 0xc4, 0x54, 0x27, + 0xc1, 0x08, 0xc4, 0x8f, 0x5d, 0xef, 0x2a, 0xb2, 0x31, 0x48, 0x4c, 0xf0, 0xfb, 0x9d, 0x2d, 0xca, + 0xf7, 0x6c, 0xff, 0xdc, 0xa8, 0xd7, 0x3b, 0x8b, 0x88, 0x89, 0xd7, 0x44, 0x0c, 0xdf, 0xf9, 0x3d, + 0x77, 0x9f, 0xa9, 0xa3, 0xd5, 0xc1, 0xd3, 0xfb, 0x45, 0xe5, 0x87, 0xa1, 0x72, 0x7c, 0x13, 0x04, + 0x63, 0x60, 0xfb, 0xf9, 0x55, 0x81, 0x0a, 0x24, 0x57, 0x42, 0xb5, 0x5c, 0x5d, 0xde, 0xa0, 0xc2, + 0xdc, 0xe2, 0x73, 0x42, 0x6c, 0xc0, 0xb4, 0xcc, 0x95, 0xc1, 0x25, 0xa7, 0x80, 0xd3, 0x93, 0x9f, + 0x97, 0x53, 0x49, 0x48, 0x36, 0x1a, 0xd8, 0x94, 0x07, 0x96, 0x80, 0x23, 0x59, 0x85, 0x3e, 0xbd, + 0x8f, 0x5f, 0x64, 0xb6, 0xcb, 0x38, 0x9c, 0xb0, 0x08, 0xdb, 0xba, 0x4a, 0x43, 0xec, 0x32, 0x8e, + 0x5c, 0xe7, 0x24, 0x60, 0xf0, 0xdf, 0x7e, 0x42, 0xf0, 0xad, 0x8e, 0x6f, 0x24, 0x2b, 0xc8, 0x83, + 0xd5, 0xae, 0xa7, 0x07, 0x2d, 0xaf, 0x29, 0x3b, 0x2a, 0x8a, 0x47, 0x4c, 0x0d, 0x23, 0x39, 0x58, + 0x3d, 0xb5, 0xdd, 0x58, 0x69, 0xd7, 0x51, 0x99, 0x45, 0x34, 0x66, 0x3f, 0xf1, 0x0b, 0xb8, 0xca, + 0x7d, 0xf4, 0xf7, 0x50, 0xab, 0xad, 0x31, 0x86, 0x5a, 0x7d, 0xa8, 0xaa, 0x38, 0x0c, 0xe0, 0xf7, + 0xa1, 0x52, 0x49, 0x6d, 0x75, 0x48, 0x91, 0x96, 0xa8, 0xe7, 0x48, 0x83, 0xb6, 0x92, 0xdc, 0xc5, + 0xf3, 0xc8, 0x43, 0xeb, 0x2e, 0x1b, 0xbc, 0xbf, 0x09, 0xcb, 0xa6, 0x92, 0x84, 0x3a, 0x60, 0xaf, + 0xae, 0xb8, 0x71, 0x8a, 0xf1, 0x54, 0xd7, 0x1c, 0x55, 0xe5, 0x68, 0x4d, 0x55, 0x99, 0x63, 0x5b, + 0xce, 0x7a, 0x18, 0xa4, 0x72, 0x46, 0x90, 0xbe, 0x29, 0x48, 0xd4, 0xdc, 0xe8, 0xfd, 0x6a, 0xae, + 0x01, 0xba, 0xbe, 0x18, 0xed, 0xd3, 0x92, 0xf2, 0x61, 0x49, 0xf9, 0x79, 0x39, 0x6b, 0x7f, 0x5c, + 0x55, 0x95, 0xa8, 0xbe, 0xf3, 0x9f, 0xaf, 0xee, 0x7e, 0xe6, 0x19, 0x17, 0xff, 0x7f, 0x40, 0x7b, + 0x06, 0x3f, 0xa6, 0x3d, 0x3f, 0xa6, 0x5a, 0xf3, 0xfc, 0x5f, 0xa5, 0x29, 0x7f, 0x5b, 0x5f, 0x3f, + 0x06, 0xab, 0xf4, 0xe3, 0xa0, 0x9c, 0x53, 0xa6, 0xe5, 0x55, 0xc3, 0xf5, 0x58, 0xaf, 0x8c, 0x5b, + 0xe5, 0xf2, 0x51, 0xa9, 0x96, 0x0d, 0xa8, 0x76, 0x95, 0x4f, 0x61, 0xfe, 0x01, 0x2d, 0xb0, 0x2a, + 0x00, 0x2a, 0xff, 0x69, 0xe7, 0x3f, 0x1a, 0xbb, 0xad, 0x1a, 0x59, 0xfc, 0xcc, 0xf4, 0x91, 0xc6, + 0xbe, 0x4e, 0xfd, 0x3b, 0x38, 0xda, 0xe6, 0x05, 0x5e, 0xed, 0x09, 0x90, 0x2e, 0x46, 0xce, 0x3c, + 0x5e, 0x26, 0xbd, 0xf5, 0xa0, 0xb9, 0xb1, 0x36, 0x6e, 0xc8, 0xcd, 0x91, 0xe6, 0x2c, 0x8e, 0xc2, + 0xa3, 0x6f, 0xe2, 0x88, 0x2f, 0x33, 0x41, 0x6d, 0x07, 0xf8, 0xb3, 0x46, 0x38, 0xb3, 0x53, 0x38, + 0x23, 0xc2, 0x32, 0x5e, 0x6f, 0xd2, 0x0f, 0xd6, 0xc6, 0x07, 0xf2, 0xe1, 0x48, 0xeb, 0x97, 0x4c, + 0xda, 0x2f, 0x98, 0xb4, 0x5f, 0x3a, 0x69, 0x71, 0x0d, 0x99, 0xae, 0x48, 0x94, 0xa5, 0xbf, 0xf8, + 0x8c, 0x8c, 0x2b, 0x6d, 0xc6, 0x71, 0xff, 0x7a, 0xfa, 0x9e, 0x6c, 0x1c, 0x88, 0xce, 0x68, 0x1c, + 0x6b, 0x78, 0x06, 0x80, 0xef, 0x57, 0x28, 0xfc, 0x48, 0x2e, 0xba, 0xba, 0xfc, 0x7a, 0x56, 0x76, + 0x87, 0x79, 0x2e, 0xfd, 0x86, 0xbf, 0xde, 0x80, 0x91, 0x48, 0x06, 0x07, 0x49, 0xd3, 0x65, 0xb8, + 0x22, 0x8c, 0xa4, 0xca, 0x39, 0xf0, 0xfc, 0xeb, 0x7b, 0xbe, 0x3a, 0x94, 0x77, 0xc6, 0x8a, 0xae, + 0x36, 0xfa, 0x6c, 0x87, 0x9e, 0xeb, 0x27, 0x5e, 0xbd, 0x78, 0x55, 0x73, 0x5b, 0x68, 0xe5, 0xa0, + 0x7c, 0x71, 0x7f, 0x26, 0x28, 0xde, 0xa4, 0x57, 0xe3, 0xaf, 0x5b, 0xec, 0x2b, 0x93, 0xda, 0xd7, + 0xb3, 0x0f, 0x5f, 0x2e, 0xb6, 0xe2, 0x90, 0xd2, 0x2d, 0x76, 0x65, 0xd4, 0x7a, 0x40, 0x0d, 0xbd, + 0xf1, 0x1f, 0x86, 0x0a, 0x14, 0x49, 0xcb, 0x31, 0xdc, 0x80, 0x03, 0xf2, 0xc9, 0xed, 0x6e, 0x89, + 0x4f, 0x51, 0x1f, 0x5a, 0xc6, 0xef, 0x5b, 0xc9, 0xd4, 0xcc, 0xfd, 0xd8, 0xca, 0xc3, 0x05, 0x2e, + 0x84, 0xa6, 0x1f, 0x6c, 0xf1, 0xab, 0x1f, 0x0f, 0x0f, 0xb6, 0xf0, 0x87, 0x83, 0xe1, 0x0f, 0x1e, + 0xc6, 0x38, 0xfc, 0x7f, 0x8d, 0xf0, 0x02, 0xe9, 0xe8, 0x94, 0x00, 0x00 +}; +#endif //__embedded_h \ No newline at end of file diff --git a/src/modules/http/favicon.h b/src/modules/http/favicon.h index e93ef2f..7176533 100644 --- a/src/modules/http/favicon.h +++ b/src/modules/http/favicon.h @@ -20,35 +20,29 @@ #ifndef __favicon_h #define __favicon_h -#define favicon_size 344 +#define favicon_size 344 const unsigned char favicon[344] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xb5, 0x94, - 0x31, 0x4b, 0xc3, 0x50, 0x14, 0x85, 0x4f, 0x63, 0xc1, 0x5a, 0x0b, 0x06, - 0x91, 0x4e, 0x52, 0x3a, 0x44, 0x10, 0x27, 0x31, 0x45, 0xdc, 0xec, 0xd4, - 0xdf, 0x21, 0x99, 0x44, 0x1c, 0x44, 0x74, 0x17, 0x9c, 0x8a, 0x73, 0x7f, - 0x80, 0xbf, 0xa0, 0x63, 0x56, 0x1d, 0x1d, 0x9c, 0xa4, 0x74, 0x15, 0x1c, - 0xc4, 0x4d, 0x90, 0x0e, 0x52, 0xa5, 0x9e, 0x4b, 0x4f, 0xf0, 0x52, 0x13, - 0xa8, 0x82, 0x2f, 0x7c, 0xcd, 0xcb, 0xb9, 0xe7, 0xde, 0x77, 0xf3, 0x5e, - 0x5b, 0xa0, 0xc4, 0x2b, 0x0c, 0xc1, 0xcf, 0x26, 0x0e, 0xcb, 0x40, 0x1d, - 0xc0, 0x26, 0xa1, 0x44, 0x65, 0xaa, 0xff, 0xd7, 0x78, 0x3b, 0x5f, 0x9e, - 0x18, 0x79, 0xf3, 0x79, 0x7d, 0x36, 0xbc, 0x2f, 0xbb, 0xc7, 0x71, 0xdc, - 0x36, 0xf2, 0x62, 0xbe, 0x4e, 0x51, 0x5d, 0xd5, 0x18, 0x93, 0xd5, 0xbc, - 0xde, 0xbc, 0x36, 0xdb, 0xb3, 0x72, 0xaf, 0xa5, 0x05, 0xbf, 0x59, 0x9f, - 0x79, 0x4f, 0x4e, 0x0f, 0xf8, 0x9c, 0x14, 0xf5, 0x39, 0x3b, 0xe8, 0xdd, - 0x25, 0xef, 0xc4, 0xea, 0xbc, 0x88, 0x89, 0xb4, 0xbd, 0xa2, 0x73, 0x60, - 0x2c, 0x22, 0x3d, 0xd2, 0x20, 0x2d, 0x92, 0x92, 0x91, 0x48, 0xa5, 0x35, - 0xe4, 0x89, 0x72, 0xf2, 0x13, 0xb7, 0xe6, 0x01, 0xa5, 0x8a, 0x0b, 0x57, - 0x4c, 0x73, 0xbd, 0x24, 0x2e, 0xaf, 0x4a, 0x3a, 0x9c, 0x96, 0x79, 0xef, - 0x92, 0x4f, 0x79, 0x6c, 0xdd, 0x7b, 0x31, 0x92, 0x66, 0xb1, 0xae, 0xbc, - 0x1d, 0xe5, 0x9e, 0x29, 0xd6, 0x27, 0x21, 0xd9, 0xb1, 0x7d, 0x77, 0x6b, - 0x65, 0x3d, 0x99, 0xb6, 0x2d, 0x4f, 0x5f, 0xba, 0xe5, 0xae, 0x93, 0x81, - 0x9e, 0x9f, 0xc9, 0x09, 0x59, 0x53, 0x6f, 0x35, 0x43, 0xf3, 0x3a, 0x39, - 0x75, 0x75, 0x1f, 0x2c, 0xd7, 0xf9, 0x7a, 0xfa, 0xae, 0x64, 0x7d, 0x0e, - 0xb4, 0x6f, 0xa9, 0xe6, 0xd9, 0x7b, 0x8d, 0xe5, 0xad, 0x15, 0x9c, 0xc1, - 0x15, 0x19, 0x3a, 0x7f, 0x56, 0x6f, 0xa8, 0xd8, 0x8f, 0xbd, 0x2f, 0x38, - 0x4f, 0xdb, 0x9b, 0xa6, 0xa8, 0xce, 0x93, 0xf3, 0x97, 0x61, 0xbf, 0xbc, - 0x8d, 0x3b, 0xa0, 0x75, 0x04, 0x44, 0x5c, 0xe5, 0x78, 0x8b, 0xff, 0x19, - 0x4b, 0xc0, 0xeb, 0x0a, 0x70, 0xb3, 0x00, 0xdc, 0x5e, 0x7e, 0x7b, 0x83, - 0x36, 0x70, 0x51, 0x02, 0x1e, 0x17, 0x81, 0x8f, 0xfd, 0x69, 0xee, 0x17, - 0xbf, 0xe1, 0x18, 0x97, 0x7e, 0x04, 0x00, 0x00}; -#endif //__favicon_h \ No newline at end of file + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xb5, 0x94, 0x31, 0x4b, 0xc3, 0x50, + 0x14, 0x85, 0x4f, 0x63, 0xc1, 0x5a, 0x0b, 0x06, 0x91, 0x4e, 0x52, 0x3a, 0x44, 0x10, 0x27, 0x31, + 0x45, 0xdc, 0xec, 0xd4, 0xdf, 0x21, 0x99, 0x44, 0x1c, 0x44, 0x74, 0x17, 0x9c, 0x8a, 0x73, 0x7f, + 0x80, 0xbf, 0xa0, 0x63, 0x56, 0x1d, 0x1d, 0x9c, 0xa4, 0x74, 0x15, 0x1c, 0xc4, 0x4d, 0x90, 0x0e, + 0x52, 0xa5, 0x9e, 0x4b, 0x4f, 0xf0, 0x52, 0x13, 0xa8, 0x82, 0x2f, 0x7c, 0xcd, 0xcb, 0xb9, 0xe7, + 0xde, 0x77, 0xf3, 0x5e, 0x5b, 0xa0, 0xc4, 0x2b, 0x0c, 0xc1, 0xcf, 0x26, 0x0e, 0xcb, 0x40, 0x1d, + 0xc0, 0x26, 0xa1, 0x44, 0x65, 0xaa, 0xff, 0xd7, 0x78, 0x3b, 0x5f, 0x9e, 0x18, 0x79, 0xf3, 0x79, + 0x7d, 0x36, 0xbc, 0x2f, 0xbb, 0xc7, 0x71, 0xdc, 0x36, 0xf2, 0x62, 0xbe, 0x4e, 0x51, 0x5d, 0xd5, + 0x18, 0x93, 0xd5, 0xbc, 0xde, 0xbc, 0x36, 0xdb, 0xb3, 0x72, 0xaf, 0xa5, 0x05, 0xbf, 0x59, 0x9f, + 0x79, 0x4f, 0x4e, 0x0f, 0xf8, 0x9c, 0x14, 0xf5, 0x39, 0x3b, 0xe8, 0xdd, 0x25, 0xef, 0xc4, 0xea, + 0xbc, 0x88, 0x89, 0xb4, 0xbd, 0xa2, 0x73, 0x60, 0x2c, 0x22, 0x3d, 0xd2, 0x20, 0x2d, 0x92, 0x92, + 0x91, 0x48, 0xa5, 0x35, 0xe4, 0x89, 0x72, 0xf2, 0x13, 0xb7, 0xe6, 0x01, 0xa5, 0x8a, 0x0b, 0x57, + 0x4c, 0x73, 0xbd, 0x24, 0x2e, 0xaf, 0x4a, 0x3a, 0x9c, 0x96, 0x79, 0xef, 0x92, 0x4f, 0x79, 0x6c, + 0xdd, 0x7b, 0x31, 0x92, 0x66, 0xb1, 0xae, 0xbc, 0x1d, 0xe5, 0x9e, 0x29, 0xd6, 0x27, 0x21, 0xd9, + 0xb1, 0x7d, 0x77, 0x6b, 0x65, 0x3d, 0x99, 0xb6, 0x2d, 0x4f, 0x5f, 0xba, 0xe5, 0xae, 0x93, 0x81, + 0x9e, 0x9f, 0xc9, 0x09, 0x59, 0x53, 0x6f, 0x35, 0x43, 0xf3, 0x3a, 0x39, 0x75, 0x75, 0x1f, 0x2c, + 0xd7, 0xf9, 0x7a, 0xfa, 0xae, 0x64, 0x7d, 0x0e, 0xb4, 0x6f, 0xa9, 0xe6, 0xd9, 0x7b, 0x8d, 0xe5, + 0xad, 0x15, 0x9c, 0xc1, 0x15, 0x19, 0x3a, 0x7f, 0x56, 0x6f, 0xa8, 0xd8, 0x8f, 0xbd, 0x2f, 0x38, + 0x4f, 0xdb, 0x9b, 0xa6, 0xa8, 0xce, 0x93, 0xf3, 0x97, 0x61, 0xbf, 0xbc, 0x8d, 0x3b, 0xa0, 0x75, + 0x04, 0x44, 0x5c, 0xe5, 0x78, 0x8b, 0xff, 0x19, 0x4b, 0xc0, 0xeb, 0x0a, 0x70, 0xb3, 0x00, 0xdc, + 0x5e, 0x7e, 0x7b, 0x83, 0x36, 0x70, 0x51, 0x02, 0x1e, 0x17, 0x81, 0x8f, 0xfd, 0x69, 0xee, 0x17, + 0xbf, 0xe1, 0x18, 0x97, 0x7e, 0x04, 0x00, 0x00 +}; +#endif //__favicon_h \ No newline at end of file diff --git a/src/modules/http/http_server.cpp b/src/modules/http/http_server.cpp index af12856..e8ab376 100644 --- a/src/modules/http/http_server.cpp +++ b/src/modules/http/http_server.cpp @@ -257,7 +257,8 @@ bool HTTP_Server::dispatch(ESP3DMessage* msg) { } if ((msg->size > 0 && msg->data) || (msg->type == ESP3DMessageType::tail)) { if (msg->type == ESP3DMessageType::head || - msg->type == ESP3DMessageType::unique) { + msg->type == ESP3DMessageType::unique || + msg->type == ESP3DMessageType::realtimecmd) { set_http_headers(); int code = 200; if (msg->request_id.code != 0) { @@ -289,7 +290,7 @@ bool HTTP_Server::dispatch(ESP3DMessage* msg) { _webserver->sendContent(""); } } - ESP3DMessageManager::deleteMsg(msg); + esp3d_message_manager.deleteMsg(msg); return true; } return false; @@ -346,13 +347,7 @@ void HTTP_Server::end() { void HTTP_Server::handle() { if (_started) { if (_webserver) { -#ifdef DISABLE_WDT_CORE_0 - disableCore0WDT(); -#endif // DISABLE_WDT_CORE_0 _webserver->handleClient(); -#ifdef DISABLE_WDT_CORE_0 - enableCore0WDT(); -#endif // DISABLE_WDT_CORE_0 } } } diff --git a/src/modules/lua_interpreter/lua_interpreter_service.cpp b/src/modules/lua_interpreter/lua_interpreter_service.cpp index f24c236..8c7b0f0 100644 --- a/src/modules/lua_interpreter/lua_interpreter_service.cpp +++ b/src/modules/lua_interpreter/lua_interpreter_service.cpp @@ -20,36 +20,519 @@ #include "../../include/esp3d_config.h" -#ifdef ESP_LUA_INTERPRETER_FEATURE -#include +#if defined(ESP_LUA_INTERPRETER_FEATURE) && defined(ARDUINO_ARCH_ESP32) +#include "../../core/esp3d_commands.h" #include "../../core/esp3d_hal.h" #include "../../core/esp3d_settings.h" #include "lua_interpreter_service.h" +#if defined(NOTIFICATION_FEATURE) +#include "../notifications/notifications_service.h" +#endif // NOTIFICATION_FEATURE +#if defined(FILESYSTEM_FEATURE) +#include "../filesystem/esp_filesystem.h" +#endif // FILESYSTEM_FEATURE +#if defined(SD_DEVICE) +#include "../filesystem/esp_sd.h" +#endif // SD_DEVICE + +#define ESP_LUA_MAX_SCRIPT_SIZE 2048 -LuaWrapper luawrapper; LuaInterpreter esp3d_lua_interpreter; -LuaInterpreter::LuaInterpreter() { _started = false; } +LuaInterpreter::LuaInterpreter() { + _scriptTask = NULL; + _pauseTime = 0; + _luaFSType = Lua_Filesystem_Type::none; + setupFunctions(); + registerConstants(); + _scriptBuffer = nullptr; + _stateMutex = xSemaphoreCreateMutex(); + _messageInFIFO.setMaxSize(10); // no limit + _messageInFIFO.setId("in"); + _messageOutFIFO.setMaxSize(0); // no limit + _messageOutFIFO.setId("out"); +} -bool LuaInterpreter::begin() { - if (_started) { - end(); +LuaInterpreter::~LuaInterpreter() { + deleteScriptTask(); + vSemaphoreDelete(_stateMutex); +} + +bool LuaInterpreter::dispatch(ESP3DMessage *message) { + if (!message) { + return false; + } + if (message->size > 0 && message->data) { + _messageInFIFO.push(message); + return true; } - _started = true; - return _started; + return false; } -void LuaInterpreter::end() { - if (!_started) { - return; + +const char *LuaInterpreter::getLastError() { + esp3d_log("getLastError *%s * %s*", _lastError.c_str(), _luaEngine.getLastError()); + if ( _lastError.length() == 0) { + _lastError = _luaEngine.getLastError(); } - _started = false; + return _lastError.c_str(); +} + +bool LuaInterpreter::createScriptTask() { + if (_scriptTask != NULL) { + deleteScriptTask(); + } + _luaEngine.clearError(); + _lastError = ""; + BaseType_t xReturned = xTaskCreatePinnedToCore( + scriptExecutionTask, /* Task function. */ + "LuaScriptTask", /* name of task. */ + 8192, /* Stack size of task */ + this, /* parameter of the task = is main or bridge*/ + 1, /* priority of the task */ + &_scriptTask, /* Task handle to keep track of created task */ + 1 /* Core to run the task */ + ); + + if (xReturned != pdPASS) { + if (_lastError.length() == 0) _lastError = "Failed to create script task"; + return false; + } + _startTime = millis(); + return true; +} + +bool LuaInterpreter::executeScriptAsync(const char *script) { + bool result = true; + _luaEngine.clearError(); + _lastError = ""; + if (_luaEngine.isRunning()) { + if (_lastError.length() == 0) _lastError = "A script is already running"; + return false; + } + _currentScriptName = script; + _lastError = ""; + if (!createScriptTask()) { + if (_lastError.length() == 0) _lastError = "Failed to create script task"; + result = false; + } + + return result; +} + +void LuaInterpreter::abortScript() { + if (_luaEngine.isRunning() && _scriptTask != NULL) { + if (_lastError.length() == 0) _lastError = "Script aborted"; + _luaEngine.stopExecution(); + } +} + +bool LuaInterpreter::pauseScript() { + if (_luaEngine.isRunning() && !_luaEngine.isPaused()) { + _luaEngine.pauseExecution(); + _pauseTime = millis(); + return true; + } + return false; +} + +bool LuaInterpreter::resumeScript() { + if (_luaEngine.isRunning() && _luaEngine.isPaused()) { + _luaEngine.resumeExecution(); + _startTime += (millis() - _pauseTime); + return true; + } + return false; +} + +void LuaInterpreter::resetLuaEnvironment() { + _luaEngine.resetState(); + setupFunctions(); + registerConstants(); +} + +void LuaInterpreter::deleteScriptTask() { + esp3d_log("Delete script task start"); + if (_scriptBuffer) { + esp3d_log("Free script buffer"); + free(_scriptBuffer); + _scriptBuffer = nullptr; + } + esp3d_log("Reset lua environment"); + _luaFSType = Lua_Filesystem_Type::none; + if (_lastError != "") resetLuaEnvironment(); + if (_scriptTask != NULL) { + esp3d_log("Delete script task"); + TaskHandle_t tmpTask = _scriptTask; + _scriptTask = NULL; + vTaskDelete(tmpTask); + } +} + +void LuaInterpreter::scriptExecutionTask(void *parameter) { + LuaInterpreter *self = static_cast(parameter); + String scriptName = self->_currentScriptName; + if (self->_scriptBuffer) { + free(self->_scriptBuffer); + self->_scriptBuffer = nullptr; + } + self->_lastError = ""; + size_t fileSize = 0; + self->_luaFSType = Lua_Filesystem_Type::none; +// define fstype +#if defined(FILESYSTEM_FEATURE) + // Check if the script is in flash + if (self->_currentScriptName.startsWith(ESP_FLASH_FS_HEADER) || + self->_currentScriptName.startsWith("/")) { + // remove the header if it exists + if (self->_currentScriptName.startsWith(ESP_FLASH_FS_HEADER)) { + scriptName = self->_currentScriptName.substring( + strlen(ESP_FLASH_FS_HEADER), self->_currentScriptName.length()); + } + // check if the file exists + if (ESP_FileSystem::exists(scriptName.c_str())) { + // open the file + ESP_File FSfileHandle = ESP_FileSystem::open(scriptName.c_str()); + if (FSfileHandle.isOpen()) { + // Check the file size + fileSize = FSfileHandle.size(); + esp3d_log("File %s opened, size is %d", scriptName.c_str(), fileSize); + if (fileSize > ESP_LUA_MAX_SCRIPT_SIZE) { + if (self->_lastError.length() == 0) + self->_lastError = "File size is too large"; + esp3d_log_e("%s", "File size is too large"); + } else { + // allocate memory for the script + self->_scriptBuffer = (char *)malloc(fileSize + 1); + if (self->_scriptBuffer) { + // read the file into the buffer + size_t readSize = + FSfileHandle.read((uint8_t *)self->_scriptBuffer, fileSize); + self->_scriptBuffer[fileSize] = '\0'; + esp3d_log("File %s read into buffer", scriptName.c_str()); + // check if the read is ok + if (readSize != fileSize) { + if (self->_lastError.length() == 0) + self->_lastError = "Failed to read file"; + esp3d_log_e("%s", self->_lastError.c_str()); + } else { + self->_luaFSType = Lua_Filesystem_Type::fLash; + } + } else { + if (self->_lastError.length() == 0) + self->_lastError = "Failed to allocate memory for script"; + esp3d_log_e("%s", "Failed to allocate memory for script"); + } + } + FSfileHandle.close(); + } else { + if (self->_lastError.length() == 0) + self->_lastError = "File is not open: " + scriptName; + esp3d_log_e("%s", self->_lastError.c_str()); + } + } else { + if (self->_lastError.length() == 0) + self->_lastError = "File not found: " + scriptName; + esp3d_log_e("%s", "File is not open: " + scriptName); + } + } +#endif // FILESYSTEM_FEATURE +#if defined(SD_DEVICE) + if (self->_currentScriptName.startsWith(ESP_SD_FS_HEADER)) { + scriptName = self->_currentScriptName.substring( + strlen(ESP_SD_FS_HEADER), self->_currentScriptName.length()); + esp3d_log("Processing SD file %s", scriptName.c_str()); + // Check if the SD file system is available + if (!ESP_SD::accessFS()) { + if (self->_lastError.length() == 0) + self->_lastError = "SD file system not found"; + esp3d_log_e("%s", "SD file system not found"); + } else { + if (ESP_SD::getState(true) == ESP_SDCARD_NOT_PRESENT) { + if (self->_lastError.length() == 0) self->_lastError = "SD card not present"; + esp3d_log_e("%s", "SD card not present"); + } else { + ESP_SD::setState(ESP_SDCARD_BUSY); + // Check script name exists + if (ESP_SD::exists(scriptName.c_str())) { + // open SD file + ESP_SDFile SDfileHandle = ESP_SD::open(scriptName.c_str()); + if (SDfileHandle.isOpen()) { + // Check script file size is under 2048 bytes + fileSize = SDfileHandle.size(); + if (fileSize > ESP_LUA_MAX_SCRIPT_SIZE) { + if (self->_lastError.length() == 0) + self->_lastError = "File size is too large"; + esp3d_log_e("%s", "File size is too large"); + } else { + // allocate memory for the script + self->_scriptBuffer = (char *)malloc(fileSize + 1); + if (self->_scriptBuffer) { + // read the file into the buffer + size_t readSize = + SDfileHandle.read((uint8_t *)self->_scriptBuffer, fileSize); + self->_scriptBuffer[fileSize] = '\0'; + esp3d_log("File %s read into buffer", scriptName.c_str()); + // check if the read is ok + if (readSize != fileSize) { + if (self->_lastError.length() == 0) + self->_lastError = "Failed to read file"; + esp3d_log_e("%s", "Failed to read file"); + } else { + self->_luaFSType = Lua_Filesystem_Type::sd; + } + } else { + if (self->_lastError.length() == 0) + self->_lastError = "Failed to allocate memory for script"; + esp3d_log_e("%s", "Failed to allocate memory for script"); + } + } + // close the file + SDfileHandle.close(); + } else { + if (self->_lastError.length() == 0) self->_lastError = + "File is not open: " + scriptName; + esp3d_log_e("%s", "File is not open: " + scriptName); + } + } else { + if (self->_lastError.length() == 0) + self->_lastError = "File not found: " + scriptName; + esp3d_log_e("%s", "File not found: " + scriptName); + } + } + ESP_SD::releaseFS(); + } + } +#endif // SD_DEVICE + // Check if the file system type is not determined + esp3d_log("Check state"); + if (self->_luaFSType == Lua_Filesystem_Type::none) { + if (self->_lastError.length() == 0) + self->_lastError = "Cannot determine file system type"; + esp3d_log_e("%s", "Cannot determine file system type"); + } else { + // Execute the script + esp3d_log("Execute script"); + if (self->_luaFSType != Lua_Filesystem_Type::none && self->_scriptBuffer) { + if (!self->_luaEngine.executeScript(self->_scriptBuffer)) { + if (self->_lastError.length() == 0) { + self->_lastError = "Script execution failed"; + } + esp3d_log_e("%s", "Script execution failed"); + } + } + } + esp3d_log("Delete script task"); + self->deleteScriptTask(); +} + +bool LuaInterpreter::begin() { + end(); + return true; } +void LuaInterpreter::end() { deleteScriptTask(); } + void LuaInterpreter::handle() { - // Nothing to do as handled by ticker / task + static bool notificationSent = false; + if (_luaEngine.isRunning() && notificationSent) { + notificationSent = false; + } + if (_messageOutFIFO.size() > 0 || _luaEngine.hasError()) { + if (xSemaphoreTake(_stateMutex, portMAX_DELAY) == pdTRUE) { + // Check if the script is in error state and if still running + if (_luaEngine.hasError()) { + _lastError = _luaEngine.getLastError(); +#ifdef NOTIFICATION_FEATURE + if (!notificationSent) { + String errorMsg = "Error: " + _lastError; + notificationsservice.sendAutoNotification(errorMsg.c_str()); + notificationSent = true; + } +#endif // NOTIFICATION_FEATURE + } + if (_messageOutFIFO.size() > 0) { + esp3d_log("lua_interpreter message size %d", _messageOutFIFO.size()); + } + ESP3DMessage *msg = _messageOutFIFO.pop(); + if (msg) { + esp3d_log("Processing message: %s", msg->data); + esp3d_commands.process(msg); + } + xSemaphoreGive(_stateMutex); + } else { + esp3d_log_e("Mutex not taken"); + } + } +} + +uint64_t LuaInterpreter::getExecutionTime() { + if (!_luaEngine.isRunning()) return 0; + if (_luaEngine.isPaused()) return _pauseTime - _startTime; + return millis() - _startTime; +} + +bool LuaInterpreter::isScriptRunning() { return _luaEngine.isRunning(); } + +bool LuaInterpreter::isScriptPaused() { return _luaEngine.isPaused(); } + +void LuaInterpreter::setupFunctions() { + _luaEngine.registerFunction("pinMode", l_pinMode); + _luaEngine.registerFunction("digitalWrite", l_digitalWrite); + _luaEngine.registerFunction("digitalRead", l_digitalRead); + _luaEngine.registerFunction("analogWrite", l_analogWrite); + _luaEngine.registerFunction("analogRead", l_analogRead); + _luaEngine.registerFunction("available", l_available, this); + _luaEngine.registerFunction("readData", l_readData, this); + _luaEngine.registerFunction("delay", l_delay, this); + _luaEngine.registerFunction("yield", l_yield); + _luaEngine.registerFunction("millis", l_millis); + _luaEngine.registerFunction("print", l_print, this); +} + +void LuaInterpreter::registerConstants() { + _luaEngine.registerConstant("INPUT", INPUT); + _luaEngine.registerConstant("OUTPUT", OUTPUT); + _luaEngine.registerConstant("INPUT_PULLUP", INPUT_PULLUP); + _luaEngine.registerConstant("INPUT_PULLDOWN", INPUT_PULLDOWN); + _luaEngine.registerConstant("HIGH", HIGH); + _luaEngine.registerConstant("LOW", LOW); +} + +// Wrapper +int LuaInterpreter::l_pinMode(lua_State *L) { + int pin = luaL_checkinteger(L, 1); + int mode = luaL_checkinteger(L, 2); + pinMode(pin, mode); + return 0; +} + +int LuaInterpreter::l_digitalWrite(lua_State *L) { + int pin = luaL_checkinteger(L, 1); + int value = luaL_checkinteger(L, 2); + digitalWrite(pin, value); + return 0; +} + +int LuaInterpreter::l_digitalRead(lua_State *L) { + int pin = luaL_checkinteger(L, 1); + int value = digitalRead(pin); + lua_pushinteger(L, value); + return 1; +} + +int LuaInterpreter::l_analogWrite(lua_State *L) { + int pin = luaL_checkinteger(L, 1); + int value = luaL_checkinteger(L, 2); + analogWrite(pin, value); + return 0; } -LuaInterpreter::~LuaInterpreter() { end(); } +int LuaInterpreter::l_analogRead(lua_State *L) { + int pin = luaL_checkinteger(L, 1); + int value = analogRead(pin); + lua_pushinteger(L, value); + return 1; +} + +int LuaInterpreter::l_print(lua_State *L) { + esp3d_log("lua_interpreter output"); + LuaInterpreter *self = + (LuaInterpreter *)lua_touserdata(L, lua_upvalueindex(1)); + String dataString; + dataString = ""; + int nargs = lua_gettop(L); + // esp3d_log("lua_interpreter output args %d", nargs); + for (int i = 1; i <= nargs; i++) { + // esp3d_log("lua_interpreter output arg %d", i); + if (lua_isstring(L, i)) { + dataString += lua_tostring(L, i); + } else if (lua_isnumber(L, i)) { + dataString += String(lua_tonumber(L, i)); + } else if (lua_isboolean(L, i)) { + dataString += lua_toboolean(L, i) ? "true" : "false"; + } else if (lua_isnil(L, i)) { + dataString += "nil"; + } else { + dataString += lua_typename(L, lua_type(L, i)); + } + } + if (!dataString.endsWith("\n")) { + dataString += "\n"; + } + esp3d_log("lua_interpreter output %s", dataString.c_str()); + esp3d_log("Message Creation"); + ESP3DMessage *msg = esp3d_message_manager.newMsg( + ESP3DClientType::lua_script, esp3d_commands.getOutputClient(), + (uint8_t *)dataString.c_str(), dataString.length(), + ESP3DAuthenticationLevel::admin); + esp3d_log("Message created"); + + if (msg) { + // process command + msg->type = ESP3DMessageType::unique; + esp3d_log("Message sent to fifo list"); + // push to FIFO + self->_messageOutFIFO.push(msg); + } else { + esp3d_log_e("Cannot create message"); + } + return 0; +} + +int LuaInterpreter::l_available(lua_State *L) { + LuaInterpreter *self = + (LuaInterpreter *)lua_touserdata(L, lua_upvalueindex(1)); + lua_pushinteger(L, self->_messageInFIFO.size()); + return 1; +} + +int LuaInterpreter::l_readData(lua_State *L) { + LuaInterpreter *self = + (LuaInterpreter *)lua_touserdata(L, lua_upvalueindex(1)); + ESP3DMessage *message = self->_messageInFIFO.pop(); + if (message) { + lua_pushlstring(L, (const char *)message->data, message->size); + esp3d_message_manager.deleteMsg(message); + } else { + lua_pushnil(L); + } + return 1; +} + +int LuaInterpreter::l_delay(lua_State *L) { + LuaInterpreter *self = + (LuaInterpreter *)lua_touserdata(L, lua_upvalueindex(1)); + int ms = luaL_checkinteger(L, 1); + TickType_t delayTicks = pdMS_TO_TICKS(ms); + // Check if during delay the script is aborted or paused + while (delayTicks > 0) { + TickType_t delayThis = (delayTicks > ESP_LUA_CHECK_INTERVAL) + ? ESP_LUA_CHECK_INTERVAL + : delayTicks; + vTaskDelay(delayThis); + delayTicks -= delayThis; + while (self->_luaEngine.isPaused()) { + vTaskDelay(ESP_LUA_CHECK_INTERVAL); + } + + if (!(self->_luaEngine.isRunning())) { + if (self->_lastError.length() == 0) + self->_lastError = "Execution stopped"; + luaL_error(L, "Execution stopped"); + } + } + return 0; +} + +int LuaInterpreter::l_yield(lua_State *L) { + taskYIELD(); + return 0; +} + +int LuaInterpreter::l_millis(lua_State *L) { + lua_pushinteger(L, millis()); + return 1; +} #endif // ESP_LUA_INTERPRETER_FEATURE diff --git a/src/modules/lua_interpreter/lua_interpreter_service.h b/src/modules/lua_interpreter/lua_interpreter_service.h index 1e91067..c38d606 100644 --- a/src/modules/lua_interpreter/lua_interpreter_service.h +++ b/src/modules/lua_interpreter/lua_interpreter_service.h @@ -17,20 +17,75 @@ License along with This code; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _LUA_INTERPRETER_H -#define _LUA_INTERPRETER_H +#pragma once +#if defined(ARDUINO_ARCH_ESP32) +#include +#include + +#include "../../core/esp3d_message.h" +#include "../../core/esp3d_messageFifo.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +enum class Lua_Filesystem_Type : uint8_t { + none = 0, + fLash = 1, + sd = 2, +}; class LuaInterpreter { public: LuaInterpreter(); ~LuaInterpreter(); - bool started() { return _started; } + + bool executeScriptAsync(const char* script); + void abortScript(); + bool pauseScript(); + bool resumeScript(); + const char* getCurrentScriptName() { return _currentScriptName.c_str(); } + uint64_t getExecutionTime(); + bool isScriptRunning(); + bool isScriptPaused(); + const char* getLastError(); + bool dispatch(ESP3DMessage* message); bool begin(); void end(); void handle(); private: - bool _started; + EspLuaEngine _luaEngine; + TaskHandle_t _scriptTask; + char* _scriptBuffer; + SemaphoreHandle_t _stateMutex; + ESP3DMessageFIFO _messageInFIFO; + ESP3DMessageFIFO _messageOutFIFO; + Lua_Filesystem_Type _luaFSType; + String _currentScriptName; + unsigned long _startTime; + unsigned long _pauseTime; + String _lastError; + + static void scriptExecutionTask(void* parameter); + void setupFunctions(); + void registerConstants(); + bool createScriptTask(); + void deleteScriptTask(); + void resetLuaEnvironment(); + + // Wrappers + static int l_print(lua_State* L); + static int l_pinMode(lua_State* L); + static int l_digitalWrite(lua_State* L); + static int l_digitalRead(lua_State* L); + static int l_analogWrite(lua_State* L); + static int l_analogRead(lua_State* L); + static int l_available(lua_State* L); + static int l_readData(lua_State* L); + static int l_delay(lua_State* L); + static int l_yield(lua_State* L); + static int l_millis(lua_State* L); }; + extern LuaInterpreter esp3d_lua_interpreter; -#endif //_LUA_INTERPRETER_H + +#endif // defined(ARDUINO_ARCH_ESP32) \ No newline at end of file diff --git a/src/modules/mDNS/mDNS.cpp b/src/modules/mDNS/mDNS.cpp index 130d8f5..fe4c6cc 100644 --- a/src/modules/mDNS/mDNS.cpp +++ b/src/modules/mDNS/mDNS.cpp @@ -252,7 +252,12 @@ const char* mDNS_Service::answerIP(uint16_t index) { return ""; } #if defined(ARDUINO_ARCH_ESP32) +#if ESP_ARDUINO_VERSION_MAJOR == 3 + tmp = MDNS.address(index).toString(); +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 +#if ESP_ARDUINO_VERSION_MAJOR == 2 tmp = MDNS.IP(index).toString(); +#endif // ESP_ARDUINO_VERSION_MAJOR == 2 #endif // ARDUINO_ARCH_ESP32 #if defined(ARDUINO_ARCH_ESP8266) diff --git a/src/modules/mks/mks_service.cpp b/src/modules/mks/mks_service.cpp index 7de53b1..4c7c383 100644 --- a/src/modules/mks/mks_service.cpp +++ b/src/modules/mks/mks_service.cpp @@ -120,7 +120,7 @@ bool MKSService::dispatch(ESP3DMessage *message) { } if (message->size > 0 && message->data) { if (sendGcodeFrame((const char *)message->data)) { - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } } diff --git a/src/modules/network/netconfig.cpp b/src/modules/network/netconfig.cpp index 870608c..a5ec78c 100644 --- a/src/modules/network/netconfig.cpp +++ b/src/modules/network/netconfig.cpp @@ -48,6 +48,10 @@ #include "../gcode_host/gcode_host.h" #endif // GCODE_HOST_FEATURE +#if defined(ARDUINO_ARCH_ESP32) +esp_netif_t *get_esp_interface_netif(esp_interface_t interface); +#endif // ARDUINO_ARCH_ESP32 + String NetConfig::_hostname = ""; bool NetConfig::_needReconnect2AP = false; bool NetConfig::_events_registered = false; @@ -231,11 +235,12 @@ void NetConfig::onWiFiEvent(WiFiEvent_t event) { case ARDUINO_EVENT_WIFI_STA_LOST_IP: if (_started) { _needReconnect2AP = true; + esp3d_log("WiFi STA lost IP"); } break; #ifdef ETH_FEATURE case ARDUINO_EVENT_ETH_START: { - EthConfig::setConnected(false); + esp3d_log("Ethernet started"); if (ESP3DSettings::isVerboseBoot()) { esp3d_commands.dispatch( "Checking connection", ESP3DClientType::all_clients, no_id, @@ -248,18 +253,24 @@ void NetConfig::onWiFiEvent(WiFiEvent_t event) { no_id, ESP3DMessageType::unique, ESP3DClientType::system, ESP3DAuthenticationLevel::admin); + esp3d_log("Ethernet connected"); EthConfig::setConnected(true); } break; case ARDUINO_EVENT_ETH_DISCONNECTED: { + esp3d_log("Ethernet disconnected"); esp3d_commands.dispatch("Cable disconnected", ESP3DClientType::all_clients, no_id, ESP3DMessageType::unique, ESP3DClientType::system, ESP3DAuthenticationLevel::admin); EthConfig::setConnected(false); } break; + case ARDUINO_EVENT_ETH_LOST_IP: + esp3d_log("Ethernet lost IP"); + break; case ARDUINO_EVENT_ETH_GOT_IP: { #if COMMUNICATION_PROTOCOL != MKS_SERIAL #if defined(ESP_GOT_IP_HOOK) && defined(GCODE_HOST_FEATURE) + ESP3DHal::wait(500); String ipMsg = esp3d_string::expandString(ESP_GOT_IP_HOOK); esp3d_log("Got IP, sending hook: %s", ipMsg.c_str()); esp3d_gcode_host.processScript(ipMsg.c_str(), @@ -268,7 +279,9 @@ void NetConfig::onWiFiEvent(WiFiEvent_t event) { #endif // #if COMMUNICATION_PROTOCOL == MKS_SERIAL EthConfig::setConnected(true); } break; + case ARDUINO_EVENT_ETH_STOP: + esp3d_log("Ethernet stopped"); EthConfig::setConnected(false); break; #endif // ETH_FEATURE @@ -523,12 +536,20 @@ void NetConfig::handle() { bool NetConfig::isIPModeDHCP(uint8_t mode) { bool started = false; #ifdef ARDUINO_ARCH_ESP32 - tcpip_adapter_dhcp_status_t dhcp_status; - tcpip_adapter_dhcpc_get_status((mode == ESP_WIFI_STA) ? TCPIP_ADAPTER_IF_STA - : (mode == ESP_WIFI_AP) ? TCPIP_ADAPTER_IF_AP - : TCPIP_ADAPTER_IF_ETH, +if (mode == ESP_WIFI_STA || mode == ESP_WIFI_AP) { + esp_netif_dhcp_status_t dhcp_status; + esp_netif_dhcpc_get_status((mode == ESP_WIFI_STA) ? get_esp_interface_netif(ESP_IF_WIFI_STA) + : get_esp_interface_netif(ESP_IF_WIFI_AP), &dhcp_status); - started = (dhcp_status == TCPIP_ADAPTER_DHCP_STARTED); + esp3d_log("DHCP Status %d", (int)dhcp_status); + started = (dhcp_status == ESP_NETIF_DHCP_STARTED); +} +#if defined(ETH_FEATURE) +if (mode == ESP_ETH_STA) { + started = (EthConfig::ipMode()==DHCP_MODE); +} +#endif // ETH_FEATURE + #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 (void)mode; @@ -540,12 +561,13 @@ bool NetConfig::isIPModeDHCP(uint8_t mode) { bool NetConfig::isDHCPServer(uint8_t mode) { bool itis = false; #ifdef ARDUINO_ARCH_ESP32 - tcpip_adapter_dhcp_status_t dhcp_status; - tcpip_adapter_dhcps_get_status((mode == ESP_WIFI_STA) ? TCPIP_ADAPTER_IF_STA - : (mode == ESP_WIFI_AP) ? TCPIP_ADAPTER_IF_AP - : TCPIP_ADAPTER_IF_ETH, + //Fzor some reason esp_netif_dhcps_get_status() give always !DHCP_MODE for Ethernet even if it is set to DHCP + if (mode == ESP_WIFI_AP) { + esp_netif_dhcp_status_t dhcp_status; + esp_netif_dhcps_get_status(get_esp_interface_netif(ESP_IF_WIFI_AP), &dhcp_status); - itis = (dhcp_status == TCPIP_ADAPTER_DHCP_STARTED); + itis = (dhcp_status == ESP_NETIF_DHCP_STARTED); + } #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 (void)mode; diff --git a/src/modules/network/netconfig.h b/src/modules/network/netconfig.h index d886eca..cbcb26b 100644 --- a/src/modules/network/netconfig.h +++ b/src/modules/network/netconfig.h @@ -35,6 +35,7 @@ #ifdef ARDUINO_ARCH_ESP32 #include +#include #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 #include diff --git a/src/modules/notifications/notifications_service.cpp b/src/modules/notifications/notifications_service.cpp index 5607b28..4105636 100644 --- a/src/modules/notifications/notifications_service.cpp +++ b/src/modules/notifications/notifications_service.cpp @@ -74,6 +74,10 @@ extern "C" { #define LINESERVER "notify-api.line.me" #define LINEPORT 443 +#define WHATSAPPTIMEOUT 5000 +#define WHATSAPPSERVER "api.callmebot.com" +#define WHATSAPPPORT 443 + #define TELEGRAMTIMEOUT 5000 #define TELEGRAMSERVER "api.telegram.org" #define TELEGRAMPORT 443 @@ -166,6 +170,8 @@ const char* NotificationsService::getTypeString() { return "telegram"; case ESP_IFTTT_NOTIFICATION: return "IFTTT"; + case ESP_WHATS_APP_NOTIFICATION: + return "WhatsApp"; case ESP_HOMEASSISTANT_NOTIFICATION: return "HomeAssistant"; default: @@ -209,6 +215,9 @@ bool NotificationsService::sendMSG(const char* title, const char* messagetxt) { case ESP_IFTTT_NOTIFICATION: return sendIFTTTMSG(title, message.c_str()); break; + case ESP_WHATS_APP_NOTIFICATION: + return sendWhatsAppMSG(title, message.c_str()); + break; case ESP_HOMEASSISTANT_NOTIFICATION: return sendHomeAssistantMSG(title, message.c_str()); break; @@ -267,6 +276,48 @@ bool NotificationsService::sendPushoverMSG(const char* title, return res; } +// WhatsApp / CallMeBot +bool NotificationsService::sendWhatsAppMSG(const char* title, + const char* message) { + String data; + String geturl; + bool res; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + WiFiClientSecure Notificationclient; +#pragma GCC diagnostic pop + Notificationclient.setInsecure(); +#if defined(ARDUINO_ARCH_ESP8266) + BearSSLSetup(Notificationclient); +#endif // ARDUINO_ARCH_ESP8266 + if (!Notificationclient.connect(_serveraddress.c_str(), _port)) { + esp3d_log_e("Error connecting server %s:%d", _serveraddress.c_str(), + _port); + return false; + } + // build data for post + data = "/whatsapp.php?phone="; + data += _token1; + data += "&apikey="; + data += _token2; + data += "&text="; + data += esp3d_string::urlEncode(message); + // build get query because it only accept GET + geturl = + "GET https://" + _serveraddress; + geturl+= data; + geturl+=" HTTP/1.0"; + Notificationclient.println(geturl.c_str()); + Notificationclient.println("Host: api.callmebot.com"); + Notificationclient.println("Connection: close"); + Notificationclient.println(); + esp3d_log("Query: %s", geturl.c_str()); + // send query + res = Wait4Answer(Notificationclient, "", "Message queued.", WHATSAPPTIMEOUT); + Notificationclient.stop(); + return res; +} + // Telegram // TODO: put error in variable to allow better error handling bool NotificationsService::sendTelegramMSG(const char* title, @@ -637,6 +688,12 @@ bool NotificationsService::begin() { _port = LINEPORT; _serveraddress = LINESERVER; break; + case ESP_WHATS_APP_NOTIFICATION: + _token1 = ESP3DSettings::readString(ESP_NOTIFICATION_TOKEN1); + _token2 = ESP3DSettings::readString(ESP_NOTIFICATION_TOKEN2); + _port = WHATSAPPPORT; + _serveraddress = WHATSAPPSERVER; + break; case ESP_IFTTT_NOTIFICATION: _token1 = ESP3DSettings::readString(ESP_NOTIFICATION_TOKEN1); _token2 = ESP3DSettings::readString(ESP_NOTIFICATION_TOKEN2); diff --git a/src/modules/notifications/notifications_service.h b/src/modules/notifications/notifications_service.h index 0e74708..bbdfb21 100644 --- a/src/modules/notifications/notifications_service.h +++ b/src/modules/notifications/notifications_service.h @@ -54,6 +54,7 @@ class NotificationsService { bool sendPushoverMSG(const char* title, const char* message); bool sendEmailMSG(const char* title, const char* message); bool sendLineMSG(const char* title, const char* message); + bool sendWhatsAppMSG(const char* title, const char* message); bool sendTelegramMSG(const char* title, const char* message); bool sendIFTTTMSG(const char* title, const char* message); bool sendHomeAssistantMSG(const char* title, const char* message); diff --git a/src/modules/serial/serial_service.cpp b/src/modules/serial/serial_service.cpp index 486e55c..4d965a5 100644 --- a/src/modules/serial/serial_service.cpp +++ b/src/modules/serial/serial_service.cpp @@ -17,113 +17,35 @@ License along with This code; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include "../../include/esp3d_config.h" -#if COMMUNICATION_PROTOCOL == MKS_SERIAL || \ - COMMUNICATION_PROTOCOL == RAW_SERIAL || defined(ESP_SERIAL_BRIDGE_OUTPUT) +#if COMMUNICATION_PROTOCOL == RAW_SERIAL || \ + defined(ESP_SERIAL_BRIDGE_OUTPUT) || COMMUNICATION_PROTOCOL == MKS_SERIAL #include "../../core/esp3d_commands.h" #include "../../core/esp3d_settings.h" #include "../../core/esp3d_string.h" -#include "serial_service.h" - -#if COMMUNICATION_PROTOCOL == MKS_SERIAL -#include "../mks/mks_service.h" -#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL #include "../authentication/authentication_service.h" -#if defined(ARDUINO_ARCH_ESP8266) -#define MAX_SERIAL 2 -HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1}; -#endif // ARDUINO_ARCH_ESP8266 - -#if defined(ARDUINO_ARCH_ESP32) - -#if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) -#define MAX_SERIAL 2 -HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1}; -#else -#define MAX_SERIAL 3 -HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1, &Serial2}; -#endif +#include "serial_service.h" -#endif // ARDUINO_ARCH_ESP32 +extern HardwareSerial *Serials[]; // Serial Parameters -#define ESP_SERIAL_PARAM SERIAL_8N1 - -#define ESP3DSERIAL_RUNNING_PRIORITY 1 -#define ESP3DSERIAL_RUNNING_CORE 1 -#define SERIAL_YIELD 10 ESP3DSerialService esp3d_serial_service = ESP3DSerialService(MAIN_SERIAL); #if defined(ESP_SERIAL_BRIDGE_OUTPUT) ESP3DSerialService serial_bridge_service = ESP3DSerialService(BRIDGE_SERIAL); #endif // ESP_SERIAL_BRIDGE_OUTPUT -#if defined(ARDUINO_ARCH_ESP32) && defined(SERIAL_INDEPENDANT_TASK) -TaskHandle_t _hserialtask = nullptr; -#endif // ARDUINO_ARCH_ESP32 - const uint32_t SupportedBaudList[] = {9600, 19200, 38400, 57600, 74880, 115200, 230400, 250000, 500000, 921600, 1000000, 1958400, 2000000}; -const size_t SupportedBaudListSize = sizeof(SupportedBaudList) / sizeof(long); +const size_t SupportedBaudListSize = + sizeof(SupportedBaudList) / sizeof(uint32_t); + -#define TIMEOUT_SERIAL_FLUSH 1500 -// Constructor -ESP3DSerialService::ESP3DSerialService(uint8_t id) { - _buffer_size = 0; - _started = false; -#if defined(AUTHENTICATION_FEATURE) - _needauthentication = true; -#else - _needauthentication = false; -#endif // AUTHENTICATION_FEATURE - _id = id; - switch (_id) { - case MAIN_SERIAL: - _rxPin = ESP_RX_PIN; - _txPin = ESP_TX_PIN; - _origin = ESP3DClientType::serial; - break; -#if defined(ESP_SERIAL_BRIDGE_OUTPUT) - case BRIDGE_SERIAL: - _rxPin = ESP_BRIDGE_RX_PIN; - _txPin = ESP_BRIDGE_TX_PIN; - _origin = ESP3DClientType::serial_bridge; - break; -#endif // ESP_SERIAL_BRIDGE_OUTPUT - default: - _rxPin = ESP_RX_PIN; - _txPin = ESP_TX_PIN; - _origin = ESP3DClientType::serial; - break; - } -} // Destructor ESP3DSerialService::~ESP3DSerialService() { end(); } -// dedicated serial task -#if defined(ARDUINO_ARCH_ESP32) && defined(SERIAL_INDEPENDANT_TASK) -void ESP3DSerialTaskfn(void *parameter) { - uint8_t id = *((uint8_t *)parameter); - if (id == MAIN_SERIAL) { - esp3d_log("Serial Task for main serial"); - } else { - esp3d_log("Serial Task for bridge serial"); - } - for (;;) { - esp3d_serial_service.process(); -#if defined(ESP_SERIAL_BRIDGE_OUTPUT) - esp3d_log("Serial Task for bridge serial"); - serial_bridge_service.process(); -#endif // ESP_SERIAL_BRIDGE_OUTPUT - ESP3DHal::wait(SERIAL_YIELD); // Yield to other tasks - } - vTaskDelete(NULL); -} -#endif // ARDUINO_ARCH_ESP32 - // extra parameters that do not need a begin void ESP3DSerialService::setParameters() { #if defined(AUTHENTICATION_FEATURE) @@ -148,346 +70,36 @@ ESP3DAuthenticationLevel ESP3DSerialService::getAuthentication() { return ESP3DAuthenticationLevel::admin; } -// Setup Serial -bool ESP3DSerialService::begin(uint8_t serialIndex) { - _serialIndex = serialIndex - 1; - esp3d_log("Serial %d begin for %d", _serialIndex, _id); - if (_id == BRIDGE_SERIAL && - ESP3DSettings::readByte(ESP_SERIAL_BRIDGE_ON) == 0) { - esp3d_log("Serial %d for %d is disabled", _serialIndex, _id); - return true; - } - if (_serialIndex >= MAX_SERIAL) { - esp3d_log_e("Serial %d begin for %d failed, index out of range", - _serialIndex, _id); - return false; - } - _lastflush = millis(); - // read from settings - long br = 0; - long defaultBr = 0; - switch (_id) { - case MAIN_SERIAL: - br = ESP3DSettings::readUint32(ESP_BAUD_RATE); - defaultBr = ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE); - break; -#if defined(ESP_SERIAL_BRIDGE_OUTPUT) - case BRIDGE_SERIAL: - br = ESP3DSettings::readUint32(ESP_SERIAL_BRIDGE_BAUD); - defaultBr = - ESP3DSettings::getDefaultIntegerSetting(ESP_SERIAL_BRIDGE_BAUD); - break; -#endif // ESP_SERIAL_BRIDGE_OUTPUT - default: - esp3d_log_e("Serial %d begin for %d failed, unknown id", _serialIndex, - _id); - return false; - } - setParameters(); - esp3d_log("Baud rate is %d , default is %d", br, defaultBr); - _buffer_size = 0; - // change only if different from current - if (br != baudRate() || (_rxPin != -1) || (_txPin != -1)) { - if (!ESP3DSettings::isValidIntegerSetting(br, ESP_BAUD_RATE)) { - br = defaultBr; - } - Serials[_serialIndex]->setRxBufferSize(SERIAL_RX_BUFFER_SIZE); -#ifdef ARDUINO_ARCH_ESP8266 - Serials[_serialIndex]->begin(br, ESP_SERIAL_PARAM, SERIAL_FULL, - (_txPin == -1) ? 1 : _txPin); - if (_rxPin != -1) { - Serials[_serialIndex]->pins((_txPin == -1) ? 1 : _txPin, _rxPin); - } - -#endif // ARDUINO_ARCH_ESP8266 -#if defined(ARDUINO_ARCH_ESP32) - Serials[_serialIndex]->begin(br, ESP_SERIAL_PARAM, _rxPin, _txPin); -#if defined(SERIAL_INDEPENDANT_TASK) - // create serial task once - esp3d_log("Serial %d for %d Task creation", _serialIndex, _id); - if (_hserialtask == nullptr && (_id == MAIN_SERIAL)) { - xTaskCreatePinnedToCore( - ESP3DSerialTaskfn, /* Task function. */ - "ESP3D Serial Task", /* name of task. */ - 8192, /* Stack size of task */ - &_id, /* parameter of the task = is main or bridge*/ - ESP3DSERIAL_RUNNING_PRIORITY, /* priority of the task */ - &_hserialtask, /* Task handle to keep track of created task */ - ESP3DSERIAL_RUNNING_CORE /* Core to run the task */ - ); - } - if (_hserialtask == nullptr) { - esp3d_log_e("Serial %d for %d Task creation failed", _serialIndex, _id); - return false; - } -#endif // SERIAL_INDEPENDANT_TASK -#endif // ARDUINO_ARCH_ESP32 - } - _started = true; - esp3d_log("Serial %d for %d is started", _serialIndex, _id); - return true; -} -// End serial -bool ESP3DSerialService::end() { - flush(); - delay(100); - swap(); - Serials[_serialIndex]->end(); - _buffer_size = 0; - _started = false; - initAuthentication(); - return true; -} - // return the array of uint32_t and array size const uint32_t *ESP3DSerialService::get_baudratelist(uint8_t *count) { if (count) { - *count = sizeof(SupportedBaudList) / sizeof(long); + *count = sizeof(SupportedBaudList) / sizeof(uint32_t); } return SupportedBaudList; } -// Function which could be called in other loop -void ESP3DSerialService::process() { - if (!_started) { - return; - } - // Do we have some data waiting - size_t len = Serials[_serialIndex]->available(); - if (len > 0) { - // if yes read them - esp3d_log("Got %d chars in serial", len); - uint8_t *sbuf = (uint8_t *)malloc(len); - if (sbuf) { - size_t count = readBytes(sbuf, len); - // push to buffer - if (count > 0) { - push2buffer(sbuf, count); - } - // freen buffer - free(sbuf); - } - } - // we cannot left data in buffer too long - // in case some commands "forget" to add \n - if (((millis() - _lastflush) > TIMEOUT_SERIAL_FLUSH) && (_buffer_size > 0)) { - flushbuffer(); - } -} - -// Function which could be called in other loop -void ESP3DSerialService::handle() { - // the serial bridge do not use independant task - // not sure if it is sill necessary to do it for the main serial - // TBC.. -#if defined(ARDUINO_ARCH_ESP32) && defined(SERIAL_INDEPENDANT_TASK) - if (_id == MAIN_SERIAL) { - return; - } -#endif // ARDUINO_ARCH_ESP32 && SERIAL_INDEPENDANT_TASK0 - process(); -} -void ESP3DSerialService::flushbuffer() { - _buffer[_buffer_size] = 0x0; - // dispatch command - if (_started) { - ESP3DMessage *message = ESP3DMessageManager::newMsg( - _origin, - _id == MAIN_SERIAL ? ESP3DClientType::all_clients - : esp3d_commands.getOutputClient(), - (uint8_t *)_buffer, _buffer_size, getAuthentication()); - if (message) { - // process command - message->type = ESP3DMessageType::unique; - esp3d_commands.process(message); - } else { - esp3d_log_e("Cannot create message"); - } - } - _lastflush = millis(); - _buffer_size = 0; -} -// push collected data to buffer and proceed accordingly -void ESP3DSerialService::push2buffer(uint8_t *sbuf, size_t len) { - if (!_started) { - return; - } - esp3d_log("buffer get %d data ", len); -#if COMMUNICATION_PROTOCOL == MKS_SERIAL - static bool isFrameStarted = false; - static bool isCommandFrame = false; - static uint8_t type; - // expected size - static int16_t framePos = -1; - // currently received - static uint datalen = 0; - for (size_t i = 0; i < len; i++) { - esp3d_log("Data : %c %x", sbuf[i], sbuf[i]); - framePos++; - _lastflush = millis(); - // so frame head was detected - if (isFrameStarted) { - // checking it is a valid Frame header - if (framePos == 1) { - esp3d_log("type = %x", sbuf[i]); - if (MKSService::isFrame(char(sbuf[i]))) { - if (MKSService::isCommand(char(sbuf[i]))) { - isCommandFrame = true; - esp3d_log("type: Command"); - } else { - esp3d_log("type: other"); - type = sbuf[i]; - isCommandFrame = false; - } - } else { - esp3d_log_e("wrong frame type"); - isFrameStarted = false; - _buffer_size = 0; - } - } else if ((framePos == 2) || (framePos == 3)) { - // add size to int - if (framePos == 2) { - datalen = sbuf[i]; - } else { - datalen += (sbuf[i] << 8); - esp3d_log("Data len: %d", datalen); - if (datalen > (ESP3D_SERIAL_BUFFER_SIZE - 5)) { - esp3d_log_e("Overflow in data len"); - isFrameStarted = false; - _buffer_size = 0; - } - } - } else if (MKSService::isTail(char(sbuf[i]))) { - esp3d_log("got tail"); - _buffer[_buffer_size] = '\0'; - esp3d_log("size is %d", _buffer_size); - // let check integrity - if (_buffer_size == datalen) { - esp3d_log("Flushing buffer"); - if (isCommandFrame) { - flushbuffer(); - } else { - MKSService::handleFrame(type, (const uint8_t *)_buffer, - _buffer_size); - } - } else { - esp3d_log_e("Error in data len"); - } - // clear frame infos - _buffer_size = 0; - isFrameStarted = false; +void ESP3DSerialService::flushChar(char c) { flushData((uint8_t *)&c, 1, ESP3DMessageType::realtimecmd); } - } else { - // it is data - if (_buffer_size < ESP3D_SERIAL_BUFFER_SIZE - 5) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } else { - esp3d_log_e("Overflow in data len"); - isFrameStarted = false; - _buffer_size = 0; - } - } - } else { - // frame is not started let see if it is a head - if (MKSService::isHead(char(sbuf[i]))) { - esp3d_log("got head"); - // yes it is - isFrameStarted = true; - framePos = 0; - _buffer_size = 0; - } else { - // no so let reset all and just ignore it - // TODO should we handle these data ? - esp3d_log_e("Unidentified data : %c %x", sbuf[i], sbuf[i]); - isCommandFrame = false; - framePos = -1; - datalen = 0; - } - } - } -#else - for (size_t i = 0; i < len; i++) { - _lastflush = millis(); - // command is defined - if ((char(sbuf[i]) == '\n') || (char(sbuf[i]) == '\r')) { - if (_buffer_size < ESP3D_SERIAL_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - flushbuffer(); - } else if (esp3d_string::isPrintableChar(char(sbuf[i]))) { - if (_buffer_size < ESP3D_SERIAL_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } else { - flushbuffer(); - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - } else { // it is not printable char - // clean buffer first - if (_buffer_size > 0) { - flushbuffer(); - } - // process char - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - flushbuffer(); - } - } -#endif +void ESP3DSerialService::flushBuffer() { + _buffer[_buffer_size] = 0x0; + flushData((uint8_t *)_buffer, _buffer_size, ESP3DMessageType::unique); + _buffer_size = 0; } -// Reset Serial Setting (baud rate) -bool ESP3DSerialService::reset() { - esp3d_log("Reset serial"); - bool res = false; - switch (_id) { - case MAIN_SERIAL: - return ESP3DSettings::writeUint32( - ESP_BAUD_RATE, - ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE)); -#if defined(ESP_SERIAL_BRIDGE_OUTPUT) - case BRIDGE_SERIAL: - res = ESP3DSettings::writeByte( - ESP_SERIAL_BRIDGE_ON, - ESP3DSettings::getDefaultByteSetting(ESP_SERIAL_BRIDGE_ON)); - return res && - ESP3DSettings::writeUint32(ESP_SERIAL_BRIDGE_BAUD, - ESP3DSettings::getDefaultIntegerSetting( - ESP_SERIAL_BRIDGE_BAUD)); -#endif // ESP_SERIAL_BRIDGE_OUTPUT - default: - return res; - } -} -void ESP3DSerialService::updateBaudRate(long br) { - if (br != baudRate()) { +void ESP3DSerialService::updateBaudRate(uint32_t br) { + if (br != _baudRate) { Serials[_serialIndex]->flush(); Serials[_serialIndex]->updateBaudRate(br); + _baudRate = br; } } // Get current baud rate -long ESP3DSerialService::baudRate() { - long br = 0; - br = Serials[_serialIndex]->baudRate(); -#ifdef ARDUINO_ARCH_ESP32 - // workaround for ESP32 - if (br == 115201) { - br = 115200; - } - if (br == 230423) { - br = 230400; - } -#endif // ARDUINO_ARCH_ESP32 - return br; -} +uint32_t ESP3DSerialService::baudRate() { return _baudRate; } size_t ESP3DSerialService::writeBytes(const uint8_t *buffer, size_t size) { if (!_started) { @@ -533,11 +145,6 @@ void ESP3DSerialService::flush() { Serials[_serialIndex]->flush(); } -void ESP3DSerialService::swap() { -#ifdef ARDUINO_ARCH_ESP8266 - Serials[_serialIndex]->swap(); -#endif // ARDUINO_ARCH_ESP8266 -} bool ESP3DSerialService::dispatch(ESP3DMessage *message) { bool done = false; @@ -550,7 +157,7 @@ bool ESP3DSerialService::dispatch(ESP3DMessage *message) { if (writeBytes(message->data, message->size) == message->size) { flush(); // Delete message now - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); done = true; } else { esp3d_log_e("Error while sending data"); @@ -565,5 +172,5 @@ bool ESP3DSerialService::dispatch(ESP3DMessage *message) { return done; } -#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL || COMMUNICATION_PROTOCOL == - // RAW_SERIAL +#endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || + // defined(ESP_SERIAL_BRIDGE_OUTPUT) \ No newline at end of file diff --git a/src/modules/serial/serial_service.h b/src/modules/serial/serial_service.h index 1016383..cfd8524 100644 --- a/src/modules/serial/serial_service.h +++ b/src/modules/serial/serial_service.h @@ -24,7 +24,12 @@ #include "../../core/esp3d_client_types.h" #include "../../core/esp3d_message.h" +#if defined(ARDUINO_ARCH_ESP32) +#include "../../core/esp3d_messageFifo.h" +#endif // ARDUINO_ARCH_ESP32 + #define ESP3D_SERIAL_BUFFER_SIZE 1024 +#define ESP_SERIAL_PARAM SERIAL_8N1 extern const uint32_t SupportedBaudList[]; extern const size_t SupportedBaudListSize; @@ -36,15 +41,16 @@ class ESP3DSerialService final { void setParameters(); bool begin(uint8_t serialIndex); bool end(); - void updateBaudRate(long br); + void updateBaudRate(uint32_t br); void handle(); - void process(); bool reset(); - long baudRate(); + uint32_t baudRate(); uint8_t serialIndex() { return _serialIndex; } const uint32_t *get_baudratelist(uint8_t *count); void flush(); + #if defined(ARDUINO_ARCH_ESP8266) void swap(); + #endif // ARDUINO_ARCH_ESP8266 size_t writeBytes(const uint8_t *buffer, size_t size); size_t readBytes(uint8_t *sbuf, size_t len); inline bool started() { return _started; } @@ -52,8 +58,13 @@ class ESP3DSerialService final { void initAuthentication(); void setAuthentication(ESP3DAuthenticationLevel auth) { _auth = auth; } ESP3DAuthenticationLevel getAuthentication(); - +#if defined(ARDUINO_ARCH_ESP32) + void receiveCb(); + static void receiveSerialCb(); + static void receiveBridgeSerialCb(); +#endif // ARDUINO_ARCH_ESP32 private: + uint32_t _baudRate; ESP3DAuthenticationLevel _auth; uint8_t _serialIndex; ESP3DClientType _origin; @@ -65,8 +76,16 @@ class ESP3DSerialService final { uint32_t _lastflush; uint8_t _buffer[ESP3D_SERIAL_BUFFER_SIZE + 1]; // keep space of 0x0 terminal size_t _buffer_size; +#if defined(ARDUINO_ARCH_ESP32) + SemaphoreHandle_t _mutex; + ESP3DMessageFIFO _messagesInFIFO; +#endif // ARDUINO_ARCH_ESP32 +#if defined(ARDUINO_ARCH_ESP8266) void push2buffer(uint8_t *sbuf, size_t len); - void flushbuffer(); +#endif // ARDUINO_ARCH_ESP8266 + void flushBuffer(); + void flushChar(char c); + void flushData(const uint8_t* data, size_t size, ESP3DMessageType type); }; extern ESP3DSerialService esp3d_serial_service; diff --git a/src/modules/serial/serial_service_esp32.cpp b/src/modules/serial/serial_service_esp32.cpp new file mode 100644 index 0000000..f541b43 --- /dev/null +++ b/src/modules/serial/serial_service_esp32.cpp @@ -0,0 +1,259 @@ +/* + esp3d_serial_service.cpp - serial services functions class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#if defined(ARDUINO_ARCH_ESP32) +#include "../../include/esp3d_config.h" +#if COMMUNICATION_PROTOCOL == RAW_SERIAL || \ + defined(ESP_SERIAL_BRIDGE_OUTPUT) || COMMUNICATION_PROTOCOL == MKS_SERIAL +#include "../../core/esp3d_commands.h" +#include "../../core/esp3d_settings.h" +#include "../../core/esp3d_string.h" +#include "../authentication/authentication_service.h" +#include "serial_service.h" + +#define SERIAL_COMMUNICATION_TIMEOUT 500 + +#if defined(CONFIG_IDF_TARGET_ESP32C3) || \ + defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32S2) +#define MAX_SERIAL 2 +HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1}; +#else +#define MAX_SERIAL 3 +HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1, &Serial2}; +#endif + +// Serial Parameters + +// Constructor +ESP3DSerialService::ESP3DSerialService(uint8_t id) { + _buffer_size = 0; + _mutex = NULL; + _started = false; +#if defined(AUTHENTICATION_FEATURE) + _needauthentication = true; +#else + _needauthentication = false; +#endif // AUTHENTICATION_FEATURE + _id = id; + switch (_id) { + case MAIN_SERIAL: + _rxPin = ESP_RX_PIN; + _txPin = ESP_TX_PIN; + _origin = ESP3DClientType::serial; + break; +#if defined(ESP_SERIAL_BRIDGE_OUTPUT) + case BRIDGE_SERIAL: + _rxPin = ESP_BRIDGE_RX_PIN; + _txPin = ESP_BRIDGE_TX_PIN; + _origin = ESP3DClientType::serial_bridge; + break; +#endif // ESP_SERIAL_BRIDGE_OUTPUT + default: + _rxPin = ESP_RX_PIN; + _txPin = ESP_TX_PIN; + _origin = ESP3DClientType::serial; + break; + } + _messagesInFIFO.setId("in"); + _messagesInFIFO.setMaxSize(0); // no limit + _baudRate = 0; +} +void ESP3DSerialService::receiveSerialCb() { esp3d_serial_service.receiveCb(); } + +#if defined(ESP_SERIAL_BRIDGE_OUTPUT) +void ESP3DSerialService::receiveBridgeSerialCb() { + serial_bridge_service.receiveCb(); +} +#endif // ESP_SERIAL_BRIDGE_OUTPUT + +void ESP3DSerialService::receiveCb() { + if (!started()) { + return; + } + if (xSemaphoreTake(_mutex, portMAX_DELAY)) { + uint32_t now = millis(); + while ((millis() - now) < SERIAL_COMMUNICATION_TIMEOUT) { + if (Serials[_serialIndex]->available()) { + _buffer[_buffer_size] = Serials[_serialIndex]->read(); + now = millis(); + if (esp3d_string::isRealTimeCommand(_buffer[_buffer_size])) { + flushChar(_buffer[_buffer_size]); + _buffer[_buffer_size] = '\0'; //remove realtime command from buffer + } else { + _buffer_size++; + if (_buffer_size > ESP3D_SERIAL_BUFFER_SIZE || + _buffer[_buffer_size - 1] == '\n') { + flushBuffer(); + } + } + } + } + + xSemaphoreGive(_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } +} + +// Setup Serial +bool ESP3DSerialService::begin(uint8_t serialIndex) { + _mutex = xSemaphoreCreateMutex(); + if (_mutex == NULL) { + esp3d_log_e("Mutex creation failed"); + return false; + } + _serialIndex = serialIndex - 1; + esp3d_log("Serial %d begin for %d", _serialIndex, _id); + if (_id == BRIDGE_SERIAL && + ESP3DSettings::readByte(ESP_SERIAL_BRIDGE_ON) == 0) { + esp3d_log("Serial %d for %d is disabled", _serialIndex, _id); + return true; + } + if (_serialIndex >= MAX_SERIAL) { + esp3d_log_e("Serial %d begin for %d failed, index out of range", + _serialIndex, _id); + return false; + } + _lastflush = millis(); + // read from settings + uint32_t br = 0; + uint32_t defaultBr = 0; + switch (_id) { + case MAIN_SERIAL: + br = ESP3DSettings::readUint32(ESP_BAUD_RATE); + defaultBr = ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE); + break; +#if defined(ESP_SERIAL_BRIDGE_OUTPUT) + case BRIDGE_SERIAL: + br = ESP3DSettings::readUint32(ESP_SERIAL_BRIDGE_BAUD); + defaultBr = + ESP3DSettings::getDefaultIntegerSetting(ESP_SERIAL_BRIDGE_BAUD); + break; +#endif // ESP_SERIAL_BRIDGE_OUTPUT + default: + esp3d_log_e("Serial %d begin for %d failed, unknown id", _serialIndex, + _id); + return false; + } + setParameters(); + esp3d_log("Baud rate is %d , default is %d", br, defaultBr); + _buffer_size = 0; + // change only if different from current + if (br != baudRate() || (_rxPin != -1) || (_txPin != -1)) { + if (!ESP3DSettings::isValidIntegerSetting(br, ESP_BAUD_RATE)) { + br = defaultBr; + } + Serials[_serialIndex]->setRxBufferSize(SERIAL_RX_BUFFER_SIZE); + Serials[_serialIndex]->begin(br, ESP_SERIAL_PARAM, _rxPin, _txPin); + _baudRate = br; + if (_id == MAIN_SERIAL) { + Serials[_serialIndex]->onReceive(receiveSerialCb); + } +#if defined(ESP_SERIAL_BRIDGE_OUTPUT) + if (_id == BRIDGE_SERIAL) { + Serials[_serialIndex]->onReceive(receiveBridgeSerialCb); + } +#endif // ESP_SERIAL_BRIDGE_OUTPUT + } + _started = true; + esp3d_log("Serial %d for %d is started", _serialIndex, _id); + return true; +} + +// End serial +bool ESP3DSerialService::end() { + flush(); + delay(100); + if (_mutex != NULL) { + vSemaphoreDelete(_mutex); + _mutex = NULL; + } + Serials[_serialIndex]->end(); + _buffer_size = 0; + _started = false; + initAuthentication(); + return true; +} + +void ESP3DSerialService::flushData(const uint8_t *data, size_t size, ESP3DMessageType type) { + ESP3DMessage *message = esp3d_message_manager.newMsg( + _origin, + _id == MAIN_SERIAL ? ESP3DClientType::all_clients + : esp3d_commands.getOutputClient(), + data, size, getAuthentication()); + + if (message) { + message->type = type; + esp3d_log("Message sent to fifo list"); + _messagesInFIFO.push(message); + } else { + esp3d_log_e("Cannot create message"); + } + _lastflush = millis(); +} + +// Function which could be called in other loop +void ESP3DSerialService::handle() { + // Do we have some data waiting + size_t len = _messagesInFIFO.size(); + if (len > 0) { + if (len > 10) { + len = 10; + } + while (len > 0) { + esp3d_log("Serial in fifo size %d", _messagesInFIFO.size()); + ESP3DMessage *message = _messagesInFIFO.pop(); + if (message) { + esp3d_commands.process(message); + } else { + esp3d_log_e("Cannot create message"); + } + len--; + } + } +} + +// Reset Serial Setting (baud rate) +bool ESP3DSerialService::reset() { + esp3d_log("Reset serial"); + bool res = false; + switch (_id) { + case MAIN_SERIAL: + return ESP3DSettings::writeUint32( + ESP_BAUD_RATE, + ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE)); +#if defined(ESP_SERIAL_BRIDGE_OUTPUT) + case BRIDGE_SERIAL: + res = ESP3DSettings::writeByte( + ESP_SERIAL_BRIDGE_ON, + ESP3DSettings::getDefaultByteSetting(ESP_SERIAL_BRIDGE_ON)); + return res && + ESP3DSettings::writeUint32(ESP_SERIAL_BRIDGE_BAUD, + ESP3DSettings::getDefaultIntegerSetting( + ESP_SERIAL_BRIDGE_BAUD)); +#endif // ESP_SERIAL_BRIDGE_OUTPUT + default: + return res; + } +} + + +#endif // COMMUNICATION_PROTOCOL == RAW_SERIAL || + // defined(ESP_SERIAL_BRIDGE_OUTPUT) +#endif // ARDUINO_ARCH_ESP32 \ No newline at end of file diff --git a/src/modules/serial/serial_service_esp8266.cpp b/src/modules/serial/serial_service_esp8266.cpp new file mode 100644 index 0000000..0e1cf6a --- /dev/null +++ b/src/modules/serial/serial_service_esp8266.cpp @@ -0,0 +1,278 @@ +/* + esp3d_serial_service.cpp - serial services functions class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#if defined(ARDUINO_ARCH_ESP8266) +#include "../../include/esp3d_config.h" +#if COMMUNICATION_PROTOCOL == MKS_SERIAL || COMMUNICATION_PROTOCOL == RAW_SERIAL +#include "../../core/esp3d_commands.h" +#include "../../core/esp3d_settings.h" +#include "../../core/esp3d_string.h" +#include "serial_service.h" + +#if COMMUNICATION_PROTOCOL == MKS_SERIAL +#include "../mks/mks_service.h" +#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL +#include "../authentication/authentication_service.h" +#define MAX_SERIAL 2 +HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1}; + +#define TIMEOUT_SERIAL_FLUSH 1500 + +// Serial Parameters + +// Constructor +ESP3DSerialService::ESP3DSerialService(uint8_t id) { + _buffer_size = 0; + _started = false; +#if defined(AUTHENTICATION_FEATURE) + _needauthentication = true; +#else + _needauthentication = false; +#endif // AUTHENTICATION_FEATURE + _id = id; + + _rxPin = ESP_RX_PIN; + _txPin = ESP_TX_PIN; + _origin = ESP3DClientType::serial; +} + +// Setup Serial +bool ESP3DSerialService::begin(uint8_t serialIndex) { + _serialIndex = serialIndex - 1; + esp3d_log("Serial %d begin for %d", _serialIndex, _id); + if (_serialIndex >= MAX_SERIAL) { + esp3d_log_e("Serial %d begin for %d failed, index out of range", + _serialIndex, _id); + return false; + } + _lastflush = millis(); + // read from settings + uint32_t br = 0; + uint32_t defaultBr = 0; + + br = ESP3DSettings::readUint32(ESP_BAUD_RATE); + defaultBr = ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE); + setParameters(); + esp3d_log("Baud rate is %d , default is %d", br, defaultBr); + _buffer_size = 0; + // change only if different from current + if (br != baudRate() || (_rxPin != -1) || (_txPin != -1)) { + if (!ESP3DSettings::isValidIntegerSetting(br, ESP_BAUD_RATE)) { + br = defaultBr; + } + Serials[_serialIndex]->setRxBufferSize(SERIAL_RX_BUFFER_SIZE); + Serials[_serialIndex]->begin(br, ESP_SERIAL_PARAM, SERIAL_FULL, + (_txPin == -1) ? 1 : _txPin); + if (_rxPin != -1) { + Serials[_serialIndex]->pins((_txPin == -1) ? 1 : _txPin, _rxPin); + } + } + _started = true; + esp3d_log("Serial %d for %d is started", _serialIndex, _id); + return true; +} +// End serial +bool ESP3DSerialService::end() { + flush(); + delay(100); + swap(); + Serials[_serialIndex]->end(); + _buffer_size = 0; + _started = false; + initAuthentication(); + return true; +} + +void ESP3DSerialService::flushData(const uint8_t *data, size_t size, ESP3DMessageType type) { + ESP3DMessage *message = esp3d_message_manager.newMsg( + _origin, + _id == MAIN_SERIAL ? ESP3DClientType::all_clients + : esp3d_commands.getOutputClient(), + data, size, getAuthentication()); + + if (message) { + message->type = type; + esp3d_log("Process Message"); + esp3d_commands.process(message); + } else { + esp3d_log_e("Cannot create message"); + } + _lastflush = millis(); +} + +// Function which could be called in other loop +void ESP3DSerialService::handle() { + if (!_started) { + return; + } + // Do we have some data waiting + size_t len = Serials[_serialIndex]->available(); + if (len > 0) { + // if yes read them + esp3d_log("Got %d chars in serial", len); + uint8_t *sbuf = (uint8_t *)malloc(len); + if (sbuf) { + size_t count = readBytes(sbuf, len); + // push to buffer + if (count > 0) { + push2buffer(sbuf, count); + } + // freen buffer + free(sbuf); + } + } + // we cannot left data in buffer too long + // in case some commands "forget" to add \n + if (((millis() - _lastflush) > TIMEOUT_SERIAL_FLUSH) && (_buffer_size > 0)) { + flushBuffer(); + } +} + +// push collected data to buffer and proceed accordingly +void ESP3DSerialService::push2buffer(uint8_t *sbuf, size_t len) { + if (!_started || !_buffer) { + return; + } + esp3d_log("buffer get %d data ", len); +#if COMMUNICATION_PROTOCOL == MKS_SERIAL + static bool isFrameStarted = false; + static bool isCommandFrame = false; + static uint8_t type; + // expected size + static int16_t framePos = -1; + // currently received + static uint datalen = 0; + for (size_t i = 0; i < len; i++) { + esp3d_log("Data : %c %x", sbuf[i], sbuf[i]); + framePos++; + _lastflush = millis(); + // so frame head was detected + if (isFrameStarted) { + // checking it is a valid Frame header + if (framePos == 1) { + esp3d_log("type = %x", sbuf[i]); + if (MKSService::isFrame(char(sbuf[i]))) { + if (MKSService::isCommand(char(sbuf[i]))) { + isCommandFrame = true; + esp3d_log("type: Command"); + } else { + esp3d_log("type: other"); + type = sbuf[i]; + isCommandFrame = false; + } + } else { + esp3d_log_e("wrong frame type"); + isFrameStarted = false; + _buffer_size = 0; + } + } else if ((framePos == 2) || (framePos == 3)) { + // add size to int + if (framePos == 2) { + datalen = sbuf[i]; + } else { + datalen += (sbuf[i] << 8); + esp3d_log("Data len: %d", datalen); + if (datalen > (ESP3D_SERIAL_BUFFER_SIZE - 5)) { + esp3d_log_e("Overflow in data len"); + isFrameStarted = false; + _buffer_size = 0; + } + } + } else if (MKSService::isTail(char(sbuf[i]))) { + esp3d_log("got tail"); + _buffer[_buffer_size] = '\0'; + esp3d_log("size is %d", _buffer_size); + // let check integrity + if (_buffer_size == datalen) { + esp3d_log("Flushing buffer"); + if (isCommandFrame) { + flushBuffer(); + } else { + MKSService::handleFrame(type, (const uint8_t *)_buffer, + _buffer_size); + } + } else { + esp3d_log_e("Error in data len"); + } + // clear frame infos + _buffer_size = 0; + isFrameStarted = false; + + } else { + // it is data + if (_buffer_size < ESP3D_SERIAL_BUFFER_SIZE - 5) { + _buffer[_buffer_size] = sbuf[i]; + _buffer_size++; + } else { + esp3d_log_e("Overflow in data len"); + isFrameStarted = false; + _buffer_size = 0; + } + } + } else { + // frame is not started let see if it is a head + if (MKSService::isHead(char(sbuf[i]))) { + esp3d_log("got head"); + // yes it is + isFrameStarted = true; + framePos = 0; + _buffer_size = 0; + } else { + // no so let reset all and just ignore it + // TODO should we handle these data ? + esp3d_log_e("Unidentified data : %c %x", sbuf[i], sbuf[i]); + isCommandFrame = false; + framePos = -1; + datalen = 0; + } + } + } +#else + for (size_t i = 0; i < len; i++) { + _lastflush = millis(); + if (esp3d_string::isRealTimeCommand(sbuf[i])) { + flushChar(sbuf[i]); + } else { + _buffer[_buffer_size] = sbuf[i]; + _buffer_size++; + if (_buffer_size > ESP3D_SERIAL_BUFFER_SIZE || + _buffer[_buffer_size - 1] == '\n') { + flushBuffer(); + } + } + } +#endif +} + +// Reset Serial Setting (baud rate) +bool ESP3DSerialService::reset() { + esp3d_log("Reset serial"); + return ESP3DSettings::writeUint32( + ESP_BAUD_RATE, ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE)); +} + +void ESP3DSerialService::swap() { +#ifdef ARDUINO_ARCH_ESP8266 + Serials[_serialIndex]->swap(); +#endif // ARDUINO_ARCH_ESP8266 +} + +#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL || COMMUNICATION_PROTOCOL == + // RAW_SERIAL +#endif // ARDUINO_ARCH_ESP8266 \ No newline at end of file diff --git a/src/modules/serial2socket/serial2socket.cpp b/src/modules/serial2socket/serial2socket.cpp index 2f657cd..10fb699 100644 --- a/src/modules/serial2socket/serial2socket.cpp +++ b/src/modules/serial2socket/serial2socket.cpp @@ -99,7 +99,7 @@ size_t Serial_2_Socket::write(const uint8_t *buffer, size_t size) { for (int i = 0; i < size; i++) { _TXbuffer[_TXbufferSize] = buffer[i]; _TXbufferSize++; - if (buffer[i] == (const uint8_t)'\n' || buffer[i] == (const uint8_t)'\r') { + if (buffer[i] == (const uint8_t)'\n') { esp3d_log("S2S: %s TXSize: %d", (const char *)_TXbuffer, _TXbufferSize); flush(); } @@ -167,7 +167,7 @@ void Serial_2_Socket::handle_flush() { } void Serial_2_Socket::flush(void) { if (_TXbufferSize > 0 && _started && !_paused) { - ESP3DMessage *msg = ESP3DMessageManager::newMsg( + ESP3DMessage *msg = esp3d_message_manager.newMsg( ESP3DClientType::socket_serial, ESP3DClientType::all_clients, _TXbuffer, _TXbufferSize, _auth); // dispatch command @@ -195,7 +195,7 @@ bool Serial_2_Socket::dispatch(ESP3DMessage *message) { esp3d_log_e("Serial2Socket: cannot push all data"); return false; } - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } esp3d_log_e("Serial2Socket: no data in message"); diff --git a/src/modules/telnet/telnet_server.cpp b/src/modules/telnet/telnet_server.cpp index 73a8863..888d88b 100644 --- a/src/modules/telnet/telnet_server.cpp +++ b/src/modules/telnet/telnet_server.cpp @@ -22,8 +22,7 @@ #if defined(TELNET_FEATURE) || \ (defined(ESP_LOG_FEATURE) && ESP_LOG_FEATURE == LOG_OUTPUT_TELNET) -#include -#include + #include "../../core/esp3d_commands.h" #include "../../core/esp3d_message.h" @@ -38,10 +37,10 @@ Telnet_Server telnet_server; #if defined(AUTHENTICATION_FEATURE) #define TELNET_WELCOME_MESSAGE \ - ";Welcome to ESP3D-TFT V" FW_VERSION \ + ";Welcome to ESP3D V" FW_VERSION \ ", please enter a command with credentials.\r\n" #else -#define TELNET_WELCOME_MESSAGE ";Welcome to ESP3D-TFT V" FW_VERSION ".\r\n" +#define TELNET_WELCOME_MESSAGE ";Welcome to ESP3D V" FW_VERSION ".\r\n" #endif // AUTHENTICATION_FEATURE void Telnet_Server::closeClient() { @@ -62,9 +61,11 @@ bool Telnet_Server::isConnected() { _telnetClients.stop(); } _telnetClients = _telnetserver->accept(); + #ifndef DISABLE_TELNET_WELCOME_MESSAGE // new client writeBytes((uint8_t *)TELNET_WELCOME_MESSAGE, strlen(TELNET_WELCOME_MESSAGE)); + #endif // DISABLE_TELNET_WELCOME_MESSAGE initAuthentication(); } } @@ -185,7 +186,7 @@ void Telnet_Server::handle() { // we cannot left data in buffer too long // in case some commands "forget" to add \n if (((millis() - _lastflush) > TIMEOUT_TELNET_FLUSH) && (_buffer_size > 0)) { - flushbuffer(); + flushBuffer(); } } @@ -198,7 +199,7 @@ bool Telnet_Server::dispatch(ESP3DMessage *message) { if (sentcnt != message->size) { return false; } - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } return false; @@ -213,57 +214,48 @@ void Telnet_Server::initAuthentication() { } ESP3DAuthenticationLevel Telnet_Server::getAuthentication() { return _auth; } -void Telnet_Server::flushbuffer() { - if (!_buffer || !_started) { - _buffer_size = 0; - return; - } - _buffer[_buffer_size] = 0x0; - ESP3DMessage *msg = ESP3DMessageManager::newMsg( - ESP3DClientType::telnet, esp3d_commands.getOutputClient(), _buffer, - _buffer_size, _auth); - if (msg) { - // process command - esp3d_commands.process(msg); + + +void Telnet_Server::flushData(const uint8_t *data, size_t size, ESP3DMessageType type) { + ESP3DMessage *message = esp3d_message_manager.newMsg( + ESP3DClientType::telnet, esp3d_commands.getOutputClient(), data, + size, _auth); + + if (message) { + message->type = type; + esp3d_log("Process Message"); + esp3d_commands.process(message); } else { esp3d_log_e("Cannot create message"); } - _lastflush = millis(); +} + + +void Telnet_Server::flushChar(char c) { flushData((uint8_t *)&c, 1, ESP3DMessageType::realtimecmd); } + +void Telnet_Server::flushBuffer() { + _buffer[_buffer_size] = 0x0; + flushData((uint8_t *)_buffer, _buffer_size, ESP3DMessageType::unique); _buffer_size = 0; } + void Telnet_Server::push2buffer(uint8_t *sbuf, size_t len) { - if (!_buffer) { + if (!_buffer || !_started) { return; } for (size_t i = 0; i < len; i++) { _lastflush = millis(); - // command is defined - if ((char(sbuf[i]) == '\n') || (char(sbuf[i]) == '\r')) { - if (_buffer_size < ESP3D_TELNET_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - flushbuffer(); - } else if (esp3d_string::isPrintableChar(char(sbuf[i]))) { - if (_buffer_size < ESP3D_TELNET_BUFFER_SIZE) { - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } else { - flushbuffer(); - _buffer[_buffer_size] = sbuf[i]; - _buffer_size++; - } - } else { // it is not printable char - // clean buffer first - if (_buffer_size > 0) { - flushbuffer(); - } - // process char + if (esp3d_string::isRealTimeCommand(sbuf[i])) { + flushChar(sbuf[i]); + } else { _buffer[_buffer_size] = sbuf[i]; _buffer_size++; - flushbuffer(); + if (_buffer_size > ESP3D_TELNET_BUFFER_SIZE || + _buffer[_buffer_size - 1] == '\n') { + flushBuffer(); + } } } } diff --git a/src/modules/telnet/telnet_server.h b/src/modules/telnet/telnet_server.h index a70508a..6c7cf2d 100644 --- a/src/modules/telnet/telnet_server.h +++ b/src/modules/telnet/telnet_server.h @@ -21,8 +21,9 @@ #ifndef _TELNET_SERVER_H #define _TELNET_SERVER_H -class WiFiServer; -class WiFiClient; +#include +#include + #include "../../core/esp3d_message.h" #define ESP3D_TELNET_BUFFER_SIZE 1200 @@ -61,7 +62,9 @@ class Telnet_Server { uint8_t* _buffer; size_t _buffer_size; void push2buffer(uint8_t* sbuf, size_t len); - void flushbuffer(); + void flushBuffer(); + void flushChar(char c); + void flushData(const uint8_t* data, size_t size, ESP3DMessageType type); }; extern Telnet_Server telnet_server; diff --git a/src/modules/time/time_service.cpp b/src/modules/time/time_service.cpp index 2be4d3d..f05b756 100644 --- a/src/modules/time/time_service.cpp +++ b/src/modules/time/time_service.cpp @@ -78,7 +78,6 @@ bool TimeService::isInternetTime(bool readfromsettings) { bool TimeService::begin() { esp3d_log("Starting TimeService"); end(); - String s1, s2, s3, t1; updateTimeZone(true); #if defined(WIFI_FEATURE) // no time server in AP mode @@ -110,14 +109,14 @@ bool TimeService::begin() { if (!isInternetTime(true)) { return true; } - s1 = ESP3DSettings::readString(ESP_TIME_SERVER1); - s2 = ESP3DSettings::readString(ESP_TIME_SERVER2); - s3 = ESP3DSettings::readString(ESP_TIME_SERVER3); + _server[0] = ESP3DSettings::readString(ESP_TIME_SERVER1); + _server[1] = ESP3DSettings::readString(ESP_TIME_SERVER2); + _server[2] = ESP3DSettings::readString(ESP_TIME_SERVER3); #if defined(ARDUINO_ARCH_ESP32) - configTzTime(_time_zone.c_str(), s1.c_str(), s2.c_str(), s3.c_str()); + configTzTime(_time_zone_config.c_str(), _server[0].c_str(), _server[1].length() > 0 ? _server[1].c_str() : nullptr, _server[2].length() > 0 ? _server[2].c_str() : nullptr); #endif // ARDUINO_ARCH_ESP32 #if defined(ARDUINO_ARCH_ESP8266) - configTime(t1.c_str(), s1.c_str(), s2.c_str(), s3.c_str()); + configTime(_time_zone_config.c_str(), _server[0].c_str(), _server[1].length() > 0 ? _server[1].c_str() : nullptr, _server[2].length() > 0 ? _server[2].c_str() : nullptr); #endif // ARDUINO_ARCH_ESP8266 time_t now = time(nullptr); @@ -181,16 +180,26 @@ bool TimeService::updateTimeZone(bool fromsettings) { setTZ(stmp.c_str()); #endif // ARDUINO_ARCH_ESP8266 + _time_zone_config = "<"; + _time_zone_config += _time_zone[0]; + _time_zone_config += _time_zone[1]; + _time_zone_config += _time_zone[2]; + _time_zone_config += _time_zone[4]; + _time_zone_config += _time_zone[5]; + _time_zone_config += ">"; + _time_zone_config += _time_zone[0]=='+' ? "-" : "+"; + _time_zone_config += &_time_zone[1]; + esp3d_log("Time zone is %s", _time_zone_config.c_str()); return true; } const char* TimeService::getCurrentTime() { struct tm tmstruct; + static char buf[20]; time_t now; // get current time time(&now); localtime_r(&now, &tmstruct); - static char buf[20]; strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tmstruct); esp3d_log("Time string is %s", buf); return buf; diff --git a/src/modules/time/time_service.h b/src/modules/time/time_service.h index 00269f6..1c26dbc 100644 --- a/src/modules/time/time_service.h +++ b/src/modules/time/time_service.h @@ -44,7 +44,9 @@ class TimeService { int _get_time_zone_offset_min(); bool _started; bool _isInternetTime; + String _server[3]; String _time_zone; + String _time_zone_config; }; extern TimeService timeService; diff --git a/src/modules/update/update_service.cpp b/src/modules/update/update_service.cpp index 2ecf50f..b46d7f0 100644 --- a/src/modules/update/update_service.cpp +++ b/src/modules/update/update_service.cpp @@ -63,11 +63,11 @@ const uint16_t ServstringKeysPos[] = {ESP_TIME_ZONE, ESP_NOTIFICATION_TOKEN2, ESP_NOTIFICATION_SETTINGS}; -const char* IPKeysVal[] = {"STA_IP", "STA_GW", "STA_MSK", "STA_DNS", "AP_IP"}; +const char* IPKeysVal[] = {"STA_IP", "STA_GW", "STA_MSK", "STA_DNS", "AP_IP","ETH_STA_IP", "ETH_STA_GW", "ETH_STA_MSK", "ETH_STA_DNS"}; const uint16_t IPKeysPos[] = {ESP_STA_IP_VALUE, ESP_STA_GATEWAY_VALUE, ESP_STA_MASK_VALUE, ESP_STA_DNS_VALUE, - ESP_AP_IP_VALUE}; + ESP_AP_IP_VALUE, ESP_ETH_STA_IP_VALUE, ESP_ETH_STA_GATEWAY_VALUE, ESP_ETH_STA_MASK_VALUE, ESP_ETH_STA_DNS_VALUE}; const char* ServintKeysVal[] = { "Serial_Bridge_Baud" @@ -87,9 +87,17 @@ const uint16_t ServintKeysPos[] = { ESP_FTP_CTRL_PORT, ESP_FTP_DATA_ACTIVE_PORT, ESP_FTP_DATA_PASSIVE_PORT}; -const char* SysintKeysVal[] = {"Baud_rate", "Boot_delay"}; +const char* SysintKeysVal[] = {"Baud_rate", +#if defined(USB_SERIAL_FEATURE) + "USB_Serial_Baud_rate", + #endif // USB_SERIAL_FEATURE + "Boot_delay"}; -const uint16_t SysintKeysPos[] = {ESP_BAUD_RATE, ESP_BOOT_DELAY}; +const uint16_t SysintKeysPos[] = {ESP_BAUD_RATE, +#if defined(USB_SERIAL_FEATURE) + ESP_USB_SERIAL_BAUD_RATE, +#endif // USB_SERIAL_FEATURE + ESP_BOOT_DELAY}; const char* ServboolKeysVal[] = {"Serial_Bridge_active", "AUTONOTIFICATION", "HTTP_active", "TELNET_active", @@ -226,7 +234,7 @@ bool processingFileFunction(const char* section, const char* key, } else if (strcasecmp("OFF", value) == 0) { b = ESP_NO_NETWORK; } else { - P = -1; // invalide value + P = -1; // invalid value } } } @@ -243,7 +251,23 @@ bool processingFileFunction(const char* section, const char* key, } else if (strcasecmp("OFF", value) == 0) { b = ESP_NO_NETWORK; } else { - P = -1; // invalide value + P = -1; // invalid value + } + } + } + + // ETH STA fallback mode BT, OFF + if (!done) { + if (strcasecmp("eth_sta_fallback", key) == 0) { + T = 'B'; + P = ESP_STA_FALLBACK_MODE; + done = true; + if (strcasecmp("BT", value) == 0) { + b = ESP_BT; + } else if (strcasecmp("OFF", value) == 0) { + b = ESP_NO_NETWORK; + } else { + P = -1; // invalid value } } } @@ -259,10 +283,27 @@ bool processingFileFunction(const char* section, const char* key, } else if (strcasecmp("STATIC", key) == 0) { b = STATIC_IP_MODE; } else { - P = -1; // invalide value + P = -1; // invalid value + } + } + } + + // ETH STA IP Mode DHCP / STATIC + if (!done) { + if (strcasecmp("ETH_STA_IP_mode", key) == 0) { + T = 'B'; + P = ESP_ETH_STA_IP_MODE; + done = true; + if (strcasecmp("DHCP", value) == 0) { + b = DHCP_MODE; + } else if (strcasecmp("STATIC", key) == 0) { + b = STATIC_IP_MODE; + } else { + P = -1; // invalid value } } } + } else if (strcasecmp("services", section) == 0) { if (!done) { done = processString(ServstringKeysVal, ServstringKeysPos, @@ -289,7 +330,7 @@ bool processingFileFunction(const char* section, const char* key, } } // Notification type None / PushOver / Line / Email / Telegram / IFTTT / - // HomeAssistant + // HomeAssistant / WhatsApp if (!done) { if (strcasecmp("NOTIF_TYPE", key) == 0) { T = 'B'; @@ -307,10 +348,12 @@ bool processingFileFunction(const char* section, const char* key, b = ESP_TELEGRAM_NOTIFICATION; } else if (strcasecmp("IFTTT", value) == 0) { b = ESP_IFTTT_NOTIFICATION; - } else if (strcasecmp("HOMEASSISTANT", value) == 0) { + } else if (strcasecmp("WhatsApp", value) == 0) { + b = ESP_WHATS_APP_NOTIFICATION; + }else if (strcasecmp("HOMEASSISTANT", value) == 0) { b = ESP_HOMEASSISTANT_NOTIFICATION; } else { - P = -1; // invalide value + P = -1; // invalid value } } } @@ -333,7 +376,7 @@ bool processingFileFunction(const char* section, const char* key, } else if (strcasecmp("BME280", key) == 0) { b = BME280_DEVICE; } else { - P = -1; // invalide value + P = -1; // invalid value } } } @@ -366,10 +409,27 @@ bool processingFileFunction(const char* section, const char* key, } else if (strcasecmp("SMOOTHIEWARE", value) == 0) { b = SMOOTHIEWARE; } else { - P = -1; // invalide value + P = -1; // invalid value + } + } + } + //Output USB Serial + #if defined(USB_SERIAL_FEATURE) + if (!done) { + if (strcasecmp("output", key) == 0) { + T = 'B'; + P = ESP_OUTPUT_CLIENT; + done = true; + if (strcasecmp("USB", value) == 0) { + b = ESP3DClientType::usb_serial; + } else if (strcasecmp("SERIAL", value) == 0) { + b = ESP3DClientType::serial; + } else { + P = -1; // invalid value } } } + #endif // USB_SERIAL_FEATURE } // now we save -handle saving status diff --git a/src/modules/usb-serial/usb_serial_service.cpp b/src/modules/usb-serial/usb_serial_service.cpp new file mode 100644 index 0000000..794ce41 --- /dev/null +++ b/src/modules/usb-serial/usb_serial_service.cpp @@ -0,0 +1,511 @@ +/* + esp3d_usb_serial_service.cpp - serial services functions class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "../../include/esp3d_config.h" +#if defined(USB_SERIAL_FEATURE) +#include "../../core/esp3d_commands.h" +#include "../../core/esp3d_settings.h" +#include "../../core/esp3d_string.h" +#include "../authentication/authentication_service.h" +#include "usb_serial_service.h" + +#if defined(NOTIFICATION_FEATURE) +#include "../notifications/notifications_service.h" +#endif // NOTIFICATION_FEATURE + +const uint32_t SupportedUsbSerialBaudList[] = { + 9600, 19200, 38400, 57600, 74880, 115200, 230400, + 250000, 500000, 921600, 1000000, 1958400, 2000000}; +const size_t SupportedUsbSerialBaudListSize = + sizeof(SupportedUsbSerialBaudList) / sizeof(uint32_t); + +ESP3DUsbSerialService esp3d_usb_serial_service; + +#define SERIAL_COMMUNICATION_TIMEOUT 500 +// Serial Parameters +#define ESP3D_USB_SERIAL_DATA_BITS (8) +#define ESP3D_USB_SERIAL_PARITY \ + (0) // 0: 1 stopbit, 1: 1.5 stopbits, 2: 2 stopbits +#define ESP3D_USB_SERIAL_STOP_BITS \ + (0) // 0: None, 1: Odd, 2: Even, 3: Mark, 4: Space +// Task parameters +#define ESP3D_USB_SERIAL_RX_BUFFER_SIZE 512 +#define ESP3D_USB_SERIAL_TX_BUFFER_SIZE 128 + +#define ESP3D_USB_SERIAL_TASK_SIZE 4096 +#if CONFIG_FREERTOS_UNICORE +#define ESP3D_USB_SERIAL_TASK_CORE 0 +#else +#define ESP3D_USB_SERIAL_TASK_CORE 1 +#endif // CONFIG_FREERTOS_UNICORE + +#define ESP3D_USB_SERIAL_TASK_PRIORITY 10 + +#define TIMEOUT_USB_SERIAL_FLUSH 1500 +// Constructor +ESP3DUsbSerialService::ESP3DUsbSerialService() { + _buffer_size = 0; + _buffer_mutex = NULL; + _device_disconnected_mutex = NULL; + _is_connected = false; + _xHandle = NULL; + _vcp_ptr = NULL; + _started = false; +#if defined(AUTHENTICATION_FEATURE) + _needauthentication = true; +#else + _needauthentication = false; +#endif // AUTHENTICATION_FEATURE + _origin = ESP3DClientType::usb_serial; + _messagesInFIFO.setId("in"); + _messagesInFIFO.setMaxSize(0); // no limit + _baudRate = 0; +} + +// Destructor +ESP3DUsbSerialService::~ESP3DUsbSerialService() { end(); } + +// extra parameters that do not need a begin +void ESP3DUsbSerialService::setParameters() { +#if defined(AUTHENTICATION_FEATURE) + _needauthentication = + (ESP3DSettings::readByte(ESP_SECURE_SERIAL) == 0) ? false : true; +#else + _needauthentication = false; +#endif // AUTHENTICATION_FEATURE +} + +void ESP3DUsbSerialService::initAuthentication() { +#if defined(AUTHENTICATION_FEATURE) + _auth = ESP3DAuthenticationLevel::guest; +#else + _auth = ESP3DAuthenticationLevel::admin; +#endif // AUTHENTICATION_FEATURE +} +ESP3DAuthenticationLevel ESP3DUsbSerialService::getAuthentication() { + if (_needauthentication) { + return _auth; + } + return ESP3DAuthenticationLevel::admin; +} + +/** + * @brief Data received callback + */ +bool usb_rx_callback(const uint8_t *data, size_t data_len, void *arg) { + esp3d_log("rx_callback %d : %s", data_len, (const char *)data); + esp3d_usb_serial_service.receiveCb(data, data_len); + return true; +} + +/** + * @brief Device event callback + * + * Apart from handling device disconnection it doesn't do anything useful + */ +void handle_event(const cdc_acm_host_dev_event_data_t *event, void *user_ctx) { + switch (event->type) { + case CDC_ACM_HOST_ERROR: +#if defined(NOTIFICATION_FEATURE) + notificationsservice.sendAutoNotification("USB Error occured"); +#endif // NOTIFICATION_FEATURE + esp3d_log_e("CDC-ACM error has occurred, err_no = %d\n", + event->data.error); + break; + case CDC_ACM_HOST_DEVICE_DISCONNECTED: + esp3d_log("Device suddenly disconnected"); + esp3d_usb_serial_service.setConnected(false); + break; + case CDC_ACM_HOST_SERIAL_STATE: + esp3d_log("Serial state notif 0x%04X\n", event->data.serial_state.val); + break; + case CDC_ACM_HOST_NETWORK_CONNECTION: + esp3d_log("Network connection established"); + break; + default: + esp3d_log("Unknown event"); + break; + } +} + +void ESP3DUsbSerialService::setConnected(bool connected) { + _is_connected = connected; + if (_is_connected) { + esp3d_log("USB device connected"); +#if defined(NOTIFICATION_FEATURE) + notificationsservice.sendAutoNotification("USB Connected"); +#endif // NOTIFICATION_FEATURE + if (xSemaphoreTake(_device_disconnected_mutex, portMAX_DELAY) != pdTRUE) { + esp3d_log_e("Mutex not taken"); + _is_connected = false; + } + } else { + esp3d_log("USB device disconnected"); +#if defined(NOTIFICATION_FEATURE) + notificationsservice.sendAutoNotification("USB Disconnected"); +#endif // NOTIFICATION_FEATURE + xSemaphoreGive(_device_disconnected_mutex); + _vcp_ptr = nullptr; + } +} + +void ESP3DUsbSerialService::receiveCb(const uint8_t *data, size_t data_len, + void *arg) { + esp3d_log("receiveCb %d : %s", data_len, (const char *)data); + if (!started()) { + return; + } + if (xSemaphoreTake(_buffer_mutex, portMAX_DELAY) == pdTRUE) { + for (size_t i = 0; i < data_len; i++) { + if (esp3d_string::isRealTimeCommand(data[i])) { + flushChar(data[i]); + } else { + _buffer[_buffer_size] = data[i]; + _buffer_size++; + if (_buffer_size > ESP3D_USB_SERIAL_BUFFER_SIZE || + _buffer[_buffer_size - 1] == '\n') { + flushBuffer(); + } + } + } + xSemaphoreGive(_buffer_mutex); + } else { + esp3d_log_e("Mutex not taken"); + } +} + +// this task only handle connection +static void esp3d_usb_serial_connection_task(void *pvParameter) { + (void)pvParameter; + while (1) { + /* Delay */ + vTaskDelay(pdMS_TO_TICKS(10)); + if (!esp3d_usb_serial_service.started()) { + esp3d_log_e("USB Serial service not started"); + break; + } + esp3d_usb_serial_service.connectDevice(); + } + /* A task should NEVER return */ + vTaskDelete(NULL); +} + +void ESP3DUsbSerialService::connectDevice() { + if (!_started || _is_connected || _vcp_ptr) { + // esp3d_log("USB device is connected (%d) or service not started (%d)", + // _is_connected, _started); + return; + } + const cdc_acm_host_device_config_t dev_config = { + .connection_timeout_ms = 5000, // 5 seconds, enough time to plug the + // device in or experiment with timeout + .out_buffer_size = ESP3D_USB_SERIAL_TX_BUFFER_SIZE, + .in_buffer_size = ESP3D_USB_SERIAL_RX_BUFFER_SIZE, + .event_cb = handle_event, + .data_cb = usb_rx_callback, + .user_arg = NULL, + }; + cdc_acm_line_coding_t line_coding = { + .dwDTERate = _baudRate, + .bCharFormat = ESP3D_USB_SERIAL_STOP_BITS, + .bParityType = ESP3D_USB_SERIAL_PARITY, + .bDataBits = ESP3D_USB_SERIAL_DATA_BITS, + }; + // You don't need to know the device's VID and PID. Just plug in any device + // and the VCP service will pick correct (already registered) driver for the + // device + esp3d_log("Waiting for USB device"); + _vcp_ptr = std::unique_ptr(esp_usb::VCP::open(&dev_config)); + + if (!_vcp_ptr) { + esp3d_log_e("USB device not found, retrying..."); + return; + } + + vTaskDelay(10); + + esp3d_log("USB device found"); + + if (_vcp_ptr->line_coding_set(&line_coding) == ESP_OK) { + esp3d_log("USB Connected"); + uint16_t vid = esp_usb::getVID(); + uint16_t pid = esp_usb::getPID(); + esp3d_log("USB device with VID: 0x%04X (%s), PID: 0x%04X (%s) found\n", vid, + esp_usb::getVIDString(), pid, esp_usb::getPIDString()); + setConnected(true); + } else { + esp3d_log_e("USB device not identified"); + } +} + +const char *ESP3DUsbSerialService::getVIDString() { + if (_vcp_ptr && _is_connected) { + return esp_usb::getVIDString(); + } + return "None"; +} +const char *ESP3DUsbSerialService::getPIDString() { + if (_vcp_ptr && _is_connected) { + return esp_usb::getPIDString(); + } + return "None"; +} + +uint16_t ESP3DUsbSerialService::getVID() { + if (_vcp_ptr && _is_connected) { + return esp_usb::getVID(); + } + return 0; +} +uint16_t ESP3DUsbSerialService::getPID() { + if (_vcp_ptr && _is_connected) { + return esp_usb::getPID(); + } + return 0; +} + +// Setup Serial +bool ESP3DUsbSerialService::begin() { + _buffer_mutex = xSemaphoreCreateMutex(); + if (_buffer_mutex == NULL) { + esp3d_log_e("Mutex creation failed"); + return false; + } + _device_disconnected_mutex = xSemaphoreCreateMutex(); + if (_device_disconnected_mutex == NULL) { + esp3d_log_e("Mutex creation failed"); + return false; + } + _lastflush = millis(); + // read from settings + + _baudRate = ESP3DSettings::readUint32(ESP_USB_SERIAL_BAUD_RATE); + esp3d_log("Baud rate is %d ", _baudRate); + _buffer_size = 0; + // change only if different from current + + if (ESP_OK != usb_serial_init()) { + esp3d_log_e("USB Serial Init failed"); + return false; + } else { + esp3d_log("USB Serial Init OK"); + if (ESP_OK != usb_serial_create_task()) { + esp3d_log_e("USB Serial Create Task failed"); + return false; + } else { + esp3d_log("USB Serial Create Task OK"); + } + _device_disconnected_mutex = xSemaphoreCreateMutex(); + if (_device_disconnected_mutex == NULL) { + Serial.println("Mutex creation failed"); + return false; + } else { + esp3d_log("Mutex creation OK"); + } + _started = true; + + BaseType_t res = xTaskCreatePinnedToCore( + esp3d_usb_serial_connection_task, "esp3d_usb_serial_task", + ESP3D_USB_SERIAL_TASK_SIZE, NULL, ESP3D_USB_SERIAL_TASK_PRIORITY, + &_xHandle, ESP3D_USB_SERIAL_TASK_CORE); + if (res != pdPASS || !_xHandle) { + esp3d_log_e("Failed to create USB Serial Connection Task"); + _started = false; + return false; + } else { + esp3d_log("USB Serial Connection Task OK"); + } + } + + return true; +} + +// End serial +bool ESP3DUsbSerialService::end() { + flush(); + delay(100); + if (_buffer_mutex != NULL) { + vSemaphoreDelete(_buffer_mutex); + _buffer_mutex = NULL; + } + if (_device_disconnected_mutex != NULL) { + vSemaphoreDelete(_device_disconnected_mutex); + _device_disconnected_mutex = NULL; + } + // Serials[_serialIndex]->end(); + _buffer_size = 0; + _started = false; + _is_connected = false; + if (_xHandle != NULL) { + vTaskDelete(_xHandle); + _xHandle = NULL; + esp3d_log("Task deleted"); + } + if (_vcp_ptr != NULL) { + _vcp_ptr = NULL; + esp3d_log("VCP deleted"); + } + usb_serial_deinit(); + usb_serial_delete_task(); + initAuthentication(); + return true; +} + +// return the array of uint32_t and array size +const uint32_t *ESP3DUsbSerialService::get_baudratelist(uint8_t *count) { + if (count) { + *count = sizeof(SupportedUsbSerialBaudList) / sizeof(uint32_t); + } + return SupportedUsbSerialBaudList; +} + +// Function which could be called in other loop +void ESP3DUsbSerialService::handle() { + // Do we have some data waiting + size_t len = _messagesInFIFO.size(); + if (len > 0) { + if (len > 10) { + len = 10; + } + while (len > 0) { + esp3d_log("Serial in fifo size %d", _messagesInFIFO.size()); + ESP3DMessage *message = _messagesInFIFO.pop(); + if (message) { + esp3d_commands.process(message); + } else { + esp3d_log_e("Cannot create message"); + } + len--; + } + } +} + +void ESP3DUsbSerialService::flushData(const uint8_t *data, size_t size, + ESP3DMessageType type) { + if (!data || !_started) { + return; + } + ESP3DMessage *message = esp3d_message_manager.newMsg( + _origin, ESP3DClientType::all_clients, data, size, getAuthentication()); + if (message) { + // process command + message->type = type; + esp3d_log("Message sent to fifo list"); + _messagesInFIFO.push(message); + } else { + esp3d_log_e("Cannot create message"); + } + _lastflush = millis(); +} + +void ESP3DUsbSerialService::flushChar(char c) { + flushData((uint8_t *)&c, 1, ESP3DMessageType::realtimecmd); +} + +void ESP3DUsbSerialService::flushBuffer() { + _buffer[_buffer_size] = 0x0; + flushData((uint8_t *)_buffer, _buffer_size, ESP3DMessageType::unique); + _buffer_size = 0; +} + +void ESP3DUsbSerialService::updateBaudRate(uint32_t br) { + if (br != _baudRate) { + _baudRate = br; + } +} + +// Get current baud rate +uint32_t ESP3DUsbSerialService::baudRate() { return _baudRate; } + +size_t ESP3DUsbSerialService::writeBytes(const uint8_t *buffer, size_t size) { + if (!_started || !_is_connected) { + esp3d_log_e("USB Serial not started or not connected"); + return 0; + } + esp3d_log("writeBytes %d : %s", size, (const char *)buffer); + if (_vcp_ptr && _vcp_ptr->tx_blocking((uint8_t *)buffer, size) == ESP_OK) { + if (!(_vcp_ptr && _vcp_ptr->set_control_line_state(true, true) == ESP_OK)) { + esp3d_log_e("Failed to set control line state"); + return 0; + + esp3d_log_e("Failed to send message"); + return 0; + } + return size; + } + if (!_vcp_ptr) { + esp3d_log_e("_vcp_ptr is null"); + } else { + esp3d_log_e("tx_blocking failed"); + } + esp3d_log_e("Failed to send message"); + return 0; +} + +size_t ESP3DUsbSerialService::readBytes(uint8_t *sbuf, size_t len) { + if (!_started) { + return -1; + } + // return Serials[_serialIndex]->readBytes(sbuf, len); + return 0; +} + +void ESP3DUsbSerialService::flush() { + if (!_started) { + return; + } + // Serials[_serialIndex]->flush(); +} + +void ESP3DUsbSerialService::swap() { + // Nothing to do +} + +bool ESP3DUsbSerialService::dispatch(ESP3DMessage *message) { + esp3d_log("dispatching received message"); + bool done = false; + // Only is serial service is started + if (_started) { + // Only if message is not null + if (message) { + // if message is not null + if (message->data && message->size != 0) { + if (writeBytes(message->data, message->size) == message->size) { + flush(); + done = true; + // Delete message now + esp3d_log("Deleting message"); + esp3d_message_manager.deleteMsg(message); + } else { + esp3d_log_e("Error while sending data"); + } + } else { + esp3d_log_e("Error null data"); + } + } else { + esp3d_log_e("Error null message"); + } + } else { + esp3d_log_e("Serial service not started"); + } + return done; +} + +#endif // USB_SERIAL_FEATURE \ No newline at end of file diff --git a/src/modules/usb-serial/usb_serial_service.h b/src/modules/usb-serial/usb_serial_service.h new file mode 100644 index 0000000..c237008 --- /dev/null +++ b/src/modules/usb-serial/usb_serial_service.h @@ -0,0 +1,87 @@ +/* + serial_service.h - serial services functions class + + Copyright (c) 2014 Luc Lebosse. All rights reserved. + + This code is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This code is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with This code; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#pragma once + +#include + +#include "../../core/esp3d_client_types.h" +#include "../../core/esp3d_message.h" +#include "../../core/esp3d_messageFifo.h" + + +#define ESP3D_USB_SERIAL_BUFFER_SIZE 1024 + +extern const uint32_t SupportedUsbSerialBaudList[]; +extern const size_t SupportedUsbSerialBaudListSize; + +class ESP3DUsbSerialService final { + public: + ESP3DUsbSerialService(); + ~ESP3DUsbSerialService(); + void setParameters(); + bool begin(); + bool end(); + void updateBaudRate(uint32_t br); + void handle(); + bool reset(); + uint32_t baudRate(); + const uint32_t *get_baudratelist(uint8_t *count); + void flush(); + void swap(); + size_t writeBytes(const uint8_t *buffer, size_t size); + size_t readBytes(uint8_t *sbuf, size_t len); + inline bool started() { return _started; } + bool dispatch(ESP3DMessage *message); + void initAuthentication(); + void setAuthentication(ESP3DAuthenticationLevel auth) { _auth = auth; } + ESP3DAuthenticationLevel getAuthentication(); + void connectDevice(); + void setConnected(bool connected); + void receiveCb(const uint8_t *data, size_t data_len, void *arg = nullptr); + bool isConnected() { return _is_connected; } + const char * getVIDString(); + const char * getPIDString(); + uint16_t getVID(); + uint16_t getPID(); + + private: + uint32_t _baudRate; + ESP3DAuthenticationLevel _auth; + ESP3DClientType _origin; + bool _started; + bool _needauthentication; + uint32_t _lastflush; + uint8_t + _buffer[ESP3D_USB_SERIAL_BUFFER_SIZE + 1]; // keep space of 0x0 terminal + size_t _buffer_size; + SemaphoreHandle_t _buffer_mutex; + SemaphoreHandle_t _device_disconnected_mutex; + bool _is_connected; + std::unique_ptr _vcp_ptr; + + TaskHandle_t _xHandle; + ESP3DMessageFIFO _messagesInFIFO; + void flushBuffer(); + void flushChar(char c); + void flushData(const uint8_t* data, size_t size, ESP3DMessageType type); +}; + +extern ESP3DUsbSerialService esp3d_usb_serial_service; diff --git a/src/modules/webdav/webdav_server.h b/src/modules/webdav/webdav_server.h index 2c69f1c..51b1195 100644 --- a/src/modules/webdav/webdav_server.h +++ b/src/modules/webdav/webdav_server.h @@ -45,8 +45,8 @@ typedef ESP_SDFile WebDavFile; typedef ESP_SD WebDavFS; #endif // WEBDAV_FEATURE == FS_SD -class WiFiServer; -class WiFiClient; +#include +#include class WebdavServer { public: diff --git a/src/modules/websocket/websocket_server.cpp b/src/modules/websocket/websocket_server.cpp index c3aeb3a..a709e97 100644 --- a/src/modules/websocket/websocket_server.cpp +++ b/src/modules/websocket/websocket_server.cpp @@ -64,7 +64,7 @@ bool WebSocket_Server::dispatch(ESP3DMessage *message) { if (sentcnt != message->size) { return false; } - ESP3DMessageManager::deleteMsg(message); + esp3d_message_manager.deleteMsg(message); return true; } return false; @@ -281,36 +281,20 @@ size_t WebSocket_Server::writeBytes(const uint8_t *buffer, size_t size) { } void WebSocket_Server::push2RXbuffer(uint8_t *sbuf, size_t len) { - if (!_RXbuffer || !_started) { + if (!_RXbuffer || !_started || !sbuf) { return; } for (size_t i = 0; i < len; i++) { _lastRXflush = millis(); - // command is defined - if ((char(sbuf[i]) == '\n') || (char(sbuf[i]) == '\r')) { - if (_RXbufferSize < RXBUFFERSIZE) { - _RXbuffer[_RXbufferSize] = sbuf[i]; - _RXbufferSize++; - } - flushRXbuffer(); - } else if (esp3d_string::isPrintableChar(char(sbuf[i]))) { - if (_RXbufferSize < RXBUFFERSIZE) { - _RXbuffer[_RXbufferSize] = sbuf[i]; - _RXbufferSize++; - } else { - flushRXbuffer(); - _RXbuffer[_RXbufferSize] = sbuf[i]; - _RXbufferSize++; - } - } else { // it is not printable char - // clean buffer first - if (_RXbufferSize > 0) { - flushRXbuffer(); - } - // process char + if (esp3d_string::isRealTimeCommand(sbuf[i])) { + flushRXChar(sbuf[i]); + } else { _RXbuffer[_RXbufferSize] = sbuf[i]; _RXbufferSize++; - flushRXbuffer(); + if (_RXbufferSize > RXBUFFERSIZE || + _RXbuffer[_RXbufferSize - 1] == '\n') { + flushRXbuffer(); + } } } } @@ -324,22 +308,33 @@ void WebSocket_Server::initAuthentication() { } ESP3DAuthenticationLevel WebSocket_Server::getAuthentication() { return _auth; } +void WebSocket_Server::flushRXChar(char c) { + flushRXData((uint8_t *)&c, 1, ESP3DMessageType::realtimecmd); +} + void WebSocket_Server::flushRXbuffer() { - if (!_RXbuffer || !_started) { - _RXbufferSize = 0; + _RXbuffer[_RXbufferSize] = 0x0; + flushRXData((uint8_t *)_RXbuffer, _RXbufferSize, ESP3DMessageType::unique); + _RXbufferSize = 0; +} + +void WebSocket_Server::flushRXData(const uint8_t *data, size_t size, + ESP3DMessageType type) { + if (!data || !_started) { return; } - _RXbuffer[_RXbufferSize] = 0x0; - ESP3DMessage *msg = ESP3DMessageManager::newMsg( - _type, esp3d_commands.getOutputClient(), _RXbuffer, _RXbufferSize, _auth); - if (msg) { - // process command - esp3d_commands.process(msg); + ESP3DMessage *message = esp3d_message_manager.newMsg( + _type, esp3d_commands.getOutputClient(), + data, size, _auth); + + if (message) { + message->type = type; + esp3d_log("Process Message"); + esp3d_commands.process(message); } else { esp3d_log_e("Cannot create message"); } _lastRXflush = millis(); - _RXbufferSize = 0; } void WebSocket_Server::handle() { diff --git a/src/modules/websocket/websocket_server.h b/src/modules/websocket/websocket_server.h index 6479432..be9d06e 100644 --- a/src/modules/websocket/websocket_server.h +++ b/src/modules/websocket/websocket_server.h @@ -70,6 +70,8 @@ class WebSocket_Server { uint8_t _current_id; void flushTXbuffer(); void flushRXbuffer(); + void flushRXChar(char c); + void flushRXData(const uint8_t* data, size_t size, ESP3DMessageType type); uint8_t *_RXbuffer; uint16_t _RXbufferSize; }; diff --git a/src/modules/wifi/wificonfig.cpp b/src/modules/wifi/wificonfig.cpp index 742a232..862f619 100644 --- a/src/modules/wifi/wificonfig.cpp +++ b/src/modules/wifi/wificonfig.cpp @@ -22,6 +22,9 @@ #if defined(WIFI_FEATURE) #ifdef ARDUINO_ARCH_ESP32 #include +#if ESP_ARDUINO_VERSION_MAJOR == 3 +#include +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 #endif // ARDUINO_ARCH_ESP8266 @@ -30,6 +33,10 @@ #include "../network/netconfig.h" #include "../wifi/wificonfig.h" +#if defined(ARDUINO_ARCH_ESP32) +esp_netif_t *get_esp_interface_netif(esp_interface_t interface); +#endif // ARDUINO_ARCH_ESP32 + const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0}; IPAddress WiFiConfig::_ap_gateway; @@ -468,8 +475,8 @@ const char* WiFiConfig::AP_Auth_String() { const char* WiFiConfig::AP_Gateway_String() { static String tmp; #ifdef ARDUINO_ARCH_ESP32 - tcpip_adapter_ip_info_t ip_AP; - tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_AP); + esp_netif_ip_info_t ip_AP; + esp_netif_get_ip_info(get_esp_interface_netif(ESP_IF_WIFI_AP), &ip_AP); tmp = IPAddress(ip_AP.gw.addr).toString(); #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 @@ -485,8 +492,8 @@ const char* WiFiConfig::AP_Gateway_String() { const char* WiFiConfig::AP_Mask_String() { static String tmp; #ifdef ARDUINO_ARCH_ESP32 - tcpip_adapter_ip_info_t ip_AP; - tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_AP); + esp_netif_ip_info_t ip_AP; + esp_netif_get_ip_info(get_esp_interface_netif(ESP_IF_WIFI_STA), &ip_AP); tmp = IPAddress(ip_AP.netmask.addr).toString(); #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 @@ -509,16 +516,33 @@ const char* WiFiConfig::getConnectedSTA(uint8_t* totalcount, bool reset) { if (current > count) { current = 0; } - static wifi_sta_list_t station; +static wifi_sta_list_t sta_list; +#if ESP_ARDUINO_VERSION_MAJOR == 3 +static wifi_sta_mac_ip_list_t tcpip_sta_list; +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 +#if ESP_ARDUINO_VERSION_MAJOR == 2 static tcpip_adapter_sta_list_t tcpip_sta_list; +#endif // ESP_ARDUINO_VERSION_MAJOR == 2 if (reset) { count = 0; } if (count == 0) { current = 0; - esp_wifi_ap_get_sta_list(&station); - tcpip_adapter_get_sta_list(&station, &tcpip_sta_list); - count = station.num; +#if ESP_ARDUINO_VERSION_MAJOR == 3 + if(esp_wifi_ap_get_sta_list(&sta_list)!=ESP_OK){ +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 +#if ESP_ARDUINO_VERSION_MAJOR == 2 + if(tcpip_adapter_get_sta_list(&sta_list, &tcpip_sta_list)!=ESP_OK){ +#endif // ESP_ARDUINO_VERSION_MAJOR == 2 + return ""; +} + if (sta_list.num > 0) { +#if ESP_ARDUINO_VERSION_MAJOR == 3 + ESP_ERROR_CHECK( + esp_wifi_ap_get_sta_list_with_ip(&sta_list, &tcpip_sta_list)); +#endif // ESP_ARDUINO_VERSION_MAJOR == 3 + } + count = sta_list.num; } if (count > 0) { data = IPAddress(tcpip_sta_list.sta[current].ip.addr).toString(); diff --git a/src/modules/wifi/wificonfig.h b/src/modules/wifi/wificonfig.h index 9c6df44..f5b0eb1 100644 --- a/src/modules/wifi/wificonfig.h +++ b/src/modules/wifi/wificonfig.h @@ -44,6 +44,7 @@ #define AUTH_WPA_WPA2_PSK WIFI_AUTH_WPA_WPA2_PSK #define ENC_TYPE_NONE AUTH_OPEN #define WiFiMode_t wifi_mode_t +#include #endif // ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 #include