From e1bbe15f2d4bc82a586924640e2fcacca8bf8c61 Mon Sep 17 00:00:00 2001 From: sL1pKn07 Date: Thu, 9 Apr 2020 13:05:08 +0200 Subject: [PATCH] sL1_Changes --- .github/ci/prepare-libs.sh | 8 +- .gitignore | 4 +- .vscode/extensions.json | 9 - .vscode/settings.json | 49 - .vscode/tasks.json | 14 - boards/sl1esp8266_w25q64.json | 32 + esp3d/config.h | 2 +- esp3d/wificonf.cpp | 2 +- libraries/AsyncTCP/.travis.yml | 37 - libraries/AsyncTCP/LICENSE | 165 -- libraries/AsyncTCP/README.md | 11 - libraries/AsyncTCP/component.mk | 3 - libraries/AsyncTCP/library.json | 22 - libraries/AsyncTCP/library.properties | 9 - libraries/AsyncTCP/src/AsyncTCP.cpp | 1188 -------------- libraries/AsyncTCP/src/AsyncTCP.h | 197 --- libraries/AsyncTCP/travis/common.sh | 23 - .../DHT_sensor_library_for_ESPx/DHTesp.cpp | 424 ----- .../DHT_sensor_library_for_ESPx/DHTesp.h | 170 -- libraries/DHT_sensor_library_for_ESPx/LICENSE | 674 -------- .../DHT_sensor_library_for_ESPx/README.md | 149 -- .../examples/DHT_ESP32/DHT_ESP32.ino | 172 -- .../examples/DHT_Multi/DHT_Multi.ino | 119 -- .../examples/DHT_Test/DHT_Test.ino | 38 - .../DHT_sensor_library_for_ESPx/keywords.txt | 79 - .../DHT_sensor_library_for_ESPx/library.json | 15 - .../library.properties | 10 - libraries/ESP32NETBIOS/ESP32NetBIOS.cpp | 274 ---- libraries/ESP32NETBIOS/ESP32NetBIOS.h | 41 - .../examples/ESP_NBNST/ESP_NBNST.ino | 50 - libraries/ESP32NETBIOS/keywords.txt | 24 - libraries/ESP32NETBIOS/library.properties | 9 - libraries/ESP32SSDP/ESP32SSDP.cpp | 477 ------ libraries/ESP32SSDP/ESP32SSDP.h | 128 -- libraries/ESP32SSDP/README.rst | 22 - libraries/ESP32SSDP/examples/SSDP/SSDP.ino | 52 - libraries/ESP32SSDP/keywords.txt | 53 - libraries/ESP32SSDP/library.properties | 9 - libraries/ESPAsyncTCP/.gitignore | 2 - libraries/ESPAsyncTCP/.travis.yml | 37 - libraries/ESPAsyncTCP/LICENSE.txt | 165 -- libraries/ESPAsyncTCP/README.md | 30 - .../examples/SyncClient/.esp31b.skip | 0 .../examples/SyncClient/SyncClient.ino | 54 - libraries/ESPAsyncTCP/library.json | 19 - libraries/ESPAsyncTCP/library.properties | 9 - libraries/ESPAsyncTCP/src/AsyncPrinter.cpp | 187 --- libraries/ESPAsyncTCP/src/AsyncPrinter.h | 73 - libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp | 1066 ------------- libraries/ESPAsyncTCP/src/ESPAsyncTCP.h | 249 --- .../ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp | 541 ------- libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h | 118 -- libraries/ESPAsyncTCP/src/SyncClient.cpp | 286 ---- libraries/ESPAsyncTCP/src/SyncClient.h | 82 - libraries/ESPAsyncTCP/src/async_config.h | 11 - libraries/ESPAsyncTCP/src/tcp_axtls.c | 586 ------- libraries/ESPAsyncTCP/src/tcp_axtls.h | 97 -- libraries/ESPAsyncTCP/ssl/gen_server_cert.sh | 36 - libraries/ESPAsyncTCP/ssl/server.cer | Bin 587 -> 0 bytes libraries/ESPAsyncTCP/ssl/server.key | Bin 611 -> 0 bytes libraries/ESPAsyncTCP/travis/common.sh | 23 - libraries/ESPAsyncWebServer/.travis.yml | 39 - libraries/ESPAsyncWebServer/README.md | 1412 ----------------- libraries/ESPAsyncWebServer/component.mk | 3 - .../examples/ESP_AsyncFSBrowser/.esp31b.skip | 0 .../ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino | 211 --- .../ESP_AsyncFSBrowser/data/.exclude.files | 2 - .../ESP_AsyncFSBrowser/data/ace.js.gz | Bin 98943 -> 0 bytes .../data/ext-searchbox.js.gz | Bin 3131 -> 0 bytes .../ESP_AsyncFSBrowser/data/favicon.ico | Bin 1150 -> 0 bytes .../ESP_AsyncFSBrowser/data/index.htm | 131 -- .../ESP_AsyncFSBrowser/data/mode-css.js.gz | Bin 6102 -> 0 bytes .../ESP_AsyncFSBrowser/data/mode-html.js.gz | Bin 17037 -> 0 bytes .../data/mode-javascript.js.gz | Bin 6315 -> 0 bytes .../ESP_AsyncFSBrowser/data/worker-html.js.gz | Bin 50024 -> 0 bytes .../examples/simple_server/simple_server.ino | 72 - libraries/ESPAsyncWebServer/keywords.txt | 3 - libraries/ESPAsyncWebServer/library.json | 29 - .../ESPAsyncWebServer/library.properties | 9 - .../src/AsyncEventSource.cpp | 345 ---- .../ESPAsyncWebServer/src/AsyncEventSource.h | 114 -- libraries/ESPAsyncWebServer/src/AsyncJson.h | 163 -- .../ESPAsyncWebServer/src/AsyncWebSocket.cpp | 1263 --------------- .../ESPAsyncWebServer/src/AsyncWebSocket.h | 323 ---- .../ESPAsyncWebServer/src/ESPAsyncWebServer.h | 457 ------ .../ESPAsyncWebServer/src/SPIFFSEditor.cpp | 544 ------- .../ESPAsyncWebServer/src/SPIFFSEditor.h | 24 - libraries/ESPAsyncWebServer/src/StringArray.h | 193 --- .../src/WebAuthentication.cpp | 235 --- .../ESPAsyncWebServer/src/WebAuthentication.h | 34 - .../ESPAsyncWebServer/src/WebHandlerImpl.h | 110 -- .../ESPAsyncWebServer/src/WebHandlers.cpp | 220 --- .../ESPAsyncWebServer/src/WebRequest.cpp | 998 ------------ .../ESPAsyncWebServer/src/WebResponseImpl.h | 136 -- .../ESPAsyncWebServer/src/WebResponses.cpp | 696 -------- libraries/ESPAsyncWebServer/src/WebServer.cpp | 188 --- libraries/ESPAsyncWebServer/src/edit.htm | 627 -------- libraries/ESPAsyncWebServer/travis/common.sh | 23 - libraries/arduinoWebSockets/.gitignore | 29 - libraries/arduinoWebSockets/.travis.yml | 40 - libraries/arduinoWebSockets/LICENSE | 502 ------ libraries/arduinoWebSockets/README.md | 98 -- .../Nginx/esp8266.ssl.reverse.proxy.conf | 83 - .../WebSocketClientAVR/WebSocketClientAVR.ino | 84 - .../esp32/WebSocketClient/WebSocketClient.ino | 106 -- .../WebSocketClientSSL/WebSocketClientSSL.ino | 102 -- .../esp32/WebSocketServer/WebSocketServer.ino | 100 -- .../WebSocketClient/WebSocketClient.ino | 92 -- .../WebSocketClientSSL/WebSocketClientSSL.ino | 88 - .../WebSocketClientSocketIO.ino | 113 -- .../WebSocketClientStomp.ino | 149 -- .../WebSocketClientStompOverSockJs.ino | 150 -- .../WebSocketServer/WebSocketServer.ino | 86 - .../WebSocketServerAllFunctionsDemo.ino | 132 -- .../WebSocketServerFragmentation.ino | 94 -- .../WebSocketServerHttpHeaderValidation.ino | 86 - .../WebSocketServer_LEDcontrol.ino | 121 -- .../ParticleWebSocketClient/application.cpp | 46 - libraries/arduinoWebSockets/library.json | 25 - .../arduinoWebSockets/library.properties | 9 - .../arduinoWebSockets/src/WebSockets.cpp | 654 -------- libraries/arduinoWebSockets/src/WebSockets.h | 312 ---- .../src/WebSocketsClient.cpp | 764 --------- .../arduinoWebSockets/src/WebSocketsClient.h | 136 -- .../src/WebSocketsServer.cpp | 875 ---------- .../arduinoWebSockets/src/WebSocketsServer.h | 212 --- .../arduinoWebSockets/src/libb64/AUTHORS | 7 - .../arduinoWebSockets/src/libb64/LICENSE | 29 - .../arduinoWebSockets/src/libb64/cdecode.c | 98 -- .../src/libb64/cdecode_inc.h | 28 - .../arduinoWebSockets/src/libb64/cencode.c | 119 -- .../src/libb64/cencode_inc.h | 31 - .../arduinoWebSockets/src/libsha1/libsha1.c | 202 --- .../arduinoWebSockets/src/libsha1/libsha1.h | 21 - .../arduinoWebSockets/tests/webSocket.html | 49 - .../tests/webSocketServer/index.js | 57 - .../tests/webSocketServer/package.json | 27 - libraries/arduinoWebSockets/travis/common.sh | 53 - libraries/oled-ssd1306/.travis.yml | 24 - libraries/oled-ssd1306/OLEDDisplay.cpp | 811 ---------- libraries/oled-ssd1306/OLEDDisplay.h | 268 ---- libraries/oled-ssd1306/OLEDDisplayFonts.h | 1274 --------------- libraries/oled-ssd1306/OLEDDisplayUi.cpp | 410 ----- libraries/oled-ssd1306/OLEDDisplayUi.h | 305 ---- libraries/oled-ssd1306/README.md | 393 ----- libraries/oled-ssd1306/SH1106.h | 36 - libraries/oled-ssd1306/SH1106Brzo.h | 133 -- libraries/oled-ssd1306/SH1106Spi.h | 128 -- libraries/oled-ssd1306/SH1106Wire.h | 152 -- libraries/oled-ssd1306/SSD1306.h | 36 - libraries/oled-ssd1306/SSD1306Brzo.h | 149 -- libraries/oled-ssd1306/SSD1306Spi.h | 150 -- libraries/oled-ssd1306/SSD1306Wire.h | 147 -- libraries/oled-ssd1306/UPGRADE-3.0.md | 125 -- .../SSD1306ClockDemo/SSD1306ClockDemo.ino | 211 --- .../examples/SSD1306ClockDemo/images.h | 21 - .../SSD1306DrawingDemo/SSD1306DrawingDemo.ino | 229 --- .../SSD1306OTADemo/SSD1306OTADemo.ino | 119 -- .../SSD1306SimpleDemo/SSD1306SimpleDemo.ino | 187 --- .../examples/SSD1306SimpleDemo/images.h | 28 - .../examples/SSD1306UiDemo/SSD1306UiDemo.ino | 194 --- .../examples/SSD1306UiDemo/images.h | 50 - libraries/oled-ssd1306/library.json | 28 - libraries/oled-ssd1306/library.properties | 9 - libraries/oled-ssd1306/license | 24 - .../oled-ssd1306/resources/DemoFrame1.jpg | Bin 16026 -> 0 bytes .../oled-ssd1306/resources/DemoFrame2.jpg | Bin 19502 -> 0 bytes .../oled-ssd1306/resources/DemoFrame3.jpg | Bin 21777 -> 0 bytes .../oled-ssd1306/resources/DemoFrame4.jpg | Bin 25325 -> 0 bytes libraries/oled-ssd1306/resources/FontTool.png | Bin 14052 -> 0 bytes .../oled-ssd1306/resources/SPI_version.jpg | Bin 26912 -> 0 bytes .../oled-ssd1306/resources/xbmPreview.png | Bin 41692 -> 0 bytes platformio.ini | 55 +- 173 files changed, 88 insertions(+), 28656 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json create mode 100644 boards/sl1esp8266_w25q64.json delete mode 100644 libraries/AsyncTCP/.travis.yml delete mode 100644 libraries/AsyncTCP/LICENSE delete mode 100644 libraries/AsyncTCP/README.md delete mode 100644 libraries/AsyncTCP/component.mk delete mode 100644 libraries/AsyncTCP/library.json delete mode 100644 libraries/AsyncTCP/library.properties delete mode 100644 libraries/AsyncTCP/src/AsyncTCP.cpp delete mode 100644 libraries/AsyncTCP/src/AsyncTCP.h delete mode 100644 libraries/AsyncTCP/travis/common.sh delete mode 100644 libraries/DHT_sensor_library_for_ESPx/DHTesp.cpp delete mode 100644 libraries/DHT_sensor_library_for_ESPx/DHTesp.h delete mode 100644 libraries/DHT_sensor_library_for_ESPx/LICENSE delete mode 100644 libraries/DHT_sensor_library_for_ESPx/README.md delete mode 100644 libraries/DHT_sensor_library_for_ESPx/examples/DHT_ESP32/DHT_ESP32.ino delete mode 100644 libraries/DHT_sensor_library_for_ESPx/examples/DHT_Multi/DHT_Multi.ino delete mode 100644 libraries/DHT_sensor_library_for_ESPx/examples/DHT_Test/DHT_Test.ino delete mode 100644 libraries/DHT_sensor_library_for_ESPx/keywords.txt delete mode 100644 libraries/DHT_sensor_library_for_ESPx/library.json delete mode 100644 libraries/DHT_sensor_library_for_ESPx/library.properties delete mode 100644 libraries/ESP32NETBIOS/ESP32NetBIOS.cpp delete mode 100644 libraries/ESP32NETBIOS/ESP32NetBIOS.h delete mode 100644 libraries/ESP32NETBIOS/examples/ESP_NBNST/ESP_NBNST.ino delete mode 100644 libraries/ESP32NETBIOS/keywords.txt delete mode 100644 libraries/ESP32NETBIOS/library.properties delete mode 100644 libraries/ESP32SSDP/ESP32SSDP.cpp delete mode 100644 libraries/ESP32SSDP/ESP32SSDP.h delete mode 100644 libraries/ESP32SSDP/README.rst delete mode 100644 libraries/ESP32SSDP/examples/SSDP/SSDP.ino delete mode 100644 libraries/ESP32SSDP/keywords.txt delete mode 100644 libraries/ESP32SSDP/library.properties delete mode 100644 libraries/ESPAsyncTCP/.gitignore delete mode 100644 libraries/ESPAsyncTCP/.travis.yml delete mode 100644 libraries/ESPAsyncTCP/LICENSE.txt delete mode 100644 libraries/ESPAsyncTCP/README.md delete mode 100644 libraries/ESPAsyncTCP/examples/SyncClient/.esp31b.skip delete mode 100644 libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino delete mode 100644 libraries/ESPAsyncTCP/library.json delete mode 100644 libraries/ESPAsyncTCP/library.properties delete mode 100644 libraries/ESPAsyncTCP/src/AsyncPrinter.cpp delete mode 100644 libraries/ESPAsyncTCP/src/AsyncPrinter.h delete mode 100644 libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp delete mode 100644 libraries/ESPAsyncTCP/src/ESPAsyncTCP.h delete mode 100644 libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp delete mode 100644 libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h delete mode 100644 libraries/ESPAsyncTCP/src/SyncClient.cpp delete mode 100644 libraries/ESPAsyncTCP/src/SyncClient.h delete mode 100644 libraries/ESPAsyncTCP/src/async_config.h delete mode 100644 libraries/ESPAsyncTCP/src/tcp_axtls.c delete mode 100644 libraries/ESPAsyncTCP/src/tcp_axtls.h delete mode 100644 libraries/ESPAsyncTCP/ssl/gen_server_cert.sh delete mode 100644 libraries/ESPAsyncTCP/ssl/server.cer delete mode 100644 libraries/ESPAsyncTCP/ssl/server.key delete mode 100644 libraries/ESPAsyncTCP/travis/common.sh delete mode 100644 libraries/ESPAsyncWebServer/.travis.yml delete mode 100644 libraries/ESPAsyncWebServer/README.md delete mode 100644 libraries/ESPAsyncWebServer/component.mk delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/.esp31b.skip delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/.exclude.files delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ace.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ext-searchbox.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/favicon.ico delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/index.htm delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-css.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-html.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-javascript.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/worker-html.js.gz delete mode 100644 libraries/ESPAsyncWebServer/examples/simple_server/simple_server.ino delete mode 100644 libraries/ESPAsyncWebServer/keywords.txt delete mode 100644 libraries/ESPAsyncWebServer/library.json delete mode 100644 libraries/ESPAsyncWebServer/library.properties delete mode 100644 libraries/ESPAsyncWebServer/src/AsyncEventSource.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/AsyncEventSource.h delete mode 100644 libraries/ESPAsyncWebServer/src/AsyncJson.h delete mode 100644 libraries/ESPAsyncWebServer/src/AsyncWebSocket.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/AsyncWebSocket.h delete mode 100644 libraries/ESPAsyncWebServer/src/ESPAsyncWebServer.h delete mode 100644 libraries/ESPAsyncWebServer/src/SPIFFSEditor.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/SPIFFSEditor.h delete mode 100644 libraries/ESPAsyncWebServer/src/StringArray.h delete mode 100644 libraries/ESPAsyncWebServer/src/WebAuthentication.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/WebAuthentication.h delete mode 100644 libraries/ESPAsyncWebServer/src/WebHandlerImpl.h delete mode 100644 libraries/ESPAsyncWebServer/src/WebHandlers.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/WebRequest.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/WebResponseImpl.h delete mode 100644 libraries/ESPAsyncWebServer/src/WebResponses.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/WebServer.cpp delete mode 100644 libraries/ESPAsyncWebServer/src/edit.htm delete mode 100644 libraries/ESPAsyncWebServer/travis/common.sh delete mode 100644 libraries/arduinoWebSockets/.gitignore delete mode 100644 libraries/arduinoWebSockets/.travis.yml delete mode 100644 libraries/arduinoWebSockets/LICENSE delete mode 100644 libraries/arduinoWebSockets/README.md delete mode 100644 libraries/arduinoWebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf delete mode 100644 libraries/arduinoWebSockets/examples/avr/WebSocketClientAVR/WebSocketClientAVR.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp32/WebSocketClient/WebSocketClient.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp32/WebSocketServer/WebSocketServer.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketClient/WebSocketClient.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSSL/WebSocketClientSSL.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSocketIO/WebSocketClientSocketIO.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStomp/WebSocketClientStomp.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStompOverSockJs/WebSocketClientStompOverSockJs.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketServer/WebSocketServer.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketServerFragmentation/WebSocketServerFragmentation.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketServerHttpHeaderValidation/WebSocketServerHttpHeaderValidation.ino delete mode 100644 libraries/arduinoWebSockets/examples/esp8266/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino delete mode 100644 libraries/arduinoWebSockets/examples/particle/ParticleWebSocketClient/application.cpp delete mode 100644 libraries/arduinoWebSockets/library.json delete mode 100644 libraries/arduinoWebSockets/library.properties delete mode 100644 libraries/arduinoWebSockets/src/WebSockets.cpp delete mode 100644 libraries/arduinoWebSockets/src/WebSockets.h delete mode 100644 libraries/arduinoWebSockets/src/WebSocketsClient.cpp delete mode 100644 libraries/arduinoWebSockets/src/WebSocketsClient.h delete mode 100644 libraries/arduinoWebSockets/src/WebSocketsServer.cpp delete mode 100644 libraries/arduinoWebSockets/src/WebSocketsServer.h delete mode 100644 libraries/arduinoWebSockets/src/libb64/AUTHORS delete mode 100644 libraries/arduinoWebSockets/src/libb64/LICENSE delete mode 100644 libraries/arduinoWebSockets/src/libb64/cdecode.c delete mode 100644 libraries/arduinoWebSockets/src/libb64/cdecode_inc.h delete mode 100644 libraries/arduinoWebSockets/src/libb64/cencode.c delete mode 100644 libraries/arduinoWebSockets/src/libb64/cencode_inc.h delete mode 100644 libraries/arduinoWebSockets/src/libsha1/libsha1.c delete mode 100644 libraries/arduinoWebSockets/src/libsha1/libsha1.h delete mode 100644 libraries/arduinoWebSockets/tests/webSocket.html delete mode 100644 libraries/arduinoWebSockets/tests/webSocketServer/index.js delete mode 100644 libraries/arduinoWebSockets/tests/webSocketServer/package.json delete mode 100644 libraries/arduinoWebSockets/travis/common.sh delete mode 100644 libraries/oled-ssd1306/.travis.yml delete mode 100644 libraries/oled-ssd1306/OLEDDisplay.cpp delete mode 100644 libraries/oled-ssd1306/OLEDDisplay.h delete mode 100644 libraries/oled-ssd1306/OLEDDisplayFonts.h delete mode 100644 libraries/oled-ssd1306/OLEDDisplayUi.cpp delete mode 100644 libraries/oled-ssd1306/OLEDDisplayUi.h delete mode 100644 libraries/oled-ssd1306/README.md delete mode 100644 libraries/oled-ssd1306/SH1106.h delete mode 100644 libraries/oled-ssd1306/SH1106Brzo.h delete mode 100644 libraries/oled-ssd1306/SH1106Spi.h delete mode 100644 libraries/oled-ssd1306/SH1106Wire.h delete mode 100644 libraries/oled-ssd1306/SSD1306.h delete mode 100644 libraries/oled-ssd1306/SSD1306Brzo.h delete mode 100644 libraries/oled-ssd1306/SSD1306Spi.h delete mode 100644 libraries/oled-ssd1306/SSD1306Wire.h delete mode 100644 libraries/oled-ssd1306/UPGRADE-3.0.md delete mode 100644 libraries/oled-ssd1306/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino delete mode 100644 libraries/oled-ssd1306/examples/SSD1306ClockDemo/images.h delete mode 100644 libraries/oled-ssd1306/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino delete mode 100644 libraries/oled-ssd1306/examples/SSD1306OTADemo/SSD1306OTADemo.ino delete mode 100644 libraries/oled-ssd1306/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino delete mode 100644 libraries/oled-ssd1306/examples/SSD1306SimpleDemo/images.h delete mode 100644 libraries/oled-ssd1306/examples/SSD1306UiDemo/SSD1306UiDemo.ino delete mode 100644 libraries/oled-ssd1306/examples/SSD1306UiDemo/images.h delete mode 100644 libraries/oled-ssd1306/library.json delete mode 100644 libraries/oled-ssd1306/library.properties delete mode 100644 libraries/oled-ssd1306/license delete mode 100644 libraries/oled-ssd1306/resources/DemoFrame1.jpg delete mode 100644 libraries/oled-ssd1306/resources/DemoFrame2.jpg delete mode 100644 libraries/oled-ssd1306/resources/DemoFrame3.jpg delete mode 100644 libraries/oled-ssd1306/resources/DemoFrame4.jpg delete mode 100644 libraries/oled-ssd1306/resources/FontTool.png delete mode 100644 libraries/oled-ssd1306/resources/SPI_version.jpg delete mode 100644 libraries/oled-ssd1306/resources/xbmPreview.png diff --git a/.github/ci/prepare-libs.sh b/.github/ci/prepare-libs.sh index 173ef8d25..b346a59f8 100644 --- a/.github/ci/prepare-libs.sh +++ b/.github/ci/prepare-libs.sh @@ -6,10 +6,10 @@ shopt -s globstar ls $HOME # Make sure we are inside the github workspace cd $GITHUB_WORKSPACE -cp -r ./libraries/ESP32SSDP $HOME/arduino_ide/libraries/ -cp -r ./libraries/arduinoWebSockets $HOME/arduino_ide/libraries/ -cp -r ./libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/libraries/ -cp -r ./libraries/oled-ssd1306 $HOME/arduino_ide/libraries/ +#cp -r ./libraries/ESP32SSDP $HOME/arduino_ide/libraries/ +#cp -r ./libraries/arduinoWebSockets $HOME/arduino_ide/libraries/ +#cp -r ./libraries/DHT_sensor_library_for_ESPx $HOME/arduino_ide/libraries/ +#cp -r ./libraries/oled-ssd1306 $HOME/arduino_ide/libraries/ cp -r ./libraries/ESP32NETBIOS $HOME/arduino_ide/libraries/ diff --git a/.gitignore b/.gitignore index bb2bde162..966dc56b7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,5 @@ embedded/dist .pio .pioenvs .piolibdeps -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json esp3d/myconfig.h +.vscode diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 5058b7d27..000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide", - "DavidAnson.vscode-markdownlint", - "shd101wyy.markdown-preview-enhanced", - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index fca77785d..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "terminal.integrated.env.windows": { - "PATH": "C:\\Users\\user\\.platformio\\penv\\Scripts;C:\\Users\\user\\.platformio\\penv;C:\\ImageMagick\\ImageMagick-7.0.8-Q16;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\iCLS\\;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\iCLS\\;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\DAL;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\DAL;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\IPT;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\IPT;C:\\Program Files\\Intel\\WiFi\\bin\\;C:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\nodejs\\;C:\\Program Files\\TortoiseGit\\bin;C:\\Program Files\\dotnet\\;C:\\Program Files\\Microsoft SQL Server\\Client SDK\\ODBC\\110\\Tools\\Binn\\;C:\\Program Files (x86)\\Microsoft SQL Server\\120\\Tools\\Binn\\;C:\\Program Files\\Microsoft SQL Server\\120\\Tools\\Binn\\;C:\\Program Files\\Microsoft SQL Server\\120\\DTS\\Binn\\;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\LLVM\\bin;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Users\\user\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files\\Intel\\WiFi\\bin\\;C:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C:\\Users\\user\\AppData\\Local\\GitHubDesktop\\bin;C:\\Eclipse\\GNUTools\\2.6-201507152002\\bin;C:\\Users\\user\\AppData\\Roaming\\npm;C:\\Users\\user\\AppData\\Local\\atom\\bin;C:\\Unxtools;;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps;C:\\ImageMagick\\ImageMagick-7.0.8-Q16;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\iCLS\\;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\iCLS\\;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\DAL;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\DAL;C:\\Program Files (x86)\\Intel\\Intel(R) Management Engine Components\\IPT;C:\\Program Files\\Intel\\Intel(R) Management Engine Components\\IPT;C:\\Program Files\\Intel\\WiFi\\bin\\;C:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\nodejs\\;C:\\Program Files\\TortoiseGit\\bin;C:\\Program Files\\dotnet\\;C:\\Program Files\\Microsoft SQL Server\\Client SDK\\ODBC\\110\\Tools\\Binn\\;C:\\Program Files (x86)\\Microsoft SQL Server\\120\\Tools\\Binn\\;C:\\Program Files\\Microsoft SQL Server\\120\\Tools\\Binn\\;C:\\Program Files\\Microsoft SQL Server\\120\\DTS\\Binn\\;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\LLVM\\bin;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Users\\user\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files\\Intel\\WiFi\\bin\\;C:\\Program Files\\Common Files\\Intel\\WirelessCommon\\;C:\\Users\\user\\AppData\\Local\\GitHubDesktop\\bin;C:\\Eclipse\\GNUTools\\2.6-201507152002\\bin;C:\\Users\\user\\AppData\\Roaming\\npm;C:\\Users\\user\\AppData\\Local\\atom\\bin;C:\\Unxtools;;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps", - "PLATFORMIO_CALLER": "vscode" - }, - "files.associations": { - "string": "cpp", - "*.tcc": "cpp", - "unordered_map": "cpp", - "array": "cpp", - "atomic": "cpp", - "cctype": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "cstdarg": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "vector": "cpp", - "exception": "cpp", - "fstream": "cpp", - "functional": "cpp", - "initializer_list": "cpp", - "iosfwd": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "ostream": "cpp", - "numeric": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "cinttypes": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "typeinfo": "cpp" - }, - "files.trimTrailingWhitespace": true, - "[markdown]": { - "files.trimTrailingWhitespace": false - }, - "files.trimFinalNewlines": true, - "files.insertFinalNewline": true, -} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index d33ea4a3d..000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "type": "PlatformIO", - "task": "Build (esp8266)", - "problemMatcher": [ - "$platformio" - ] - } - ] -} \ No newline at end of file diff --git a/boards/sl1esp8266_w25q64.json b/boards/sl1esp8266_w25q64.json new file mode 100644 index 000000000..82cd6b474 --- /dev/null +++ b/boards/sl1esp8266_w25q64.json @@ -0,0 +1,32 @@ +{ + "build": { + "arduino": { + "ldscript": "eagle.flash.8m6m.ld" + }, + "core": "esp8266", + "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01", + "f_cpu": "80000000L", + "f_flash": "40000000L", + "flash_mode": "qio", + "mcu": "esp8266", + "variant": "generic" + }, + "connectivity": [ + "wifi" + ], + "frameworks": [ + "arduino", + "esp8266-rtos-sdk", + "esp8266-nonos-sdk" + ], + "name": "Espressif Generic ESP8266 ESP-01 8Mb", + "upload": { + "maximum_ram_size": 81920, + "maximum_size": 8388608, + "require_upload_port": true, + "resetmethod": "ck", + "speed": 115200 + }, + "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family", + "vendor": "Espressif" +} diff --git a/esp3d/config.h b/esp3d/config.h index a9f005eae..284ab0cb0 100644 --- a/esp3d/config.h +++ b/esp3d/config.h @@ -97,7 +97,7 @@ //Extra features ///////////////////////////////////////////////////////////////////////// //Workaround for Marlin 2.X coldstart -//#define DISABLE_CONNECTING_MSG +#define DISABLE_CONNECTING_MSG //Serial rx buffer size is 256 but can be extended #define SERIAL_RX_BUFFER_SIZE 512 diff --git a/esp3d/wificonf.cpp b/esp3d/wificonf.cpp index c0858b259..713196b36 100644 --- a/esp3d/wificonf.cpp +++ b/esp3d/wificonf.cpp @@ -51,7 +51,7 @@ const byte DNS_PORT = 53; #ifdef ARDUINO_ARCH_ESP8266 #include #else -#include +#include #endif #endif #ifdef ARDUINO_ARCH_ESP8266 diff --git a/libraries/AsyncTCP/.travis.yml b/libraries/AsyncTCP/.travis.yml deleted file mode 100644 index 89808806b..000000000 --- a/libraries/AsyncTCP/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -sudo: false -language: bash -os: - - linux - -script: - - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16 - - sleep 3 - - export DISPLAY=:1.0 - - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz - - tar xf arduino-1.6.5-linux64.tar.xz - - mv arduino-1.6.5 $HOME/arduino_ide - - export PATH="$HOME/arduino_ide:$PATH" - - which arduino - - mkdir -p $HOME/Arduino/libraries - - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESPAsyncTCP - - cd $HOME/arduino_ide/hardware - - mkdir esp8266com - - cd esp8266com - - git clone https://github.com/esp8266/Arduino.git esp8266 - - cd esp8266/tools - - python get.py - - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncTCP esp8266 - -notifications: - email: - on_success: change - on_failure: change - webhooks: - urls: - - https://webhooks.gitter.im/e/60e65d0c78ea0a920347 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false diff --git a/libraries/AsyncTCP/LICENSE b/libraries/AsyncTCP/LICENSE deleted file mode 100644 index 65c5ca88a..000000000 --- a/libraries/AsyncTCP/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/libraries/AsyncTCP/README.md b/libraries/AsyncTCP/README.md deleted file mode 100644 index 023849bfd..000000000 --- a/libraries/AsyncTCP/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# AsyncTCP -Async TCP Library for ESP32 Arduino - -[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -This is a fully asynchronous TCP library, aimed at enabling trouble-free, multi-connection network environment for Espressif's ESP32 MCUs. - -This library is the base for [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) - -## AsyncClient and AsyncServer -The base classes on which everything else is built. They expose all possible scenarios, but are really raw and require more skills to use. diff --git a/libraries/AsyncTCP/component.mk b/libraries/AsyncTCP/component.mk deleted file mode 100644 index bb5bb1614..000000000 --- a/libraries/AsyncTCP/component.mk +++ /dev/null @@ -1,3 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := src -COMPONENT_SRCDIRS := src -CXXFLAGS += -fno-rtti diff --git a/libraries/AsyncTCP/library.json b/libraries/AsyncTCP/library.json deleted file mode 100644 index b4a0e22dc..000000000 --- a/libraries/AsyncTCP/library.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name":"AsyncTCP", - "description":"Asynchronous TCP Library for ESP32", - "keywords":"async,tcp", - "authors": - { - "name": "Hristo Gochkov", - "maintainer": true - }, - "repository": - { - "type": "git", - "url": "https://github.com/me-no-dev/AsyncTCP.git" - }, - "version": "1.0.3", - "license": "LGPL-3.0", - "frameworks": "arduino", - "platforms": "espressif32", - "build": { - "libCompatMode": 2 - } -} diff --git a/libraries/AsyncTCP/library.properties b/libraries/AsyncTCP/library.properties deleted file mode 100644 index 14c39f0cb..000000000 --- a/libraries/AsyncTCP/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=AsyncTCP -version=1.0.3 -author=Me-No-Dev -maintainer=Me-No-Dev -sentence=Async TCP Library for ESP32 -paragraph=Async TCP Library for ESP32 -category=Other -url=https://github.com/me-no-dev/AsyncTCP -architectures=* diff --git a/libraries/AsyncTCP/src/AsyncTCP.cpp b/libraries/AsyncTCP/src/AsyncTCP.cpp deleted file mode 100644 index f06ccccb7..000000000 --- a/libraries/AsyncTCP/src/AsyncTCP.cpp +++ /dev/null @@ -1,1188 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "Arduino.h" - -#include "AsyncTCP.h" -extern "C"{ -#include "lwip/opt.h" -#include "lwip/tcp.h" -#include "lwip/inet.h" -#include "lwip/dns.h" -} - -#if CONFIG_FREERTOS_UNICORE -#define ASYNCTCP_RUNNING_CORE 0 -#else -#define ASYNCTCP_RUNNING_CORE 1 -#endif - -/* - * TCP/IP Event Task - * */ - -typedef enum { - LWIP_TCP_SENT, LWIP_TCP_RECV, LWIP_TCP_ERROR, LWIP_TCP_POLL, LWIP_TCP_CLEAR -} lwip_event_t; - -typedef struct { - lwip_event_t event; - void *arg; - union { - struct { - void * pcb; - int8_t err; - } connected; - struct { - int8_t err; - } error; - struct { - tcp_pcb * pcb; - uint16_t len; - } sent; - struct { - tcp_pcb * pcb; - pbuf * pb; - int8_t err; - } recv; - struct { - tcp_pcb * pcb; - } poll; - struct { - tcp_pcb * pcb; - int8_t err; - } accept; - struct { - const char * name; - ip_addr_t addr; - } dns; - }; -} lwip_event_packet_t; - -static xQueueHandle _async_queue; -static TaskHandle_t _async_service_task_handle = NULL; - -static inline bool _init_async_event_queue(){ - if(!_async_queue){ - _async_queue = xQueueCreate(32, sizeof(lwip_event_packet_t *)); - if(!_async_queue){ - return false; - } - } - return true; -} - -static inline bool _send_async_event(lwip_event_packet_t ** e){ - return _async_queue && xQueueSend(_async_queue, e, portMAX_DELAY) == pdPASS; -} - -static inline bool _prepend_async_event(lwip_event_packet_t ** e){ - return _async_queue && xQueueSendToFront(_async_queue, e, portMAX_DELAY) == pdPASS; -} - -static inline bool _get_async_event(lwip_event_packet_t ** e){ - return _async_queue && xQueueReceive(_async_queue, e, portMAX_DELAY) == pdPASS; -} - -static bool _remove_events_with_arg(void * arg){ - lwip_event_packet_t * first_packet = NULL; - lwip_event_packet_t * packet = NULL; - - if(!_async_queue){ - return false; - } - //figure out which is the first packet so we can keep the order - while(!first_packet){ - if(xQueueReceive(_async_queue, &first_packet, 0) != pdPASS){ - return false; - } - //discard packet if matching - if((int)first_packet->arg == (int)arg){ - //ets_printf("X: 0x%08x\n", (uint32_t)first_packet->arg); - free(first_packet); - first_packet = NULL; - //return first packet to the back of the queue - } else if(xQueueSend(_async_queue, &first_packet, portMAX_DELAY) != pdPASS){ - return false; - } - } - - while(xQueuePeek(_async_queue, &packet, 0) == pdPASS && packet != first_packet){ - if(xQueueReceive(_async_queue, &packet, 0) != pdPASS){ - return false; - } - if((int)packet->arg == (int)arg){ - //ets_printf("X: 0x%08x\n", (uint32_t)packet->arg); - free(packet); - packet = NULL; - } else if(xQueueSend(_async_queue, &packet, portMAX_DELAY) != pdPASS){ - return false; - } - } - return true; -} - -static void _handle_async_event(lwip_event_packet_t * e){ - if(e->event == LWIP_TCP_CLEAR){ - _remove_events_with_arg(e->arg); - } else if(e->event == LWIP_TCP_RECV){ - //ets_printf("%c: 0x%08x 0x%08x\n", e->recv.pb?'R':'D', e->arg, e->recv.pcb); - AsyncClient::_s_recv(e->arg, e->recv.pcb, e->recv.pb, e->recv.err); - } else if(e->event == LWIP_TCP_SENT){ - //ets_printf("S: 0x%08x 0x%08x\n", e->arg, e->sent.pcb); - AsyncClient::_s_sent(e->arg, e->sent.pcb, e->sent.len); - } else if(e->event == LWIP_TCP_POLL){ - //ets_printf("P: 0x%08x 0x%08x\n", e->arg, e->poll.pcb); - AsyncClient::_s_poll(e->arg, e->poll.pcb); - } else if(e->event == LWIP_TCP_ERROR){ - AsyncClient::_s_error(e->arg, e->error.err); - } - free((void*)(e)); -} - -static void _async_service_task(void *pvParameters){ - lwip_event_packet_t * packet = NULL; - for (;;) { - if(_get_async_event(&packet)){ - _handle_async_event(packet); - } - } - vTaskDelete(NULL); - _async_service_task_handle = NULL; -} -/* -static void _stop_async_task(){ - if(_async_service_task_handle){ - vTaskDelete(_async_service_task_handle); - _async_service_task_handle = NULL; - } -} -*/ -static bool _start_async_task(){ - if(!_init_async_event_queue()){ - return false; - } - if(!_async_service_task_handle){ - xTaskCreatePinnedToCore(_async_service_task, "async_tcp", 8192, NULL, 3, &_async_service_task_handle, ASYNCTCP_RUNNING_CORE); - if(!_async_service_task_handle){ - return false; - } - } - return true; -} - -/* - * LwIP Callbacks - * */ - -static int8_t _tcp_clear_events(void * arg) { - lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t)); - e->event = LWIP_TCP_CLEAR; - e->arg = arg; - if (!_prepend_async_event(&e)) { - free((void*)(e)); - } - return ERR_OK; -} - -static int8_t _tcp_poll(void * arg, struct tcp_pcb * pcb) { - lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t)); - e->event = LWIP_TCP_POLL; - e->arg = arg; - e->poll.pcb = pcb; - if (!_send_async_event(&e)) { - free((void*)(e)); - } - return ERR_OK; -} - -static int8_t _tcp_recv(void * arg, struct tcp_pcb * pcb, struct pbuf *pb, int8_t err) { - lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t)); - e->event = LWIP_TCP_RECV; - e->arg = arg; - e->recv.pcb = pcb; - e->recv.pb = pb; - e->recv.err = err; - if (!_send_async_event(&e)) { - free((void*)(e)); - } - return ERR_OK; -} - -static int8_t _tcp_sent(void * arg, struct tcp_pcb * pcb, uint16_t len) { - lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t)); - e->event = LWIP_TCP_SENT; - e->arg = arg; - e->sent.pcb = pcb; - e->sent.len = len; - if (!_send_async_event(&e)) { - free((void*)(e)); - } - return ERR_OK; -} - -static void _tcp_error(void * arg, int8_t err) { - lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t)); - e->event = LWIP_TCP_ERROR; - e->arg = arg; - e->error.err = err; - if (!_send_async_event(&e)) { - free((void*)(e)); - } -} - -/* - * TCP/IP API Calls - * */ - -#include "lwip/priv/tcpip_priv.h" - -typedef struct { - struct tcpip_api_call_data call; - tcp_pcb * pcb; - int8_t err; - union { - struct { - const char* data; - size_t size; - uint8_t apiflags; - } write; - size_t received; - struct { - ip_addr_t * addr; - uint16_t port; - tcp_connected_fn cb; - } connect; - struct { - ip_addr_t * addr; - uint16_t port; - } bind; - uint8_t backlog; - }; -} tcp_api_call_t; - -static err_t _tcp_output_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - if(msg->pcb){ - msg->err = tcp_output(msg->pcb); - } else { - msg->err = 0; - } - return msg->err; -} - -static esp_err_t _tcp_output(tcp_pcb * pcb) { - tcp_api_call_t msg; - msg.pcb = pcb; - tcpip_api_call(_tcp_output_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_write_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = tcp_write(msg->pcb, msg->write.data, msg->write.size, msg->write.apiflags); - return msg->err; -} - -static esp_err_t _tcp_write(tcp_pcb * pcb, const char* data, size_t size, uint8_t apiflags) { - tcp_api_call_t msg; - msg.pcb = pcb; - msg.write.data = data; - msg.write.size = size; - msg.write.apiflags = apiflags; - tcpip_api_call(_tcp_write_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_recved_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = 0; - tcp_recved(msg->pcb, msg->received); - return msg->err; -} - -static esp_err_t _tcp_recved(tcp_pcb * pcb, size_t len) { - tcp_api_call_t msg; - msg.pcb = pcb; - msg.received = len; - tcpip_api_call(_tcp_recved_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_connect_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = tcp_connect(msg->pcb, msg->connect.addr, msg->connect.port, msg->connect.cb); - return msg->err; -} - -static esp_err_t _tcp_connect(tcp_pcb * pcb, ip_addr_t * addr, uint16_t port, tcp_connected_fn cb) { - tcp_api_call_t msg; - msg.pcb = pcb; - msg.connect.addr = addr; - msg.connect.port = port; - msg.connect.cb = cb; - tcpip_api_call(_tcp_connect_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_close_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = tcp_close(msg->pcb); - return msg->err; -} - -static esp_err_t _tcp_close(tcp_pcb * pcb) { - tcp_api_call_t msg; - msg.pcb = pcb; - //ets_printf("close 0x%08x\n", (uint32_t)pcb); - tcpip_api_call(_tcp_close_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_abort_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = 0; - tcp_abort(msg->pcb); - return msg->err; -} - -static esp_err_t _tcp_abort(tcp_pcb * pcb) { - tcp_api_call_t msg; - msg.pcb = pcb; - //ets_printf("abort 0x%08x\n", (uint32_t)pcb); - tcpip_api_call(_tcp_abort_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_bind_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = tcp_bind(msg->pcb, msg->bind.addr, msg->bind.port); - return msg->err; -} - -static esp_err_t _tcp_bind(tcp_pcb * pcb, ip_addr_t * addr, uint16_t port) { - tcp_api_call_t msg; - msg.pcb = pcb; - msg.bind.addr = addr; - msg.bind.port = port; - tcpip_api_call(_tcp_bind_api, (struct tcpip_api_call_data*)&msg); - return msg.err; -} - -static err_t _tcp_listen_api(struct tcpip_api_call_data *api_call_msg){ - tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg; - msg->err = 0; - msg->pcb = tcp_listen_with_backlog(msg->pcb, msg->backlog); - return msg->err; -} - -static tcp_pcb * _tcp_listen_with_backlog(tcp_pcb * pcb, uint8_t backlog) { - tcp_api_call_t msg; - msg.pcb = pcb; - msg.backlog = backlog?backlog:0xFF; - tcpip_api_call(_tcp_listen_api, (struct tcpip_api_call_data*)&msg); - return msg.pcb; -} -#define _tcp_listen(p) _tcp_listen_with_backlog(p, 0xFF); - - - -/* - Async TCP Client - */ - -AsyncClient::AsyncClient(tcp_pcb* pcb) -: _connect_cb(0) -, _connect_cb_arg(0) -, _discard_cb(0) -, _discard_cb_arg(0) -, _sent_cb(0) -, _sent_cb_arg(0) -, _error_cb(0) -, _error_cb_arg(0) -, _recv_cb(0) -, _recv_cb_arg(0) -, _pb_cb(0) -, _pb_cb_arg(0) -, _timeout_cb(0) -, _timeout_cb_arg(0) -, _pcb_busy(false) -, _pcb_sent_at(0) -, _close_pcb(false) -, _ack_pcb(true) -, _rx_last_packet(0) -, _rx_since_timeout(0) -, _ack_timeout(ASYNC_MAX_ACK_TIME) -, _connect_port(0) -, prev(NULL) -, next(NULL) -, _in_lwip_thread(false) -{ - //ets_printf("+: 0x%08x\n", (uint32_t)this); - - _pcb = pcb; - if(_pcb){ - _rx_last_packet = millis(); - tcp_arg(_pcb, this); - tcp_recv(_pcb, &_tcp_recv); - tcp_sent(_pcb, &_tcp_sent); - tcp_err(_pcb, &_tcp_error); - tcp_poll(_pcb, &_tcp_poll, 1); - //ets_printf("accept 0x%08x\n", (uint32_t)_pcb); - } -} - -AsyncClient::~AsyncClient(){ - if(_pcb) - _close(); - - //ets_printf("-: 0x%08x\n", (uint32_t)this); -} - -bool AsyncClient::connect(IPAddress ip, uint16_t port){ - if (_pcb){ - log_w("already connected, state %d", _pcb->state); - return false; - } - if(!_start_async_task()){ - log_e("failed to start task"); - return false; - } - - ip_addr_t addr; - addr.type = IPADDR_TYPE_V4; - addr.u_addr.ip4.addr = ip; - - tcp_pcb* pcb = tcp_new_ip_type(IPADDR_TYPE_V4); - if (!pcb){ - log_e("pcb == NULL"); - return false; - } - - tcp_arg(pcb, this); - tcp_err(pcb, &_tcp_error); - if(_in_lwip_thread){ - tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected); - } else { - _tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected); - } - return true; -} - -AsyncClient& AsyncClient::operator=(const AsyncClient& other){ - if (_pcb) - _close(); - - _pcb = other._pcb; - if (_pcb) { - _rx_last_packet = millis(); - tcp_arg(_pcb, this); - tcp_recv(_pcb, &_tcp_recv); - tcp_sent(_pcb, &_tcp_sent); - tcp_err(_pcb, &_tcp_error); - tcp_poll(_pcb, &_tcp_poll, 1); - } - return *this; -} - -int8_t AsyncClient::_connected(void* pcb, int8_t err){ - _pcb = reinterpret_cast(pcb); - if(_pcb){ - _rx_last_packet = millis(); - _pcb_busy = false; - tcp_recv(_pcb, &_tcp_recv); - tcp_sent(_pcb, &_tcp_sent); - tcp_poll(_pcb, &_tcp_poll, 1); - } - _in_lwip_thread = true; - if(_connect_cb) - _connect_cb(_connect_cb_arg, this); - _in_lwip_thread = false; - return ERR_OK; -} - -int8_t AsyncClient::_close(){ - //ets_printf("X: 0x%08x\n", (uint32_t)this); - int8_t err = ERR_OK; - if(_pcb) { - //log_i(""); - tcp_arg(_pcb, NULL); - tcp_sent(_pcb, NULL); - tcp_recv(_pcb, NULL); - tcp_err(_pcb, NULL); - tcp_poll(_pcb, NULL, 0); - _tcp_clear_events(this); - if(_in_lwip_thread){ - err = tcp_close(_pcb); - } else { - err = _tcp_close(_pcb); - } - if(err != ERR_OK) { - err = abort(); - } - _pcb = NULL; - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); - } - return err; -} - -void AsyncClient::_error(int8_t err) { - if(_pcb){ - tcp_arg(_pcb, NULL); - tcp_sent(_pcb, NULL); - tcp_recv(_pcb, NULL); - tcp_err(_pcb, NULL); - tcp_poll(_pcb, NULL, 0); - _pcb = NULL; - } - if(_error_cb) - _error_cb(_error_cb_arg, this, err); - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); -} - -int8_t AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) { - _in_lwip_thread = false; - _rx_last_packet = millis(); - //log_i("%u", len); - _pcb_busy = false; - if(_sent_cb) - _sent_cb(_sent_cb_arg, this, len, (millis() - _pcb_sent_at)); - return ERR_OK; -} - -int8_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, int8_t err) { - if(!_pcb || pcb != _pcb){ - log_e("0x%08x != 0x%08x", (uint32_t)pcb, (uint32_t)_pcb); - if(pb){ - pbuf_free(pb); - } - return ERR_OK; - } - _in_lwip_thread = false; - if(pb == NULL){ - return _close(); - } - - while(pb != NULL){ - _rx_last_packet = millis(); - //we should not ack before we assimilate the data - //log_i("%u", pb->len); - //Serial.write((const uint8_t *)pb->payload, pb->len); - _ack_pcb = true; - pbuf *b = pb; - pb = b->next; - b->next = NULL; - if(_pb_cb){ - _pb_cb(_pb_cb_arg, this, b); - } else { - if(_recv_cb) - _recv_cb(_recv_cb_arg, this, b->payload, b->len); - if(!_ack_pcb) - _rx_ack_len += b->len; - else - _tcp_recved(pcb, b->len); - pbuf_free(b); - } - } - return ERR_OK; -} - -int8_t AsyncClient::_poll(tcp_pcb* pcb){ - _in_lwip_thread = false; - // Close requested - if(_close_pcb){ - _close_pcb = false; - _close(); - return ERR_OK; - } - uint32_t now = millis(); - - // ACK Timeout - if(_pcb_busy && _ack_timeout && (now - _pcb_sent_at) >= _ack_timeout){ - _pcb_busy = false; - log_w("ack timeout %d", pcb->state); - if(_timeout_cb) - _timeout_cb(_timeout_cb_arg, this, (now - _pcb_sent_at)); - return ERR_OK; - } - // RX Timeout - if(_rx_since_timeout && (now - _rx_last_packet) >= (_rx_since_timeout * 1000)){ - log_w("rx timeout %d", pcb->state); - _close(); - return ERR_OK; - } - // Everything is fine - if(_poll_cb) - _poll_cb(_poll_cb_arg, this); - return ERR_OK; -} - -void AsyncClient::_dns_found(struct ip_addr *ipaddr){ - _in_lwip_thread = true; - if(ipaddr){ - connect(IPAddress(ipaddr->u_addr.ip4.addr), _connect_port); - } else { - log_e("dns fail"); - if(_error_cb) - _error_cb(_error_cb_arg, this, -55); - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); - } - _in_lwip_thread = false; -} - -bool AsyncClient::operator==(const AsyncClient &other) { - return _pcb == other._pcb; -} - -bool AsyncClient::connect(const char* host, uint16_t port){ - ip_addr_t addr; - err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_s_dns_found, this); - if(err == ERR_OK) { - return connect(IPAddress(addr.u_addr.ip4.addr), port); - } else if(err == ERR_INPROGRESS) { - _connect_port = port; - return true; - } - log_e("error: %d", err); - return false; -} - -int8_t AsyncClient::abort(){ - if(_pcb) { - log_w("state %d", _pcb->state); - if(_in_lwip_thread){ - tcp_abort(_pcb); - } else { - _tcp_abort(_pcb); - } - _pcb = NULL; - } - return ERR_ABRT; -} - -void AsyncClient::close(bool now){ - if(_pcb){ - if(_in_lwip_thread){ - tcp_recved(_pcb, _rx_ack_len); - } else { - _tcp_recved(_pcb, _rx_ack_len); - } - } - if(now) - _close(); - else - _close_pcb = true; -} - -void AsyncClient::stop() { - close(false); -} - -bool AsyncClient::free(){ - if(!_pcb) - return true; - if(_pcb->state == 0 || _pcb->state > 4) - return true; - return false; -} - -size_t AsyncClient::space(){ - if((_pcb != NULL) && (_pcb->state == 4)){ - return tcp_sndbuf(_pcb); - } - return 0; -} - -size_t AsyncClient::write(const char* data) { - if(data == NULL) - return 0; - return write(data, strlen(data)); -} - -size_t AsyncClient::write(const char* data, size_t size, uint8_t apiflags) { - size_t will_send = add(data, size, apiflags); - if(!will_send || !send()) - return 0; - return will_send; -} - - -size_t AsyncClient::add(const char* data, size_t size, uint8_t apiflags) { - if(!_pcb || size == 0 || data == NULL) - return 0; - size_t room = space(); - if(!room) - return 0; - size_t will_send = (room < size) ? room : size; - int8_t err = ERR_OK; - if(_in_lwip_thread){ - err = tcp_write(_pcb, data, will_send, apiflags); - } else { - err = _tcp_write(_pcb, data, will_send, apiflags); - } - if(err != ERR_OK) - return 0; - return will_send; -} - -bool AsyncClient::send(){ - int8_t err = ERR_OK; - if(_in_lwip_thread){ - err = tcp_output(_pcb); - } else { - err = _tcp_output(_pcb); - } - if(err == ERR_OK){ - _pcb_busy = true; - _pcb_sent_at = millis(); - return true; - } - return false; -} - -size_t AsyncClient::ack(size_t len){ - if(len > _rx_ack_len) - len = _rx_ack_len; - if(len){ - if(_in_lwip_thread){ - tcp_recved(_pcb, len); - } else { - _tcp_recved(_pcb, len); - } - } - _rx_ack_len -= len; - return len; -} - -// Operators - -AsyncClient & AsyncClient::operator+=(const AsyncClient &other) { - if(next == NULL){ - next = (AsyncClient*)(&other); - next->prev = this; - } else { - AsyncClient *c = next; - while(c->next != NULL) c = c->next; - c->next =(AsyncClient*)(&other); - c->next->prev = c; - } - return *this; -} - -void AsyncClient::setRxTimeout(uint32_t timeout){ - _rx_since_timeout = timeout; -} - -uint32_t AsyncClient::getRxTimeout(){ - return _rx_since_timeout; -} - -uint32_t AsyncClient::getAckTimeout(){ - return _ack_timeout; -} - -void AsyncClient::setAckTimeout(uint32_t timeout){ - _ack_timeout = timeout; -} - -void AsyncClient::setNoDelay(bool nodelay){ - if(!_pcb) - return; - if(nodelay) - tcp_nagle_disable(_pcb); - else - tcp_nagle_enable(_pcb); -} - -bool AsyncClient::getNoDelay(){ - if(!_pcb) - return false; - return tcp_nagle_disabled(_pcb); -} - -uint16_t AsyncClient::getMss(){ - if(_pcb) - return tcp_mss(_pcb); - return 0; -} - -uint32_t AsyncClient::getRemoteAddress() { - if(!_pcb) - return 0; - return _pcb->remote_ip.u_addr.ip4.addr; -} - -uint16_t AsyncClient::getRemotePort() { - if(!_pcb) - return 0; - return _pcb->remote_port; -} - -uint32_t AsyncClient::getLocalAddress() { - if(!_pcb) - return 0; - return _pcb->local_ip.u_addr.ip4.addr; -} - -uint16_t AsyncClient::getLocalPort() { - if(!_pcb) - return 0; - return _pcb->local_port; -} - -IPAddress AsyncClient::remoteIP() { - return IPAddress(getRemoteAddress()); -} - -uint16_t AsyncClient::remotePort() { - return getRemotePort(); -} - -IPAddress AsyncClient::localIP() { - return IPAddress(getLocalAddress()); -} - -uint16_t AsyncClient::localPort() { - return getLocalPort(); -} - -uint8_t AsyncClient::state() { - if(!_pcb) - return 0; - return _pcb->state; -} - -bool AsyncClient::connected(){ - if (!_pcb) - return false; - return _pcb->state == 4; -} - -bool AsyncClient::connecting(){ - if (!_pcb) - return false; - return _pcb->state > 0 && _pcb->state < 4; -} - -bool AsyncClient::disconnecting(){ - if (!_pcb) - return false; - return _pcb->state > 4 && _pcb->state < 10; -} - -bool AsyncClient::disconnected(){ - if (!_pcb) - return true; - return _pcb->state == 0 || _pcb->state == 10; -} - -bool AsyncClient::freeable(){ - if (!_pcb) - return true; - return _pcb->state == 0 || _pcb->state > 4; -} - -bool AsyncClient::canSend(){ - return space() > 0; -} - -void AsyncClient::ackPacket(struct pbuf * pb){ - if(!pb){ - return; - } - _tcp_recved(_pcb, pb->len); - pbuf_free(pb); -} - - -// Callback Setters - -void AsyncClient::onConnect(AcConnectHandler cb, void* arg){ - _connect_cb = cb; - _connect_cb_arg = arg; -} - -void AsyncClient::onDisconnect(AcConnectHandler cb, void* arg){ - _discard_cb = cb; - _discard_cb_arg = arg; -} - -void AsyncClient::onAck(AcAckHandler cb, void* arg){ - _sent_cb = cb; - _sent_cb_arg = arg; -} - -void AsyncClient::onError(AcErrorHandler cb, void* arg){ - _error_cb = cb; - _error_cb_arg = arg; -} - -void AsyncClient::onData(AcDataHandler cb, void* arg){ - _recv_cb = cb; - _recv_cb_arg = arg; -} - -void AsyncClient::onPacket(AcPacketHandler cb, void* arg){ - _pb_cb = cb; - _pb_cb_arg = arg; -} - -void AsyncClient::onTimeout(AcTimeoutHandler cb, void* arg){ - _timeout_cb = cb; - _timeout_cb_arg = arg; -} - -void AsyncClient::onPoll(AcConnectHandler cb, void* arg){ - _poll_cb = cb; - _poll_cb_arg = arg; -} - - -void AsyncClient::_s_dns_found(const char * name, struct ip_addr * ipaddr, void * arg){ - if(arg){ - reinterpret_cast(arg)->_dns_found(ipaddr); - } else { - log_e("Bad Arg: 0x%08x", arg); - } -} - -int8_t AsyncClient::_s_poll(void * arg, struct tcp_pcb * pcb) { - if(arg && pcb){ - reinterpret_cast(arg)->_poll(pcb); - } else { - log_e("Bad Args: 0x%08x 0x%08x", arg, pcb); - } - return ERR_OK; -} - -int8_t AsyncClient::_s_recv(void * arg, struct tcp_pcb * pcb, struct pbuf *pb, int8_t err) { - if(arg && pcb){ - reinterpret_cast(arg)->_recv(pcb, pb, err); - } else { - if(pb){ - pbuf_free(pb); - } - log_e("Bad Args: 0x%08x 0x%08x", arg, pcb); - } - return ERR_OK; -} - -int8_t AsyncClient::_s_sent(void * arg, struct tcp_pcb * pcb, uint16_t len) { - if(arg && pcb){ - reinterpret_cast(arg)->_sent(pcb, len); - } else { - log_e("Bad Args: 0x%08x 0x%08x", arg, pcb); - } - return ERR_OK; -} - -void AsyncClient::_s_error(void * arg, int8_t err) { - if(arg){ - reinterpret_cast(arg)->_error(err); - } else { - log_e("Bad Arg: 0x%08x", arg); - } -} - -int8_t AsyncClient::_s_connected(void * arg, void * pcb, int8_t err){ - if(arg && pcb){ - reinterpret_cast(arg)->_connected(pcb, err); - } else { - log_e("Bad Args: 0x%08x 0x%08x", arg, pcb); - } - return ERR_OK; -} - -const char * AsyncClient::errorToString(int8_t error){ - switch(error){ - case 0: return "OK"; - case -1: return "Out of memory error"; - case -2: return "Buffer error"; - case -3: return "Timeout"; - case -4: return "Routing problem"; - case -5: return "Operation in progress"; - case -6: return "Illegal value"; - case -7: return "Operation would block"; - case -8: return "Connection aborted"; - case -9: return "Connection reset"; - case -10: return "Connection closed"; - case -11: return "Not connected"; - case -12: return "Illegal argument"; - case -13: return "Address in use"; - case -14: return "Low-level netif error"; - case -15: return "Already connected"; - case -55: return "DNS failed"; - default: return "UNKNOWN"; - } -} - -const char * AsyncClient::stateToString(){ - switch(state()){ - case 0: return "Closed"; - case 1: return "Listen"; - case 2: return "SYN Sent"; - case 3: return "SYN Received"; - case 4: return "Established"; - case 5: return "FIN Wait 1"; - case 6: return "FIN Wait 2"; - case 7: return "Close Wait"; - case 8: return "Closing"; - case 9: return "Last ACK"; - case 10: return "Time Wait"; - default: return "UNKNOWN"; - } -} - -/* - Async TCP Server - */ -struct pending_pcb { - tcp_pcb* pcb; - pbuf *pb; - struct pending_pcb * next; -}; - -AsyncServer::AsyncServer(IPAddress addr, uint16_t port) -: _port(port) -, _addr(addr) -, _noDelay(false) -, _in_lwip_thread(false) -, _pcb(0) -, _connect_cb(0) -, _connect_cb_arg(0) -{} - -AsyncServer::AsyncServer(uint16_t port) -: _port(port) -, _addr((uint32_t) IPADDR_ANY) -, _noDelay(false) -, _in_lwip_thread(false) -, _pcb(0) -, _connect_cb(0) -, _connect_cb_arg(0) -{} - -AsyncServer::~AsyncServer(){ - end(); -} - -void AsyncServer::onClient(AcConnectHandler cb, void* arg){ - _connect_cb = cb; - _connect_cb_arg = arg; -} - -int8_t AsyncServer::_s_accept(void * arg, tcp_pcb * pcb, int8_t err){ - reinterpret_cast(arg)->_accept(pcb, err); - return ERR_OK; -} - -int8_t AsyncServer::_accept(tcp_pcb* pcb, int8_t err){ - tcp_accepted(_pcb); - if(_connect_cb){ - - if (_noDelay) - tcp_nagle_disable(pcb); - else - tcp_nagle_enable(pcb); - - AsyncClient *c = new AsyncClient(pcb); - if(c){ - _in_lwip_thread = true; - c->_in_lwip_thread = true; - _connect_cb(_connect_cb_arg, c); - c->_in_lwip_thread = false; - _in_lwip_thread = false; - return ERR_OK; - } - } - if(tcp_close(pcb) != ERR_OK){ - tcp_abort(pcb); - } - log_e("FAIL"); - return ERR_OK; -} - -void AsyncServer::begin(){ - if(_pcb) - return; - - if(!_start_async_task()){ - log_e("failed to start task"); - return; - } - int8_t err; - _pcb = tcp_new_ip_type(IPADDR_TYPE_V4); - if (!_pcb){ - log_e("_pcb == NULL"); - return; - } - - ip_addr_t local_addr; - local_addr.type = IPADDR_TYPE_V4; - local_addr.u_addr.ip4.addr = (uint32_t) _addr; - err = _tcp_bind(_pcb, &local_addr, _port); - - if (err != ERR_OK) { - _tcp_close(_pcb); - log_e("bind error: %d", err); - return; - } - - static uint8_t backlog = 5; - _pcb = _tcp_listen_with_backlog(_pcb, backlog); - //_pcb = _tcp_listen(_pcb); - if (!_pcb) { - log_e("listen_pcb == NULL"); - return; - } - tcp_arg(_pcb, (void*) this); - tcp_accept(_pcb, &_s_accept); -} - -void AsyncServer::end(){ - if(_pcb){ - tcp_arg(_pcb, NULL); - tcp_accept(_pcb, NULL); - if(_in_lwip_thread){ - tcp_close(_pcb); - } else { - _tcp_close(_pcb); - } - _pcb = NULL; - } -} - -void AsyncServer::setNoDelay(bool nodelay){ - _noDelay = nodelay; -} - -bool AsyncServer::getNoDelay(){ - return _noDelay; -} - -uint8_t AsyncServer::status(){ - if (!_pcb) - return 0; - return _pcb->state; -} diff --git a/libraries/AsyncTCP/src/AsyncTCP.h b/libraries/AsyncTCP/src/AsyncTCP.h deleted file mode 100644 index 6cd0fca24..000000000 --- a/libraries/AsyncTCP/src/AsyncTCP.h +++ /dev/null @@ -1,197 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef ASYNCTCP_H_ -#define ASYNCTCP_H_ - -#include "IPAddress.h" -#include -extern "C" { - #include "freertos/semphr.h" - #include "lwip/pbuf.h" -} - -class AsyncClient; - -#define ASYNC_MAX_ACK_TIME 5000 -#define ASYNC_WRITE_FLAG_COPY 0x01 //will allocate new buffer to hold the data while sending (else will hold reference to the data given) -#define ASYNC_WRITE_FLAG_MORE 0x02 //will not send PSH flag, meaning that there should be more data to be sent before the application should react. - -typedef std::function AcConnectHandler; -typedef std::function AcAckHandler; -typedef std::function AcErrorHandler; -typedef std::function AcDataHandler; -typedef std::function AcPacketHandler; -typedef std::function AcTimeoutHandler; - -struct tcp_pcb; -struct ip_addr; - -class AsyncClient { - protected: - tcp_pcb* _pcb; - - AcConnectHandler _connect_cb; - void* _connect_cb_arg; - AcConnectHandler _discard_cb; - void* _discard_cb_arg; - AcAckHandler _sent_cb; - void* _sent_cb_arg; - AcErrorHandler _error_cb; - void* _error_cb_arg; - AcDataHandler _recv_cb; - void* _recv_cb_arg; - AcPacketHandler _pb_cb; - void* _pb_cb_arg; - AcTimeoutHandler _timeout_cb; - void* _timeout_cb_arg; - AcConnectHandler _poll_cb; - void* _poll_cb_arg; - - bool _pcb_busy; - uint32_t _pcb_sent_at; - bool _close_pcb; - bool _ack_pcb; - uint32_t _rx_ack_len; - uint32_t _rx_last_packet; - uint32_t _rx_since_timeout; - uint32_t _ack_timeout; - uint16_t _connect_port; - - int8_t _close(); - int8_t _connected(void* pcb, int8_t err); - void _error(int8_t err); - int8_t _poll(tcp_pcb* pcb); - int8_t _sent(tcp_pcb* pcb, uint16_t len); - void _dns_found(struct ip_addr *ipaddr); - - - public: - AsyncClient* prev; - AsyncClient* next; - - AsyncClient(tcp_pcb* pcb = 0); - ~AsyncClient(); - - AsyncClient & operator=(const AsyncClient &other); - AsyncClient & operator+=(const AsyncClient &other); - - bool operator==(const AsyncClient &other); - - bool operator!=(const AsyncClient &other) { - return !(*this == other); - } - bool connect(IPAddress ip, uint16_t port); - bool connect(const char* host, uint16_t port); - void close(bool now = false); - void stop(); - int8_t abort(); - bool free(); - - bool canSend();//ack is not pending - size_t space(); - size_t add(const char* data, size_t size, uint8_t apiflags=ASYNC_WRITE_FLAG_COPY);//add for sending - bool send();//send all data added with the method above - size_t ack(size_t len); //ack data that you have not acked using the method below - void ackLater(){ _ack_pcb = false; } //will not ack the current packet. Call from onData - - size_t write(const char* data); - size_t write(const char* data, size_t size, uint8_t apiflags=ASYNC_WRITE_FLAG_COPY); //only when canSend() == true - - uint8_t state(); - bool connecting(); - bool connected(); - bool disconnecting(); - bool disconnected(); - bool freeable();//disconnected or disconnecting - - uint16_t getMss(); - uint32_t getRxTimeout(); - void setRxTimeout(uint32_t timeout);//no RX data timeout for the connection in seconds - uint32_t getAckTimeout(); - void setAckTimeout(uint32_t timeout);//no ACK timeout for the last sent packet in milliseconds - void setNoDelay(bool nodelay); - bool getNoDelay(); - uint32_t getRemoteAddress(); - uint16_t getRemotePort(); - uint32_t getLocalAddress(); - uint16_t getLocalPort(); - - IPAddress remoteIP(); - uint16_t remotePort(); - IPAddress localIP(); - uint16_t localPort(); - - void onConnect(AcConnectHandler cb, void* arg = 0); //on successful connect - void onDisconnect(AcConnectHandler cb, void* arg = 0); //disconnected - void onAck(AcAckHandler cb, void* arg = 0); //ack received - void onError(AcErrorHandler cb, void* arg = 0); //unsuccessful connect or error - void onData(AcDataHandler cb, void* arg = 0); //data received (called if onPacket is not used) - void onPacket(AcPacketHandler cb, void* arg = 0); //data received - void onTimeout(AcTimeoutHandler cb, void* arg = 0); //ack timeout - void onPoll(AcConnectHandler cb, void* arg = 0); //every 125ms when connected - - void ackPacket(struct pbuf * pb); - - const char * errorToString(int8_t error); - const char * stateToString(); - - int8_t _recv(tcp_pcb* pcb, pbuf* pb, int8_t err); - - static int8_t _s_poll(void *arg, struct tcp_pcb *tpcb); - static int8_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, int8_t err); - static void _s_error(void *arg, int8_t err); - static int8_t _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len); - static int8_t _s_connected(void* arg, void* tpcb, int8_t err); - static void _s_dns_found(const char *name, struct ip_addr *ipaddr, void *arg); - - bool _in_lwip_thread; -}; - -class AsyncServer { - protected: - uint16_t _port; - IPAddress _addr; - bool _noDelay; - bool _in_lwip_thread; - tcp_pcb* _pcb; - AcConnectHandler _connect_cb; - void* _connect_cb_arg; - - public: - - AsyncServer(IPAddress addr, uint16_t port); - AsyncServer(uint16_t port); - ~AsyncServer(); - void onClient(AcConnectHandler cb, void* arg); - void begin(); - void end(); - void setNoDelay(bool nodelay); - bool getNoDelay(); - uint8_t status(); - - static int8_t _s_accept(void *arg, tcp_pcb* newpcb, int8_t err); - protected: - int8_t _accept(tcp_pcb* newpcb, int8_t err); -}; - - -#endif /* ASYNCTCP_H_ */ diff --git a/libraries/AsyncTCP/travis/common.sh b/libraries/AsyncTCP/travis/common.sh deleted file mode 100644 index 57bede343..000000000 --- a/libraries/AsyncTCP/travis/common.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -function build_sketches() -{ - local arduino=$1 - local srcpath=$2 - local platform=$3 - local sketches=$(find $srcpath -name *.ino) - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - if [[ -f "$sketchdir/.$platform.skip" ]]; then - echo -e "\n\n ------------ Skipping $sketch ------------ \n\n"; - continue - fi - echo -e "\n\n ------------ Building $sketch ------------ \n\n"; - $arduino --verify $sketch; - local result=$? - if [ $result -ne 0 ]; then - echo "Build failed ($1)" - return $result - fi - done -} diff --git a/libraries/DHT_sensor_library_for_ESPx/DHTesp.cpp b/libraries/DHT_sensor_library_for_ESPx/DHTesp.cpp deleted file mode 100644 index 49d6ff6d4..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/DHTesp.cpp +++ /dev/null @@ -1,424 +0,0 @@ -/****************************************************************** - DHT Temperature & Humidity Sensor library for Arduino & ESP32. - - Features: - - Support for DHT11 and DHT22/AM2302/RHT03 - - Auto detect sensor model - - Very low memory footprint - - Very small code - - https://github.com/beegee-tokyo/arduino-DHTesp - - Written by Mark Ruys, mark@paracas.nl. - Updated to work with ESP32 by Bernd Giesecke, bernd@giesecke.tk - - GNU General Public License, check LICENSE for more information. - All text above must be included in any redistribution. - - Datasheets: - - http://www.micro4you.com/files/sensor/DHT11.pdf - - http://www.adafruit.com/datasheets/DHT22.pdf - - http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Sensors/Weather/RHT03.pdf - - http://meteobox.tk/files/AM2302.pdf - - Changelog: - 2013-06-10: Initial version - 2013-06-12: Refactored code - 2013-07-01: Add a resetTimer method - 2017-12-12: Added task switch disable - Added computeHeatIndex function from Adafruit DNT library - 2017-12-14: Added computeDewPoint function from idDHTLib Library - Added getComfortRatio function from libDHT Library - 2017-12-15: Added computePerception function - 2018-01-02: Added example for multiple sensors usage. - 2018-01-03: Added function getTempAndHumidity which returns temperature and humidity in one call. - 2018-01-03: Added retry in case the reading from the sensor fails with a timeout. - 2018-01-08: Added ESP8266 (and probably AVR) compatibility. - 2018-03-11: Updated DHT example -******************************************************************/ - -#include "DHTesp.h" - -void DHTesp::setup(uint8_t pin, DHT_MODEL_t model) -{ - DHTesp::pin = pin; - DHTesp::model = model; - DHTesp::resetTimer(); // Make sure we do read the sensor in the next readSensor() - - if ( model == AUTO_DETECT) { - DHTesp::model = DHT22; - readSensor(); - if ( error == ERROR_TIMEOUT ) { - DHTesp::model = DHT11; - // Warning: in case we auto detect a DHT11, you should wait at least 1000 msec - // before your first read request. Otherwise you will get a time out error. - } - } - - //Set default comfort profile. - - //In computing these constants the following reference was used - //http://epb.apogee.net/res/refcomf.asp - //It was simplified as 4 straight lines and added very little skew on - //the vertical lines (+0.1 on x for C,D) - //The for points used are(from top left, clock wise) - //A(30%, 30*C) B(70%, 26.2*C) C(70.1%, 20.55*C) D(30.1%, 22.22*C) - //On the X axis we have the rel humidity in % and on the Y axis the temperature in *C - - //Too hot line AB - m_comfort.m_tooHot_m = -0.095; - m_comfort.m_tooHot_b = 32.85; - //Too humid line BC - m_comfort.m_tooHumid_m = -56.5; - m_comfort.m_tooHumid_b = 3981.2; - //Too cold line DC - m_comfort.m_tooCold_m = -0.04175; - m_comfort.m_tooHCold_b = 23.476675; - //Too dry line AD - m_comfort.m_tooDry_m = -77.8; - m_comfort.m_tooDry_b = 2364; -} - -void DHTesp::resetTimer() -{ - DHTesp::lastReadTime = millis() - 3000; -} - -float DHTesp::getHumidity() -{ - readSensor(); - if ( error == ERROR_TIMEOUT ) { // Try a second time to read - readSensor(); - } - return humidity; -} - -float DHTesp::getTemperature() -{ - readSensor(); - if ( error == ERROR_TIMEOUT ) { // Try a second time to read - readSensor(); - } - return temperature; -} - -TempAndHumidity DHTesp::getTempAndHumidity() -{ - readSensor(); - if ( error == ERROR_TIMEOUT ) { // Try a second time to read - readSensor(); - } - values.temperature = temperature; - values.humidity = humidity; - return values; -} - -#ifndef OPTIMIZE_SRAM_SIZE - -const char* DHTesp::getStatusString() -{ - switch ( error ) { - case DHTesp::ERROR_TIMEOUT: - return "TIMEOUT"; - - case DHTesp::ERROR_CHECKSUM: - return "CHECKSUM"; - - default: - return "OK"; - } -} - -#else - -// At the expense of 26 bytes of extra PROGMEM, we save 11 bytes of -// SRAM by using the following method: - -prog_char P_OK[] PROGMEM = "OK"; -prog_char P_TIMEOUT[] PROGMEM = "TIMEOUT"; -prog_char P_CHECKSUM[] PROGMEM = "CHECKSUM"; - -const char *DHTesp::getStatusString() { - prog_char *c; - switch ( error ) { - case DHTesp::ERROR_CHECKSUM: - c = P_CHECKSUM; break; - - case DHTesp::ERROR_TIMEOUT: - c = P_TIMEOUT; break; - - default: - c = P_OK; break; - } - - static char buffer[9]; - strcpy_P(buffer, c); - - return buffer; -} - -#endif - -void DHTesp::readSensor() -{ - // Make sure we don't poll the sensor too often - // - Max sample rate DHT11 is 1 Hz (duty cicle 1000 ms) - // - Max sample rate DHT22 is 0.5 Hz (duty cicle 2000 ms) - unsigned long startTime = millis(); - if ( (unsigned long)(startTime - lastReadTime) < (model == DHT11 ? 999L : 1999L) ) { - return; - } - lastReadTime = startTime; - - temperature = NAN; - humidity = NAN; - - uint16_t rawHumidity = 0; - uint16_t rawTemperature = 0; - uint16_t data = 0; - - // Request sample - digitalWrite(pin, LOW); // Send start signal - pinMode(pin, OUTPUT); - if ( model == DHT11 ) { - delay(18); - } - else { - // This will fail for a DHT11 - that's how we can detect such a device - delayMicroseconds(800); - } - - pinMode(pin, INPUT); - digitalWrite(pin, HIGH); // Switch bus to receive data - - // We're going to read 83 edges: - // - First a FALLING, RISING, and FALLING edge for the start bit - // - Then 40 bits: RISING and then a FALLING edge per bit - // To keep our code simple, we accept any HIGH or LOW reading if it's max 85 usecs long - -#ifdef ESP32 - // ESP32 is a multi core / multi processing chip - // It is necessary to disable task switches during the readings - portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; - portENTER_CRITICAL(&mux); -#else - cli(); -#endif - for ( int8_t i = -3 ; i < 2 * 40; i++ ) { - byte age; - startTime = micros(); - - do { - age = (unsigned long)(micros() - startTime); - if ( age > 90 ) { - error = ERROR_TIMEOUT; -#ifdef ESP32 - portEXIT_CRITICAL(&mux); -#else - sei(); -#endif - return; - } - } - while ( digitalRead(pin) == (i & 1) ? HIGH : LOW ); - - if ( i >= 0 && (i & 1) ) { - // Now we are being fed our 40 bits - data <<= 1; - - // A zero max 30 usecs, a one at least 68 usecs. - if ( age > 30 ) { - data |= 1; // we got a one - } - } - - switch ( i ) { - case 31: - rawHumidity = data; - break; - case 63: - rawTemperature = data; - data = 0; - break; - } - } - -#ifdef ESP32 - portEXIT_CRITICAL(&mux); -#else - sei(); -#endif - - // Verify checksum - - if ( (byte)(((byte)rawHumidity) + (rawHumidity >> 8) + ((byte)rawTemperature) + (rawTemperature >> 8)) != data ) { - error = ERROR_CHECKSUM; - return; - } - - // Store readings - - if ( model == DHT11 ) { - humidity = rawHumidity >> 8; - temperature = rawTemperature >> 8; - } - else { - humidity = rawHumidity * 0.1; - - if ( rawTemperature & 0x8000 ) { - rawTemperature = -(int16_t)(rawTemperature & 0x7FFF); - } - temperature = ((int16_t)rawTemperature) * 0.1; - } - - error = ERROR_NONE; -} - -//boolean isFahrenheit: True == Fahrenheit; False == Celcius -float DHTesp::computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit) { - // Using both Rothfusz and Steadman's equations - // http://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml - float hi; - - if (!isFahrenheit) { - temperature = toFahrenheit(temperature); - } - - hi = 0.5 * (temperature + 61.0 + ((temperature - 68.0) * 1.2) + (percentHumidity * 0.094)); - - if (hi > 79) { - hi = -42.379 + - 2.04901523 * temperature + - 10.14333127 * percentHumidity + - -0.22475541 * temperature*percentHumidity + - -0.00683783 * pow(temperature, 2) + - -0.05481717 * pow(percentHumidity, 2) + - 0.00122874 * pow(temperature, 2) * percentHumidity + - 0.00085282 * temperature*pow(percentHumidity, 2) + - -0.00000199 * pow(temperature, 2) * pow(percentHumidity, 2); - - if((percentHumidity < 13) && (temperature >= 80.0) && (temperature <= 112.0)) - hi -= ((13.0 - percentHumidity) * 0.25) * sqrt((17.0 - abs(temperature - 95.0)) * 0.05882); - - else if((percentHumidity > 85.0) && (temperature >= 80.0) && (temperature <= 87.0)) - hi += ((percentHumidity - 85.0) * 0.1) * ((87.0 - temperature) * 0.2); - } - - return isFahrenheit ? hi : toCelsius(hi); -} - -//boolean isFahrenheit: True == Fahrenheit; False == Celcius -float DHTesp::computeDewPoint(float temperature, float percentHumidity, bool isFahrenheit) { - // reference: http://wahiduddin.net/calc/density_algorithms.htm - if (isFahrenheit) { - temperature = toCelsius(temperature); - } - double A0 = 373.15 / (273.15 + (double) temperature); - double SUM = -7.90298 * (A0 - 1); - SUM += 5.02808 * log10(A0); - SUM += -1.3816e-7 * (pow(10, (11.344 * (1 - 1 / A0))) - 1) ; - SUM += 8.1328e-3 * (pow(10, (-3.49149 * (A0 - 1))) - 1) ; - SUM += log10(1013.246); - double VP = pow(10, SUM - 3) * (double) percentHumidity; - double Td = log(VP / 0.61078); // temp var - Td = (241.88 * Td) / (17.558 - Td); - return isFahrenheit ? toFahrenheit(Td) : Td; -} - -//boolean isFahrenheit: True == Fahrenheit; False == Celcius -byte DHTesp::computePerception(float temperature, float percentHumidity, bool isFahrenheit) { - // Computing human perception from dew point - // reference: https://en.wikipedia.org/wiki/Dew_point ==> Relationship to human comfort - // reference: Horstmeyer, Steve (2006-08-15). "Relative Humidity....Relative to What? The Dew Point Temperature...a better approach". Steve Horstmeyer, Meteorologist, WKRC TV, Cincinnati, Ohio, USA. Retrieved 2009-08-20. - // Using table - // Return value Dew point Human perception[6] - // 7 Over 26 °C Severely high, even deadly for asthma related illnesses - // 6 24–26 °C Extremely uncomfortable, oppressive - // 5 21–24 °C Very humid, quite uncomfortable - // 4 18–21 °C Somewhat uncomfortable for most people at upper edge - // 3 16–18 °C OK for most, but all perceive the humidity at upper edge - // 2 13–16 °C Comfortable - // 1 10–12 °C Very comfortable - // 0 Under 10 °C A bit dry for some - - if (isFahrenheit) { - temperature = toCelsius(temperature); - } - float dewPoint = computeDewPoint(temperature, percentHumidity); - - if (dewPoint < 10.0f) { - return Perception_Dry; - } else if (dewPoint < 13.0f) { - return Perception_VeryComfy; - } else if (dewPoint < 16.0f) { - return Perception_Comfy; - } else if (dewPoint < 18.0f) { - return Perception_Ok; - } else if (dewPoint < 21.0f) { - return Perception_UnComfy; - } else if (dewPoint < 24.0f) { - return Perception_QuiteUnComfy; - } else if (dewPoint < 26.0f) { - return Perception_VeryUnComfy; - } - // else dew >= 26.0 - return Perception_SevereUncomfy; -} - -//boolean isFahrenheit: True == Fahrenheit; False == Celcius -float DHTesp::getComfortRatio(ComfortState& destComfortStatus, float temperature, float percentHumidity, bool isFahrenheit) { - float ratio = 100; //100% - float distance = 0; - float kTempFactor = 3; //take into account the slope of the lines - float kHumidFactor = 0.1; //take into account the slope of the lines - uint8_t tempComfort = 0; - - if (isFahrenheit) { - temperature = toCelsius(temperature); - } - - destComfortStatus = Comfort_OK; - - distance = m_comfort.distanceTooHot(temperature, percentHumidity); - if(distance > 0) - { - //update the comfort descriptor - tempComfort += (uint8_t)Comfort_TooHot; - //decrease the comfot ratio taking the distance into account - ratio -= distance * kTempFactor; - } - - distance = m_comfort.distanceTooHumid(temperature, percentHumidity); - if(distance > 0) - { - //update the comfort descriptor - tempComfort += (uint8_t)Comfort_TooHumid; - //decrease the comfot ratio taking the distance into account - ratio -= distance * kHumidFactor; - } - - distance = m_comfort.distanceTooCold(temperature, percentHumidity); - if(distance > 0) - { - //update the comfort descriptor - tempComfort += (uint8_t)Comfort_TooCold; - //decrease the comfot ratio taking the distance into account - ratio -= distance * kTempFactor; - } - - distance = m_comfort.distanceTooDry(temperature, percentHumidity); - if(distance > 0) - { - //update the comfort descriptor - tempComfort += (uint8_t)Comfort_TooDry; - //decrease the comfot ratio taking the distance into account - ratio -= distance * kHumidFactor; - } - - destComfortStatus = (ComfortState)tempComfort; - - if(ratio < 0) - ratio = 0; - - return ratio; -} diff --git a/libraries/DHT_sensor_library_for_ESPx/DHTesp.h b/libraries/DHT_sensor_library_for_ESPx/DHTesp.h deleted file mode 100644 index a062449a8..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/DHTesp.h +++ /dev/null @@ -1,170 +0,0 @@ -/****************************************************************** - DHT Temperature & Humidity Sensor library for Arduino & ESP32. - - Features: - - Support for DHT11 and DHT22/AM2302/RHT03 - - Auto detect sensor model - - Very low memory footprint - - Very small code - - https://github.com/beegee-tokyo/arduino-DHTesp - - Written by Mark Ruys, mark@paracas.nl. - Updated to work with ESP32 by Bernd Giesecke, bernd@giesecke.tk - - GNU General Public License, check LICENSE for more information. - All text above must be included in any redistribution. - - Datasheets: - - http://www.micro4you.com/files/sensor/DHT11.pdf - - http://www.adafruit.com/datasheets/DHT22.pdf - - http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Sensors/Weather/RHT03.pdf - - http://meteobox.tk/files/AM2302.pdf - - Changelog: - 2013-06-10: Initial version - 2013-06-12: Refactored code - 2013-07-01: Add a resetTimer method - 2017-12-12: Added task switch disable - Added computeHeatIndex function from Adafruit DNT library - 2017-12-14: Added computeDewPoint function from idDHTLib Library - Added getComfortRatio function from libDHT Library - 2017-12-15: Added computePerception function - 2018-01-02: Added example for multiple sensors usage. - 2018-01-03: Added function getTempAndHumidity which returns temperature and humidity in one call. - 2018-01-03: Added retry in case the reading from the sensor fails with a timeout. - 2018-01-08: Added ESP8266 (and probably AVR) compatibility. - ******************************************************************/ - -#ifndef dhtesp_h -#define dhtesp_h - -#if ARDUINO < 100 - #include -#else - #include -#endif - -// Reference: http://epb.apogee.net/res/refcomf.asp (References invalid) -enum ComfortState { - Comfort_OK = 0, - Comfort_TooHot = 1, - Comfort_TooCold = 2, - Comfort_TooDry = 4, - Comfort_TooHumid = 8, - Comfort_HotAndHumid = 9, - Comfort_HotAndDry = 5, - Comfort_ColdAndHumid = 10, - Comfort_ColdAndDry = 6 -}; - -// References https://en.wikipedia.org/wiki/Dew_point ==> Relationship to human comfort -enum PerceptionState { - Perception_Dry = 0, - Perception_VeryComfy = 1, - Perception_Comfy = 2, - Perception_Ok = 3, - Perception_UnComfy = 4, - Perception_QuiteUnComfy = 5, - Perception_VeryUnComfy = 6, - Perception_SevereUncomfy = 7 -}; - -struct TempAndHumidity { - float temperature; - float humidity; -}; - -struct ComfortProfile -{ - //Represent the 4 line equations: - //dry, humid, hot, cold, using the y = mx + b formula - float m_tooHot_m, m_tooHot_b; - float m_tooCold_m, m_tooHCold_b; - float m_tooDry_m, m_tooDry_b; - float m_tooHumid_m, m_tooHumid_b; - - inline bool isTooHot(float temp, float humidity) {return (temp > (humidity * m_tooHot_m + m_tooHot_b));} - inline bool isTooHumid(float temp, float humidity) {return (temp > (humidity * m_tooHumid_m + m_tooHumid_b));} - inline bool isTooCold(float temp, float humidity) {return (temp < (humidity * m_tooCold_m + m_tooHCold_b));} - inline bool isTooDry(float temp, float humidity) {return (temp < (humidity * m_tooDry_m + m_tooDry_b));} - - inline float distanceTooHot(float temp, float humidity) {return temp - (humidity * m_tooHot_m + m_tooHot_b);} - inline float distanceTooHumid(float temp, float humidity) {return temp - (humidity * m_tooHumid_m + m_tooHumid_b);} - inline float distanceTooCold(float temp, float humidity) {return (humidity * m_tooCold_m + m_tooHCold_b) - temp;} - inline float distanceTooDry(float temp, float humidity) {return (humidity * m_tooDry_m + m_tooDry_b) - temp;} -}; - -class DHTesp -{ -public: - - typedef enum { - AUTO_DETECT, - DHT11, - DHT22, - AM2302, // Packaged DHT22 - RHT03 // Equivalent to DHT22 - } - DHT_MODEL_t; - - typedef enum { - ERROR_NONE = 0, - ERROR_TIMEOUT, - ERROR_CHECKSUM - } - DHT_ERROR_t; - - TempAndHumidity values; - - void setup(uint8_t pin, DHT_MODEL_t model=AUTO_DETECT); - void resetTimer(); - - float getTemperature(); - float getHumidity(); - TempAndHumidity getTempAndHumidity(); - - DHT_ERROR_t getStatus() { return error; }; - const char* getStatusString(); - - DHT_MODEL_t getModel() { return model; } - - int getMinimumSamplingPeriod() { return model == DHT11 ? 1000 : 2000; } - - int8_t getNumberOfDecimalsTemperature() { return model == DHT11 ? 0 : 1; }; - int8_t getLowerBoundTemperature() { return model == DHT11 ? 0 : -40; }; - int8_t getUpperBoundTemperature() { return model == DHT11 ? 50 : 125; }; - - int8_t getNumberOfDecimalsHumidity() { return 0; }; - int8_t getLowerBoundHumidity() { return model == DHT11 ? 20 : 0; }; - int8_t getUpperBoundHumidity() { return model == DHT11 ? 90 : 100; }; - - static float toFahrenheit(float fromCelcius) { return 1.8 * fromCelcius + 32.0; }; - static float toCelsius(float fromFahrenheit) { return (fromFahrenheit - 32.0) / 1.8; }; - - float computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit=false); - float computeDewPoint(float temperature, float percentHumidity, bool isFahrenheit=false); - float getComfortRatio(ComfortState& destComfStatus, float temperature, float percentHumidity, bool isFahrenheit=false); - ComfortProfile getComfortProfile() {return m_comfort;} - void setComfortProfile(ComfortProfile& c) {m_comfort = c;} - inline bool isTooHot(float temp, float humidity) {return m_comfort.isTooHot(temp, humidity);} - inline bool isTooHumid(float temp, float humidity) {return m_comfort.isTooHumid(temp, humidity);} - inline bool isTooCold(float temp, float humidity) {return m_comfort.isTooCold(temp, humidity);} - inline bool isTooDry(float temp, float humidity) {return m_comfort.isTooDry(temp, humidity);} - byte computePerception(float temperature, float percentHumidity, bool isFahrenheit=false); -protected: - void readSensor(); - - float temperature; - float humidity; - - uint8_t pin; - -private: - DHT_MODEL_t model; - DHT_ERROR_t error; - unsigned long lastReadTime; - ComfortProfile m_comfort; -}; - -#endif /*dhtesp_h*/ diff --git a/libraries/DHT_sensor_library_for_ESPx/LICENSE b/libraries/DHT_sensor_library_for_ESPx/LICENSE deleted file mode 100644 index 30ace6a87..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/libraries/DHT_sensor_library_for_ESPx/README.md b/libraries/DHT_sensor_library_for_ESPx/README.md deleted file mode 100644 index e51edcf93..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/README.md +++ /dev/null @@ -1,149 +0,0 @@ -DHTesp -=== - -An Arduino library for reading the DHT family of temperature and humidity sensors. -Forked from [arduino-DHT](https://github.com/markruys/arduino-DHT) -Original written by Mark Ruys, . - -Why did I clone this library instead of forking the original repo and push the changes? -When I searched through Github for DHT libraries, I found a lot of them, some of them offers additional functions, some of them only basic temperature and humidity values. I wanted to combine all interesting functions into one library. In addition, none of the DHT libraries I found were written to work without errors on the ESP32. For ESP32 (a multi core/ multi processing SOC) task switching must be disabled while reading data from the sensor. -Another problem I found is that many of the available libraries use the same naming (dht.h, dht.cpp), which easily leads to conflicts if different libraries are used for different platforms. - -The library is tested as well on ESP8266 and should work on AVR boards as well. - -Changes to the original library: --------- -- 2017-12-12: Renamed DHT class to DHTesp and filenames from dht.* to DHTesp.* to avoid conflicts with other libraries - beegee-tokyo, . -- 2017-12-12: Updated to work with ESP32 - beegee-tokyo, . -- 2017-12-12: Added function computeHeatIndex. Reference: [Adafruit DHT library](https://github.com/adafruit/DHT-sensor-library). -- 2017-12-14: Added function computeDewPoint. Reference: [idDHTLib](https://github.com/niesteszeck/idDHTLib). -- 2017-12-14: Added function getComfortRatio. Reference: [libDHT](https://github.com/ADiea/libDHT). (References about Human Comfort invalid) -- 2017-12-15: Added function computePerception. Reference: [WikiPedia Dew point==> Relationship to human comfort](https://en.wikipedia.org/wiki/Dew_point) - beegee-tokyo, . -- 2018-01-02: Added example for multiple sensors usage. -- 2018-01-03: Added function getTempAndHumidity which returns temperature and humidity in one call. -- 2018-01-03: Added retry in case the reading from the sensor fails with a timeout. -- 2018-01-08: Added ESP8266 (and probably AVR) compatibility. -- 2018-03-11: Updated DHT example -Features --------- - - Support for DHT11 and DHT22, AM2302, RHT03 - - Auto detect sensor model - - Determine heat index - - Determine dewpoint - - Determine thermal comfort: - * Empiric comfort function based on comfort profiles(parametric lines) - * Multiple comfort profiles possible. Default based on http://epb.apogee.net/res/refcomf.asp (References invalid) - * Determine if it's too cold, hot, humid, dry, based on current comfort profile - * More info at [Determining Thermal Comfort Using a Humidity and Temperature Sensor](https://www.azosensors.com/article.aspx?ArticleID=487) - - Determine human perception based on humidity, temperature and dew point according to Horstmeyer, Steve (2006-08-15). [Relative Humidity....Relative to What? The Dew Point Temperature...a better approach](http://www.shorstmeyer.com/wxfaqs/humidity/humidity.html) - -Functions ------ -_**`void setup(uint8_t pin, DHT_MODEL_t model=AUTO_DETECT);`**_ -- Call to initialize the interface, define the GPIO pin to which the sensor is connected and define the sensor type. Valid sensor types are: - - AUTO_DETECT Try to detect which sensor is connected - - DHT11 - - DHT22 - - AM2302 Packaged DHT22 - - RHT03 Equivalent to DHT22 - -_**`void resetTimer();`**_ -- Reset last time the sensor was read - -_**`float getTemperature();`**_ -- Get the temperature in degree Centigrade from the sensor -Either one of _`getTemperature()`_ or _`getHumidity()`_ or _`getTempAndHumidity()`_ initiates reading a value from the sensor if the last reading was older than the minimal refresh time of the sensor. -See example _`DHT_ESP32.ino`_ or _`DHT_Test.ino`_ - -_**`float getHumidity();`**_ -- Get the humidity from the sensor -Either one of _`getTemperature()`_ or _`getHumidity()`_ or _`getTempAndHumidity()`_ initiates reading a value from the sensor if the last reading was older than the minimal refresh time of the sensor. -See example _`DHT_ESP32.ino`_ or _`DHT_Test.ino`_ - -_**`TempAndHumidity getTempAndHumidity();`**_ -- Get the temperature and humidity from the sensor -Either one of _`getTemperature()`_ or _`getHumidity()`_ or _`getTempAndHumidity()`_ initiates reading a value from the sensor if the last reading was older than the minimal refresh time of the sensor. -Return value is a struct of type _`TempAndHumidity`_ with temperature and humidity as float values. -See example _`DHT_Multi.ino`_ - -_**`DHT_ERROR_t getStatus();`**_ -- Get last error if reading from the sensor failed. Possible values are: - - ERROR_NONE no error occured - - ERROR_TIMEOUT timeout reading from the sensor - - ERROR_CHECKSUM checksum of received values doesn't match - -_**`const char* getStatusString();`**_ -- Get last error as a char * - -_**`DHT_MODEL_t getModel()`**_ -- Get detected (or defined) sensor type - -_**`int getMinimumSamplingPeriod();`**_ -- Get minimmum possible sampling period. For DHT11 this is 1000ms, for other sensors it is 2000ms - -_**`int8_t getNumberOfDecimalsTemperature();`**_ -- Get number of decimals in the temperature value. For DHT11 this is 0, for other sensors it is 1 - -_**`int8_t getLowerBoundTemperature();`**_ -- Get lower temperature range of the sensor. For DHT11 this is 0 degree Centigrade, for other sensors this is -40 degree Centrigrade - -_**`int8_t getUpperBoundTemperature();`**_ -- Get upper temperature range of the sensor. For DHT11 this is 50 degree Centigrade, for other sensors this is 125 degree Centrigrade - -_**`int8_t getNumberOfDecimalsHumidity();`**_ -- Get number of decimals in the humidity value. This is always 0. - -_**`int8_t getLowerBoundHumidity();`**_ -- Get lower humidity range of the sensor. For DHT11 this is 20 percent, for other sensors this is 0 percent - -_**`int8_t getUpperBoundHumidity();`**_ -- Get upper temperature range of the sensor. For DHT11 this is 90 percent, for other sensors this is 100 percent - -_**`static float toFahrenheit(float fromCelcius);`**_ -- Convert Centrigrade value to Fahrenheit value - -_**`static float toCelsius(float fromFahrenheit) { return (fromFahrenheit - 32.0) / 1.8; };`**_ -- Convert Fahrenheit value to Centigrade value - -_**`float computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit=false);`**_ -- Compute the heat index. Default temperature is in Centrigrade. - -_**`float computeDewPoint(float temperature, float percentHumidity, bool isFahrenheit=false);`**_ -- Compute the dew point. Default temperature is in Centrigrade. - -_**`float getComfortRatio(ComfortState& destComfStatus, float temperature, float percentHumidity, bool isFahrenheit=false);`**_ -- Compute the comfort ratio. Default temperature is in Centrigrade. Return values: -0 -> OK -1 -> Too Hot -2 -> Too cold -4 -> Too dry -8 -> Too humid -9 -> Hot and humid -5 -> Hot and dry -10 -> Cold and humid -6 -> Cold and dry - -_**`byte computePerception(float temperature, float percentHumidity, bool isFahrenheit=false);`**_ -- Compute the human perception. Default temperature is in Centrigrade. Return values: -0 -> Dry -1 -> Very comfortable -2 -> Comfortable -3 -> Ok -4 -> Uncomfortable -5 -> Quite uncomfortable -6 -> Very uncomfortable -7 -> Severe uncomfortable - -Usage ------ -See [examples](https://github.com/beegee-tokyo/DHTesp/blob/master/examples). For all the options, see [dhtesp.h](https://github.com/beegee-tokyo/DHTesp/blob/master/DHTesp.h). - -Installation ------------- - -In Arduino IDE open Sketch->Include Library->Manage Libraries then search for _**DHT ESP**_ -In PlatformIO open PlatformIO Home, switch to libraries and search for _**DHT ESP32**_. Or install the library in the terminal with _**`platformio lib install 2029`**_ - -For manual installation [download](https://github.com/beegee-tokyo/DHTesp/archive/master.zip) the archive, unzip it and place the DHTesp folder into the library directory. -In Arduino IDE this is usually _**`/libraries/`**_ -In PlatformIO this is usually _**``**_ diff --git a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_ESP32/DHT_ESP32.ino b/libraries/DHT_sensor_library_for_ESPx/examples/DHT_ESP32/DHT_ESP32.ino deleted file mode 100644 index 282bbaa1a..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_ESP32/DHT_ESP32.ino +++ /dev/null @@ -1,172 +0,0 @@ -#include "DHTesp.h" -#include "ESP32Ticker.h" - -/**************************************************************/ -/* Example how to read DHT sensors from an ESP32 using multi- */ -/* tasking. */ -/* This example depends on the ESP32Ticker library to wake up */ -/* the task every 20 seconds */ -/* Please install Ticker-esp32 library first */ -/* bertmelis/Ticker-esp32 */ -/* https://github.com/bertmelis/Ticker-esp32 */ -/**************************************************************/ - -DHTesp dht; - -void tempTask(void *pvParameters); -bool getTemperature(); -void triggerGetTemp(); - -/** Task handle for the light value read task */ -TaskHandle_t tempTaskHandle = NULL; -/** Ticker for temperature reading */ -Ticker tempTicker; -/** Comfort profile */ -ComfortState cf; -/** Flag if task should run */ -bool tasksEnabled = false; -/** Pin number for DHT11 data pin */ -int dhtPin = 17; - -/** - * initTemp - * Setup DHT library - * Setup task and timer for repeated measurement - * @return bool - * true if task and timer are started - * false if task or timer couldn't be started - */ -bool initTemp() { - byte resultValue = 0; - // Initialize temperature sensor - dht.setup(dhtPin, DHTesp::DHT11); - Serial.println("DHT initiated"); - - // Start task to get temperature - xTaskCreatePinnedToCore( - tempTask, /* Function to implement the task */ - "tempTask ", /* Name of the task */ - 4000, /* Stack size in words */ - NULL, /* Task input parameter */ - 5, /* Priority of the task */ - &tempTaskHandle, /* Task handle. */ - 1); /* Core where the task should run */ - - if (tempTaskHandle == NULL) { - Serial.println("Failed to start task for temperature update"); - return false; - } else { - // Start update of environment data every 20 seconds - tempTicker.attach(20, triggerGetTemp); - } - return true; -} - -/** - * triggerGetTemp - * Sets flag dhtUpdated to true for handling in loop() - * called by Ticker getTempTimer - */ -void triggerGetTemp() { - if (tempTaskHandle != NULL) { - xTaskResumeFromISR(tempTaskHandle); - } -} - -/** - * Task to reads temperature from DHT11 sensor - * @param pvParameters - * pointer to task parameters - */ -void tempTask(void *pvParameters) { - Serial.println("tempTask loop started"); - while (1) // tempTask loop - { - if (tasksEnabled) { - // Get temperature values - getTemperature(); - } - // Got sleep again - vTaskSuspend(NULL); - } -} - -/** - * getTemperature - * Reads temperature from DHT11 sensor - * @return bool - * true if temperature could be aquired - * false if aquisition failed -*/ -bool getTemperature() { - // Reading temperature for humidity takes about 250 milliseconds! - // Sensor readings may also be up to 2 seconds 'old' (it's a very slow sensor) - TempAndHumidity newValues = dht.getTempAndHumidity(); - // Check if any reads failed and exit early (to try again). - if (dht.getStatus() != 0) { - Serial.println("DHT11 error status: " + String(dht.getStatusString())); - return false; - } - - float heatIndex = dht.computeHeatIndex(newValues.temperature, newValues.humidity); - float dewPoint = dht.computeDewPoint(newValues.temperature, newValues.humidity); - float cr = dht.getComfortRatio(cf, newValues.temperature, newValues.humidity); - - String comfortStatus; - switch(cf) { - case Comfort_OK: - comfortStatus = "Comfort_OK"; - break; - case Comfort_TooHot: - comfortStatus = "Comfort_TooHot"; - break; - case Comfort_TooCold: - comfortStatus = "Comfort_TooCold"; - break; - case Comfort_TooDry: - comfortStatus = "Comfort_TooDry"; - break; - case Comfort_TooHumid: - comfortStatus = "Comfort_TooHumid"; - break; - case Comfort_HotAndHumid: - comfortStatus = "Comfort_HotAndHumid"; - break; - case Comfort_HotAndDry: - comfortStatus = "Comfort_HotAndDry"; - break; - case Comfort_ColdAndHumid: - comfortStatus = "Comfort_ColdAndHumid"; - break; - case Comfort_ColdAndDry: - comfortStatus = "Comfort_ColdAndDry"; - break; - default: - comfortStatus = "Unknown:"; - break; - }; - - Serial.println(" T:" + String(newValues.temperature) + " H:" + String(newValues.humidity) + " I:" + String(heatIndex) + " D:" + String(dewPoint) + " " + comfortStatus); - return true; -} - -void setup() -{ - Serial.begin(115200); - Serial.println(); - Serial.println("DHT ESP32 example with tasks"); - initTemp(); -} - -void loop() { - if (!tasksEnabled) { - // Wait 2 seconds to let system settle down - delay(2000); - // Enable task that will read values from the DHT sensor - tasksEnabled = true; - if (tempTaskHandle != NULL) { - vTaskResume(tempTaskHandle); - } - } - yield(); -} diff --git a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Multi/DHT_Multi.ino b/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Multi/DHT_Multi.ino deleted file mode 100644 index 75997f191..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Multi/DHT_Multi.ino +++ /dev/null @@ -1,119 +0,0 @@ -#include - -#include "ESP32Ticker.h" -#include "DHTesp.h" - -/** Initialize DHT sensor 1 */ -DHTesp dhtSensor1; -/** Initialize DHT sensor 2 */ -DHTesp dhtSensor2; -/** Initialize DHT sensor 3 */ -DHTesp dhtSensor3; -/** Task handle for the light value read task */ -TaskHandle_t tempTaskHandle = NULL; -/** Pin number for DHT11 1 data pin */ -int dhtPin1 = 17; -/** Pin number for DHT11 2 data pin */ -int dhtPin2 = 16; -/** Pin number for DHT11 3 data pin */ -int dhtPin3 = 27; -/** Ticker for temperature reading */ -Ticker tempTicker; -/** Flags for temperature readings finished */ -bool gotNewTemperature = false; -/** Data from sensor 1 */ -TempAndHumidity sensor1Data; -/** Data from sensor 2 */ -TempAndHumidity sensor2Data; -/** Data from sensor 3 */ -TempAndHumidity sensor3Data; - -/* Flag if main loop is running */ -bool tasksEnabled = false; - -/** - -/** - * Task to reads temperature from DHT11 sensor - * @param pvParameters - * pointer to task parameters - */ -void tempTask(void *pvParameters) { - Serial.println("tempTask loop started"); - while (1) // tempTask loop - { - if (tasksEnabled && !gotNewTemperature) { // Read temperature only if old data was processed already - // Reading temperature for humidity takes about 250 milliseconds! - // Sensor readings may also be up to 2 seconds 'old' (it's a very slow sensor) - sensor1Data = dhtSensor1.getTempAndHumidity(); // Read values from sensor 1 - sensor2Data = dhtSensor2.getTempAndHumidity(); // Read values from sensor 1 - sensor3Data = dhtSensor3.getTempAndHumidity(); // Read values from sensor 1 - gotNewTemperature = true; - } - vTaskSuspend(NULL); - } -} - -/** - * triggerGetTemp - * Sets flag dhtUpdated to true for handling in loop() - * called by Ticker tempTicker - */ -void triggerGetTemp() { - if (tempTaskHandle != NULL) { - xTaskResumeFromISR(tempTaskHandle); - } -} - -/** - * Arduino setup function (called once after boot/reboot) - */ -void setup() { - Serial.begin(115200); - Serial.println("Example for 3 DHT11/22 sensors"); - - // Initialize temperature sensor 1 - dhtSensor1.setup(dhtPin1, DHTesp::DHT11); - // Initialize temperature sensor 2 - dhtSensor2.setup(dhtPin2, DHTesp::DHT11); - // Initialize temperature sensor 3 - dhtSensor3.setup(dhtPin3, DHTesp::DHT11); - - // Start task to get temperature - xTaskCreatePinnedToCore( - tempTask, /* Function to implement the task */ - "tempTask ", /* Name of the task */ - 4000, /* Stack size in words */ - NULL, /* Task input parameter */ - 5, /* Priority of the task */ - &tempTaskHandle, /* Task handle. */ - 1); /* Core where the task should run */ - - if (tempTaskHandle == NULL) { - Serial.println("[ERROR] Failed to start task for temperature update"); - } else { - // Start update of environment data every 30 seconds - tempTicker.attach(30, triggerGetTemp); - } - - // Signal end of setup() to tasks - tasksEnabled = true; -} // End of setup. - - -/** - * loop - * Arduino loop function, called once 'setup' is complete (your own code - * should go here) - */ -void loop() { - if (gotNewTemperature) { - Serial.println("Sensor 1 data:"); - Serial.println("Temp: " + String(sensor1Data.temperature,2) + "'C Humidity: " + String(sensor1Data.humidity,1) + "%"); - Serial.println("Sensor 2 data:"); - Serial.println("Temp: " + String(sensor2Data.temperature,2) + "'C Humidity: " + String(sensor2Data.humidity,1) + "%"); - Serial.println("Sensor 3 data:"); - Serial.println("Temp: " + String(sensor3Data.temperature,2) + "'C Humidity: " + String(sensor3Data.humidity,1) + "%"); - gotNewTemperature = false; - } -} // End of loop diff --git a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Test/DHT_Test.ino b/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Test/DHT_Test.ino deleted file mode 100644 index a374e460b..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/examples/DHT_Test/DHT_Test.ino +++ /dev/null @@ -1,38 +0,0 @@ -#include "DHTesp.h" - -DHTesp dht; - -void setup() -{ - Serial.begin(115200); - Serial.println(); - Serial.println("Status\tHumidity (%)\tTemperature (C)\t(F)\tHeatIndex (C)\t(F)"); - - dht.setup(22); // Connect DHT sensor to GPIO 17 -} - -void loop() -{ - - //delay(dht.getMinimumSamplingPeriod()*1.2); - static uint32_t last_dht_update= 0; - uint32_t now_dht = millis(); - if (now_dht - last_dht_update > dht.getMinimumSamplingPeriod() *1.2) { - last_dht_update = now_dht; - float humidity = dht.getHumidity(); - float temperature = dht.getTemperature(); - - Serial.print(dht.getStatusString()); - Serial.print("\t H:"); - Serial.print(humidity, 1); - Serial.print("%\t\T :"); - Serial.print(temperature, 1); - Serial.println("C\t\t"); - //Serial.print(dht.toFahrenheit(temperature), 1); - //Serial.print("\t\t"); - //Serial.print(dht.computeHeatIndex(temperature, humidity, false), 1); - //Serial.print("\t\t"); - //Serial.println(dht.computeHeatIndex(dht.toFahrenheit(temperature), humidity, true), 1); - } -} - diff --git a/libraries/DHT_sensor_library_for_ESPx/keywords.txt b/libraries/DHT_sensor_library_for_ESPx/keywords.txt deleted file mode 100644 index 953f244bc..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/keywords.txt +++ /dev/null @@ -1,79 +0,0 @@ -####################################### -# Syntax Coloring Map For DHTesp -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -DHTesp KEYWORD1 -TempAndHumidity KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -setup KEYWORD2 -getTemperature KEYWORD2 -getHumidity KEYWORD2 -getTempAndHumidity KEYWORD2 -getStatus KEYWORD2 -getStatusString KEYWORD2 -getModel KEYWORD2 -getMinimumSamplingPeriod KEYWORD2 -toFahrenheit KEYWORD2 -toCelsius KEYWORD2 -computeHeatIndex KEYWORD2 -computeDewPoint KEYWORD2 -getComfortRatio KEYWORD2 -getNumberOfDecimalsTemperature KEYWORD2 -getLowerBoundTemperature KEYWORD2 -getUpperBoundTemperature KEYWORD2 -getNumberOfDecimalsHumidity KEYWORD2 -getLowerBoundHumidity KEYWORD2 -getUpperBoundHumidity KEYWORD2 -getComfortProfile KEYWORD2 -setComfortProfile KEYWORD2 -isTooHot KEYWORD2 -isTooHumid KEYWORD2 -isTooCold KEYWORD2 -isTooDry KEYWORD2 -computePerception KEYWORD2 - -####################################### -# Instances (KEYWORD2) -####################################### - - -####################################### -# Constants (LITERAL1) -####################################### - -AUTO_DETECT LITERAL1 -DHT11 LITERAL1 -DHT22 LITERAL1 -AM2302 LITERAL1 -RHT03 LITERAL1 - -ERROR_NONE LITERAL1 -ERROR_TIMEOUT LITERAL1 -ERROR_CHECKSUM LITERAL1 - -Comfort_OK LITERAL1 -Comfort_TooHot LITERAL1 -Comfort_TooCold LITERAL1 -Comfort_TooDry LITERAL1 -Comfort_TooHumid LITERAL1 -Comfort_HotAndHumid LITERAL1 -Comfort_HotAndDry LITERAL1 -Comfort_ColdAndHumid LITERAL1 -Comfort_ColdAndDry LITERAL1 - -Perception_Dry LITERAL1 -Perception_VeryComfy LITERAL1 -Perception_Comfy LITERAL1 -Perception_Ok LITERAL1 -Perception_UnComfy LITERAL1 -Perception_QuiteUnComfy LITERAL1 -Perception_UnComfy LITERAL1 -Perception_VeryUncomfy LITERAL1 diff --git a/libraries/DHT_sensor_library_for_ESPx/library.json b/libraries/DHT_sensor_library_for_ESPx/library.json deleted file mode 100644 index a9d7f27b0..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/library.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "DHT sensor library for ESPx", - "keywords": "onewire, 1-wire, bus, sensor, temperature", - "description": "Arduino ESP library for DHT11, DHT22, etc Temp & Humidity Sensors. Last changes: Updated example.", - "repository": - { - "type": "git", - "url": "https://github.com/beegee-tokyo/DHTesp.git" - }, - "version": "1.0.6", - "frameworks": "arduino", - "platforms": "*", - "license": "GPL-3.0-only", - "homepage": "http://desire.giesecke.tk/index.php/2018/01/30/esp32-dht11/" -} diff --git a/libraries/DHT_sensor_library_for_ESPx/library.properties b/libraries/DHT_sensor_library_for_ESPx/library.properties deleted file mode 100644 index 84d28855f..000000000 --- a/libraries/DHT_sensor_library_for_ESPx/library.properties +++ /dev/null @@ -1,10 +0,0 @@ -name=DHT sensor library for ESPx -version=1.0.6 -author=beegee_tokyo -maintainer=beegee_tokyo -sentence=Arduino ESP library for DHT11, DHT22, etc Temp & Humidity Sensors -paragraph=Optimized libray to match ESP32 requirements. Last changes: Updated example. -category=Sensors -url=http://desire.giesecke.tk/index.php/2018/01/30/esp32-dht11/ -architectures=esp8266,esp32,arduino-esp32 -includes=DHTesp.h diff --git a/libraries/ESP32NETBIOS/ESP32NetBIOS.cpp b/libraries/ESP32NETBIOS/ESP32NetBIOS.cpp deleted file mode 100644 index a7daaf793..000000000 --- a/libraries/ESP32NETBIOS/ESP32NetBIOS.cpp +++ /dev/null @@ -1,274 +0,0 @@ -/* Klient sluzby NBNS - */ - -#include "ESP32NetBIOS.h" - -#include -#include - -#include "lwip/inet.h" -#include "lwip/udp.h" - -#define NBNSQ_TYPE_NB (0x0020) -#define NBNSQ_CLASS_IN (0x0001) -#ifndef LWIP_PLATFORM_HTONS -#define LWIP_PLATFORM_HTONS(_n) ((u16_t)((((_n) & 0xff) << 8) | (((_n) >> 8) & 0xff))) -#endif -#ifndef LWIP_PLATFORM_HTONL -#define LWIP_PLATFORM_HTONL(_n) ((u32_t)( (((_n) & 0xff) << 24) | (((_n) & 0xff00) << 8) | (((_n) >> 8) & 0xff00) | (((_n) >> 24) & 0xff) )) -#endif - -// Definice struktury NBNS dotazu (alespon veci, ktere jsem vypozoroval): -struct NBNSQUESTION { - uint16_t NBNSQ_ID; // ID dotazu - uint8_t NBNSQ_FLAGS1; - uint8_t NBNSQ_FLAGS2; - uint16_t NBNSQ_QUESTIONCOUNT; - uint16_t NBNSQ_ANSWERCOUNT; - uint16_t NBNSQ_AUTHORITYCOUNT; - uint16_t NBNSQ_ADDITIONALRECORDCOUNT; - uint8_t NBNSQ_NAMESIZE; // delka nasledujiciho retezce - char NBNSQ_NAME[32+1]; // POZOR!!! mozna tato polozka muze byt ruzne dlouha - uint16_t NBNSQ_TYPE; - uint16_t NBNSQ_CLASS; -} __attribute__((packed)); - -// Definice struktury NBNS odpovedi (stejne jako u dotazu) -struct NBNSANSWER { - uint16_t NBNSA_ID; // ID dotazu - uint8_t NBNSA_FLAGS1; - uint8_t NBNSA_FLAGS2; - uint16_t NBNSA_QUESTIONCOUNT; - uint16_t NBNSA_ANSWERCOUNT; - uint16_t NBNSA_AUTHORITYCOUNT; - uint16_t NBNSA_ADDITIONALRECORDCOUNT; - uint8_t NBNSA_NAMESIZE; // delka nasledujiciho retezce - char NBNSA_NAME[32 + 1]; // POZOR!!! mozna tato polozka muze byt ruzne dlouha - uint16_t NBNSA_TYPE; - uint16_t NBNSA_CLASS; - uint32_t NBNSA_TIMETOLIVE; - uint16_t NBNSA_LENGTH; - uint16_t NBNSA_NODEFLAGS; // POZOR!!! tady si nejsem moc jisty - uint32_t NBNSA_NODEADDRESS; -} __attribute__((packed)); - -// Definice struktury NBNS odpovedi na dotaz na jmeno -struct NBNSANSWERN { - uint16_t NBNSAN_ID; // ID dotazu - uint8_t NBNSAN_FLAGS1; - uint8_t NBNSAN_FLAGS2; - uint16_t NBNSAN_QUESTIONCOUNT; - uint16_t NBNSAN_ANSWERCOUNT; - uint16_t NBNSAN_AUTHORITYCOUNT; - uint16_t NBNSAN_ADDITIONALRECORDCOUNT; - uint8_t NBNSAN_NAMESIZE; // delka nasledujiciho retezce - char NBNSAN_NAME[32 + 1]; // POZOR!!! mozna tato polozka muze byt ruzne dlouha - uint16_t NBNSAN_TYPE; - uint16_t NBNSAN_CLASS; - uint32_t NBNSAN_TIMETOLIVE; - uint16_t NBNSAN_LENGTH; - uint8_t NBNSAN_NUMBER; // number of names - char NBNSAN_NNAME[15]; // jmeno nodu - uint8_t NBNSAN_NTYPE; // typ jmena - uint16_t NBNSAN_NFLAGS; // node flags -} __attribute__((packed)); - -/** Metoda pro ziskani jmena z kodovani NETBIOS. - * \param nbname Ukazatel na jmeno v NETBIOS kodovani. - * \param name Ukazatel na misto, kam prevadime jmeno. - * \param maxlen Maximalni pocet znaku v nbname. - */ -void ESP32NetBIOS::_getnbname(char *nbname, char *name, uint8_t maxlen) -{ - uint8_t b; - uint8_t c = 0; - - while ((*nbname != 0x0) && (c < maxlen)) { - b = (*nbname++ - 'A') << 4; // opravime nibble a prevedeme ho do vyssich bitu - c++; // pocitame pocet odebranych bytu - if (*nbname != 0x0) { - b |= *nbname++ - 'A'; // pridame nizsi nibble - c++; // opet spocitame pocet odebranych znaku - } - *name++ = b; // ulozime znak do vysledku a posuneme ukazatel - } - *name = 0x0; // ulozime ukoncovaci 0 -} - -/** Prevod zadaneho textu do NETBIOS kodovani - * \param name Ukazatel na prevadene jmeno. - * \param nbname Ukazatel na misto, kam vytvarime jmeno. - * \param outlen Pocet vystupnich znaku (mimo ukoncovaci 0) musi byt delitelne 2 - */ -void ESP32NetBIOS::_makenbname(char *name, char *nbname, uint8_t outlen) -{ - uint8_t b; - uint8_t c = 0; - - while (c < (outlen - 2)) { - b = *name; // prevadeny znak - if (b) { - name++; // zatim se posunujeme - } else { - b = 0x20; // konec retezce je nahrazeny mezerou - } - *nbname++ = (b >> 4) + 'A'; // jeden nibble ze znaku - *nbname++ = (b & 0xf) + 'A'; // druhy nibble ze znaku - c += 2; // pocet prevedenych znaku - } - *nbname++ = 'A'; - *nbname++ = 'A'; // ulozime ukoncovaci 0 v NBNS kodovani - *nbname = 0; // ulozime ukoncovaci 0 retezce -} - -ESP32NetBIOS::ESP32NetBIOS():_pcb(NULL) -{ - -} -ESP32NetBIOS::~ESP32NetBIOS() -{ - end(); -} - -// Vytvoreni a otevreni UDP soketu, pokud jeste neni... -bool ESP32NetBIOS::begin(const char *name) -{ - size_t n = strlen(name); - if (n > sizeof(_name)) { - // prilis dlouhe jmeno - return false; - } - - // presuneme jmeno zarizeni se soucasnou upravou na UPPER case - for (size_t i = 0; i < n; ++i) { - _name[i] = toupper(name[i]); - } - _name[n] = '\0'; - - if(_pcb != NULL) { - return true; - } - ip_addr_t addr; - addr.type = IPADDR_TYPE_V4; - addr.u_addr.ip4.addr = IPAddress(INADDR_ANY); - _pcb = udp_new(); - udp_recv(_pcb, &_s_recv, (void *) this); - err_t err = udp_bind(_pcb, &addr, NBNS_PORT); - if(err != ERR_OK) { - end(); - return false; - } - return true; -} - -void ESP32NetBIOS::end() -{ - if(_pcb != NULL) { - udp_remove(_pcb); - _pcb = NULL; - } -} - -void ESP32NetBIOS::_recv(udp_pcb *upcb, pbuf *pb, const ip_addr_t *addr, uint16_t port) - -{ - (void)upcb; - (void)addr; - (void)port; - while(pb != NULL) { - uint8_t * data = (uint8_t*)((pb)->payload); - size_t len = pb->len; - ip_hdr* iphdr = reinterpret_cast(data - UDP_HLEN - IP_HLEN); - ip_addr_t saddr; - saddr.type = IPADDR_TYPE_V4; - saddr.u_addr.ip4.addr = iphdr->src.addr; - if (len >= sizeof(struct NBNSQUESTION)) { - struct NBNSQUESTION * question = (struct NBNSQUESTION *)data; - if (0 == (question->NBNSQ_FLAGS1 & 0x80)) { - char name[ NBNS_MAX_HOSTNAME_LEN + 1 ]; // dekodovane dotazovane jmeno - char *str; // pomocna promenna, pouze pro praci s retezcem - - _getnbname(&question->NBNSQ_NAME[0], (char *)&name, question->NBNSQ_NAMESIZE); // prevedeme dotazovane jmeno - if ((str = strchr(name, ' ')) != NULL) { // jmeno hledaneho zarizeni v tomto pripade ukoncuje i mezera - *str = '\0'; // ukoncime retezec na vyskytu prvni mezery - } - - if (0 == strcmp(name, _name)) { - // dotaz primo na nas - struct NBNSANSWER nbnsa; // buffer, do ktereho je sestavena odpoved na dotaz - - nbnsa.NBNSA_ID = question->NBNSQ_ID;// ID dotazu kopirujeme do ID odpovedi - nbnsa.NBNSA_FLAGS1 = 0x85; // priznak odpovedi - nbnsa.NBNSA_FLAGS2 = 0; // vlajky 2 a response code - nbnsa.NBNSA_QUESTIONCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsa.NBNSA_ANSWERCOUNT = LWIP_PLATFORM_HTONS(1);// poradove cislo odpovedi - nbnsa.NBNSA_AUTHORITYCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsa.NBNSA_ADDITIONALRECORDCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsa.NBNSA_NAMESIZE = sizeof(nbnsa.NBNSA_NAME) - 1; // prekopirujeme delku jmena stanice - _makenbname(_name, &nbnsa.NBNSA_NAME[0], sizeof(nbnsa.NBNSA_NAME) - 1); // prevedeme jmeno - nbnsa.NBNSA_TYPE = LWIP_PLATFORM_HTONS(0x20); // NetBIOS name - nbnsa.NBNSA_CLASS = LWIP_PLATFORM_HTONS(1); // Internet name - nbnsa.NBNSA_TIMETOLIVE = LWIP_PLATFORM_HTONL(300000UL);// Time to live (30000 sekund) - nbnsa.NBNSA_LENGTH = LWIP_PLATFORM_HTONS(6); - nbnsa.NBNSA_NODEFLAGS = LWIP_PLATFORM_HTONS(0); - nbnsa.NBNSA_NODEADDRESS = WiFi.localIP(); // ulozime nasi IP adresu - - pbuf* pbt = pbuf_alloc(PBUF_TRANSPORT, sizeof(nbnsa), PBUF_RAM); - if(pbt != NULL) { - uint8_t* dst = reinterpret_cast(pbt->payload); - memcpy(dst, (uint8_t *)&nbnsa, sizeof(nbnsa)); - udp_sendto(_pcb, pbt, &saddr, NBNS_PORT); - pbuf_free(pbt); - } - } else if (0 == strcmp(name, "*")) { - // obecny dotaz - mireny nejspis na nasi IP adresu - struct NBNSANSWERN nbnsan; // buffer, do ktereho je sestavena odpoved na dotaz - - nbnsan.NBNSAN_ID = question->NBNSQ_ID;// ID dotazu kopirujeme do ID odpovedi - nbnsan.NBNSAN_FLAGS1 = 0x84; // priznak odpovedi - nbnsan.NBNSAN_FLAGS2 = 0; // vlajky 2 a response code - nbnsan.NBNSAN_QUESTIONCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsan.NBNSAN_ANSWERCOUNT = LWIP_PLATFORM_HTONS(1);// poradove cislo odpovedi - nbnsan.NBNSAN_AUTHORITYCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsan.NBNSAN_ADDITIONALRECORDCOUNT = LWIP_PLATFORM_HTONS(0); - nbnsan.NBNSAN_NAMESIZE = question->NBNSQ_NAMESIZE; // prekopirujeme delku jmena stanice - memcpy(nbnsan.NBNSAN_NAME, question->NBNSQ_NAME, sizeof(nbnsan.NBNSAN_NAME)); // prekopirujeme dotazovane jmeno - nbnsan.NBNSAN_TYPE = LWIP_PLATFORM_HTONS(0x21); // NBSTAT - nbnsan.NBNSAN_CLASS = LWIP_PLATFORM_HTONS(1); // Internet name - nbnsan.NBNSAN_TIMETOLIVE = LWIP_PLATFORM_HTONL(0); - nbnsan.NBNSAN_LENGTH = LWIP_PLATFORM_HTONS(4 + sizeof(nbnsan.NBNSAN_NNAME)); - nbnsan.NBNSAN_NUMBER = 1; // Number of names - memset(nbnsan.NBNSAN_NNAME, 0x20, sizeof(nbnsan.NBNSAN_NNAME)); - memcpy(nbnsan.NBNSAN_NNAME, _name, strlen(_name)); - nbnsan.NBNSAN_NTYPE = 0; // Workstation/Redirector - nbnsan.NBNSAN_NFLAGS = LWIP_PLATFORM_HTONS(0x400); // b-node, unique, active - - pbuf* pbt = pbuf_alloc(PBUF_TRANSPORT, sizeof(nbnsan), PBUF_RAM); - if(pbt != NULL) { - uint8_t* dst = reinterpret_cast(pbt->payload); - memcpy(dst, (uint8_t *)&nbnsan, sizeof(nbnsan)); - udp_sendto(_pcb, pbt, &saddr, NBNS_PORT); - pbuf_free(pbt); - } - } - } - } - - pbuf * this_pb = pb; - pb = pb->next; - this_pb->next = NULL; - pbuf_free(this_pb); - } -} - - -void ESP32NetBIOS::_s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port) -{ - reinterpret_cast(arg)->_recv(upcb, p, addr, port); -} - -#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_NETBIOS) -ESP32NetBIOS NBNS; -#endif - -// EOF diff --git a/libraries/ESP32NETBIOS/ESP32NetBIOS.h b/libraries/ESP32NETBIOS/ESP32NetBIOS.h deleted file mode 100644 index d45fe4ebd..000000000 --- a/libraries/ESP32NETBIOS/ESP32NetBIOS.h +++ /dev/null @@ -1,41 +0,0 @@ -// -#ifndef __ESPNBNS_h__ -#define __ESPNBNS_h__ - -#include -#include - -#define NBNS_PORT 137 -/** -* @def NBNS_MAX_HOSTNAME_LEN -* @brief maximalni delka NBNS jmena zarizeni -* @remarks -* Jmeno zarizeni musi byt uvedeno VELKYMI pismenami a nesmi obsahovat mezery (whitespaces). -*/ -#define NBNS_MAX_HOSTNAME_LEN 16 - -struct udp_pcb; -struct pbuf; - -class ESP32NetBIOS -{ -protected: - udp_pcb* _pcb; - char _name[NBNS_MAX_HOSTNAME_LEN + 1]; - void _getnbname(char *nbname, char *name, uint8_t maxlen); - void _makenbname(char *name, char *nbname, uint8_t outlen); - - void _recv(udp_pcb *upcb, pbuf *pb, const ip_addr_t *addr, uint16_t port); - static void _s_recv(void *arg, udp_pcb *upcb, pbuf *p, const ip_addr_t *addr, uint16_t port); -public: - ESP32NetBIOS(); - ~ESP32NetBIOS(); - bool begin(const char *name); - void end(); -}; - -#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_NETBIOS) -extern ESP32NetBIOS NBNS; -#endif - -#endif diff --git a/libraries/ESP32NETBIOS/examples/ESP_NBNST/ESP_NBNST.ino b/libraries/ESP32NETBIOS/examples/ESP_NBNST/ESP_NBNST.ino deleted file mode 100644 index e54cdec58..000000000 --- a/libraries/ESP32NETBIOS/examples/ESP_NBNST/ESP_NBNST.ino +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include - -const char* ssid = "............"; -const char* password = ".............."; - -WebServer wwwserver(80); -String content; - -static void handleRoot(void) -{ - content = F("\nHello world from ESP32"); - content += F("

"); - content += F(""); - - wwwserver.send(200, F("text/html"), content); -} - -void setup() -{ - Serial.begin(115200); - - // Connect to WiFi network - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - Serial.println(""); - - // Wait for connection - while (WiFi.status() != WL_CONNECTED) { - delay(500); - Serial.print("."); - } - Serial.println(""); - Serial.print("Connected to "); - Serial.println(ssid); - Serial.print("IP address: "); - Serial.println(WiFi.localIP()); - - - wwwserver.on("/", handleRoot); - wwwserver.begin(); - - NBNS.begin("ESP"); -} - -void loop() -{ - wwwserver.handleClient(); -} diff --git a/libraries/ESP32NETBIOS/keywords.txt b/libraries/ESP32NETBIOS/keywords.txt deleted file mode 100644 index 41f45d5e2..000000000 --- a/libraries/ESP32NETBIOS/keywords.txt +++ /dev/null @@ -1,24 +0,0 @@ -####################################### -# Syntax Coloring Map For ESPNBNS -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -NBNS KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -begin KEYWORD2 - -####################################### -# Instances (KEYWORD2) -####################################### - - -####################################### -# Constants (LITERAL1) -####################################### diff --git a/libraries/ESP32NETBIOS/library.properties b/libraries/ESP32NETBIOS/library.properties deleted file mode 100644 index 11796a047..000000000 --- a/libraries/ESP32NETBIOS/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=ESP32NetBIOS -version=1.0 -author=Pablo@xpablo.cz -maintainer=Hristo Gochkov -sentence=Enables NBNS (NetBIOS) name resolution. -paragraph=With this library you can connect to your ESP from Windows using a short name -category=Communication -url=http://www.xpablo.cz/?p=751#more-751 -architectures=esp32 diff --git a/libraries/ESP32SSDP/ESP32SSDP.cpp b/libraries/ESP32SSDP/ESP32SSDP.cpp deleted file mode 100644 index e862b1464..000000000 --- a/libraries/ESP32SSDP/ESP32SSDP.cpp +++ /dev/null @@ -1,477 +0,0 @@ -/* -ESP32 Simple Service Discovery -Copyright (c) 2015 Hristo Gochkov - -Original (Arduino) version by Filippo Sallemi, July 23, 2014. -Can be found at: https://github.com/nomadnt/uSSDP - -License (MIT license): - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -*/ - -#include -#include "ESP32SSDP.h" -#include "WiFiUdp.h" -#include - -//#define DEBUG_SSDP Serial - -#define SSDP_INTERVAL 1200 -#define SSDP_PORT 1900 -#define SSDP_METHOD_SIZE 10 -#define SSDP_URI_SIZE 2 -#define SSDP_BUFFER_SIZE 64 -#define SSDP_MULTICAST_TTL 2 -static const IPAddress SSDP_MULTICAST_ADDR(239, 255, 255, 250); - - - -static const char _ssdp_response_template[] PROGMEM = - "HTTP/1.1 200 OK\r\n" - "EXT:\r\n"; - -static const char _ssdp_notify_template[] PROGMEM = - "NOTIFY * HTTP/1.1\r\n" - "HOST: 239.255.255.250:1900\r\n" - "NTS: ssdp:alive\r\n"; - -static const char _ssdp_packet_template[] PROGMEM = - "%s" // _ssdp_response_template / _ssdp_notify_template - "CACHE-CONTROL: max-age=%u\r\n" // SSDP_INTERVAL - "SERVER: Arduino/1.0 UPNP/1.1 %s/%s\r\n" // _modelName, _modelNumber - "USN: uuid:%s\r\n" // _uuid - "%s: %s\r\n" // "NT" or "ST", _deviceType - "LOCATION: http://%u.%u.%u.%u:%u/%s\r\n" // WiFi.localIP(), _port, _schemaURL - "\r\n"; - -static const char _ssdp_schema_template[] PROGMEM = - "HTTP/1.1 200 OK\r\n" - "Content-Type: text/xml\r\n" - "Connection: close\r\n" - "Access-Control-Allow-Origin: *\r\n" - "\r\n" - "" - "" - "" - "1" - "0" - "" - "http://%u.%u.%u.%u:%u/" // WiFi.localIP(), _port - "" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "%s" - "uuid:%s" - "" -// "" -// "" -// "image/png" -// "48" -// "48" -// "24" -// "icon48.png" -// "" -// "" -// "image/png" -// "120" -// "120" -// "24" -// "icon120.png" -// "" -// "" - "\r\n" - "\r\n"; - -struct SSDPTimer { - ETSTimer timer; -}; - -SSDPClass::SSDPClass() : -_server(0), -_timer(0), -_port(80), -_ttl(SSDP_MULTICAST_TTL), -_respondToPort(0), -_pending(false), -_delay(0), -_process_time(0), -_notify_time(0) -{ - _uuid[0] = '\0'; - _modelNumber[0] = '\0'; - sprintf(_deviceType, "urn:schemas-upnp-org:device:Basic:1"); - _friendlyName[0] = '\0'; - _presentationURL[0] = '\0'; - _serialNumber[0] = '\0'; - _modelName[0] = '\0'; - _modelURL[0] = '\0'; - _manufacturer[0] = '\0'; - _manufacturerURL[0] = '\0'; - sprintf(_schemaURL, "ssdp/schema.xml"); -} - -SSDPClass::~SSDPClass(){ - end(); -} - -void SSDPClass::end(){ - if(!_server) { - return; - } -#ifdef DEBUG_SSDP - DEBUG_SSDP.printf_P(PSTR("SSDP end ... ")); -#endif - // undo all initializations done in begin(), in reverse order - _stopTimer(); - _server->stop(); - delete (_server); - _server = 0; -} - -IPAddress SSDPClass::localIP(){ - tcpip_adapter_ip_info_t ip; - if (WiFi.getMode() == WIFI_STA) { - if (tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip)) { - return IPAddress(); - } - } else if (WiFi.getMode() == WIFI_OFF) { - if (tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &ip)) { - return IPAddress(); - } - } - return IPAddress(ip.ip.addr); -} - -bool SSDPClass::begin(){ - _pending = false; - end(); - uint32_t chipId = ((uint16_t) (ESP.getEfuseMac() >> 32)); - sprintf(_uuid, "38323636-4558-4dda-9188-cda0e6%02x%02x%02x", - (uint16_t) ((chipId >> 16) & 0xff), - (uint16_t) ((chipId >> 8) & 0xff), - (uint16_t) chipId & 0xff ); - assert(nullptr == _server); - _server = new WiFiUDP; -#ifdef DEBUG_SSDP - DEBUG_SSDP.printf("SSDP UUID: %s\n", (char *)_uuid); -#endif - - - _server = new WiFiUDP; - if (!(_server->beginMulticast(IPAddress(SSDP_MULTICAST_ADDR), SSDP_PORT))) { -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("Error begin"); -#endif - return false; - } - - _startTimer(); - - return true; -} - -void SSDPClass::_send(ssdp_method_t method){ - char buffer[1460]; - IPAddress ip = localIP(); - - char valueBuffer[strlen_P(_ssdp_notify_template)+1]; - strcpy_P(valueBuffer, (method == NONE)?_ssdp_response_template:_ssdp_notify_template); - - int len = snprintf_P(buffer, sizeof(buffer), - _ssdp_packet_template, - valueBuffer, - SSDP_INTERVAL, - _modelName, _modelNumber, - _uuid, - (method == NONE)?"ST":"NT", - _deviceType, - ip[0], ip[1], ip[2], ip[3], _port, _schemaURL - ); - if(len < 0) return; - IPAddress remoteAddr; - uint16_t remotePort; - if(method == NONE) { - remoteAddr = _respondToAddr; - remotePort = _respondToPort; -#ifdef DEBUG_SSDP - DEBUG_SSDP.print("Sending Response to "); -#endif - } else { - remoteAddr = IPAddress(SSDP_MULTICAST_ADDR); - remotePort = SSDP_PORT; -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("Sending Notify to "); -#endif - } -#ifdef DEBUG_SSDP - DEBUG_SSDP.print(remoteAddr); - DEBUG_SSDP.print(":"); - DEBUG_SSDP.println(remotePort); -#endif - _server->beginPacket(remoteAddr, remotePort); - _server->println(buffer); - _server->endPacket(); -} - -void SSDPClass::schema(WiFiClient client){ - IPAddress ip = localIP(); - char buffer[strlen_P(_ssdp_schema_template)+1]; - strcpy_P(buffer, _ssdp_schema_template); - client.printf(buffer, - ip[0], ip[1], ip[2], ip[3], _port, - _deviceType, - _friendlyName, - _presentationURL, - _serialNumber, - _modelName, - _modelNumber, - _modelURL, - _manufacturer, - _manufacturerURL, - _uuid - ); -} - -void SSDPClass::_update(){ - int nbBytes =0; - char * packetBuffer = nullptr; - - if(!_pending && _server) { - ssdp_method_t method = NONE; - nbBytes= _server->parsePacket(); - typedef enum {METHOD, URI, PROTO, KEY, VALUE, ABORT} states; - states state = METHOD; - typedef enum {START, MAN, ST, MX} headers; - headers header = START; - - uint8_t cursor = 0; - uint8_t cr = 0; - - char buffer[SSDP_BUFFER_SIZE] = {0}; - packetBuffer = new char[nbBytes +1]; - int message_size=_server->read(packetBuffer,nbBytes); - int process_pos = 0; - packetBuffer[message_size]='\0'; - _respondToAddr = _server->remoteIP(); - _respondToPort = _server->remotePort(); -#ifdef DEBUG_SSDP - if (message_size) { - DEBUG_SSDP.println("****************************************************"); - DEBUG_SSDP.println(_server->remoteIP()); - DEBUG_SSDP.println(packetBuffer); - DEBUG_SSDP.println("****************************************************"); - } -#endif - while(process_pos < message_size){ - - char c = packetBuffer[process_pos]; - process_pos++; - (c == '\r' || c == '\n') ? cr++ : cr = 0; -#ifdef DEBUG_SSDP - if ((c == '\r' || c == '\n') && (cr < 2)) DEBUG_SSDP.println(buffer); -#endif - switch(state){ - case METHOD: - if(c == ' '){ - if(strcmp(buffer, "M-SEARCH") == 0) method = SEARCH; - - if(method == NONE) state = ABORT; - else state = URI; - cursor = 0; - - } else if(cursor < SSDP_METHOD_SIZE - 1){ buffer[cursor++] = c; buffer[cursor] = '\0'; } - break; - case URI: - if(c == ' '){ - if(strcmp(buffer, "*")) state = ABORT; - else state = PROTO; - cursor = 0; - } else if(cursor < SSDP_URI_SIZE - 1){ buffer[cursor++] = c; buffer[cursor] = '\0'; } - break; - case PROTO: - if(cr == 2){ state = KEY; cursor = 0; } - break; - case KEY: - if(cr == 4){ _pending = true; _process_time = millis(); } - else if(c == ' '){ cursor = 0; state = VALUE; } - else if(c != '\r' && c != '\n' && c != ':' && cursor < SSDP_BUFFER_SIZE - 1){ buffer[cursor++] = c; buffer[cursor] = '\0'; } - break; - case VALUE: - if(cr == 2){ - switch(header){ - case START: - break; - case MAN: -#ifdef DEBUG_SSDP - DEBUG_SSDP.printf("MAN: %s\n", (char *)buffer); -#endif - break; - case ST: - if(strcmp(buffer, "ssdp:all")){ - state = ABORT; -#ifdef DEBUG_SSDP - DEBUG_SSDP.printf("REJECT: %s\n", (char *)buffer); -#endif - } - // if the search type matches our type, we should respond instead of ABORT - if(strcasecmp(buffer, _deviceType) == 0){ - _pending = true; - _process_time = 0; -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("the search type matches our type"); -#endif - state = KEY; - } - break; - case MX: - _delay = random(0, atoi(buffer)) * 1000L; - break; - } - - if(state != ABORT){ state = KEY; header = START; cursor = 0; } - } else if(c != '\r' && c != '\n'){ - if(header == START){ - if(strncmp(buffer, "MA", 2) == 0) header = MAN; - else if(strcmp(buffer, "ST") == 0) header = ST; - else if(strcmp(buffer, "MX") == 0) header = MX; - } - - if(cursor < SSDP_BUFFER_SIZE - 1){ buffer[cursor++] = c; buffer[cursor] = '\0'; } - } - break; - case ABORT: - _pending = false; _delay = 0; - break; - } - } - } - if(packetBuffer) delete packetBuffer; - if(_pending && (millis() - _process_time) > _delay){ - _pending = false; _delay = 0; -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("Send None"); -#endif - _send(NONE); - } else if(_notify_time == 0 || (millis() - _notify_time) > (SSDP_INTERVAL * 1000L)){ - _notify_time = millis(); - #ifdef DEBUG_SSDP - DEBUG_SSDP.println("Send Notify"); -#endif - _send(NOTIFY); - } else { -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("Do not sent"); -#endif - } - - if (_pending) { - _server->flush(); - } - -} - -void SSDPClass::setSchemaURL(const char *url){ - strlcpy(_schemaURL, url, sizeof(_schemaURL)); -} - -void SSDPClass::setHTTPPort(uint16_t port){ - _port = port; -} - -void SSDPClass::setDeviceType(const char *deviceType){ - strlcpy(_deviceType, deviceType, sizeof(_deviceType)); -} - -void SSDPClass::setName(const char *name){ - strlcpy(_friendlyName, name, sizeof(_friendlyName)); -} - -void SSDPClass::setURL(const char *url){ - strlcpy(_presentationURL, url, sizeof(_presentationURL)); -} - -void SSDPClass::setSerialNumber(const char *serialNumber){ - strlcpy(_serialNumber, serialNumber, sizeof(_serialNumber)); -} - -void SSDPClass::setSerialNumber(const uint32_t serialNumber){ - snprintf(_serialNumber, sizeof(uint32_t)*2+1, "%08X", serialNumber); -} - -void SSDPClass::setModelName(const char *name){ - strlcpy(_modelName, name, sizeof(_modelName)); -} - -void SSDPClass::setModelNumber(const char *num){ - strlcpy(_modelNumber, num, sizeof(_modelNumber)); -} - -void SSDPClass::setModelURL(const char *url){ - strlcpy(_modelURL, url, sizeof(_modelURL)); -} - -void SSDPClass::setManufacturer(const char *name){ - strlcpy(_manufacturer, name, sizeof(_manufacturer)); -} - -void SSDPClass::setManufacturerURL(const char *url){ - strlcpy(_manufacturerURL, url, sizeof(_manufacturerURL)); -} - -void SSDPClass::setTTL(const uint8_t ttl){ - _ttl = ttl; -} - -void SSDPClass::_onTimerStatic(SSDPClass* self) { -#ifdef DEBUG_SSDP - DEBUG_SSDP.println("Update"); -#endif - self->_update(); -} - -void SSDPClass::_startTimer() { - _stopTimer(); - _timer= new SSDPTimer(); - ETSTimer* tm = &(_timer->timer); - const int interval = 1000; - ets_timer_disarm(tm); - ets_timer_setfn(tm, reinterpret_cast(&SSDPClass::_onTimerStatic), reinterpret_cast(this)); - ets_timer_arm(tm, interval, 1 /* repeat */); -} - -void SSDPClass::_stopTimer() { - if(!_timer){ - return; - } - ETSTimer* tm = &(_timer->timer); - ets_timer_disarm(tm); - delete _timer; - _timer = nullptr; -} - -#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SSDP) -SSDPClass SSDP; -#endif diff --git a/libraries/ESP32SSDP/ESP32SSDP.h b/libraries/ESP32SSDP/ESP32SSDP.h deleted file mode 100644 index 796c4fe15..000000000 --- a/libraries/ESP32SSDP/ESP32SSDP.h +++ /dev/null @@ -1,128 +0,0 @@ -/* -ESP32 Simple Service Discovery -Copyright (c) 2015 Hristo Gochkov - -Original (Arduino) version by Filippo Sallemi, July 23, 2014. -Can be found at: https://github.com/nomadnt/uSSDP - -License (MIT license): - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -*/ - -#ifndef ESP32SSDP_H -#define ESP32SSDP_H - -#include -#include -#include - -#define SSDP_UUID_SIZE 37 -#define SSDP_SCHEMA_URL_SIZE 64 -#define SSDP_DEVICE_TYPE_SIZE 64 -#define SSDP_FRIENDLY_NAME_SIZE 64 -#define SSDP_SERIAL_NUMBER_SIZE 32 -#define SSDP_PRESENTATION_URL_SIZE 128 -#define SSDP_MODEL_NAME_SIZE 64 -#define SSDP_MODEL_URL_SIZE 128 -#define SSDP_MODEL_VERSION_SIZE 32 -#define SSDP_MANUFACTURER_SIZE 64 -#define SSDP_MANUFACTURER_URL_SIZE 128 - -typedef enum { - NONE, - SEARCH, - NOTIFY -} ssdp_method_t; - - -struct SSDPTimer; - -class SSDPClass{ - public: - SSDPClass(); - ~SSDPClass(); - - bool begin(); - void end(); - - void schema(WiFiClient client); - - void setDeviceType(const String& deviceType) { setDeviceType(deviceType.c_str()); } - void setDeviceType(const char *deviceType); - void setName(const String& name) { setName(name.c_str()); } - void setName(const char *name); - void setURL(const String& url) { setURL(url.c_str()); } - void setURL(const char *url); - void setSchemaURL(const String& url) { setSchemaURL(url.c_str()); } - void setSchemaURL(const char *url); - void setSerialNumber(const String& serialNumber) { setSerialNumber(serialNumber.c_str()); } - void setSerialNumber(const char *serialNumber); - void setSerialNumber(const uint32_t serialNumber); - void setModelName(const String& name) { setModelName(name.c_str()); } - void setModelName(const char *name); - void setModelNumber(const String& num) { setModelNumber(num.c_str()); } - void setModelNumber(const char *num); - void setModelURL(const String& url) { setModelURL(url.c_str()); } - void setModelURL(const char *url); - void setManufacturer(const String& name) { setManufacturer(name.c_str()); } - void setManufacturer(const char *name); - void setManufacturerURL(const String& url) { setManufacturerURL(url.c_str()); } - void setManufacturerURL(const char *url); - void setHTTPPort(uint16_t port); - void setTTL(uint8_t ttl); - - protected: - void _send(ssdp_method_t method); - void _update(); - void _startTimer(); - void _stopTimer(); - static void _onTimerStatic(SSDPClass* self); - IPAddress localIP(); - WiFiUDP *_server; - SSDPTimer* _timer; - uint16_t _port; - uint8_t _ttl; - - IPAddress _respondToAddr; - uint16_t _respondToPort; - - bool _pending; - unsigned short _delay; - unsigned long _process_time; - unsigned long _notify_time; - - char _schemaURL[SSDP_SCHEMA_URL_SIZE]; - char _uuid[SSDP_UUID_SIZE]; - char _deviceType[SSDP_DEVICE_TYPE_SIZE]; - char _friendlyName[SSDP_FRIENDLY_NAME_SIZE]; - char _serialNumber[SSDP_SERIAL_NUMBER_SIZE]; - char _presentationURL[SSDP_PRESENTATION_URL_SIZE]; - char _manufacturer[SSDP_MANUFACTURER_SIZE]; - char _manufacturerURL[SSDP_MANUFACTURER_URL_SIZE]; - char _modelName[SSDP_MODEL_NAME_SIZE]; - char _modelURL[SSDP_MODEL_URL_SIZE]; - char _modelNumber[SSDP_MODEL_VERSION_SIZE]; -}; - -#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SSDP) -extern SSDPClass SSDP; -#endif - -#endif diff --git a/libraries/ESP32SSDP/README.rst b/libraries/ESP32SSDP/README.rst deleted file mode 100644 index b2c92c752..000000000 --- a/libraries/ESP32SSDP/README.rst +++ /dev/null @@ -1,22 +0,0 @@ -ESP32 Simple Service Discovery Copyright (c) 2015 Hristo Gochkov -Original (Arduino) version by Filippo Sallemi, July 23, 2014. Can be -found at: https://github.com/nomadnt/uSSDP - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/libraries/ESP32SSDP/examples/SSDP/SSDP.ino b/libraries/ESP32SSDP/examples/SSDP/SSDP.ino deleted file mode 100644 index 46f024389..000000000 --- a/libraries/ESP32SSDP/examples/SSDP/SSDP.ino +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include -#include - -const char* ssid = "********"; -const char* password = "********"; - -WebServer HTTP(80); - -void setup() { - Serial.begin(115200); - Serial.println(); - Serial.println("Starting WiFi..."); - - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if(WiFi.waitForConnectResult() == WL_CONNECTED){ - - Serial.printf("Starting HTTP...\n"); - HTTP.on("/index.html", HTTP_GET, [](){ - HTTP.send(200, "text/plain", "Hello World!"); - }); - HTTP.on("/description.xml", HTTP_GET, [](){ - SSDP.schema(HTTP.client()); - }); - HTTP.begin(); - - Serial.printf("Starting SSDP...\n"); - SSDP.setSchemaURL("description.xml"); - SSDP.setHTTPPort(80); - SSDP.setName("Philips hue clone"); - SSDP.setSerialNumber("001788102201"); - SSDP.setURL("index.html"); - SSDP.setModelName("Philips hue bridge 2012"); - SSDP.setModelNumber("929000226503"); - SSDP.setModelURL("http://www.meethue.com"); - SSDP.setManufacturer("Royal Philips Electronics"); - SSDP.setManufacturerURL("http://www.philips.com"); - SSDP.setDeviceType("upnp:rootdevice"); //to appear as root device - SSDP.begin(); - - Serial.printf("Ready!\n"); - } else { - Serial.printf("WiFi Failed\n"); - while(1) delay(100); - } -} - -void loop() { - HTTP.handleClient(); - delay(1); -} diff --git a/libraries/ESP32SSDP/keywords.txt b/libraries/ESP32SSDP/keywords.txt deleted file mode 100644 index 241d34145..000000000 --- a/libraries/ESP32SSDP/keywords.txt +++ /dev/null @@ -1,53 +0,0 @@ -####################################### -# Syntax Coloring Map For Ultrasound -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -ESP8266SSDP KEYWORD1 -SSDP KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -begin KEYWORD2 -schema KEYWORD2 -setName KEYWORD2 -setURL KEYWORD2 -setHTTPPort KEYWORD2 -setSchemaURL KEYWORD2 -setSerialNumber KEYWORD2 -setModelName KEYWORD2 -setModelNumber KEYWORD2 -setModelURL KEYWORD2 -setManufacturer KEYWORD2 -setManufacturerURL KEYWORD2 - -####################################### -# Constants (LITERAL1) -####################################### -SSDP_INTERVAL LITERAL1 -SSDP_PORT LITERAL1 -SSDP_METHOD_SIZE LITERAL1 -SSDP_URI_SIZE LITERAL1 -SSDP_BUFFER_SIZE LITERAL1 -SSDP_BASE_SIZE LITERAL1 -SSDP_FRIENDLY_NAME_SIZE LITERAL1 -SSDP_SERIAL_NUMBER_SIZE LITERAL1 -SSDP_PRESENTATION_URL_SIZE LITERAL1 -SSDP_MODEL_NAME_SIZE LITERAL1 -SSDP_MODEL_URL_SIZE LITERAL1 -SSDP_MODEL_VERSION_SIZE LITERAL1 -SSDP_MANUFACTURER_SIZE LITERAL1 -SSDP_MANUFACTURER_URL_SIZE LITERAL1 -SEARCH LITERAL1 -NOTIFY LITERAL1 -BASIC LITERAL1 -MANAGEABLE LITERAL1 -SOLARPROTECTIONBLIND LITERAL1 -DIGITALSECURITYCAMERA LITERAL1 -HVAC LITERAL1 -LIGHTINGCONTROL LITERAL1 diff --git a/libraries/ESP32SSDP/library.properties b/libraries/ESP32SSDP/library.properties deleted file mode 100644 index b55243db2..000000000 --- a/libraries/ESP32SSDP/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=ESP32SSDP -version=1.0 -author=Me-No-Dev -maintainer=Me-No-Dev -sentence=Simple SSDP library for ESP32 -paragraph=Only for ESP32 -category=Communication -url= -architectures=esp32 diff --git a/libraries/ESPAsyncTCP/.gitignore b/libraries/ESPAsyncTCP/.gitignore deleted file mode 100644 index 9bea4330f..000000000 --- a/libraries/ESPAsyncTCP/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -.DS_Store diff --git a/libraries/ESPAsyncTCP/.travis.yml b/libraries/ESPAsyncTCP/.travis.yml deleted file mode 100644 index 89808806b..000000000 --- a/libraries/ESPAsyncTCP/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -sudo: false -language: bash -os: - - linux - -script: - - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16 - - sleep 3 - - export DISPLAY=:1.0 - - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz - - tar xf arduino-1.6.5-linux64.tar.xz - - mv arduino-1.6.5 $HOME/arduino_ide - - export PATH="$HOME/arduino_ide:$PATH" - - which arduino - - mkdir -p $HOME/Arduino/libraries - - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESPAsyncTCP - - cd $HOME/arduino_ide/hardware - - mkdir esp8266com - - cd esp8266com - - git clone https://github.com/esp8266/Arduino.git esp8266 - - cd esp8266/tools - - python get.py - - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncTCP esp8266 - -notifications: - email: - on_success: change - on_failure: change - webhooks: - urls: - - https://webhooks.gitter.im/e/60e65d0c78ea0a920347 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false diff --git a/libraries/ESPAsyncTCP/LICENSE.txt b/libraries/ESPAsyncTCP/LICENSE.txt deleted file mode 100644 index 65c5ca88a..000000000 --- a/libraries/ESPAsyncTCP/LICENSE.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/libraries/ESPAsyncTCP/README.md b/libraries/ESPAsyncTCP/README.md deleted file mode 100644 index 2c48453cf..000000000 --- a/libraries/ESPAsyncTCP/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# ESPAsyncTCP [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncTCP.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncTCP) -Async TCP Library for ESP8266 Arduino - -For ESP32 look [HERE](https://github.com/me-no-dev/AsyncTCP) - -[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -This is a fully asynchronous TCP library, aimed at enabling trouble-free, multi-connection network environment for Espressif's ESP8266 MCUs. - -This library is the base for [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) - -## AsyncClient and AsyncServer -The base classes on which everything else is built. They expose all possible scenarios, but are really raw and require more skills to use. - -## AsyncPrinter -This class can be used to send data like any other ```Print``` interface (```Serial``` for example). -The object then can be used outside of the Async callbacks (the loop) and receive asynchronously data using ```onData```. The object can be checked if the underlying ```AsyncClient```is connected, or hook to the ```onDisconnect``` callback. - -## AsyncTCPbuffer -This class is really similar to the ```AsyncPrinter```, but it differs in the fact that it can buffer some of the incoming data. - -## SyncClient -It is exactly what it sounds like. This is a standard, blocking TCP Client, similar to the one included in ```ESP8266WiFi``` - -## Libraries and projects that use AsyncTCP -- [ESP Async Web Server](https://github.com/me-no-dev/ESPAsyncWebServer) -- [Async MQTT client](https://github.com/marvinroger/async-mqtt-client) -- [arduinoWebSockets](https://github.com/Links2004/arduinoWebSockets) -- [ESP8266 Smart Home](https://github.com/baruch/esp8266_smart_home) -- [KBox Firmware](https://github.com/sarfata/kbox-firmware) diff --git a/libraries/ESPAsyncTCP/examples/SyncClient/.esp31b.skip b/libraries/ESPAsyncTCP/examples/SyncClient/.esp31b.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino b/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino deleted file mode 100644 index 6ecc52552..000000000 --- a/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino +++ /dev/null @@ -1,54 +0,0 @@ -#ifdef ESP8266 -#include -#include -#include -#else -#include -#endif -#include "ESPAsyncTCP.h" -#include "SyncClient.h" - -const char* ssid = "**********"; -const char* password = "************"; - -void setup(){ - Serial.begin(115200); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.printf("WiFi Failed!\n"); - return; - } - Serial.printf("WiFi Connected!\n"); - Serial.println(WiFi.localIP()); -#ifdef ESP8266 - ArduinoOTA.begin(); -#endif - - SyncClient client; - if(!client.connect("www.google.com", 80)){ - Serial.println("Connect Failed"); - return; - } - client.setTimeout(2); - if(client.printf("GET / HTTP/1.1\r\nHost: www.google.com\r\nConnection: close\r\n\r\n") > 0){ - while(client.connected() && client.available() == 0){ - delay(1); - } - while(client.available()){ - Serial.write(client.read()); - } - if(client.connected()){ - client.stop(); - } - } else { - client.stop(); - Serial.println("Send Failed"); - while(client.connected()) delay(0); - } -} - -void loop(){ -#ifdef ESP8266 - ArduinoOTA.handle(); -#endif -} diff --git a/libraries/ESPAsyncTCP/library.json b/libraries/ESPAsyncTCP/library.json deleted file mode 100644 index 71d9da77d..000000000 --- a/libraries/ESPAsyncTCP/library.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name":"ESPAsyncTCP", - "description":"Asynchronous TCP Library for ESP8266", - "keywords":"async,tcp", - "authors": - { - "name": "Hristo Gochkov", - "maintainer": true - }, - "repository": - { - "type": "git", - "url": "https://github.com/me-no-dev/ESPAsyncTCP.git" - }, - "version": "1.1.1", - "license": "LGPL-3.0", - "frameworks": "arduino", - "platforms":"espressif8266" -} diff --git a/libraries/ESPAsyncTCP/library.properties b/libraries/ESPAsyncTCP/library.properties deleted file mode 100644 index 9330e4d66..000000000 --- a/libraries/ESPAsyncTCP/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=ESP AsyncTCP -version=1.1.0 -author=Me-No-Dev -maintainer=Me-No-Dev -sentence=Async TCP Library for ESP8266 and ESP31B -paragraph=Async TCP Library for ESP8266 and ESP31B -category=Other -url=https://github.com/me-no-dev/ESPAsyncTCP -architectures=* diff --git a/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp b/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp deleted file mode 100644 index dd61e764e..000000000 --- a/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "AsyncPrinter.h" - -AsyncPrinter::AsyncPrinter() - : _client(NULL) - , _data_cb(NULL) - , _data_arg(NULL) - , _close_cb(NULL) - , _close_arg(NULL) - , _tx_buffer(NULL) - , _tx_buffer_size(1460) - , next(NULL) -{} - -AsyncPrinter::AsyncPrinter(AsyncClient *client, size_t txBufLen) - : _client(client) - , _data_cb(NULL) - , _data_arg(NULL) - , _close_cb(NULL) - , _close_arg(NULL) - , _tx_buffer(NULL) - , _tx_buffer_size(txBufLen) - , next(NULL) -{ - _attachCallbacks(); - _tx_buffer = new cbuf(_tx_buffer_size); -} - -AsyncPrinter::~AsyncPrinter(){ - _on_close(); -} - -void AsyncPrinter::onData(ApDataHandler cb, void *arg){ - _data_cb = cb; - _data_arg = arg; -} - -void AsyncPrinter::onClose(ApCloseHandler cb, void *arg){ - _close_cb = cb; - _close_arg = arg; -} - -int AsyncPrinter::connect(IPAddress ip, uint16_t port){ - if(_client != NULL && connected()) - return 0; - _client = new AsyncClient(); - _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this); - if(_client->connect(ip, port)){ - while(_client->state() < 4) - delay(1); - return connected(); - } - return 0; -} - -int AsyncPrinter::connect(const char *host, uint16_t port){ - if(_client != NULL && connected()) - return 0; - _client = new AsyncClient(); - _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this); - if(_client->connect(host, port)){ - while(_client->state() < 4) - delay(1); - return connected(); - } - return 0; -} - -void AsyncPrinter::_onConnect(AsyncClient *c){ - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - _tx_buffer = new cbuf(_tx_buffer_size); - _attachCallbacks(); -} - -AsyncPrinter::operator bool(){ return connected(); } - -AsyncPrinter & AsyncPrinter::operator=(const AsyncPrinter &other){ - if(_client != NULL){ - _client->close(true); - _client = NULL; - } - _tx_buffer_size = other._tx_buffer_size; - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - _tx_buffer = new cbuf(other._tx_buffer_size); - _client = other._client; - _attachCallbacks(); - return *this; -} - -size_t AsyncPrinter::write(uint8_t data){ - return write(&data, 1); -} - -size_t AsyncPrinter::write(const uint8_t *data, size_t len){ - if(_tx_buffer == NULL || !connected()) - return 0; - size_t toWrite = 0; - size_t toSend = len; - while(_tx_buffer->room() < toSend){ - toWrite = _tx_buffer->room(); - _tx_buffer->write((const char*)data, toWrite); - while(!_client->canSend()) - delay(0); - _sendBuffer(); - toSend -= toWrite; - } - _tx_buffer->write((const char*)(data+(len - toSend)), toSend); - while(!_client->canSend()) delay(0); - _sendBuffer(); - return len; -} - -bool AsyncPrinter::connected(){ - return (_client != NULL && _client->connected()); -} - -void AsyncPrinter::close(){ - if(_client != NULL) - _client->close(true); -} - -size_t AsyncPrinter::_sendBuffer(){ - size_t available = _tx_buffer->available(); - if(!connected() || !_client->canSend() || available == 0) - return 0; - size_t sendable = _client->space(); - if(sendable < available) - available= sendable; - char *out = new char[available]; - _tx_buffer->read(out, available); - size_t sent = _client->write(out, available); - delete out; - return sent; -} - -void AsyncPrinter::_onData(void *data, size_t len){ - if(_data_cb) - _data_cb(_data_arg, this, (uint8_t*)data, len); -} - -void AsyncPrinter::_on_close(){ - if(_client != NULL){ - _client = NULL; - } - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - if(_close_cb) - _close_cb(_close_arg, this); -} - -void AsyncPrinter::_attachCallbacks(){ - _client->onPoll([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this); - _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this); - _client->onDisconnect([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_on_close(); delete c; }, this); - _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((AsyncPrinter*)(obj))->_onData(data, len); }, this); -} diff --git a/libraries/ESPAsyncTCP/src/AsyncPrinter.h b/libraries/ESPAsyncTCP/src/AsyncPrinter.h deleted file mode 100644 index 1fa0f8bd4..000000000 --- a/libraries/ESPAsyncTCP/src/AsyncPrinter.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef ASYNCPRINTER_H_ -#define ASYNCPRINTER_H_ - -#include "Arduino.h" -#include "ESPAsyncTCP.h" -#include "cbuf.h" - -class AsyncPrinter; - -typedef std::function ApDataHandler; -typedef std::function ApCloseHandler; - -class AsyncPrinter: public Print { - private: - AsyncClient *_client; - ApDataHandler _data_cb; - void *_data_arg; - ApCloseHandler _close_cb; - void *_close_arg; - cbuf *_tx_buffer; - size_t _tx_buffer_size; - - void _onConnect(AsyncClient *c); - public: - AsyncPrinter *next; - - AsyncPrinter(); - AsyncPrinter(AsyncClient *client, size_t txBufLen = 1460); - virtual ~AsyncPrinter(); - - int connect(IPAddress ip, uint16_t port); - int connect(const char *host, uint16_t port); - - void onData(ApDataHandler cb, void *arg); - void onClose(ApCloseHandler cb, void *arg); - - operator bool(); - AsyncPrinter & operator=(const AsyncPrinter &other); - - size_t write(uint8_t data); - size_t write(const uint8_t *data, size_t len); - - bool connected(); - void close(); - - size_t _sendBuffer(); - void _onData(void *data, size_t len); - void _on_close(); - void _attachCallbacks(); -}; - -#endif /* ASYNCPRINTER_H_ */ diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp deleted file mode 100644 index 593d6d6ba..000000000 --- a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp +++ /dev/null @@ -1,1066 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "Arduino.h" - -#include "ESPAsyncTCP.h" -extern "C"{ - #include "lwip/opt.h" - #include "lwip/tcp.h" - #include "lwip/inet.h" - #include "lwip/dns.h" - #include "lwip/init.h" -} -#include - -/* - Async TCP Client -*/ - -#if ASYNC_TCP_SSL_ENABLED -AsyncClient::AsyncClient(tcp_pcb* pcb, SSL_CTX * ssl_ctx): -#else -AsyncClient::AsyncClient(tcp_pcb* pcb): -#endif - _connect_cb(0) - , _connect_cb_arg(0) - , _discard_cb(0) - , _discard_cb_arg(0) - , _sent_cb(0) - , _sent_cb_arg(0) - , _error_cb(0) - , _error_cb_arg(0) - , _recv_cb(0) - , _recv_cb_arg(0) - , _timeout_cb(0) - , _timeout_cb_arg(0) - , _pcb_busy(false) -#if ASYNC_TCP_SSL_ENABLED - , _pcb_secure(false) - , _handshake_done(true) -#endif - , _pcb_sent_at(0) - , _close_pcb(false) - , _ack_pcb(true) - , _tx_unacked_len(0) - , _tx_acked_len(0) - , _tx_unsent_len(0) - , _rx_last_packet(0) - , _rx_since_timeout(0) - , _ack_timeout(ASYNC_MAX_ACK_TIME) - , _connect_port(0) - , prev(NULL) - , next(NULL) -{ - _pcb = pcb; - if(_pcb){ - _rx_last_packet = millis(); - tcp_setprio(_pcb, TCP_PRIO_MIN); - tcp_arg(_pcb, this); - tcp_recv(_pcb, &_s_recv); - tcp_sent(_pcb, &_s_sent); - tcp_err(_pcb, &_s_error); - tcp_poll(_pcb, &_s_poll, 1); -#if ASYNC_TCP_SSL_ENABLED - if(ssl_ctx){ - if(tcp_ssl_new_server(_pcb, ssl_ctx) < 0){ - _close(); - return; - } - tcp_ssl_arg(_pcb, this); - tcp_ssl_data(_pcb, &_s_data); - tcp_ssl_handshake(_pcb, &_s_handshake); - tcp_ssl_err(_pcb, &_s_ssl_error); - - _pcb_secure = true; - _handshake_done = false; - } -#endif - } -} - -AsyncClient::~AsyncClient(){ - if(_pcb) - _close(); -} - -#if ASYNC_TCP_SSL_ENABLED -bool AsyncClient::connect(IPAddress ip, uint16_t port, bool secure){ -#else -bool AsyncClient::connect(IPAddress ip, uint16_t port){ -#endif - if (_pcb) //already connected - return false; - ip_addr_t addr; - addr.addr = ip; -#if LWIP_VERSION_MAJOR == 1 - netif* interface = ip_route(&addr); - if (!interface){ //no route to host - return false; - } -#endif - tcp_pcb* pcb = tcp_new(); - if (!pcb){ //could not allocate pcb - return false; - } - -#if ASYNC_TCP_SSL_ENABLED - _pcb_secure = secure; - _handshake_done = !secure; -#endif - tcp_arg(pcb, this); - tcp_err(pcb, &_s_error); - tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected); - return true; -} - -#if ASYNC_TCP_SSL_ENABLED -bool AsyncClient::connect(const char* host, uint16_t port, bool secure){ -#else -bool AsyncClient::connect(const char* host, uint16_t port){ -#endif - ip_addr_t addr; - err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_s_dns_found, this); - if(err == ERR_OK) { -#if ASYNC_TCP_SSL_ENABLED - return connect(IPAddress(addr.addr), port, secure); -#else - return connect(IPAddress(addr.addr), port); -#endif - } else if(err == ERR_INPROGRESS) { -#if ASYNC_TCP_SSL_ENABLED - _pcb_secure = secure; - _handshake_done = !secure; -#endif - _connect_port = port; - return true; - } - return false; -} - -AsyncClient& AsyncClient::operator=(const AsyncClient& other){ - if (_pcb) - _close(); - - _pcb = other._pcb; - if (_pcb) { - _rx_last_packet = millis(); - tcp_setprio(_pcb, TCP_PRIO_MIN); - tcp_arg(_pcb, this); - tcp_recv(_pcb, &_s_recv); - tcp_sent(_pcb, &_s_sent); - tcp_err(_pcb, &_s_error); - tcp_poll(_pcb, &_s_poll, 1); -#if ASYNC_TCP_SSL_ENABLED - if(tcp_ssl_has(_pcb)){ - _pcb_secure = true; - _handshake_done = false; - tcp_ssl_arg(_pcb, this); - tcp_ssl_data(_pcb, &_s_data); - tcp_ssl_handshake(_pcb, &_s_handshake); - tcp_ssl_err(_pcb, &_s_ssl_error); - } else { - _pcb_secure = false; - _handshake_done = true; - } -#endif - } - return *this; -} - -bool AsyncClient::operator==(const AsyncClient &other) { - return (_pcb != NULL && other._pcb != NULL && (_pcb->remote_ip.addr == other._pcb->remote_ip.addr) && (_pcb->remote_port == other._pcb->remote_port)); -} - -int8_t AsyncClient::abort(){ - if(_pcb) { - tcp_abort(_pcb); - _pcb = NULL; - } - return ERR_ABRT; -} - -void AsyncClient::close(bool now){ - tcp_recved(_pcb, _rx_ack_len); - if(now) - _close(); - else - _close_pcb = true; -} - -void AsyncClient::stop() { - close(false); -} - -bool AsyncClient::free(){ - if(!_pcb) - return true; - if(_pcb->state == 0 || _pcb->state > 4) - return true; - return false; -} - -size_t AsyncClient::write(const char* data) { - if(data == NULL) - return 0; - return write(data, strlen(data)); -} - -size_t AsyncClient::write(const char* data, size_t size, uint8_t apiflags) { - size_t will_send = add(data, size, apiflags); - if(!will_send || !send()) - return 0; - return will_send; -} - -size_t AsyncClient::add(const char* data, size_t size, uint8_t apiflags) { - if(!_pcb || size == 0 || data == NULL) - return 0; - size_t room = space(); - if(!room) - return 0; -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure){ - int sent = tcp_ssl_write(_pcb, (uint8_t*)data, size); - if(sent >= 0){ - _tx_unacked_len += sent; - return sent; - } - _close(); - return 0; - } -#endif - size_t will_send = (room < size) ? room : size; - int8_t err = tcp_write(_pcb, data, will_send, apiflags); - if(err != ERR_OK) - return 0; - _tx_unsent_len += will_send; - return will_send; -} - -bool AsyncClient::send(){ -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure) - return true; -#endif - if(tcp_output(_pcb) == ERR_OK){ - _pcb_busy = true; - _pcb_sent_at = millis(); - _tx_unacked_len += _tx_unsent_len; - _tx_unsent_len = 0; - return true; - } - _tx_unsent_len = 0; - return false; -} - -size_t AsyncClient::ack(size_t len){ - if(len > _rx_ack_len) - len = _rx_ack_len; - if(len) - tcp_recved(_pcb, len); - _rx_ack_len -= len; - return len; -} - -// Private Callbacks - -long AsyncClient::_connected(void* pcb, long err){ - _pcb = reinterpret_cast(pcb); - if(_pcb){ - _pcb_busy = false; - _rx_last_packet = millis(); - tcp_setprio(_pcb, TCP_PRIO_MIN); - tcp_recv(_pcb, &_s_recv); - tcp_sent(_pcb, &_s_sent); - tcp_poll(_pcb, &_s_poll, 1); -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure){ - if(tcp_ssl_new_client(_pcb) < 0){ - return _close(); - } - tcp_ssl_arg(_pcb, this); - tcp_ssl_data(_pcb, &_s_data); - tcp_ssl_handshake(_pcb, &_s_handshake); - tcp_ssl_err(_pcb, &_s_ssl_error); - } - } - if(!_pcb_secure && _connect_cb) -#else - } - if(_connect_cb) -#endif - _connect_cb(_connect_cb_arg, this); - return ERR_OK; -} - -int8_t AsyncClient::_close(){ - int8_t err = ERR_OK; - if(_pcb) { -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure){ - tcp_ssl_free(_pcb); - } -#endif - tcp_arg(_pcb, NULL); - tcp_sent(_pcb, NULL); - tcp_recv(_pcb, NULL); - tcp_err(_pcb, NULL); - tcp_poll(_pcb, NULL, 0); - err = tcp_close(_pcb); - if(err != ERR_OK) { - err = abort(); - } - _pcb = NULL; - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); - } - return err; -} - -void AsyncClient::_error(long err) { - if(_pcb){ -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure){ - tcp_ssl_free(_pcb); - } -#endif - tcp_arg(_pcb, NULL); - tcp_sent(_pcb, NULL); - tcp_recv(_pcb, NULL); - tcp_err(_pcb, NULL); - tcp_poll(_pcb, NULL, 0); - _pcb = NULL; - } - if(_error_cb) - _error_cb(_error_cb_arg, this, err); - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); -} - -#if ASYNC_TCP_SSL_ENABLED -void AsyncClient::_ssl_error(int8_t err){ - if(_error_cb) - _error_cb(_error_cb_arg, this, err+64); -} -#endif - -long AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) { - _rx_last_packet = millis(); - ASYNC_TCP_DEBUG("_sent: %u\n", len); - _tx_unacked_len -= len; - _tx_acked_len += len; - if(_tx_unacked_len == 0){ - _pcb_busy = false; - if(_sent_cb) - _sent_cb(_sent_cb_arg, this, _tx_acked_len, (millis() - _pcb_sent_at)); - _tx_acked_len = 0; - } - return ERR_OK; -} - -long AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, long err) { - if(pb == NULL){ - ASYNC_TCP_DEBUG("_recv: pb == NULL! Closing... %d\n", err); - return _close(); - } - - _rx_last_packet = millis(); -#if ASYNC_TCP_SSL_ENABLED - if(_pcb_secure){ - ASYNC_TCP_DEBUG("_recv: %d\n", pb->tot_len); - int read_bytes = tcp_ssl_read(pcb, pb); - if(read_bytes < 0){ - if (read_bytes != SSL_CLOSE_NOTIFY) { - ASYNC_TCP_DEBUG("_recv err: %d\n", read_bytes); - _close(); - } - return read_bytes; - } - return ERR_OK; - } -#endif - while(pb != NULL){ - //we should not ack before we assimilate the data - _ack_pcb = true; - pbuf *b = pb; - ASYNC_TCP_DEBUG("_recv: %d\n", b->len); - if(_recv_cb) - _recv_cb(_recv_cb_arg, this, b->payload, b->len); - if(!_ack_pcb) - _rx_ack_len += b->len; - else - tcp_recved(pcb, b->len); - pb = b->next; - b->next = NULL; - pbuf_free(b); - } - return ERR_OK; -} - -long AsyncClient::_poll(tcp_pcb* pcb){ - // Close requested - if(_close_pcb){ - _close_pcb = false; - _close(); - return ERR_OK; - } - uint32_t now = millis(); - - // ACK Timeout - if(_pcb_busy && _ack_timeout && (now - _pcb_sent_at) >= _ack_timeout){ - _pcb_busy = false; - if(_timeout_cb) - _timeout_cb(_timeout_cb_arg, this, (now - _pcb_sent_at)); - return ERR_OK; - } - // RX Timeout - if(_rx_since_timeout && (now - _rx_last_packet) >= (_rx_since_timeout * 1000)){ - _close(); - return ERR_OK; - } -#if ASYNC_TCP_SSL_ENABLED - // SSL Handshake Timeout - if(_pcb_secure && !_handshake_done && (now - _rx_last_packet) >= 2000){ - _close(); - return ERR_OK; - } -#endif - // Everything is fine - if(_poll_cb) - _poll_cb(_poll_cb_arg, this); - return ERR_OK; -} - -#if LWIP_VERSION_MAJOR == 1 -void AsyncClient::_dns_found(struct ip_addr *ipaddr){ -#else -void AsyncClient::_dns_found(const ip_addr *ipaddr){ -#endif - if(ipaddr){ -#if ASYNC_TCP_SSL_ENABLED - connect(IPAddress(ipaddr->addr), _connect_port, _pcb_secure); -#else - connect(IPAddress(ipaddr->addr), _connect_port); -#endif - } else { - if(_error_cb) - _error_cb(_error_cb_arg, this, -55); - if(_discard_cb) - _discard_cb(_discard_cb_arg, this); - } -} - -// lWIP Callbacks -#if LWIP_VERSION_MAJOR == 1 -void AsyncClient::_s_dns_found(const char *name, ip_addr_t *ipaddr, void *arg){ -#else -void AsyncClient::_s_dns_found(const char *name, const ip_addr *ipaddr, void *arg){ -#endif - reinterpret_cast(arg)->_dns_found(ipaddr); -} - -long AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) { - return reinterpret_cast(arg)->_poll(tpcb); -} - -long AsyncClient::_s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err) { - return reinterpret_cast(arg)->_recv(tpcb, pb, err); -} - -void AsyncClient::_s_error(void *arg, long err) { - reinterpret_cast(arg)->_error(err); -} - -long AsyncClient::_s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len) { - return reinterpret_cast(arg)->_sent(tpcb, len); -} - -long AsyncClient::_s_connected(void* arg, void* tpcb, long err){ - return reinterpret_cast(arg)->_connected(tpcb, err); -} - -#if ASYNC_TCP_SSL_ENABLED -void AsyncClient::_s_data(void *arg, struct tcp_pcb *tcp, uint8_t * data, size_t len){ - AsyncClient *c = reinterpret_cast(arg); - if(c->_recv_cb) - c->_recv_cb(c->_recv_cb_arg, c, data, len); -} - -void AsyncClient::_s_handshake(void *arg, struct tcp_pcb *tcp, SSL *ssl){ - AsyncClient *c = reinterpret_cast(arg); - c->_handshake_done = true; - if(c->_connect_cb) - c->_connect_cb(c->_connect_cb_arg, c); -} - -void AsyncClient::_s_ssl_error(void *arg, struct tcp_pcb *tcp, int8_t err){ - reinterpret_cast(arg)->_ssl_error(err); -} -#endif - -// Operators - -AsyncClient & AsyncClient::operator+=(const AsyncClient &other) { - if(next == NULL){ - next = (AsyncClient*)(&other); - next->prev = this; - } else { - AsyncClient *c = next; - while(c->next != NULL) c = c->next; - c->next =(AsyncClient*)(&other); - c->next->prev = c; - } - return *this; -} - -void AsyncClient::setRxTimeout(uint32_t timeout){ - _rx_since_timeout = timeout; -} - -uint32_t AsyncClient::getRxTimeout(){ - return _rx_since_timeout; -} - -uint32_t AsyncClient::getAckTimeout(){ - return _ack_timeout; -} - -void AsyncClient::setAckTimeout(uint32_t timeout){ - _ack_timeout = timeout; -} - -void AsyncClient::setNoDelay(bool nodelay){ - if(!_pcb) - return; - if(nodelay) - tcp_nagle_disable(_pcb); - else - tcp_nagle_enable(_pcb); -} - -bool AsyncClient::getNoDelay(){ - if(!_pcb) - return false; - return tcp_nagle_disabled(_pcb); -} - -uint16_t AsyncClient::getMss(){ - if(_pcb) - return tcp_mss(_pcb); - return 0; -} - -uint32_t AsyncClient::getRemoteAddress() { - if(!_pcb) - return 0; - return _pcb->remote_ip.addr; -} - -uint16_t AsyncClient::getRemotePort() { - if(!_pcb) - return 0; - return _pcb->remote_port; -} - -uint32_t AsyncClient::getLocalAddress() { - if(!_pcb) - return 0; - return _pcb->local_ip.addr; -} - -uint16_t AsyncClient::getLocalPort() { - if(!_pcb) - return 0; - return _pcb->local_port; -} - -IPAddress AsyncClient::remoteIP() { - return IPAddress(getRemoteAddress()); -} - -uint16_t AsyncClient::remotePort() { - return getRemotePort(); -} - -IPAddress AsyncClient::localIP() { - return IPAddress(getLocalAddress()); -} - -uint16_t AsyncClient::localPort() { - return getLocalPort(); -} - -#if ASYNC_TCP_SSL_ENABLED -SSL * AsyncClient::getSSL(){ - if(_pcb && _pcb_secure){ - return tcp_ssl_get_ssl(_pcb); - } - return NULL; -} -#endif - -uint8_t AsyncClient::state() { - if(!_pcb) - return 0; - return _pcb->state; -} - -bool AsyncClient::connected(){ - if (!_pcb) - return false; -#if ASYNC_TCP_SSL_ENABLED - return _pcb->state == 4 && _handshake_done; -#else - return _pcb->state == 4; -#endif -} - -bool AsyncClient::connecting(){ - if (!_pcb) - return false; - return _pcb->state > 0 && _pcb->state < 4; -} - -bool AsyncClient::disconnecting(){ - if (!_pcb) - return false; - return _pcb->state > 4 && _pcb->state < 10; -} - -bool AsyncClient::disconnected(){ - if (!_pcb) - return true; - return _pcb->state == 0 || _pcb->state == 10; -} - -bool AsyncClient::freeable(){ - if (!_pcb) - return true; - return _pcb->state == 0 || _pcb->state > 4; -} - -bool AsyncClient::canSend(){ - return !_pcb_busy && (space() > 0); -} - - -// Callback Setters - -void AsyncClient::onConnect(AcConnectHandler cb, void* arg){ - _connect_cb = cb; - _connect_cb_arg = arg; -} - -void AsyncClient::onDisconnect(AcConnectHandler cb, void* arg){ - _discard_cb = cb; - _discard_cb_arg = arg; -} - -void AsyncClient::onAck(AcAckHandler cb, void* arg){ - _sent_cb = cb; - _sent_cb_arg = arg; -} - -void AsyncClient::onError(AcErrorHandler cb, void* arg){ - _error_cb = cb; - _error_cb_arg = arg; -} - -void AsyncClient::onData(AcDataHandler cb, void* arg){ - _recv_cb = cb; - _recv_cb_arg = arg; -} - -void AsyncClient::onTimeout(AcTimeoutHandler cb, void* arg){ - _timeout_cb = cb; - _timeout_cb_arg = arg; -} - -void AsyncClient::onPoll(AcConnectHandler cb, void* arg){ - _poll_cb = cb; - _poll_cb_arg = arg; -} - - -size_t AsyncClient::space(){ -#if ASYNC_TCP_SSL_ENABLED - if((_pcb != NULL) && (_pcb->state == 4) && _handshake_done){ - uint16_t s = tcp_sndbuf(_pcb); - if(_pcb_secure){ -#ifdef AXTLS_2_0_0_SNDBUF - return tcp_ssl_sndbuf(_pcb); -#else - if(s >= 128) //safe approach - return s - 128; - return 0; -#endif - } - return s; - } -#else - if((_pcb != NULL) && (_pcb->state == 4)){ - return tcp_sndbuf(_pcb); - } -#endif - return 0; -} - -const char * AsyncClient::errorToString(int8_t error){ - switch(error){ - case 0: return "OK"; - case -1: return "Out of memory error"; - case -2: return "Buffer error"; - case -3: return "Timeout"; - case -4: return "Routing problem"; - case -5: return "Operation in progress"; - case -6: return "Illegal value"; - case -7: return "Operation would block"; - case -8: return "Connection aborted"; - case -9: return "Connection reset"; - case -10: return "Connection closed"; - case -11: return "Not connected"; - case -12: return "Illegal argument"; - case -13: return "Address in use"; - case -14: return "Low-level netif error"; - case -15: return "Already connected"; - case -55: return "DNS failed"; - default: return "UNKNOWN"; - } -} - -const char * AsyncClient::stateToString(){ - switch(state()){ - case 0: return "Closed"; - case 1: return "Listen"; - case 2: return "SYN Sent"; - case 3: return "SYN Received"; - case 4: return "Established"; - case 5: return "FIN Wait 1"; - case 6: return "FIN Wait 2"; - case 7: return "Close Wait"; - case 8: return "Closing"; - case 9: return "Last ACK"; - case 10: return "Time Wait"; - default: return "UNKNOWN"; - } -} - -/* - Async TCP Server -*/ -struct pending_pcb { - tcp_pcb* pcb; - pbuf *pb; - struct pending_pcb * next; -}; - -AsyncServer::AsyncServer(IPAddress addr, uint16_t port) - : _port(port) - , _addr(addr) - , _noDelay(false) - , _pcb(0) - , _connect_cb(0) - , _connect_cb_arg(0) -#if ASYNC_TCP_SSL_ENABLED - , _pending(NULL) - , _ssl_ctx(NULL) - , _file_cb(0) - , _file_cb_arg(0) -#endif -{} - -AsyncServer::AsyncServer(uint16_t port) - : _port(port) - , _addr((uint32_t) IPADDR_ANY) - , _noDelay(false) - , _pcb(0) - , _connect_cb(0) - , _connect_cb_arg(0) -#if ASYNC_TCP_SSL_ENABLED - , _pending(NULL) - , _ssl_ctx(NULL) - , _file_cb(0) - , _file_cb_arg(0) -#endif -{} - -AsyncServer::~AsyncServer(){ - end(); -} - -void AsyncServer::onClient(AcConnectHandler cb, void* arg){ - _connect_cb = cb; - _connect_cb_arg = arg; -} - -#if ASYNC_TCP_SSL_ENABLED -void AsyncServer::onSslFileRequest(AcSSlFileHandler cb, void* arg){ - _file_cb = cb; - _file_cb_arg = arg; -} -#endif - -void AsyncServer::begin(){ - if(_pcb) - return; - - int8_t err; - tcp_pcb* pcb = tcp_new(); - if (!pcb){ - return; - } - - ip_addr_t local_addr; - local_addr.addr = (uint32_t) _addr; - err = tcp_bind(pcb, &local_addr, _port); - - if (err != ERR_OK) { - tcp_close(pcb); - return; - } - - tcp_pcb* listen_pcb = tcp_listen(pcb); - if (!listen_pcb) { - tcp_close(pcb); - return; - } - _pcb = listen_pcb; - tcp_arg(_pcb, (void*) this); - tcp_accept(_pcb, &_s_accept); -} - -#if ASYNC_TCP_SSL_ENABLED -void AsyncServer::beginSecure(const char *cert, const char *key, const char *password){ - if(_ssl_ctx){ - return; - } - tcp_ssl_file(_s_cert, this); - _ssl_ctx = tcp_ssl_new_server_ctx(cert, key, password); - if(_ssl_ctx){ - begin(); - } -} -#endif - -void AsyncServer::end(){ - if(_pcb){ - //cleanup all connections? - tcp_abort(_pcb); - tcp_arg(_pcb, NULL); - tcp_accept(_pcb, NULL); - if(tcp_close(_pcb) != ERR_OK){ - tcp_abort(_pcb); - } - _pcb = NULL; - } -#if ASYNC_TCP_SSL_ENABLED - if(_ssl_ctx){ - ssl_ctx_free(_ssl_ctx); - _ssl_ctx = NULL; - if(_pending){ - struct pending_pcb * p; - while(_pending){ - p = _pending; - _pending = _pending->next; - if(p->pb){ - pbuf_free(p->pb); - } - free(p); - } - } - } -#endif -} - -void AsyncServer::setNoDelay(bool nodelay){ - _noDelay = nodelay; -} - -bool AsyncServer::getNoDelay(){ - return _noDelay; -} - -uint8_t AsyncServer::status(){ - if (!_pcb) - return 0; - return _pcb->state; -} - -long AsyncServer::_accept(tcp_pcb* pcb, long err){ - if(_connect_cb){ -#if ASYNC_TCP_SSL_ENABLED - if (_noDelay || _ssl_ctx) -#else - if (_noDelay) -#endif - tcp_nagle_disable(pcb); - else - tcp_nagle_enable(pcb); - - -#if ASYNC_TCP_SSL_ENABLED - if(_ssl_ctx){ - if(tcp_ssl_has_client() || _pending){ - struct pending_pcb * new_item = (struct pending_pcb*)malloc(sizeof(struct pending_pcb)); - if(!new_item){ - ASYNC_TCP_DEBUG("### malloc new pending failed!\n"); - if(tcp_close(pcb) != ERR_OK){ - tcp_abort(pcb); - } - return ERR_OK; - } - ASYNC_TCP_DEBUG("### put to wait: %d\n", _clients_waiting); - new_item->pcb = pcb; - new_item->pb = NULL; - new_item->next = NULL; - tcp_setprio(_pcb, TCP_PRIO_MIN); - tcp_arg(pcb, this); - tcp_poll(pcb, &_s_poll, 1); - tcp_recv(pcb, &_s_recv); - - if(_pending == NULL){ - _pending = new_item; - } else { - struct pending_pcb * p = _pending; - while(p->next != NULL) - p = p->next; - p->next = new_item; - } - } else { - AsyncClient *c = new AsyncClient(pcb, _ssl_ctx); - if(c){ - c->onConnect([this](void * arg, AsyncClient *c){ - _connect_cb(_connect_cb_arg, c); - }, this); - } - } - return ERR_OK; - } else { - AsyncClient *c = new AsyncClient(pcb, NULL); -#else - AsyncClient *c = new AsyncClient(pcb); -#endif - if(c){ - _connect_cb(_connect_cb_arg, c); - return ERR_OK; - } -#if ASYNC_TCP_SSL_ENABLED - } -#endif - } - if(tcp_close(pcb) != ERR_OK){ - tcp_abort(pcb); - } - return ERR_OK; -} - - long AsyncServer::_s_accept(void *arg, tcp_pcb* pcb, long err){ - return reinterpret_cast(arg)->_accept(pcb, err); - } - -#if ASYNC_TCP_SSL_ENABLED -long AsyncServer::_poll(tcp_pcb* pcb){ - if(!tcp_ssl_has_client() && _pending){ - struct pending_pcb * p = _pending; - if(p->pcb == pcb){ - _pending = _pending->next; - } else { - while(p->next && p->next->pcb != pcb) p = p->next; - if(!p->next) return 0; - struct pending_pcb * b = p->next; - p->next = b->next; - p = b; - } - ASYNC_TCP_DEBUG("### remove from wait: %d\n", _clients_waiting); - AsyncClient *c = new AsyncClient(pcb, _ssl_ctx); - if(c){ - c->onConnect([this](void * arg, AsyncClient *c){ - _connect_cb(_connect_cb_arg, c); - }, this); - if(p->pb) - c->_recv(pcb, p->pb, 0); - } - free(p); - } - return ERR_OK; -} - -long AsyncServer::_recv(struct tcp_pcb *pcb, struct pbuf *pb, long err){ - if(!_pending) - return ERR_OK; - - struct pending_pcb * p; - - if(!pb){ - ASYNC_TCP_DEBUG("### close from wait: %d\n", _clients_waiting); - p = _pending; - if(p->pcb == pcb){ - _pending = _pending->next; - } else { - while(p->next && p->next->pcb != pcb) p = p->next; - if(!p->next) return 0; - struct pending_pcb * b = p->next; - p->next = b->next; - p = b; - } - if(p->pb){ - pbuf_free(p->pb); - } - free(p); - tcp_close(pcb); - tcp_abort(pcb); - } else { - ASYNC_TCP_DEBUG("### wait _recv: %u %d\n", pb->tot_len, _clients_waiting); - p = _pending; - while(p && p->pcb != pcb) - p = p->next; - if(p){ - if(p->pb){ - pbuf_chain(p->pb, pb); - } else { - p->pb = pb; - } - } - } - return ERR_OK; -} - -int AsyncServer::_cert(const char *filename, uint8_t **buf){ - if(_file_cb){ - return _file_cb(_file_cb_arg, filename, buf); - } - *buf = 0; - return 0; -} - -int AsyncServer::_s_cert(void *arg, const char *filename, uint8_t **buf){ - return reinterpret_cast(arg)->_cert(filename, buf); -} - -long AsyncServer::_s_poll(void *arg, struct tcp_pcb *pcb){ - return reinterpret_cast(arg)->_poll(pcb); -} - -long AsyncServer::_s_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *pb, long err){ - return reinterpret_cast(arg)->_recv(pcb, pb, err); -} -#endif diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h deleted file mode 100644 index 1e72dfd54..000000000 --- a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h +++ /dev/null @@ -1,249 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef ASYNCTCP_H_ -#define ASYNCTCP_H_ - -#include -#include "IPAddress.h" -#include -#include "lwip/init.h" - -class AsyncClient; - -#define ASYNC_MAX_ACK_TIME 5000 -#define ASYNC_WRITE_FLAG_COPY 0x01 //will allocate new buffer to hold the data while sending (else will hold reference to the data given) -#define ASYNC_WRITE_FLAG_MORE 0x02 //will not send PSH flag, meaning that there should be more data to be sent before the application should react. - -typedef std::function AcConnectHandler; -typedef std::function AcAckHandler; -typedef std::function AcErrorHandler; -typedef std::function AcDataHandler; -typedef std::function AcTimeoutHandler; - -struct tcp_pcb; -struct pbuf; -struct ip_addr; -#if ASYNC_TCP_SSL_ENABLED -struct SSL_; -typedef struct SSL_ SSL; -struct SSL_CTX_; -typedef struct SSL_CTX_ SSL_CTX; -#endif - -class AsyncClient { - protected: - friend class AsyncTCPbuffer; - tcp_pcb* _pcb; - AcConnectHandler _connect_cb; - void* _connect_cb_arg; - AcConnectHandler _discard_cb; - void* _discard_cb_arg; - AcAckHandler _sent_cb; - void* _sent_cb_arg; - AcErrorHandler _error_cb; - void* _error_cb_arg; - AcDataHandler _recv_cb; - void* _recv_cb_arg; - AcTimeoutHandler _timeout_cb; - void* _timeout_cb_arg; - AcConnectHandler _poll_cb; - void* _poll_cb_arg; - bool _pcb_busy; -#if ASYNC_TCP_SSL_ENABLED - bool _pcb_secure; - bool _handshake_done; -#endif - uint32_t _pcb_sent_at; - bool _close_pcb; - bool _ack_pcb; - uint32_t _tx_unacked_len; - uint32_t _tx_acked_len; - uint32_t _tx_unsent_len; - uint32_t _rx_ack_len; - uint32_t _rx_last_packet; - uint32_t _rx_since_timeout; - uint32_t _ack_timeout; - uint16_t _connect_port; - - int8_t _close(); - long _connected(void* pcb, long err); - void _error(long err); -#if ASYNC_TCP_SSL_ENABLED - void _ssl_error(int8_t err); -#endif - long _poll(tcp_pcb* pcb); - long _sent(tcp_pcb* pcb, uint16_t len); -#if LWIP_VERSION_MAJOR == 1 - void _dns_found(struct ip_addr *ipaddr); -#else - void _dns_found(const ip_addr *ipaddr); -#endif - static long _s_poll(void *arg, struct tcp_pcb *tpcb); - static long _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err); - static void _s_error(void *arg, long err); - static long _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len); - static long _s_connected(void* arg, void* tpcb, long err); -#if LWIP_VERSION_MAJOR == 1 - static void _s_dns_found(const char *name, struct ip_addr *ipaddr, void *arg); -#else - static void _s_dns_found(const char *name, const ip_addr *ipaddr, void *arg); -#endif -#if ASYNC_TCP_SSL_ENABLED - static void _s_data(void *arg, struct tcp_pcb *tcp, uint8_t * data, size_t len); - static void _s_handshake(void *arg, struct tcp_pcb *tcp, SSL *ssl); - static void _s_ssl_error(void *arg, struct tcp_pcb *tcp, int8_t err); -#endif - - public: - AsyncClient* prev; - AsyncClient* next; - -#if ASYNC_TCP_SSL_ENABLED - AsyncClient(tcp_pcb* pcb = 0, SSL_CTX * ssl_ctx = NULL); -#else - AsyncClient(tcp_pcb* pcb = 0); -#endif - ~AsyncClient(); - - AsyncClient & operator=(const AsyncClient &other); - AsyncClient & operator+=(const AsyncClient &other); - - bool operator==(const AsyncClient &other); - - bool operator!=(const AsyncClient &other) { - return !(*this == other); - } -#if ASYNC_TCP_SSL_ENABLED - bool connect(IPAddress ip, uint16_t port, bool secure=false); - bool connect(const char* host, uint16_t port, bool secure=false); -#else - bool connect(IPAddress ip, uint16_t port); - bool connect(const char* host, uint16_t port); -#endif - void close(bool now = false); - void stop(); - int8_t abort(); - bool free(); - - bool canSend();//ack is not pending - size_t space(); - size_t add(const char* data, size_t size, uint8_t apiflags=0);//add for sending - bool send();//send all data added with the method above - size_t ack(size_t len); //ack data that you have not acked using the method below - void ackLater(){ _ack_pcb = false; } //will not ack the current packet. Call from onData - -#if ASYNC_TCP_SSL_ENABLED - SSL *getSSL(); -#endif - - size_t write(const char* data); - size_t write(const char* data, size_t size, uint8_t apiflags=0); //only when canSend() == true - - uint8_t state(); - bool connecting(); - bool connected(); - bool disconnecting(); - bool disconnected(); - bool freeable();//disconnected or disconnecting - - uint16_t getMss(); - uint32_t getRxTimeout(); - void setRxTimeout(uint32_t timeout);//no RX data timeout for the connection in seconds - uint32_t getAckTimeout(); - void setAckTimeout(uint32_t timeout);//no ACK timeout for the last sent packet in milliseconds - void setNoDelay(bool nodelay); - bool getNoDelay(); - uint32_t getRemoteAddress(); - uint16_t getRemotePort(); - uint32_t getLocalAddress(); - uint16_t getLocalPort(); - - IPAddress remoteIP(); - uint16_t remotePort(); - IPAddress localIP(); - uint16_t localPort(); - - void onConnect(AcConnectHandler cb, void* arg = 0); //on successful connect - void onDisconnect(AcConnectHandler cb, void* arg = 0); //disconnected - void onAck(AcAckHandler cb, void* arg = 0); //ack received - void onError(AcErrorHandler cb, void* arg = 0); //unsuccessful connect or error - void onData(AcDataHandler cb, void* arg = 0); //data received - void onTimeout(AcTimeoutHandler cb, void* arg = 0); //ack timeout - void onPoll(AcConnectHandler cb, void* arg = 0); //every 125ms when connected - - const char * errorToString(int8_t error); - const char * stateToString(); - - long _recv(tcp_pcb* pcb, pbuf* pb, long err); -}; - -#if ASYNC_TCP_SSL_ENABLED -typedef std::function AcSSlFileHandler; -struct pending_pcb; -#endif - -class AsyncServer { - protected: - uint16_t _port; - IPAddress _addr; - bool _noDelay; - tcp_pcb* _pcb; - AcConnectHandler _connect_cb; - void* _connect_cb_arg; -#if ASYNC_TCP_SSL_ENABLED - struct pending_pcb * _pending; - SSL_CTX * _ssl_ctx; - AcSSlFileHandler _file_cb; - void* _file_cb_arg; -#endif - - public: - - AsyncServer(IPAddress addr, uint16_t port); - AsyncServer(uint16_t port); - ~AsyncServer(); - void onClient(AcConnectHandler cb, void* arg); -#if ASYNC_TCP_SSL_ENABLED - void onSslFileRequest(AcSSlFileHandler cb, void* arg); - void beginSecure(const char *cert, const char *private_key_file, const char *password); -#endif - void begin(); - void end(); - void setNoDelay(bool nodelay); - bool getNoDelay(); - uint8_t status(); - - protected: - long _accept(tcp_pcb* newpcb, long err); - static long _s_accept(void *arg, tcp_pcb* newpcb, long err); -#if ASYNC_TCP_SSL_ENABLED - int _cert(const char *filename, uint8_t **buf); - long _poll(tcp_pcb* pcb); - long _recv(tcp_pcb *pcb, struct pbuf *pb, long err); - static int _s_cert(void *arg, const char *filename, uint8_t **buf); - static long _s_poll(void *arg, struct tcp_pcb *tpcb); - static long _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err); -#endif -}; - - -#endif /* ASYNCTCP_H_ */ diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp deleted file mode 100644 index 7bca134f4..000000000 --- a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp +++ /dev/null @@ -1,541 +0,0 @@ -/** - * @file ESPAsyncTCPbuffer.cpp - * @date 22.01.2016 - * @author Markus Sattler - * - * Copyright (c) 2015 Markus Sattler. All rights reserved. - * This file is part of the Asynv TCP for ESP. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - - -#include -#include - -#include "ESPAsyncTCPbuffer.h" - - -AsyncTCPbuffer::AsyncTCPbuffer(AsyncClient* client) { - if(client == NULL) { - DEBUG_ASYNC_TCP("[A-TCP] client is null!!!\n"); - panic(); - } - - _client = client; - _TXbufferWrite = new cbuf(1460); - _TXbufferRead = _TXbufferWrite; - _RXbuffer = new cbuf(100); - _RXmode = ATB_RX_MODE_FREE; - _rxSize = 0; - _rxTerminator = 0x00; - _rxReadBytesPtr = NULL; - _rxReadStringPtr = NULL; - _cbDisconnect = NULL; - - _cbRX = NULL; - _cbDone = NULL; - _attachCallbacks(); -} - -AsyncTCPbuffer::~AsyncTCPbuffer() { - if(_client) { - _client->close(); - } - - if(_RXbuffer) { - delete _RXbuffer; - _RXbuffer = NULL; - } - - if(_TXbufferWrite) { - // will be deleted in _TXbufferRead chain - _TXbufferWrite = NULL; - } - - if(_TXbufferRead) { - cbuf * next = _TXbufferRead->next; - delete _TXbufferRead; - while(next != NULL) { - _TXbufferRead = next; - next = _TXbufferRead->next; - delete _TXbufferRead; - } - _TXbufferRead = NULL; - } -} - -size_t AsyncTCPbuffer::write(String & data) { - return write(data.c_str(), data.length()); -} - -size_t AsyncTCPbuffer::write(uint8_t data) { - return write(&data, 1); -} - -size_t AsyncTCPbuffer::write(const char* data) { - return write((const uint8_t *) data, strlen(data)); -} - -size_t AsyncTCPbuffer::write(const char *data, size_t len) { - return write((const uint8_t *) data, len); -} - -/** - * write data in to buffer and try to send the data - * @param data - * @param len - * @return - */ -size_t AsyncTCPbuffer::write(const uint8_t *data, size_t len) { - if(_TXbufferWrite == NULL || _client == NULL || !_client->connected() || data == NULL || len == 0) { - return 0; - } - - size_t bytesLeft = len; - while(bytesLeft) { - size_t w = _TXbufferWrite->write((const char*) data, bytesLeft); - bytesLeft -= w; - data += w; - _sendBuffer(); - - // add new buffer since we have more data - if(_TXbufferWrite->full() && bytesLeft > 0) { - - // to less ram!!! - if(ESP.getFreeHeap() < 4096) { - DEBUG_ASYNC_TCP("[A-TCP] run out of Heap can not send all Data!\n"); - return (len - bytesLeft); - } - - cbuf * next = new cbuf(1460); - - if(next == NULL) { - DEBUG_ASYNC_TCP("[A-TCP] run out of Heap!\n"); - panic(); - } else { - DEBUG_ASYNC_TCP("[A-TCP] new cbuf\n"); - } - - // add new buffer to chain (current cbuf) - _TXbufferWrite->next = next; - - // move ptr for next data - _TXbufferWrite = next; - } - } - - return len; - -} - -/** - * wait until all data has send out - */ -void AsyncTCPbuffer::flush() { - while(!_TXbufferWrite->empty()) { - while(!_client->canSend()) { - delay(0); - } - _sendBuffer(); - } -} - -void AsyncTCPbuffer::noCallback() { - _RXmode = ATB_RX_MODE_NONE; -} - -void AsyncTCPbuffer::readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done) { - if(_client == NULL) { - return; - } - DEBUG_ASYNC_TCP("[A-TCP] readStringUntil terminator: %02X\n", terminator); - _RXmode = ATB_RX_MODE_NONE; - _cbDone = done; - _rxReadStringPtr = str; - _rxTerminator = terminator; - _rxSize = 0; - _RXmode = ATB_RX_MODE_TERMINATOR_STRING; -} - -/* - void AsyncTCPbuffer::readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done) { - _RXmode = ATB_RX_MODE_NONE; - _cbDone = done; - _rxReadBytesPtr = (uint8_t *) buffer; - _rxTerminator = terminator; - _rxSize = length; - _RXmode = ATB_RX_MODE_TERMINATOR; - _handleRxBuffer(NULL, 0); - } - - void AsyncTCPbuffer::readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) { - readBytesUntil(terminator, (char *) buffer, length, done); - } - */ - -void AsyncTCPbuffer::readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done) { - if(_client == NULL) { - return; - } - DEBUG_ASYNC_TCP("[A-TCP] readBytes length: %d\n", length); - _RXmode = ATB_RX_MODE_NONE; - _cbDone = done; - _rxReadBytesPtr = (uint8_t *) buffer; - _rxSize = length; - _RXmode = ATB_RX_MODE_READ_BYTES; -} - -void AsyncTCPbuffer::readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) { - readBytes((char *) buffer, length, done); -} - -void AsyncTCPbuffer::onData(AsyncTCPbufferDataCb cb) { - if(_client == NULL) { - return; - } - DEBUG_ASYNC_TCP("[A-TCP] onData\n"); - _RXmode = ATB_RX_MODE_NONE; - _cbDone = NULL; - _cbRX = cb; - _RXmode = ATB_RX_MODE_FREE; -} - -void AsyncTCPbuffer::onDisconnect(AsyncTCPbufferDisconnectCb cb) { - _cbDisconnect = cb; -} - -IPAddress AsyncTCPbuffer::remoteIP() { - if(!_client) { - return IPAddress(0U); - } - return _client->remoteIP(); -} - -uint16_t AsyncTCPbuffer::remotePort() { - if(!_client) { - return 0; - } - return _client->remotePort(); -} - -bool AsyncTCPbuffer::connected() { - if(!_client) { - return false; - } - return _client->connected(); -} - -void AsyncTCPbuffer::stop() { - - if(!_client) { - return; - } - _client->stop(); - _client = NULL; - - if(_cbDone) { - switch(_RXmode) { - case ATB_RX_MODE_READ_BYTES: - case ATB_RX_MODE_TERMINATOR: - case ATB_RX_MODE_TERMINATOR_STRING: - _RXmode = ATB_RX_MODE_NONE; - _cbDone(false, NULL); - break; - default: - break; - } - } - _RXmode = ATB_RX_MODE_NONE; -} - -void AsyncTCPbuffer::close() { - stop(); -} - - -///-------------------------------- - -/** - * attachCallbacks to AsyncClient class - */ -void AsyncTCPbuffer::_attachCallbacks() { - if(!_client) { - return; - } - DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks\n"); - - _client->onPoll([](void *obj, AsyncClient* c) { - AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj)); - if((b->_TXbufferRead != NULL) && !b->_TXbufferRead->empty()) { - b->_sendBuffer(); - } - // if(!b->_RXbuffer->empty()) { - // b->_handleRxBuffer(NULL, 0); - // } - }, this); - - _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time) { - DEBUG_ASYNC_TCP("[A-TCP] onAck\n"); - ((AsyncTCPbuffer*)(obj))->_sendBuffer(); - }, this); - - _client->onDisconnect([](void *obj, AsyncClient* c) { - DEBUG_ASYNC_TCP("[A-TCP] onDisconnect\n"); - AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj)); - b->_client = NULL; - bool del = true; - if(b->_cbDisconnect) { - del = b->_cbDisconnect(b); - } - delete c; - if(del) { - delete b; - } - }, this); - - _client->onData([](void *obj, AsyncClient* c, void *buf, size_t len) { - AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj)); - b->_rxData((uint8_t *)buf, len); - }, this); - - _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){ - DEBUG_ASYNC_TCP("[A-TCP] onTimeout\n"); - c->close(); - }, this); - - DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks Done.\n"); -} - -/** - * send TX buffer if possible - */ -void AsyncTCPbuffer::_sendBuffer() { - //DEBUG_ASYNC_TCP("[A-TCP] _sendBuffer...\n"); - size_t available = _TXbufferRead->available(); - if(available == 0 || _client == NULL || !_client->connected() || !_client->canSend()) { - return; - } - - while((_client->space() > 0) && (_TXbufferRead->available() > 0) && _client->canSend()) { - - available = _TXbufferRead->available(); - - if(available > _client->space()) { - available = _client->space(); - } - - char *out = new char[available]; - if(out == NULL) { - DEBUG_ASYNC_TCP("[A-TCP] to less heap, try later.\n"); - return; - } - - // read data from buffer - _TXbufferRead->peek(out, available); - - // send data - size_t send = _client->write((const char*) out, available); - if(send != available) { - DEBUG_ASYNC_TCP("[A-TCP] write failed send: %d available: %d \n", send, available); - } - - // remove really send data from buffer - _TXbufferRead->remove(send); - - // if buffer is empty and there is a other buffer in chain delete the empty one - if(_TXbufferRead->available() == 0 && _TXbufferRead->next != NULL) { - cbuf * old = _TXbufferRead; - _TXbufferRead = _TXbufferRead->next; - delete old; - DEBUG_ASYNC_TCP("[A-TCP] delete cbuf\n"); - } - - delete out; - } - -} - -/** - * called on incoming data - * @param buf - * @param len - */ -void AsyncTCPbuffer::_rxData(uint8_t *buf, size_t len) { - if(!_client || !_client->connected()) { - DEBUG_ASYNC_TCP("[A-TCP] not connected!\n"); - return; - } - if(!_RXbuffer) { - DEBUG_ASYNC_TCP("[A-TCP] _rxData no _RXbuffer!\n"); - return; - } - DEBUG_ASYNC_TCP("[A-TCP] _rxData len: %d RXmode: %d\n", len, _RXmode); - - size_t handled = 0; - - if(_RXmode != ATB_RX_MODE_NONE) { - handled = _handleRxBuffer((uint8_t *) buf, len); - buf += handled; - len -= handled; - - // handle as much as possible before using the buffer - if(_RXbuffer->empty()) { - while(_RXmode != ATB_RX_MODE_NONE && handled != 0 && len > 0) { - handled = _handleRxBuffer(buf, len); - buf += handled; - len -= handled; - } - } - } - - if(len > 0) { - - if(_RXbuffer->room() < len) { - // to less space - DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer full try resize\n"); - _RXbuffer->resizeAdd((len + _RXbuffer->room())); - - if(_RXbuffer->room() < len) { - DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer to full can only handle %d!!!\n", _RXbuffer->room()); - } - } - - _RXbuffer->write((const char *) (buf), len); - } - - if(!_RXbuffer->empty() && _RXmode != ATB_RX_MODE_NONE) { - // handle as much as possible data in buffer - handled = _handleRxBuffer(NULL, 0); - while(_RXmode != ATB_RX_MODE_NONE && handled != 0) { - handled = _handleRxBuffer(NULL, 0); - } - } - - // clean up ram - if(_RXbuffer->empty() && _RXbuffer->room() != 100) { - _RXbuffer->resize(100); - } - -} - -/** - * - */ -size_t AsyncTCPbuffer::_handleRxBuffer(uint8_t *buf, size_t len) { - if(!_client || !_client->connected() || _RXbuffer == NULL) { - return 0; - } - - DEBUG_ASYNC_TCP("[A-TCP] _handleRxBuffer len: %d RXmode: %d\n", len, _RXmode); - - size_t BufferAvailable = _RXbuffer->available(); - size_t r = 0; - - if(_RXmode == ATB_RX_MODE_NONE) { - return 0; - } else if(_RXmode == ATB_RX_MODE_FREE) { - if(_cbRX == NULL) { - return 0; - } - - if(BufferAvailable > 0) { - uint8_t * b = new uint8_t[BufferAvailable]; - _RXbuffer->peek((char *) b, BufferAvailable); - r = _cbRX(b, BufferAvailable); - _RXbuffer->remove(r); - } - - if(r == BufferAvailable && buf && (len > 0)) { - return _cbRX(buf, len); - } else { - return 0; - } - - } else if(_RXmode == ATB_RX_MODE_READ_BYTES) { - if(_rxReadBytesPtr == NULL || _cbDone == NULL) { - return 0; - } - - size_t newReadCount = 0; - - if(BufferAvailable) { - r = _RXbuffer->read((char *) _rxReadBytesPtr, _rxSize); - _rxSize -= r; - _rxReadBytesPtr += r; - } - - if(_RXbuffer->empty() && (len > 0) && buf) { - r = len; - if(r > _rxSize) { - r = _rxSize; - } - memcpy(_rxReadBytesPtr, buf, r); - _rxReadBytesPtr += r; - _rxSize -= r; - newReadCount += r; - } - - if(_rxSize == 0) { - _RXmode = ATB_RX_MODE_NONE; - _cbDone(true, NULL); - } - - // add left over bytes to Buffer - return newReadCount; - - } else if(_RXmode == ATB_RX_MODE_TERMINATOR) { - // TODO implement read terminator non string - - } else if(_RXmode == ATB_RX_MODE_TERMINATOR_STRING) { - if(_rxReadStringPtr == NULL || _cbDone == NULL) { - return 0; - } - - // handle Buffer - if(BufferAvailable > 0) { - while(!_RXbuffer->empty()) { - char c = _RXbuffer->read(); - if(c == _rxTerminator || c == 0x00) { - _RXmode = ATB_RX_MODE_NONE; - _cbDone(true, _rxReadStringPtr); - return 0; - } else { - (*_rxReadStringPtr) += c; - } - } - } - - if(_RXbuffer->empty() && (len > 0) && buf) { - size_t newReadCount = 0; - while(newReadCount < len) { - char c = (char) *buf; - buf++; - newReadCount++; - if(c == _rxTerminator || c == 0x00) { - _RXmode = ATB_RX_MODE_NONE; - _cbDone(true, _rxReadStringPtr); - return newReadCount; - } else { - (*_rxReadStringPtr) += c; - } - } - return newReadCount; - } - } - - return 0; -} diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h deleted file mode 100644 index 374364e52..000000000 --- a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @file ESPAsyncTCPbuffer.h - * @date 22.01.2016 - * @author Markus Sattler - * - * Copyright (c) 2015 Markus Sattler. All rights reserved. - * This file is part of the Asynv TCP for ESP. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef ESPASYNCTCPBUFFER_H_ -#define ESPASYNCTCPBUFFER_H_ - -//#define DEBUG_ASYNC_TCP(...) while(((U0S >> USTXC) & 0x7F) != 0x00); os_printf( __VA_ARGS__ ); while(((U0S >> USTXC) & 0x7F) != 0x00) - -#ifndef DEBUG_ASYNC_TCP -#define DEBUG_ASYNC_TCP(...) -#endif - -#include -#include - -#include "ESPAsyncTCP.h" - - - -typedef enum { - ATB_RX_MODE_NONE, - ATB_RX_MODE_FREE, - ATB_RX_MODE_READ_BYTES, - ATB_RX_MODE_TERMINATOR, - ATB_RX_MODE_TERMINATOR_STRING -} atbRxMode_t; - -class AsyncTCPbuffer: public Print { - - public: - - typedef std::function AsyncTCPbufferDataCb; - typedef std::function AsyncTCPbufferDoneCb; - typedef std::function AsyncTCPbufferDisconnectCb; - - AsyncTCPbuffer(AsyncClient* c); - virtual ~AsyncTCPbuffer(); - - size_t write(String & data); - size_t write(uint8_t data); - size_t write(const char* data); - size_t write(const char *data, size_t len); - size_t write(const uint8_t *data, size_t len); - - void flush(); - - void noCallback(); - - void readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done); - - // TODO implement read terminator non string - //void readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done); - //void readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done); - - void readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done); - void readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done); - - // TODO implement - // void setTimeout(size_t timeout); - - void onData(AsyncTCPbufferDataCb cb); - void onDisconnect(AsyncTCPbufferDisconnectCb cb); - - IPAddress remoteIP(); - uint16_t remotePort(); - IPAddress localIP(); - uint16_t localPort(); - - bool connected(); - - void stop(); - void close(); - - protected: - AsyncClient* _client; - cbuf * _TXbufferRead; - cbuf * _TXbufferWrite; - cbuf * _RXbuffer; - atbRxMode_t _RXmode; - size_t _rxSize; - char _rxTerminator; - uint8_t * _rxReadBytesPtr; - String * _rxReadStringPtr; - - AsyncTCPbufferDataCb _cbRX; - AsyncTCPbufferDoneCb _cbDone; - AsyncTCPbufferDisconnectCb _cbDisconnect; - - void _attachCallbacks(); - void _sendBuffer(); - void _on_close(); - void _rxData(uint8_t *buf, size_t len); - size_t _handleRxBuffer(uint8_t *buf, size_t len); - -}; - -#endif /* ESPASYNCTCPBUFFER_H_ */ diff --git a/libraries/ESPAsyncTCP/src/SyncClient.cpp b/libraries/ESPAsyncTCP/src/SyncClient.cpp deleted file mode 100644 index df9489f74..000000000 --- a/libraries/ESPAsyncTCP/src/SyncClient.cpp +++ /dev/null @@ -1,286 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#include "SyncClient.h" -#include "Arduino.h" -#include "ESPAsyncTCP.h" -#include "cbuf.h" - - -SyncClient::SyncClient(size_t txBufLen) - : _client(NULL) - , _tx_buffer(NULL) - , _tx_buffer_size(txBufLen) - , _rx_buffer(NULL) -{} - -SyncClient::SyncClient(AsyncClient *client, size_t txBufLen) - : _client(client) - , _tx_buffer(new cbuf(txBufLen)) - , _tx_buffer_size(txBufLen) - , _rx_buffer(NULL) -{ - _attachCallbacks(); -} - -SyncClient::~SyncClient(){ - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - while(_rx_buffer != NULL){ - cbuf *b = _rx_buffer; - _rx_buffer = _rx_buffer->next; - delete b; - } -} - -#if ASYNC_TCP_SSL_ENABLED -int SyncClient::connect(IPAddress ip, uint16_t port, bool secure){ -#else -int SyncClient::connect(IPAddress ip, uint16_t port){ -#endif - if(_client != NULL && connected()) - return 0; - _client = new AsyncClient(); - _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this); - _attachCallbacks_Disconnect(); -#if ASYNC_TCP_SSL_ENABLED - if(_client->connect(ip, port, secure)){ -#else - if(_client->connect(ip, port)){ -#endif - while(_client != NULL && !_client->connected() && !_client->disconnecting()) - delay(1); - return connected(); - } - return 0; -} - -#if ASYNC_TCP_SSL_ENABLED -int SyncClient::connect(const char *host, uint16_t port, bool secure){ -#else -int SyncClient::connect(const char *host, uint16_t port){ -#endif - if(_client != NULL && connected()){ - return 0; - } - _client = new AsyncClient(); - _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this); - _attachCallbacks_Disconnect(); -#if ASYNC_TCP_SSL_ENABLED - if(_client->connect(host, port, secure)){ -#else - if(_client->connect(host, port)){ -#endif - while(_client != NULL && !_client->connected() && !_client->disconnecting()) - delay(1); - return connected(); - } - return 0; -} - -SyncClient & SyncClient::operator=(const SyncClient &other){ - if(_client != NULL){ - _client->abort(); - _client->free(); - _client = NULL; - } - _tx_buffer_size = other._tx_buffer_size; - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - while(_rx_buffer != NULL){ - cbuf *b = _rx_buffer; - _rx_buffer = b->next; - delete b; - } - _tx_buffer = new cbuf(other._tx_buffer_size); - _client = other._client; - _attachCallbacks(); - return *this; -} - -void SyncClient::setTimeout(uint32_t seconds){ - if(_client != NULL) - _client->setRxTimeout(seconds); -} - -uint8_t SyncClient::status(){ - if(_client == NULL) - return 0; - return _client->state(); -} - -uint8_t SyncClient::connected(){ - return (_client != NULL && _client->connected()); -} - -void SyncClient::stop(){ - if(_client != NULL) - _client->close(true); -} - -size_t SyncClient::_sendBuffer(){ - size_t available = _tx_buffer->available(); - if(!connected() || !_client->canSend() || available == 0) - return 0; - size_t sendable = _client->space(); - if(sendable < available) - available= sendable; - char *out = new char[available]; - _tx_buffer->read(out, available); - size_t sent = _client->write(out, available); - delete[] out; - return sent; -} - -void SyncClient::_onData(void *data, size_t len){ - _client->ackLater(); - cbuf *b = new cbuf(len+1); - if(b != NULL){ - b->write((const char *)data, len); - if(_rx_buffer == NULL) - _rx_buffer = b; - else { - cbuf *p = _rx_buffer; - while(p->next != NULL) - p = p->next; - p->next = b; - } - } -} - -void SyncClient::_onDisconnect(){ - if(_client != NULL){ - _client = NULL; - } - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } -} - -void SyncClient::_onConnect(AsyncClient *c){ - _client = c; - if(_tx_buffer != NULL){ - cbuf *b = _tx_buffer; - _tx_buffer = NULL; - delete b; - } - _tx_buffer = new cbuf(_tx_buffer_size); - _attachCallbacks_AfterConnected(); -} - -void SyncClient::_attachCallbacks(){ - _attachCallbacks_Disconnect(); - _attachCallbacks_AfterConnected(); -} - -void SyncClient::_attachCallbacks_AfterConnected(){ - _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((SyncClient*)(obj))->_sendBuffer(); }, this); - _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((SyncClient*)(obj))->_onData(data, len); }, this); - _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){ c->close(); }, this); -} - -void SyncClient::_attachCallbacks_Disconnect(){ - _client->onDisconnect([](void *obj, AsyncClient* c){ ((SyncClient*)(obj))->_onDisconnect(); delete c; }, this); -} - -size_t SyncClient::write(uint8_t data){ - return write(&data, 1); -} - -size_t SyncClient::write(const uint8_t *data, size_t len){ - if(_tx_buffer == NULL || !connected()){ - return 0; - } - size_t toWrite = 0; - size_t toSend = len; - while(_tx_buffer->room() < toSend){ - toWrite = _tx_buffer->room(); - _tx_buffer->write((const char*)data, toWrite); - while(!_client->canSend() && connected()) - delay(0); - _sendBuffer(); - toSend -= toWrite; - } - _tx_buffer->write((const char*)(data+(len - toSend)), toSend); - if(_client->canSend() && connected()) - _sendBuffer(); - return len; -} - -int SyncClient::available(){ - if(_rx_buffer == NULL) return 0; - size_t a = 0; - cbuf *b = _rx_buffer; - while(b != NULL){ - a += b->available(); - b = b->next; - } - return a; -} - -int SyncClient::peek(){ - if(_rx_buffer == NULL) return -1; - return _rx_buffer->peek(); -} - -int SyncClient::read(uint8_t *data, size_t len){ - if(_rx_buffer == NULL) return -1; - - size_t readSoFar = 0; - while(_rx_buffer != NULL && (len - readSoFar) >= _rx_buffer->available()){ - cbuf *b = _rx_buffer; - _rx_buffer = _rx_buffer->next; - size_t toRead = b->available(); - readSoFar += b->read((char*)(data+readSoFar), toRead); - if(connected()){ - _client->ack(b->size() - 1); - } - delete b; - } - if(_rx_buffer != NULL && readSoFar < len){ - readSoFar += _rx_buffer->read((char*)(data+readSoFar), (len - readSoFar)); - } - return readSoFar; -} - -int SyncClient::read(){ - uint8_t res = 0; - if(read(&res, 1) != 1) - return -1; - return res; -} - -void SyncClient::flush(){ - if(_tx_buffer == NULL || !connected()) - return; - if(_tx_buffer->available()){ - while(!_client->canSend() && connected()) - delay(0); - _sendBuffer(); - } -} diff --git a/libraries/ESPAsyncTCP/src/SyncClient.h b/libraries/ESPAsyncTCP/src/SyncClient.h deleted file mode 100644 index e46f4e48f..000000000 --- a/libraries/ESPAsyncTCP/src/SyncClient.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef SYNCCLIENT_H_ -#define SYNCCLIENT_H_ - -#include "Client.h" -#include -class cbuf; -class AsyncClient; - -class SyncClient: public Client { - private: - AsyncClient *_client; - cbuf *_tx_buffer; - size_t _tx_buffer_size; - cbuf *_rx_buffer; - - size_t _sendBuffer(); - void _onData(void *data, size_t len); - void _onConnect(AsyncClient *c); - void _onDisconnect(); - void _attachCallbacks(); - void _attachCallbacks_Disconnect(); - void _attachCallbacks_AfterConnected(); - - public: - SyncClient(size_t txBufLen = 1460); - SyncClient(AsyncClient *client, size_t txBufLen = 1460); - virtual ~SyncClient(); - - operator bool(){ return connected(); } - SyncClient & operator=(const SyncClient &other); - -#if ASYNC_TCP_SSL_ENABLED - int connect(IPAddress ip, uint16_t port, bool secure); - int connect(const char *host, uint16_t port, bool secure); - int connect(IPAddress ip, uint16_t port){ - return connect(ip, port, false); - } - int connect(const char *host, uint16_t port){ - return connect(host, port, false); - } -#else - int connect(IPAddress ip, uint16_t port); - int connect(const char *host, uint16_t port); -#endif - void setTimeout(uint32_t seconds); - - uint8_t status(); - uint8_t connected(); - void stop(); - - size_t write(uint8_t data); - size_t write(const uint8_t *data, size_t len); - - int available(); - int peek(); - int read(); - int read(uint8_t *data, size_t len); - void flush(); -}; - -#endif /* SYNCCLIENT_H_ */ diff --git a/libraries/ESPAsyncTCP/src/async_config.h b/libraries/ESPAsyncTCP/src/async_config.h deleted file mode 100644 index 61cfc25d0..000000000 --- a/libraries/ESPAsyncTCP/src/async_config.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LIBRARIES_ESPASYNCTCP_SRC_ASYNC_CONFIG_H_ -#define LIBRARIES_ESPASYNCTCP_SRC_ASYNC_CONFIG_H_ - -#ifndef ASYNC_TCP_SSL_ENABLED -#define ASYNC_TCP_SSL_ENABLED 0 -#endif - -#define ASYNC_TCP_DEBUG(...) //ets_printf(__VA_ARGS__) -#define TCP_SSL_DEBUG(...) //ets_printf(__VA_ARGS__) - -#endif /* LIBRARIES_ESPASYNCTCP_SRC_ASYNC_CONFIG_H_ */ diff --git a/libraries/ESPAsyncTCP/src/tcp_axtls.c b/libraries/ESPAsyncTCP/src/tcp_axtls.c deleted file mode 100644 index 2a7b9663f..000000000 --- a/libraries/ESPAsyncTCP/src/tcp_axtls.c +++ /dev/null @@ -1,586 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/* - * Compatibility for AxTLS with LWIP raw tcp mode (http://lwip.wikia.com/wiki/Raw/TCP) - * Original Code and Inspiration: Slavey Karadzhov - */ -#include -#if ASYNC_TCP_SSL_ENABLED - -#include "lwip/opt.h" -#include "lwip/tcp.h" -#include "lwip/inet.h" -#include -#include -#include -#include - -uint8_t * default_private_key = NULL; -uint16_t default_private_key_len = 0; - -uint8_t * default_certificate = NULL; -uint16_t default_certificate_len = 0; - -static uint8_t _tcp_ssl_has_client = 0; - -SSL_CTX * tcp_ssl_new_server_ctx(const char *cert, const char *private_key_file, const char *password){ - uint32_t options = SSL_CONNECT_IN_PARTS; - SSL_CTX *ssl_ctx; - - if(private_key_file){ - options |= SSL_NO_DEFAULT_KEY; - } - - if ((ssl_ctx = ssl_ctx_new(options, SSL_DEFAULT_SVR_SESS)) == NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_server_ctx: failed to allocate context\n"); - return NULL; - } - - if (private_key_file){ - int obj_type = SSL_OBJ_RSA_KEY; - if (strstr(private_key_file, ".p8")) - obj_type = SSL_OBJ_PKCS8; - else if (strstr(private_key_file, ".p12")) - obj_type = SSL_OBJ_PKCS12; - - if (ssl_obj_load(ssl_ctx, obj_type, private_key_file, password)){ - TCP_SSL_DEBUG("tcp_ssl_new_server_ctx: load private key '%s' failed\n", private_key_file); - return NULL; - } - } - - if (cert){ - if (ssl_obj_load(ssl_ctx, SSL_OBJ_X509_CERT, cert, NULL)){ - TCP_SSL_DEBUG("tcp_ssl_new_server_ctx: load certificate '%s' failed\n", cert); - return NULL; - } - } - return ssl_ctx; -} - -struct tcp_ssl_pcb { - struct tcp_pcb *tcp; - int fd; - SSL_CTX* ssl_ctx; - SSL *ssl; - uint8_t type; - int handshake; - void * arg; - tcp_ssl_data_cb_t on_data; - tcp_ssl_handshake_cb_t on_handshake; - tcp_ssl_error_cb_t on_error; - int last_wr; - struct pbuf *tcp_pbuf; - int pbuf_offset; - struct tcp_ssl_pcb * next; -}; - -typedef struct tcp_ssl_pcb tcp_ssl_t; - -static tcp_ssl_t * tcp_ssl_array = NULL; -static int tcp_ssl_next_fd = 0; - -uint8_t tcp_ssl_has_client(){ - return _tcp_ssl_has_client; -} - -tcp_ssl_t * tcp_ssl_new(struct tcp_pcb *tcp) { - - if(tcp_ssl_next_fd < 0){ - tcp_ssl_next_fd = 0;//overflow - } - - tcp_ssl_t * new_item = (tcp_ssl_t*)malloc(sizeof(tcp_ssl_t)); - if(!new_item){ - TCP_SSL_DEBUG("tcp_ssl_new: failed to allocate tcp_ssl\n"); - return NULL; - } - - new_item->tcp = tcp; - new_item->handshake = SSL_NOT_OK; - new_item->arg = NULL; - new_item->on_data = NULL; - new_item->on_handshake = NULL; - new_item->on_error = NULL; - new_item->tcp_pbuf = NULL; - new_item->pbuf_offset = 0; - new_item->next = NULL; - new_item->ssl_ctx = NULL; - new_item->ssl = NULL; - new_item->type = TCP_SSL_TYPE_CLIENT; - new_item->fd = tcp_ssl_next_fd++; - - if(tcp_ssl_array == NULL){ - tcp_ssl_array = new_item; - } else { - tcp_ssl_t * item = tcp_ssl_array; - while(item->next != NULL) - item = item->next; - item->next = new_item; - } - - TCP_SSL_DEBUG("tcp_ssl_new: %d\n", new_item->fd); - return new_item; -} - -tcp_ssl_t* tcp_ssl_get(struct tcp_pcb *tcp) { - if(tcp == NULL) { - return NULL; - } - tcp_ssl_t * item = tcp_ssl_array; - while(item && item->tcp != tcp){ - item = item->next; - } - return item; -} - -int tcp_ssl_new_client(struct tcp_pcb *tcp){ - SSL_CTX* ssl_ctx; - tcp_ssl_t * tcp_ssl; - - if(tcp == NULL) { - return -1; - } - - if(tcp_ssl_get(tcp) != NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_client: tcp_ssl already exists\n"); - return -1; - } - - ssl_ctx = ssl_ctx_new(SSL_CONNECT_IN_PARTS | SSL_SERVER_VERIFY_LATER, 1); - if(ssl_ctx == NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_client: failed to allocate ssl context\n"); - return -1; - } - - tcp_ssl = tcp_ssl_new(tcp); - if(tcp_ssl == NULL){ - ssl_ctx_free(ssl_ctx); - return -1; - } - - tcp_ssl->ssl_ctx = ssl_ctx; - - tcp_ssl->ssl = ssl_client_new(ssl_ctx, tcp_ssl->fd, NULL, 0, NULL); - if(tcp_ssl->ssl == NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_client: failed to allocate ssl\n"); - tcp_ssl_free(tcp); - return -1; - } - - return tcp_ssl->fd; -} - -int tcp_ssl_new_server(struct tcp_pcb *tcp, SSL_CTX* ssl_ctx){ - tcp_ssl_t * tcp_ssl; - - if(tcp == NULL) { - return -1; - } - - if(ssl_ctx == NULL){ - return -1; - } - - if(tcp_ssl_get(tcp) != NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_server: tcp_ssl already exists\n"); - return -1; - } - - tcp_ssl = tcp_ssl_new(tcp); - if(tcp_ssl == NULL){ - return -1; - } - - tcp_ssl->type = TCP_SSL_TYPE_SERVER; - tcp_ssl->ssl_ctx = ssl_ctx; - - _tcp_ssl_has_client = 1; - tcp_ssl->ssl = ssl_server_new(ssl_ctx, tcp_ssl->fd); - if(tcp_ssl->ssl == NULL){ - TCP_SSL_DEBUG("tcp_ssl_new_server: failed to allocate ssl\n"); - tcp_ssl_free(tcp); - return -1; - } - - return tcp_ssl->fd; -} - -int tcp_ssl_free(struct tcp_pcb *tcp) { - - if(tcp == NULL) { - return -1; - } - - tcp_ssl_t * item = tcp_ssl_array; - - if(item->tcp == tcp){ - tcp_ssl_array = tcp_ssl_array->next; - if(item->tcp_pbuf != NULL){ - pbuf_free(item->tcp_pbuf); - } - TCP_SSL_DEBUG("tcp_ssl_free: %d\n", item->fd); - if(item->ssl) - ssl_free(item->ssl); - if(item->type == TCP_SSL_TYPE_CLIENT && item->ssl_ctx) - ssl_ctx_free(item->ssl_ctx); - if(item->type == TCP_SSL_TYPE_SERVER) - _tcp_ssl_has_client = 0; - free(item); - return 0; - } - - while(item->next && item->next->tcp != tcp) - item = item->next; - - if(item->next == NULL){ - return ERR_TCP_SSL_INVALID_CLIENTFD_DATA;//item not found - } - - tcp_ssl_t * i = item->next; - item->next = i->next; - if(i->tcp_pbuf != NULL){ - pbuf_free(i->tcp_pbuf); - } - TCP_SSL_DEBUG("tcp_ssl_free: %d\n", i->fd); - if(i->ssl) - ssl_free(i->ssl); - if(i->type == TCP_SSL_TYPE_CLIENT && i->ssl_ctx) - ssl_ctx_free(i->ssl_ctx); - if(i->type == TCP_SSL_TYPE_SERVER) - _tcp_ssl_has_client = 0; - free(i); - return 0; -} - -#ifdef AXTLS_2_0_0_SNDBUF -int tcp_ssl_sndbuf(struct tcp_pcb *tcp){ - int expected; - int available; - int result = -1; - - if(tcp == NULL) { - return result; - } - tcp_ssl_t * tcp_ssl = tcp_ssl_get(tcp); - if(!tcp_ssl){ - TCP_SSL_DEBUG("tcp_ssl_sndbuf: tcp_ssl is NULL\n"); - return result; - } - available = tcp_sndbuf(tcp); - if(!available){ - TCP_SSL_DEBUG("tcp_ssl_sndbuf: tcp_sndbuf is zero\n"); - return 0; - } - result = available; - while((expected = ssl_calculate_write_length(tcp_ssl->ssl, result)) > available){ - result -= (expected - available) + 4; - } - - if(expected > 0){ - //TCP_SSL_DEBUG("tcp_ssl_sndbuf: tcp_sndbuf is %d from %d\n", result, available); - return result; - } - - return 0; -} -#endif - -int tcp_ssl_write(struct tcp_pcb *tcp, uint8_t *data, size_t len) { - if(tcp == NULL) { - return -1; - } - tcp_ssl_t * tcp_ssl = tcp_ssl_get(tcp); - if(!tcp_ssl){ - TCP_SSL_DEBUG("tcp_ssl_write: tcp_ssl is NULL\n"); - return 0; - } - tcp_ssl->last_wr = 0; - -#ifdef AXTLS_2_0_0_SNDBUF - int expected_len = ssl_calculate_write_length(tcp_ssl->ssl, len); - int available_len = tcp_sndbuf(tcp); - if(expected_len < 0 || expected_len > available_len){ - TCP_SSL_DEBUG("tcp_ssl_write: data will not fit! %u < %d(%u)\r\n", available_len, expected_len, len); - return -1; - } -#endif - - int rc = ssl_write(tcp_ssl->ssl, data, len); - - //TCP_SSL_DEBUG("tcp_ssl_write: %u -> %d (%d)\r\n", len, tcp_ssl->last_wr, rc); - - if (rc < 0){ - if(rc != SSL_CLOSE_NOTIFY) { - TCP_SSL_DEBUG("tcp_ssl_write error: %d\r\n", rc); - } - return rc; - } - - return tcp_ssl->last_wr; -} - -/** - * Reads data from the SSL over TCP stream. Returns decrypted data. - * @param tcp_pcb *tcp - pointer to the raw tcp object - * @param pbuf *p - pointer to the buffer with the TCP packet data - * - * @return int - * 0 - when everything is fine but there are no symbols to process yet - * < 0 - when there is an error - * > 0 - the length of the clear text characters that were read - */ -int tcp_ssl_read(struct tcp_pcb *tcp, struct pbuf *p) { - if(tcp == NULL) { - return -1; - } - tcp_ssl_t* fd_data = NULL; - - int read_bytes = 0; - int total_bytes = 0; - uint8_t *read_buf; - - fd_data = tcp_ssl_get(tcp); - if(fd_data == NULL) { - TCP_SSL_DEBUG("tcp_ssl_read: tcp_ssl is NULL\n"); - return ERR_TCP_SSL_INVALID_CLIENTFD_DATA; - } - - if(p == NULL) { - TCP_SSL_DEBUG("tcp_ssl_read:p == NULL\n"); - return ERR_TCP_SSL_INVALID_DATA; - } - - //TCP_SSL_DEBUG("READY TO READ SOME DATA\n"); - - fd_data->tcp_pbuf = p; - fd_data->pbuf_offset = 0; - - do { - read_bytes = ssl_read(fd_data->ssl, &read_buf); - //TCP_SSL_DEBUG("tcp_ssl_ssl_read: %d\n", read_bytes); - if(read_bytes < SSL_OK) { - if(read_bytes != SSL_CLOSE_NOTIFY) { - TCP_SSL_DEBUG("tcp_ssl_read: read error: %d\n", read_bytes); - } - total_bytes = read_bytes; - break; - } else if(read_bytes > 0){ - if(fd_data->on_data){ - fd_data->on_data(fd_data->arg, tcp, read_buf, read_bytes); - } - total_bytes+= read_bytes; - } else { - if(fd_data->handshake != SSL_OK) { - fd_data->handshake = ssl_handshake_status(fd_data->ssl); - if(fd_data->handshake == SSL_OK){ - //TCP_SSL_DEBUG("tcp_ssl_read: handshake OK\n"); - if(fd_data->on_handshake) - fd_data->on_handshake(fd_data->arg, fd_data->tcp, fd_data->ssl); - } else if(fd_data->handshake != SSL_NOT_OK){ - TCP_SSL_DEBUG("tcp_ssl_read: handshake error: %d\n", fd_data->handshake); - if(fd_data->on_error) - fd_data->on_error(fd_data->arg, fd_data->tcp, fd_data->handshake); - return fd_data->handshake; - } - } - } - } while (p->tot_len - fd_data->pbuf_offset > 0); - - tcp_recved(tcp, p->tot_len); - pbuf_free(p); - - return total_bytes; -} - -SSL * tcp_ssl_get_ssl(struct tcp_pcb *tcp){ - tcp_ssl_t * tcp_ssl = tcp_ssl_get(tcp); - if(tcp_ssl){ - return tcp_ssl->ssl; - } - return NULL; -} - -bool tcp_ssl_has(struct tcp_pcb *tcp){ - return tcp_ssl_get(tcp) != NULL; -} - -int tcp_ssl_is_server(struct tcp_pcb *tcp){ - tcp_ssl_t * tcp_ssl = tcp_ssl_get(tcp); - if(tcp_ssl){ - return tcp_ssl->type; - } - return -1; -} - -void tcp_ssl_arg(struct tcp_pcb *tcp, void * arg){ - tcp_ssl_t * item = tcp_ssl_get(tcp); - if(item) { - item->arg = arg; - } -} - -void tcp_ssl_data(struct tcp_pcb *tcp, tcp_ssl_data_cb_t arg){ - tcp_ssl_t * item = tcp_ssl_get(tcp); - if(item) { - item->on_data = arg; - } -} - -void tcp_ssl_handshake(struct tcp_pcb *tcp, tcp_ssl_handshake_cb_t arg){ - tcp_ssl_t * item = tcp_ssl_get(tcp); - if(item) { - item->on_handshake = arg; - } -} - -void tcp_ssl_err(struct tcp_pcb *tcp, tcp_ssl_error_cb_t arg){ - tcp_ssl_t * item = tcp_ssl_get(tcp); - if(item) { - item->on_error = arg; - } -} - -static tcp_ssl_file_cb_t _tcp_ssl_file_cb = NULL; -static void * _tcp_ssl_file_arg = NULL; - -void tcp_ssl_file(tcp_ssl_file_cb_t cb, void * arg){ - _tcp_ssl_file_cb = cb; - _tcp_ssl_file_arg = arg; -} - -int ax_get_file(const char *filename, uint8_t **buf) { - //TCP_SSL_DEBUG("ax_get_file: %s\n", filename); - if(_tcp_ssl_file_cb){ - return _tcp_ssl_file_cb(_tcp_ssl_file_arg, filename, buf); - } - *buf = 0; - return 0; -} - -tcp_ssl_t* tcp_ssl_get_by_fd(int fd) { - tcp_ssl_t * item = tcp_ssl_array; - while(item && item->fd != fd){ - item = item->next; - } - return item; -} -/* - * The LWIP tcp raw version of the SOCKET_WRITE(A, B, C) - */ -int ax_port_write(int fd, uint8_t *data, uint16_t len) { - tcp_ssl_t *fd_data = NULL; - int tcp_len = 0; - err_t err = ERR_OK; - - //TCP_SSL_DEBUG("ax_port_write: %d, %d\n", fd, len); - - fd_data = tcp_ssl_get_by_fd(fd); - if(fd_data == NULL) { - //TCP_SSL_DEBUG("ax_port_write: tcp_ssl[%d] is NULL\n", fd); - return ERR_MEM; - } - - if (data == NULL || len == 0) { - return 0; - } - - if (tcp_sndbuf(fd_data->tcp) < len) { - tcp_len = tcp_sndbuf(fd_data->tcp); - if(tcp_len == 0) { - TCP_SSL_DEBUG("ax_port_write: tcp_sndbuf is zero: %d\n", len); - return ERR_MEM; - } - } else { - tcp_len = len; - } - - if (tcp_len > 2 * fd_data->tcp->mss) { - tcp_len = 2 * fd_data->tcp->mss; - } - - err = tcp_write(fd_data->tcp, data, tcp_len, TCP_WRITE_FLAG_COPY); - if(err < ERR_OK) { - if (err == ERR_MEM) { - TCP_SSL_DEBUG("ax_port_write: No memory %d (%d)\n", tcp_len, len); - return err; - } - TCP_SSL_DEBUG("ax_port_write: tcp_write error: %d\n", err); - return err; - } else if (err == ERR_OK) { - //TCP_SSL_DEBUG("ax_port_write: tcp_output: %d / %d\n", tcp_len, len); - err = tcp_output(fd_data->tcp); - if(err != ERR_OK) { - TCP_SSL_DEBUG("ax_port_write: tcp_output err: %d\n", err); - return err; - } - } - - fd_data->last_wr += tcp_len; - - return tcp_len; -} - -/* - * The LWIP tcp raw version of the SOCKET_READ(A, B, C) - */ -int ax_port_read(int fd, uint8_t *data, int len) { - tcp_ssl_t *fd_data = NULL; - uint8_t *read_buf = NULL; - uint8_t *pread_buf = NULL; - u16_t recv_len = 0; - - //TCP_SSL_DEBUG("ax_port_read: %d, %d\n", fd, len); - - fd_data = tcp_ssl_get_by_fd(fd); - if (fd_data == NULL) { - TCP_SSL_DEBUG("ax_port_read: tcp_ssl[%d] is NULL\n", fd); - return ERR_TCP_SSL_INVALID_CLIENTFD_DATA; - } - - if(fd_data->tcp_pbuf == NULL || fd_data->tcp_pbuf->tot_len == 0) { - return 0; - } - - read_buf =(uint8_t*)calloc(fd_data->tcp_pbuf->len + 1, sizeof(uint8_t)); - pread_buf = read_buf; - if (pread_buf != NULL){ - recv_len = pbuf_copy_partial(fd_data->tcp_pbuf, read_buf, len, fd_data->pbuf_offset); - fd_data->pbuf_offset += recv_len; - } - - if (recv_len != 0) { - memcpy(data, read_buf, recv_len); - } - - if(len < recv_len) { - TCP_SSL_DEBUG("ax_port_read: got %d bytes more than expected\n", recv_len - len); - } - - free(pread_buf); - pread_buf = NULL; - - return recv_len; -} - -void ax_wdt_feed() {} - -#endif diff --git a/libraries/ESPAsyncTCP/src/tcp_axtls.h b/libraries/ESPAsyncTCP/src/tcp_axtls.h deleted file mode 100644 index 57a0e52c0..000000000 --- a/libraries/ESPAsyncTCP/src/tcp_axtls.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - Asynchronous TCP library for Espressif MCUs - - Copyright (c) 2016 Hristo Gochkov. All rights reserved. - This file is part of the esp8266 core for Arduino environment. - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -/* - * Compatibility for AxTLS with LWIP raw tcp mode (http://lwip.wikia.com/wiki/Raw/TCP) - * Original Code and Inspiration: Slavey Karadzhov - */ - -#ifndef LWIPR_COMPAT_H -#define LWIPR_COMPAT_H - -#include - -#if ASYNC_TCP_SSL_ENABLED - -#include "lwipopts.h" -/* - * All those functions will run only if LWIP tcp raw mode is used - */ -#if LWIP_RAW==1 - -#ifdef __cplusplus -extern "C" { -#endif - -#include "include/ssl.h" - -#define ERR_TCP_SSL_INVALID_SSL -101 -#define ERR_TCP_SSL_INVALID_TCP -102 -#define ERR_TCP_SSL_INVALID_CLIENTFD -103 -#define ERR_TCP_SSL_INVALID_CLIENTFD_DATA -104 -#define ERR_TCP_SSL_INVALID_DATA -105 - -#define TCP_SSL_TYPE_CLIENT 0 -#define TCP_SSL_TYPE_SERVER 1 - -#define tcp_ssl_ssl_write(A, B, C) tcp_ssl_write(A, B, C) -#define tcp_ssl_ssl_read(A, B) tcp_ssl_read(A, B) - -typedef void (* tcp_ssl_data_cb_t)(void *arg, struct tcp_pcb *tcp, uint8_t * data, size_t len); -typedef void (* tcp_ssl_handshake_cb_t)(void *arg, struct tcp_pcb *tcp, SSL *ssl); -typedef void (* tcp_ssl_error_cb_t)(void *arg, struct tcp_pcb *tcp, int8_t error); -typedef int (* tcp_ssl_file_cb_t)(void *arg, const char *filename, uint8_t **buf); - -uint8_t tcp_ssl_has_client(); - -int tcp_ssl_new_client(struct tcp_pcb *tcp); - -SSL_CTX * tcp_ssl_new_server_ctx(const char *cert, const char *private_key_file, const char *password); -int tcp_ssl_new_server(struct tcp_pcb *tcp, SSL_CTX* ssl_ctx); -int tcp_ssl_is_server(struct tcp_pcb *tcp); - -int tcp_ssl_free(struct tcp_pcb *tcp); -int tcp_ssl_read(struct tcp_pcb *tcp, struct pbuf *p); - -#ifdef AXTLS_2_0_0_SNDBUF -int tcp_ssl_sndbuf(struct tcp_pcb *tcp); -#endif - -int tcp_ssl_write(struct tcp_pcb *tcp, uint8_t *data, size_t len); - -void tcp_ssl_file(tcp_ssl_file_cb_t cb, void * arg); - -void tcp_ssl_arg(struct tcp_pcb *tcp, void * arg); -void tcp_ssl_data(struct tcp_pcb *tcp, tcp_ssl_data_cb_t arg); -void tcp_ssl_handshake(struct tcp_pcb *tcp, tcp_ssl_handshake_cb_t arg); -void tcp_ssl_err(struct tcp_pcb *tcp, tcp_ssl_error_cb_t arg); - -SSL * tcp_ssl_get_ssl(struct tcp_pcb *tcp); -bool tcp_ssl_has(struct tcp_pcb *tcp); - -#ifdef __cplusplus -} -#endif - -#endif /* LWIP_RAW==1 */ - -#endif /* ASYNC_TCP_SSL_ENABLED */ - -#endif /* LWIPR_COMPAT_H */ diff --git a/libraries/ESPAsyncTCP/ssl/gen_server_cert.sh b/libraries/ESPAsyncTCP/ssl/gen_server_cert.sh deleted file mode 100644 index fd749ed4a..000000000 --- a/libraries/ESPAsyncTCP/ssl/gen_server_cert.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -cat > ca_cert.conf << EOF -[ req ] -distinguished_name = req_distinguished_name -prompt = no - -[ req_distinguished_name ] - O = Espressif Systems -EOF - -openssl genrsa -out axTLS.ca_key.pem 2048 -openssl req -new -config ./ca_cert.conf -key axTLS.ca_key.pem -out axTLS.ca_x509.req -openssl x509 -req -sha1 -days 5000 -signkey axTLS.ca_key.pem -CAkey axTLS.ca_key.pem -in axTLS.ca_x509.req -out axTLS.ca_x509.pem - -cat > certs.conf << EOF -[ req ] -distinguished_name = req_distinguished_name -prompt = no - -[ req_distinguished_name ] - O = axTLS on ESP8266 - CN = esp8266.local -EOF - -openssl genrsa -out axTLS.key_1024.pem 1024 -openssl req -new -config ./certs.conf -key axTLS.key_1024.pem -out axTLS.x509_1024.req -openssl x509 -req -sha1 -CAcreateserial -days 5000 -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem -in axTLS.x509_1024.req -out axTLS.x509_1024.pem - -openssl rsa -outform DER -in axTLS.key_1024.pem -out axTLS.key_1024 -openssl x509 -outform DER -in axTLS.x509_1024.pem -out axTLS.x509_1024.cer - -cat axTLS.key_1024 > server.key -cat axTLS.x509_1024.cer > server.cer - -rm axTLS.* ca_cert.conf certs.conf diff --git a/libraries/ESPAsyncTCP/ssl/server.cer b/libraries/ESPAsyncTCP/ssl/server.cer deleted file mode 100644 index b5e5f248c4a5e86231876e4a9d0188624355266d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 587 zcmXqLVsbZVV$^5iWSGpfaN~?!WzGh?Y@Awc9&O)w85vnw84P3$r3@t4m_u2(cm!RG z3yM;Ui!;*{f-8$lQge$9E++@_GkM4DONU`s!Yh*a3uA%Yr>0vuTxoGhl`X= zOm)@|y?rGhX-}oBV&|g6>yCF;GafqH|Lx56CmB)ZicHLm42;Om1BMZE6C)!7Q{4 zVCeqqWd!S26n2qiLoZd^)KFr)c^x5%qQkDoiF*OU#gF#P*W_qgHz5K80RRC4fq?*x z404IsAG!|uZhSjSEN@k>Opd#k7h|ttCdOIJSPO%wGa?lf^COVvG_XDD&e? zyvGxataxxV>tpH@0=8+~?+Q)L-YEeBK>*|f|LN$~bw50ah7!i*rhGxNWaSKQgYqgm z{hCLUY2^{1Hv@E?C}m=~;yrD$M#BP=%o;o()sx1v9dHi3c<};30Lr%&dusO-%he4r zCXmZGM{6`I6pLC{CISQo#O-Kr1!n69lpq7y(si&Q zF#kQUO^(d{A^ck;ARC_@8*h>ZYI(wDiee6p=K$&v!C*c49 diff --git a/libraries/ESPAsyncTCP/travis/common.sh b/libraries/ESPAsyncTCP/travis/common.sh deleted file mode 100644 index 57bede343..000000000 --- a/libraries/ESPAsyncTCP/travis/common.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -function build_sketches() -{ - local arduino=$1 - local srcpath=$2 - local platform=$3 - local sketches=$(find $srcpath -name *.ino) - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - if [[ -f "$sketchdir/.$platform.skip" ]]; then - echo -e "\n\n ------------ Skipping $sketch ------------ \n\n"; - continue - fi - echo -e "\n\n ------------ Building $sketch ------------ \n\n"; - $arduino --verify $sketch; - local result=$? - if [ $result -ne 0 ]; then - echo "Build failed ($1)" - return $result - fi - done -} diff --git a/libraries/ESPAsyncWebServer/.travis.yml b/libraries/ESPAsyncWebServer/.travis.yml deleted file mode 100644 index ce0228f4b..000000000 --- a/libraries/ESPAsyncWebServer/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -sudo: false -language: bash -os: - - linux - -script: - - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16 - - sleep 3 - - export DISPLAY=:1.0 - - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz - - tar xf arduino-1.6.5-linux64.tar.xz - - mv arduino-1.6.5 $HOME/arduino_ide - - export PATH="$HOME/arduino_ide:$PATH" - - which arduino - - mkdir -p $HOME/Arduino/libraries - - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESPAsyncWebServer - - git clone https://github.com/bblanchon/ArduinoJson $HOME/Arduino/libraries/ArduinoJson - - git clone https://github.com/me-no-dev/ESPAsyncTCP $HOME/Arduino/libraries/ESPAsyncTCP - - cd $HOME/arduino_ide/hardware - - mkdir esp8266com - - cd esp8266com - - git clone https://github.com/esp8266/Arduino.git esp8266 - - cd esp8266/tools - - python get.py - - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266com:esp8266:generic --save-prefs - - arduino --get-pref sketchbook.path - - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncWebServer esp8266 - -notifications: - email: - on_success: change - on_failure: change - webhooks: - urls: - - https://webhooks.gitter.im/e/60e65d0c78ea0a920347 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false diff --git a/libraries/ESPAsyncWebServer/README.md b/libraries/ESPAsyncWebServer/README.md deleted file mode 100644 index 7ec5424a4..000000000 --- a/libraries/ESPAsyncWebServer/README.md +++ /dev/null @@ -1,1412 +0,0 @@ -# ESPAsyncWebServer [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncWebServer.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncWebServer) - -For help and support [![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -Async HTTP and WebSocket Server for ESP8266 Arduino - -For ESP8266 it requires [ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) -To use this library you might need to have the latest git versions of [ESP8266](https://github.com/esp8266/Arduino) Arduino Core - -For ESP32 it requires [AsyncTCP](https://github.com/me-no-dev/AsyncTCP) to work -To use this library you might need to have the latest git versions of [ESP32](https://github.com/espressif/arduino-esp32) Arduino Core - -## Table of contents -- [ESPAsyncWebServer ](#espasyncwebserver-) - - [Installation](#installation) - - [Using PlatformIO](#using-platformio) - - [Why should you care](#why-should-you-care) - - [Important things to remember](#important-things-to-remember) - - [Principles of operation](#principles-of-operation) - - [The Async Web server](#the-async-web-server) - - [Request Life Cycle](#request-life-cycle) - - [Rewrites and how do they work](#rewrites-and-how-do-they-work) - - [Handlers and how do they work](#handlers-and-how-do-they-work) - - [Responses and how do they work](#responses-and-how-do-they-work) - - [Template processing](#template-processing) - - [Libraries and projects that use AsyncWebServer](#libraries-and-projects-that-use-asyncwebserver) - - [Request Variables](#request-variables) - - [Common Variables](#common-variables) - - [Headers](#headers) - - [GET, POST and FILE parameters](#get-post-and-file-parameters) - - [FILE Upload handling](#file-upload-handling) - - [Body data handling](#body-data-handling) - - [JSON body handling with ArduinoJson](#json-body-handling-with-arduinojson) - - [Responses](#responses) - - [Redirect to another URL](#redirect-to-another-url) - - [Basic response with HTTP Code](#basic-response-with-http-code) - - [Basic response with HTTP Code and extra headers](#basic-response-with-http-code-and-extra-headers) - - [Basic response with string content](#basic-response-with-string-content) - - [Basic response with string content and extra headers](#basic-response-with-string-content-and-extra-headers) - - [Send large webpage from PROGMEM](#send-large-webpage-from-progmem) - - [Send large webpage from PROGMEM and extra headers](#send-large-webpage-from-progmem-and-extra-headers) - - [Send large webpage from PROGMEM containing templates](#send-large-webpage-from-progmem-containing-templates) - - [Send large webpage from PROGMEM containing templates and extra headers](#send-large-webpage-from-progmem-containing-templates-and-extra-headers) - - [Send binary content from PROGMEM](#send-binary-content-from-progmem) - - [Respond with content coming from a Stream](#respond-with-content-coming-from-a-stream) - - [Respond with content coming from a Stream and extra headers](#respond-with-content-coming-from-a-stream-and-extra-headers) - - [Respond with content coming from a Stream containing templates](#respond-with-content-coming-from-a-stream-containing-templates) - - [Respond with content coming from a Stream containing templates and extra headers](#respond-with-content-coming-from-a-stream-containing-templates-and-extra-headers) - - [Respond with content coming from a File](#respond-with-content-coming-from-a-file) - - [Respond with content coming from a File and extra headers](#respond-with-content-coming-from-a-file-and-extra-headers) - - [Respond with content coming from a File containing templates](#respond-with-content-coming-from-a-file-containing-templates) - - [Respond with content using a callback](#respond-with-content-using-a-callback) - - [Respond with content using a callback and extra headers](#respond-with-content-using-a-callback-and-extra-headers) - - [Respond with content using a callback containing templates](#respond-with-content-using-a-callback-containing-templates) - - [Respond with content using a callback containing templates and extra headers](#respond-with-content-using-a-callback-containing-templates-and-extra-headers) - - [Chunked Response](#chunked-response) - - [Print to response](#print-to-response) - - [ArduinoJson Basic Response](#arduinojson-basic-response) - - [ArduinoJson Advanced Response](#arduinojson-advanced-response) - - [Serving static files](#serving-static-files) - - [Serving specific file by name](#serving-specific-file-by-name) - - [Serving files in directory](#serving-files-in-directory) - - [Specifying Cache-Control header](#specifying-cache-control-header) - - [Specifying Date-Modified header](#specifying-date-modified-header) - - [Specifying Template Processor callback](#specifying-template-processor-callback) - - [Using filters](#using-filters) - - [Serve different site files in AP mode](#serve-different-site-files-in-ap-mode) - - [Rewrite to different index on AP](#rewrite-to-different-index-on-ap) - - [Serving different hosts](#serving-different-hosts) - - [Bad Responses](#bad-responses) - - [Respond with content using a callback without content length to HTTP/1.0 clients](#respond-with-content-using-a-callback-without-content-length-to-http10-clients) - - [Async WebSocket Plugin](#async-websocket-plugin) - - [Async WebSocket Event](#async-websocket-event) - - [Methods for sending data to a socket client](#methods-for-sending-data-to-a-socket-client) - - [Async Event Source Plugin](#async-event-source-plugin) - - [Setup Event Source on the server](#setup-event-source-on-the-server) - - [Setup Event Source in the browser](#setup-event-source-in-the-browser) - - [Scanning for available WiFi Networks](#scanning-for-available-wifi-networks) - - [Remove handlers and rewrites](#remove-handlers-and-rewrites) - - [Setting up the server](#setting-up-the-server) - - [Setup global and class functions as request handlers](#setup-global-and-class-functions-as-request-handlers) - - [Methods for controlling websocket connections](#methods-for-controlling-websocket-connections) - - [Adding default headers to all responses](#adding-default-headers) - -## Installation - -### Using PlatformIO - -[PlatformIO](http://platformio.org) is an open source ecosystem for IoT development with cross platform build system, library manager and full support for Espressif ESP8266/ESP32 development. It works on the popular host OS: Mac OS X, Windows, Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard). - -1. Install [PlatformIO IDE](http://platformio.org/platformio-ide) -2. Create new project using "PlatformIO Home > New Project" -3. Update dev/platform to staging version: - - [Instruction for Espressif 8266](http://docs.platformio.org/en/latest/platforms/espressif8266.html#using-arduino-framework-with-staging-version) - - [Instruction for Espressif 32](http://docs.platformio.org/en/latest/platforms/espressif32.html#using-arduino-framework-with-staging-version) - 4. Add "ESP Async WebServer" to project using [Project Configuration File `platformio.ini`](http://docs.platformio.org/page/projectconf.html) and [lib_deps](http://docs.platformio.org/page/projectconf/section_env_library.html#lib-deps) option: -```ini -[env:myboard] -platform = espressif... -board = ... -framework = arduino - -# using the latest stable version -lib_deps = ESP Async WebServer - -# or using GIT Url (the latest development version) -lib_deps = https://github.com/me-no-dev/ESPAsyncWebServer.git -``` - 5. Happy coding with PlatformIO! - -## Why should you care -- Using asynchronous network means that you can handle more than one connection at the same time -- You are called once the request is ready and parsed -- When you send the response, you are immediately ready to handle other connections - while the server is taking care of sending the response in the background -- Speed is OMG -- Easy to use API, HTTP Basic and Digest MD5 Authentication (default), ChunkedResponse -- Easily extendible to handle any type of content -- Supports Continue 100 -- Async WebSocket plugin offering different locations without extra servers or ports -- Async EventSource (Server-Sent Events) plugin to send events to the browser -- URL Rewrite plugin for conditional and permanent url rewrites -- ServeStatic plugin that supports cache, Last-Modified, default index and more -- Simple template processing engine to handle templates - -## Important things to remember -- This is fully asynchronous server and as such does not run on the loop thread. -- You can not use yield or delay or any function that uses them inside the callbacks -- The server is smart enough to know when to close the connection and free resources -- You can not send more than one response to a single request - -## Principles of operation - -### The Async Web server -- Listens for connections -- Wraps the new clients into ```Request``` -- Keeps track of clients and cleans memory -- Manages ```Rewrites``` and apply them on the request url -- Manages ```Handlers``` and attaches them to Requests - -### Request Life Cycle -- TCP connection is received by the server -- The connection is wrapped inside ```Request``` object -- When the request head is received (type, url, get params, http version and host), - the server goes through all ```Rewrites``` (in the order they were added) to rewrite the url and inject query parameters, - next, it goes through all attached ```Handlers```(in the order they were added) trying to find one - that ```canHandle``` the given request. If none are found, the default(catch-all) handler is attached. -- The rest of the request is received, calling the ```handleUpload``` or ```handleBody``` methods of the ```Handler``` if they are needed (POST+File/Body) -- When the whole request is parsed, the result is given to the ```handleRequest``` method of the ```Handler``` and is ready to be responded to -- In the ```handleRequest``` method, to the ```Request``` is attached a ```Response``` object (see below) that will serve the response data back to the client -- When the ```Response``` is sent, the client is closed and freed from the memory - -### Rewrites and how do they work -- The ```Rewrites``` are used to rewrite the request url and/or inject get parameters for a specific request url path. -- All ```Rewrites``` are evaluated on the request in the order they have been added to the server. -- The ```Rewrite``` will change the request url only if the request url (excluding get parameters) is fully match - the rewrite url, and when the optional ```Filter``` callback return true. -- Setting a ```Filter``` to the ```Rewrite``` enables to control when to apply the rewrite, decision can be based on - request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP. -- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface, - ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface. -- The ```Rewrite``` can specify a target url with optional get parameters, e.g. ```/to-url?with=params``` - -### Handlers and how do they work -- The ```Handlers``` are used for executing specific actions to particular requests -- One ```Handler``` instance can be attached to any request and lives together with the server -- Setting a ```Filter``` to the ```Handler``` enables to control when to apply the handler, decision can be based on - request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP. -- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface, - ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface. -- The ```canHandle``` method is used for handler specific control on whether the requests can be handled - and for declaring any interesting headers that the ```Request``` should parse. Decision can be based on request - method, request url, http version, request host/port/target host and get parameters -- Once a ```Handler``` is attached to given ```Request``` (```canHandle``` returned true) - that ```Handler``` takes care to receive any file/data upload and attach a ```Response``` - once the ```Request``` has been fully parsed -- ```Handlers``` are evaluated in the order they are attached to the server. The ```canHandle``` is called only - if the ```Filter``` that was set to the ```Handler``` return true. -- The first ```Handler``` that can handle the request is selected, not further ```Filter``` and ```canHandle``` are called. - -### Responses and how do they work -- The ```Response``` objects are used to send the response data back to the client -- The ```Response``` object lives with the ```Request``` and is freed on end or disconnect -- Different techniques are used depending on the response type to send the data in packets - returning back almost immediately and sending the next packet when this one is received. - Any time in between is spent to run the user loop and handle other network packets -- Responding asynchronously is probably the most difficult thing for most to understand -- Many different options exist for the user to make responding a background task - -### Template processing -- ESPAsyncWebserver contains simple template processing engine. -- Template processing can be added to most response types. -- Currently it supports only replacing template placeholders with actual values. No conditional processing, cycles, etc. -- Placeholders are delimited with ```%``` symbols. Like this: ```%TEMPLATE_PLACEHOLDER%```. -- It works by extracting placeholder name from response text and passing it to user provided function which should return actual value to be used instead of placeholder. -- Since it's user provided function, it is possible for library users to implement conditional processing and cycles themselves. -- Since it's impossible to know the actual response size after template processing step in advance (and, therefore, to include it in response headers), the response becomes [chunked](#chunked-response). - -## Libraries and projects that use AsyncWebServer -- [WebSocketToSerial](https://github.com/hallard/WebSocketToSerial) - Debug serial devices through the web browser -- [Sattrack](https://github.com/Hopperpop/Sattrack) - Track the ISS with ESP8266 -- [ESP Radio](https://github.com/Edzelf/Esp-radio) - Icecast radio based on ESP8266 and VS1053 -- [VZero](https://github.com/andig/vzero) - the Wireless zero-config controller for volkszaehler.org -- [ESPurna](https://bitbucket.org/xoseperez/espurna) - ESPurna ("spark" in Catalan) is a custom C firmware for ESP8266 based smart switches. It was originally developed with the ITead Sonoff in mind. -- [fauxmoESP](https://bitbucket.org/xoseperez/fauxmoesp) - Belkin WeMo emulator library for ESP8266. -- [ESP-RFID](https://github.com/omersiar/esp-rfid) - MFRC522 RFID Access Control Management project for ESP8266. - -## Request Variables - -### Common Variables -```cpp -request->version(); // uint8_t: 0 = HTTP/1.0, 1 = HTTP/1.1 -request->method(); // enum: HTTP_GET, HTTP_POST, HTTP_DELETE, HTTP_PUT, HTTP_PATCH, HTTP_HEAD, HTTP_OPTIONS -request->url(); // String: URL of the request (not including host, port or GET parameters) -request->host(); // String: The requested host (can be used for virtual hosting) -request->contentType(); // String: ContentType of the request (not avaiable in Handler::canHandle) -request->contentLength(); // size_t: ContentLength of the request (not avaiable in Handler::canHandle) -request->multipart(); // bool: True if the request has content type "multipart" -``` - -### Headers -```cpp -//List all collected headers -int headers = request->headers(); -int i; -for(i=0;igetHeader(i); - Serial.printf("HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str()); -} - -//get specific header by name -if(request->hasHeader("MyHeader")){ - AsyncWebHeader* h = request->getHeader("MyHeader"); - Serial.printf("MyHeader: %s\n", h->value().c_str()); -} - -//List all collected headers (Compatibility) -int headers = request->headers(); -int i; -for(i=0;iheaderName(i).c_str(), request->header(i).c_str()); -} - -//get specific header by name (Compatibility) -if(request->hasHeader("MyHeader")){ - Serial.printf("MyHeader: %s\n", request->header("MyHeader").c_str()); -} -``` - -### GET, POST and FILE parameters -```cpp -//List all parameters -int params = request->params(); -for(int i=0;igetParam(i); - if(p->isFile()){ //p->isPost() is also true - Serial.printf("FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size()); - } else if(p->isPost()){ - Serial.printf("POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } else { - Serial.printf("GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } -} - -//Check if GET parameter exists -if(request->hasParam("download")) - AsyncWebParameter* p = request->getParam("download"); - -//Check if POST (but not File) parameter exists -if(request->hasParam("download", true)) - AsyncWebParameter* p = request->getParam("download", true); - -//Check if FILE was uploaded -if(request->hasParam("download", true, true)) - AsyncWebParameter* p = request->getParam("download", true, true); - -//List all parameters (Compatibility) -int args = request->args(); -for(int i=0;iargName(i).c_str(), request->arg(i).c_str()); -} - -//Check if parameter exists (Compatibility) -if(request->hasArg("download")) - String arg = request->arg("download"); -``` - -### FILE Upload handling -```cpp -void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - if(!index){ - Serial.printf("UploadStart: %s\n", filename.c_str()); - } - for(size_t i=0; i(); - // ... -}); -server.addHandler(handler); -``` - -## Responses -### Redirect to another URL -```cpp -//to local url -request->redirect("/login"); - -//to external url -request->redirect("http://esp8266.com"); -``` - -### Basic response with HTTP Code -```cpp -request->send(404); //Sends 404 File Not Found -``` - -### Basic response with HTTP Code and extra headers -```cpp -AsyncWebServerResponse *response = request->beginResponse(404); //Sends 404 File Not Found -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Basic response with string content -```cpp -request->send(200, "text/plain", "Hello World!"); -``` - -### Basic response with string content and extra headers -```cpp -AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", "Hello World!"); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send large webpage from PROGMEM -```cpp -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -request->send_P(200, "text/html", index_html); -``` - -### Send large webpage from PROGMEM and extra headers -```cpp -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", index_html); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send large webpage from PROGMEM containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -request->send_P(200, "text/html", index_html, processor); -``` - -### Send large webpage from PROGMEM containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", index_html, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send binary content from PROGMEM -```cpp - -//File: favicon.ico.gz, Size: 726 -#define favicon_ico_gz_len 726 -const uint8_t favicon_ico_gz[] PROGMEM = { - 0x1F, 0x8B, 0x08, 0x08, 0x0B, 0x87, 0x90, 0x57, 0x00, 0x03, 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F, - 0x6E, 0x2E, 0x69, 0x63, 0x6F, 0x00, 0xCD, 0x53, 0x5F, 0x48, 0x9A, 0x51, 0x14, 0xBF, 0x62, 0x6D, - 0x86, 0x96, 0xA9, 0x64, 0xD3, 0xFE, 0xA8, 0x99, 0x65, 0x1A, 0xB4, 0x8A, 0xA8, 0x51, 0x54, 0x23, - 0xA8, 0x11, 0x49, 0x51, 0x8A, 0x34, 0x62, 0x93, 0x85, 0x31, 0x58, 0x44, 0x12, 0x45, 0x2D, 0x58, - 0xF5, 0x52, 0x41, 0x10, 0x23, 0x82, 0xA0, 0x20, 0x98, 0x2F, 0xC1, 0x26, 0xED, 0xA1, 0x20, 0x89, - 0x04, 0xD7, 0x83, 0x58, 0x20, 0x28, 0x04, 0xAB, 0xD1, 0x9B, 0x8C, 0xE5, 0xC3, 0x60, 0x32, 0x64, - 0x0E, 0x56, 0xBF, 0x9D, 0xEF, 0xF6, 0x30, 0x82, 0xED, 0xAD, 0x87, 0xDD, 0x8F, 0xF3, 0xDD, 0x8F, - 0x73, 0xCF, 0xEF, 0x9C, 0xDF, 0x39, 0xBF, 0xFB, 0x31, 0x26, 0xA2, 0x27, 0x37, 0x97, 0xD1, 0x5B, - 0xCF, 0x9E, 0x67, 0x30, 0xA6, 0x66, 0x8C, 0x99, 0xC9, 0xC8, 0x45, 0x9E, 0x6B, 0x3F, 0x5F, 0x74, - 0xA6, 0x94, 0x5E, 0xDB, 0xFF, 0xB2, 0xE6, 0xE7, 0xE7, 0xF9, 0xDE, 0xD6, 0xD6, 0x96, 0xDB, 0xD8, - 0xD8, 0x78, 0xBF, 0xA1, 0xA1, 0xC1, 0xDA, 0xDC, 0xDC, 0x2C, 0xEB, 0xED, 0xED, 0x15, 0x9B, 0xCD, - 0xE6, 0x4A, 0x83, 0xC1, 0xE0, 0x2E, 0x29, 0x29, 0x99, 0xD6, 0x6A, 0xB5, 0x4F, 0x75, 0x3A, 0x9D, - 0x61, 0x75, 0x75, 0x95, 0xB5, 0xB7, 0xB7, 0xDF, 0xC8, 0xD1, 0xD4, 0xD4, 0xF4, 0xB0, 0xBA, 0xBA, - 0xFA, 0x83, 0xD5, 0x6A, 0xFD, 0x5A, 0x5E, 0x5E, 0x9E, 0x28, 0x2D, 0x2D, 0x0D, 0x10, 0xC6, 0x4B, - 0x98, 0x78, 0x5E, 0x5E, 0xDE, 0x95, 0x42, 0xA1, 0x40, 0x4E, 0x4E, 0xCE, 0x65, 0x76, 0x76, 0xF6, - 0x47, 0xB5, 0x5A, 0x6D, 0x4F, 0x26, 0x93, 0xA2, 0xD6, 0xD6, 0x56, 0x8E, 0x6D, 0x69, 0x69, 0xD1, - 0x11, 0x36, 0x62, 0xB1, 0x58, 0x60, 0x32, 0x99, 0xA0, 0xD7, 0xEB, 0x51, 0x58, 0x58, 0x88, 0xFC, - 0xFC, 0x7C, 0x10, 0x16, 0x02, 0x56, 0x2E, 0x97, 0x43, 0x2A, 0x95, 0x42, 0x2C, 0x16, 0x23, 0x33, - 0x33, 0x33, 0xAE, 0x52, 0xA9, 0x1E, 0x64, 0x65, 0x65, 0x71, 0x7C, 0x7D, 0x7D, 0xBD, 0x93, 0xEA, - 0xFE, 0x30, 0x1A, 0x8D, 0xE8, 0xEC, 0xEC, 0xC4, 0xE2, 0xE2, 0x22, 0x6A, 0x6A, 0x6A, 0x40, 0x39, - 0x41, 0xB5, 0x38, 0x4E, 0xC8, 0x33, 0x3C, 0x3C, 0x0C, 0x87, 0xC3, 0xC1, 0x6B, 0x54, 0x54, 0x54, - 0xBC, 0xE9, 0xEB, 0xEB, 0x93, 0x5F, 0x5C, 0x5C, 0x30, 0x8A, 0x9D, 0x2E, 0x2B, 0x2B, 0xBB, 0xA2, - 0x3E, 0x41, 0xBD, 0x21, 0x1E, 0x8F, 0x63, 0x6A, 0x6A, 0x0A, 0x81, 0x40, 0x00, 0x94, 0x1B, 0x3D, - 0x3D, 0x3D, 0x42, 0x3C, 0x96, 0x96, 0x96, 0x70, 0x7E, 0x7E, 0x8E, 0xE3, 0xE3, 0x63, 0xF8, 0xFD, - 0xFE, 0xB4, 0xD7, 0xEB, 0xF5, 0x8F, 0x8F, 0x8F, 0x5B, 0x68, 0x5E, 0x6F, 0x05, 0xCE, 0xB4, 0xE3, - 0xE8, 0xE8, 0x08, 0x27, 0x27, 0x27, 0xD8, 0xDF, 0xDF, 0xC7, 0xD9, 0xD9, 0x19, 0x6C, 0x36, 0x1B, - 0x36, 0x36, 0x36, 0x38, 0x9F, 0x85, 0x85, 0x05, 0xAC, 0xAF, 0xAF, 0x23, 0x1A, 0x8D, 0x22, 0x91, - 0x48, 0x20, 0x16, 0x8B, 0xFD, 0xDA, 0xDA, 0xDA, 0x7A, 0x41, 0x33, 0x7E, 0x57, 0x50, 0x50, 0x80, - 0x89, 0x89, 0x09, 0x84, 0xC3, 0x61, 0x6C, 0x6F, 0x6F, 0x23, 0x12, 0x89, 0xE0, 0xE0, 0xE0, 0x00, - 0x43, 0x43, 0x43, 0x58, 0x5E, 0x5E, 0xE6, 0x9C, 0x7D, 0x3E, 0x1F, 0x46, 0x47, 0x47, 0x79, 0xBE, - 0xBD, 0xBD, 0x3D, 0xE1, 0x3C, 0x1D, 0x0C, 0x06, 0x9F, 0x10, 0xB7, 0xC7, 0x84, 0x4F, 0xF6, 0xF7, - 0xF7, 0x63, 0x60, 0x60, 0x00, 0x83, 0x83, 0x83, 0x18, 0x19, 0x19, 0xC1, 0xDC, 0xDC, 0x1C, 0x8F, - 0x17, 0x7C, 0xA4, 0x27, 0xE7, 0x34, 0x39, 0x39, 0x89, 0x9D, 0x9D, 0x1D, 0x6E, 0x54, 0xE3, 0x13, - 0xE5, 0x34, 0x11, 0x37, 0x49, 0x51, 0x51, 0xD1, 0x4B, 0xA5, 0x52, 0xF9, 0x45, 0x26, 0x93, 0x5D, - 0x0A, 0xF3, 0x92, 0x48, 0x24, 0xA0, 0x6F, 0x14, 0x17, 0x17, 0xA3, 0xB6, 0xB6, 0x16, 0x5D, 0x5D, - 0x5D, 0x7C, 0x1E, 0xBB, 0xBB, 0xBB, 0x9C, 0xD7, 0xE1, 0xE1, 0x21, 0x42, 0xA1, 0xD0, 0x6B, 0xD2, - 0x45, 0x4C, 0x33, 0x12, 0x34, 0xCC, 0xA0, 0x19, 0x54, 0x92, 0x56, 0x0E, 0xD2, 0xD9, 0x43, 0xF8, - 0xCF, 0x82, 0x56, 0xC2, 0xDC, 0xEB, 0xEA, 0xEA, 0x38, 0x7E, 0x6C, 0x6C, 0x4C, 0xE0, 0xFE, 0x9D, - 0xB8, 0xBF, 0xA7, 0xFA, 0xAF, 0x56, 0x56, 0x56, 0xEE, 0x6D, 0x6E, 0x6E, 0xDE, 0xB8, 0x47, 0x55, - 0x55, 0x55, 0x6C, 0x66, 0x66, 0x46, 0x44, 0xDA, 0x3B, 0x34, 0x1A, 0x4D, 0x94, 0xB0, 0x3F, 0x09, - 0x7B, 0x45, 0xBD, 0xA5, 0x5D, 0x2E, 0x57, 0x8C, 0x7A, 0x73, 0xD9, 0xED, 0xF6, 0x3B, 0x84, 0xFF, - 0xE7, 0x7D, 0xA6, 0x3A, 0x2C, 0x95, 0x4A, 0xB1, 0x8E, 0x8E, 0x0E, 0x6D, 0x77, 0x77, 0xB7, 0xCD, - 0xE9, 0x74, 0x3E, 0x73, 0xBB, 0xDD, 0x8F, 0x3C, 0x1E, 0x8F, 0xE6, 0xF4, 0xF4, 0x94, 0xAD, 0xAD, - 0xAD, 0xDD, 0xDE, 0xCF, 0x73, 0x0B, 0x0B, 0xB8, 0xB6, 0xE0, 0x5D, 0xC6, 0x66, 0xC5, 0xE4, 0x10, - 0x4C, 0xF4, 0xF7, 0xD8, 0x59, 0xF2, 0x7F, 0xA3, 0xB8, 0xB4, 0xFC, 0x0F, 0xEE, 0x37, 0x70, 0xEC, - 0x16, 0x4A, 0x7E, 0x04, 0x00, 0x00 -}; - -AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", favicon_ico_gz, favicon_ico_gz_len); -response->addHeader("Content-Encoding", "gzip"); -request->send(response); -``` - -### Respond with content coming from a Stream -```cpp -//read 12 bytes from Serial and send them as Content Type text/plain -request->send(Serial, "text/plain", 12); -``` - -### Respond with content coming from a Stream and extra headers -```cpp -//read 12 bytes from Serial and send them as Content Type text/plain -AsyncWebServerResponse *response = request->beginResponse(Serial, "text/plain", 12); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content coming from a Stream containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//read 12 bytes from Serial and send them as Content Type text/plain -request->send(Serial, "text/plain", 12, processor); -``` - -### Respond with content coming from a Stream containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//read 12 bytes from Serial and send them as Content Type text/plain -AsyncWebServerResponse *response = request->beginResponse(Serial, "text/plain", 12, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content coming from a File -```cpp -//Send index.htm with default content type -request->send(SPIFFS, "/index.htm"); - -//Send index.htm as text -request->send(SPIFFS, "/index.htm", "text/plain"); - -//Download index.htm -request->send(SPIFFS, "/index.htm", String(), true); -``` - -### Respond with content coming from a File and extra headers -```cpp -//Send index.htm with default content type -AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm"); - -//Send index.htm as text -AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm", "text/plain"); - -//Download index.htm -AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm", String(), true); - -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content coming from a File containing templates -Internally uses [Chunked Response](#chunked-response). - -Index.htm contents: -``` -%HELLO_FROM_TEMPLATE% -``` - -Somewhere in source files: -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//Send index.htm with template processor function -request->send(SPIFFS, "/index.htm", String(), false, processor); -``` - -### Respond with content using a callback -```cpp -//send 128 bytes as plain text -request->send("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}); -``` - -### Respond with content using a callback and extra headers -```cpp -//send 128 bytes as plain text -AsyncWebServerResponse *response = request->beginResponse("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content using a callback containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//send 128 bytes as plain text -request->send("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}, processor); -``` - -### Respond with content using a callback containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//send 128 bytes as plain text -AsyncWebServerResponse *response = request->beginResponse("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Chunked Response -Used when content length is unknown. Works best if the client supports HTTP/1.1 -```cpp -AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Chunked Response containing templates -Used when content length is unknown. Works best if the client supports HTTP/1.1 -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Print to response -```cpp -AsyncResponseStream *response = request->beginResponseStream("text/html"); -response->addHeader("Server","ESP Async Web Server"); -response->printf("Webpage at %s", request->url().c_str()); - -response->print("

Hello "); -response->print(request->client()->remoteIP()); -response->print("

"); - -response->print("

General

"); -response->print("
    "); -response->printf("
  • Version: HTTP/1.%u
    • ", request->version()); -response->printf("
  • Method: %s
    • ", request->methodToString()); -response->printf("
  • URL: %s
    • ", request->url().c_str()); -response->printf("
  • Host: %s
    • ", request->host().c_str()); -response->printf("
  • ContentType: %s
    • ", request->contentType().c_str()); -response->printf("
  • ContentLength: %u
    • ", request->contentLength()); -response->printf("
  • Multipart: %s
    • ", request->multipart()?"true":"false"); -response->print("
"); - -response->print("

Headers

"); -response->print("
    "); -int headers = request->headers(); -for(int i=0;igetHeader(i); - response->printf("
  • %s: %s
    • ", h->name().c_str(), h->value().c_str()); -} -response->print("
"); - -response->print("

Parameters

"); -response->print("
    "); -int params = request->params(); -for(int i=0;igetParam(i); - if(p->isFile()){ - response->printf("
  • FILE[%s]: %s, size: %u
    • ", p->name().c_str(), p->value().c_str(), p->size()); - } else if(p->isPost()){ - response->printf("
  • POST[%s]: %s
    • ", p->name().c_str(), p->value().c_str()); - } else { - response->printf("
  • GET[%s]: %s
    • ", p->name().c_str(), p->value().c_str()); - } -} -response->print("
"); - -response->print(""); -//send the response last -request->send(response); -``` - -### ArduinoJson Basic Response -This way of sending Json is great for when the result is below 4KB -```cpp -#include "AsyncJson.h" -#include "ArduinoJson.h" - - -AsyncResponseStream *response = request->beginResponseStream("application/json"); -DynamicJsonBuffer jsonBuffer; -JsonObject &root = jsonBuffer.createObject(); -root["heap"] = ESP.getFreeHeap(); -root["ssid"] = WiFi.SSID(); -root.printTo(*response); -request->send(response); -``` - -### ArduinoJson Advanced Response -This response can handle really large Json objects (tested to 40KB) -There isn't any noticeable speed decrease for small results with the method above -Since ArduinoJson does not allow reading parts of the string, the whole Json has to -be passed every time a chunks needs to be sent, which shows speed decrease proportional -to the resulting json packets -```cpp -#include "AsyncJson.h" -#include "ArduinoJson.h" - - -AsyncJsonResponse * response = new AsyncJsonResponse(); -response->addHeader("Server","ESP Async Web Server"); -JsonObject& root = response->getRoot(); -root["heap"] = ESP.getFreeHeap(); -root["ssid"] = WiFi.SSID(); -response->setLength(); -request->send(response); -``` - -## Serving static files -In addition to serving files from SPIFFS as described above, the server provide a dedicated handler that optimize the -performance of serving files from SPIFFS - ```AsyncStaticWebHandler```. Use ```server.serveStatic()``` function to -initialize and add a new instance of ```AsyncStaticWebHandler``` to the server. -The Handler will not handle the request if the file does not exists, e.g. the server will continue to look for another -handler that can handle the request. -Notice that you can chain setter functions to setup the handler, or keep a pointer to change it at a later time. - -### Serving specific file by name -```cpp -// Serve the file "/www/page.htm" when request url is "/page.htm" -server.serveStatic("/page.htm", SPIFFS, "/www/page.htm"); -``` - -### Serving files in directory -To serve files in a directory, the path to the files should specify a directory in SPIFFS and ends with "/". -```cpp -// Serve files in directory "/www/" when request url starts with "/" -// Request to the root or none existing files will try to server the defualt -// file name "index.htm" if exists -server.serveStatic("/", SPIFFS, "/www/"); - -// Server with different default file -server.serveStatic("/", SPIFFS, "/www/").setDefaultFile("default.html"); -``` - -### Serving static files with authentication - -```cpp -server - .serveStatic("/", SPIFFS, "/www/") - .setDefaultFile("default.html") - .setAuthentication("user", "pass"); -``` - -### Specifying Cache-Control header -It is possible to specify Cache-Control header value to reduce the number of calls to the server once the client loaded -the files. For more information on Cache-Control values see [Cache-Control](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9) -```cpp -// Cache responses for 10 minutes (600 seconds) -server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age=600"); - -//*** Change Cache-Control after server setup *** - -// During setup - keep a pointer to the handler -AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age=600"); - -// At a later event - change Cache-Control -handler->setCacheControl("max-age=30"); -``` - -### Specifying Date-Modified header -It is possible to specify Date-Modified header to enable the server to return Not-Modified (304) response for requests -with "If-Modified-Since" header with the same value, instead of responding with the actual file content. -```cpp -// Update the date modified string every time files are updated -server.serveStatic("/", SPIFFS, "/www/").setLastModified("Mon, 20 Jun 2016 14:00:00 GMT"); - -//*** Chage last modified value at a later stage *** - -// During setup - read last modified value from config or EEPROM -String date_modified = loadDateModified(); -AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/"); -handler->setLastModified(date_modified); - -// At a later event when files are updated -String date_modified = getNewDateModfied(); -saveDateModified(date_modified); // Save for next reset -handler->setLastModified(date_modified); -``` - -### Specifying Template Processor callback -It is possible to specify template processor for static files. For information on template processor see -[Respond with content coming from a File containing templates](#respond-with-content-coming-from-a-file-containing-templates). -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -server.serveStatic("/", SPIFFS, "/www/").setTemplateProcessor(processor); -``` - - -## Using filters -Filters can be set to `Rewrite` or `Handler` in order to control when to apply the rewrite and consider the handler. -A filter is a callback function that evaluates the request and return a boolean `true` to include the item -or `false` to exclude it. -Two filter callback are provided for convince: -* `ON_STA_FILTER` - return true when requests are made to the STA (station mode) interface. -* `ON_AP_FILTER` - return true when requests are made to the AP (access point) interface. - -### Serve different site files in AP mode -```cpp -server.serveStatic("/", SPIFFS, "/www/").setFilter(ON_STA_FILTER); -server.serveStatic("/", SPIFFS, "/ap/").setFilter(ON_AP_FILTER); -``` - -### Rewrite to different index on AP -```cpp -// Serve the file "/www/index-ap.htm" in AP, and the file "/www/index.htm" on STA -server.rewrite("/", "index.htm"); -server.rewrite("/index.htm", "index-ap.htm").setFilter(ON_AP_FILTER); -server.serveStatic("/", SPIFFS, "/www/"); -``` - -### Serving different hosts -```cpp -// Filter callback using request host -bool filterOnHost1(AsyncWebServerRequest *request) { return request->host() == "host1"; } - -// Server setup: server files in "/host1/" to requests for "host1", and files in "/www/" otherwise. -server.serveStatic("/", SPIFFS, "/host1/").setFilter(filterOnHost1); -server.serveStatic("/", SPIFFS, "/www/"); -``` - -## Bad Responses -Some responses are implemented, but you should not use them, because they do not conform to HTTP. -The following example will lead to unclean close of the connection and more time wasted -than providing the length of the content - -### Respond with content using a callback without content length to HTTP/1.0 clients -```cpp -//This is used as fallback for chunked responses to HTTP/1.0 Clients -request->send("text/plain", 0, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}); -``` - -## Async WebSocket Plugin -The server includes a web socket plugin which lets you define different WebSocket locations to connect to -without starting another listening service or using different port - -### Async WebSocket Event -```cpp - -void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){ - if(type == WS_EVT_CONNECT){ - //client connected - os_printf("ws[%s][%u] connect\n", server->url(), client->id()); - client->printf("Hello Client %u :)", client->id()); - client->ping(); - } else if(type == WS_EVT_DISCONNECT){ - //client disconnected - os_printf("ws[%s][%u] disconnect: %u\n", server->url(), client->id()); - } else if(type == WS_EVT_ERROR){ - //error was received from the other end - os_printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data); - } else if(type == WS_EVT_PONG){ - //pong message was received (in response to a ping request maybe) - os_printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len)?(char*)data:""); - } else if(type == WS_EVT_DATA){ - //data packet - AwsFrameInfo * info = (AwsFrameInfo*)arg; - if(info->final && info->index == 0 && info->len == len){ - //the whole message is in a single frame and we got all of it's data - os_printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT)?"text":"binary", info->len); - if(info->opcode == WS_TEXT){ - data[len] = 0; - os_printf("%s\n", (char*)data); - } else { - for(size_t i=0; i < info->len; i++){ - os_printf("%02x ", data[i]); - } - os_printf("\n"); - } - if(info->opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } else { - //message is comprised of multiple frames or the frame is split into multiple packets - if(info->index == 0){ - if(info->num == 0) - os_printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - os_printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len); - } - - os_printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len); - if(info->message_opcode == WS_TEXT){ - data[len] = 0; - os_printf("%s\n", (char*)data); - } else { - for(size_t i=0; i < len; i++){ - os_printf("%02x ", data[i]); - } - os_printf("\n"); - } - - if((info->index + len) == info->len){ - os_printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len); - if(info->final){ - os_printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - if(info->message_opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } - } - } - } -} -``` - -### Methods for sending data to a socket client -```cpp - - - -//Server methods -AsyncWebSocket ws("/ws"); -//printf to a client -ws.printf((uint32_t)client_id, arguments...); -//printf to all clients -ws.printfAll(arguments...); -//printf_P to a client -ws.printf_P((uint32_t)client_id, PSTR(format), arguments...); -//printfAll_P to all clients -ws.printfAll_P(PSTR(format), arguments...); -//send text to a client -ws.text((uint32_t)client_id, (char*)text); -ws.text((uint32_t)client_id, (uint8_t*)text, (size_t)len); -//send text from PROGMEM to a client -ws.text((uint32_t)client_id, PSTR("text")); -const char flash_text[] PROGMEM = "Text to send" -ws.text((uint32_t)client_id, FPSTR(flash_text)); -//send text to all clients -ws.textAll((char*)text); -ws.textAll((uint8_t*)text, (size_t)len); -//send binary to a client -ws.binary((uint32_t)client_id, (char*)binary); -ws.binary((uint32_t)client_id, (uint8_t*)binary, (size_t)len); -//send binary from PROGMEM to a client -const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 }; -ws.binary((uint32_t)client_id, flash_binary, 4); -//send binary to all clients -ws.binaryAll((char*)binary); -ws.binaryAll((uint8_t*)binary, (size_t)len); -//HTTP Authenticate before switch to Websocket protocol -ws.setAuthentication("user", "pass"); - -//client methods -AsyncWebSocketClient * client; -//printf -client->printf(arguments...); -//printf_P -client->printf_P(PSTR(format), arguments...); -//send text -client->text((char*)text); -client->text((uint8_t*)text, (size_t)len); -//send text from PROGMEM -client->text(PSTR("text")); -const char flash_text[] PROGMEM = "Text to send"; -client->text(FPSTR(flash_text)); -//send binary -client->binary((char*)binary); -client->binary((uint8_t*)binary, (size_t)len); -//send binary from PROGMEM -const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 }; -client->binary(flash_binary, 4); -``` - -### Direct access to web socket message buffer -When sending a web socket message using the above methods a buffer is created. Under certain circumstances you might want to manipulate or populate this buffer directly from your application, for example to prevent unnecessary duplications of the data. This example below shows how to create a buffer and print data to it from an ArduinoJson object then send it. - -```cpp -void sendDataWs(AsyncWebSocketClient * client) -{ - DynamicJsonBuffer jsonBuffer; - JsonObject& root = jsonBuffer.createObject(); - root["a"] = "abc"; - root["b"] = "abcd"; - root["c"] = "abcde"; - root["d"] = "abcdef"; - root["e"] = "abcdefg"; - size_t len = root.measureLength(); - AsyncWebSocketMessageBuffer * buffer = ws.makeBuffer(len); // creates a buffer (len + 1) for you. - if (buffer) { - root.printTo((char *)buffer->get(), len + 1); - if (client) { - client->text(buffer); - } else { - ws.textAll(buffer); - } - } -} -``` - -## Async Event Source Plugin -The server includes EventSource (Server-Sent Events) plugin which can be used to send short text events to the browser. -Difference between EventSource and WebSockets is that EventSource is single direction, text-only protocol. - -### Setup Event Source on the server -```cpp -AsyncWebServer server(80); -AsyncEventSource events("/events"); - -void setup(){ - // setup ...... - events.onConnect([](AsyncEventSourceClient *client){ - if(client->lastId()){ - Serial.printf("Client reconnected! Last message ID that it gat is: %u\n", client->lastId()); - } - //send event with message "hello!", id current millis - // and set reconnect delay to 1 second - client->send("hello!",NULL,millis(),1000); - }); - //HTTP Basic authentication - events.setAuthentication("user", "pass"); - server.addHandler(&events); - // setup ...... -} - -void loop(){ - if(eventTriggered){ // your logic here - //send event "myevent" - events.send("my event content","myevent",millis()); - } -} -``` - -### Setup Event Source in the browser -```javascript -if (!!window.EventSource) { - var source = new EventSource('/events'); - - source.addEventListener('open', function(e) { - console.log("Events Connected"); - }, false); - - source.addEventListener('error', function(e) { - if (e.target.readyState != EventSource.OPEN) { - console.log("Events Disconnected"); - } - }, false); - - source.addEventListener('message', function(e) { - console.log("message", e.data); - }, false); - - source.addEventListener('myevent', function(e) { - console.log("myevent", e.data); - }, false); -} -``` - -## Scanning for available WiFi Networks -```cpp -//First request will return 0 results unless you start scan from somewhere else (loop/setup) -//Do not request more often than 3-5 seconds -server.on("/scan", HTTP_GET, [](AsyncWebServerRequest *request){ - String json = "["; - int n = WiFi.scanComplete(); - if(n == -2){ - WiFi.scanNetworks(true); - } else if(n){ - for (int i = 0; i < n; ++i){ - if(i) json += ","; - json += "{"; - json += "\"rssi\":"+String(WiFi.RSSI(i)); - json += ",\"ssid\":\""+WiFi.SSID(i)+"\""; - json += ",\"bssid\":\""+WiFi.BSSIDstr(i)+"\""; - json += ",\"channel\":"+String(WiFi.channel(i)); - json += ",\"secure\":"+String(WiFi.encryptionType(i)); - json += ",\"hidden\":"+String(WiFi.isHidden(i)?"true":"false"); - json += "}"; - } - WiFi.scanDelete(); - if(WiFi.scanComplete() == -2){ - WiFi.scanNetworks(true); - } - } - json += "]"; - request->send(200, "application/json", json); - json = String(); -}); -``` - -## Remove handlers and rewrites - -Server goes through handlers in same order as they were added. You can't simple add handler with same path to override them. -To remove handler: -```arduino -// save callback for particular URL path -auto handler = server.on("/some/path", [](AsyncWebServerRequest *request){ - //do something useful -}); -// when you don't need handler anymore remove it -server.removeHandler(&handler); - -// same with rewrites -server.removeRewrite(&someRewrite); - -server.onNotFound([](AsyncWebServerRequest *request){ - request->send(404); -}); - -// remove server.onNotFound handler -server.onNotFound(NULL); - -// remove all rewrites, handlers and onNotFound/onFileUpload/onRequestBody callbacks -server.reset(); -``` - -## Setting up the server -```cpp -#include "ESPAsyncTCP.h" -#include "ESPAsyncWebServer.h" - -AsyncWebServer server(80); -AsyncWebSocket ws("/ws"); // access at ws://[esp ip]/ws -AsyncEventSource events("/events"); // event source (Server-Sent events) - -const char* ssid = "your-ssid"; -const char* password = "your-pass"; -const char* http_username = "admin"; -const char* http_password = "admin"; - -//flag to use from web update to reboot the ESP -bool shouldReboot = false; - -void onRequest(AsyncWebServerRequest *request){ - //Handle Unknown Request - request->send(404); -} - -void onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){ - //Handle body -} - -void onUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - //Handle upload -} - -void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){ - //Handle WebSocket event -} - -void setup(){ - Serial.begin(115200); - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.printf("WiFi Failed!\n"); - return; - } - - // attach AsyncWebSocket - ws.onEvent(onEvent); - server.addHandler(&ws); - - // attach AsyncEventSource - server.addHandler(&events); - - // respond to GET requests on URL /heap - server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/plain", String(ESP.getFreeHeap())); - }); - - // upload a file to /upload - server.on("/upload", HTTP_POST, [](AsyncWebServerRequest *request){ - request->send(200); - }, onUpload); - - // send a file when /index is requested - server.on("/index", HTTP_ANY, [](AsyncWebServerRequest *request){ - request->send(SPIFFS, "/index.htm"); - }); - - // HTTP basic authentication - server.on("/login", HTTP_GET, [](AsyncWebServerRequest *request){ - if(!request->authenticate(http_username, http_password)) - return request->requestAuthentication(); - request->send(200, "text/plain", "Login Success!"); - }); - - // Simple Firmware Update Form - server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/html", "
"); - }); - server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){ - shouldReboot = !Update.hasError(); - AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", shouldReboot?"OK":"FAIL"); - response->addHeader("Connection", "close"); - request->send(response); - },[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - if(!index){ - Serial.printf("Update Start: %s\n", filename.c_str()); - Update.runAsync(true); - if(!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)){ - Update.printError(Serial); - } - } - if(!Update.hasError()){ - if(Update.write(data, len) != len){ - Update.printError(Serial); - } - } - if(final){ - if(Update.end(true)){ - Serial.printf("Update Success: %uB\n", index+len); - } else { - Update.printError(Serial); - } - } - }); - - // attach filesystem root at URL /fs - server.serveStatic("/fs", SPIFFS, "/"); - - // Catch-All Handlers - // Any request that can not find a Handler that canHandle it - // ends in the callbacks below. - server.onNotFound(onRequest); - server.onFileUpload(onUpload); - server.onRequestBody(onBody); - - server.begin(); -} - -void loop(){ - if(shouldReboot){ - Serial.println("Rebooting..."); - delay(100); - ESP.restart(); - } - static char temp[128]; - sprintf(temp, "Seconds since boot: %u", millis()/1000); - events.send(temp, "time"); //send event "time" -} -``` - -### Setup global and class functions as request handlers - -```arduino -#include -#include -#include -#include - -void handleRequest(AsyncWebServerRequest *request) -{ -} - -class WebClass -{ -public : - WebClass(){ - }; - - AsyncWebServer classWebServer = AsyncWebServer(80); - - void classRequest (AsyncWebServerRequest *request) - { - } - - void begin(){ - - // attach global request handler - classWebServer.on("/example", HTTP_ANY, handleRequest); - - // attach class request handler - classWebServer.on("/example", HTTP_ANY, std::bind(&WebClass::classRequest, this, std::placeholders::_1)); - } -}; - -AsyncWebServer globalWebServer(80); -WebClass webClassInstance; - -void setup() { - - // attach global request handler - globalWebServer.on("/example", HTTP_ANY, handleRequest); - - // attach class request handler - globalWebServer.on("/example", HTTP_ANY, std::bind(&WebClass::classRequest, webClassInstance, std::placeholders::_1)); -} - -void loop() { - -} -``` - -### Methods for controlling websocket connections - -```arduino - // Disable client connections if it was activated - if ( ws.enabled() ) - ws.enable(false); - - // enable client connections if it was disabled - if ( !ws.enabled() ) - ws.enable(true); -``` - -Example of OTA code - -```arduino - // OTA callbacks - ArduinoOTA.onStart([]() { - // Clean SPIFFS - SPIFFS.end(); - - // Disable client connections - ws.enable(false); - - // Advertise connected clients what's going on - ws.textAll("OTA Update Started"); - - // Close them - ws.closeAll(); - - }); - -``` - -### Adding Default Headers - -In some cases, such as when working with CORS, or with some sort of custom authentication system, -you might need to define a header that should get added to all responses (including static, websocket and EventSource). -The DefaultHeaders singleton allows you to do this. - -Example: - -```arduino -DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", "*"); -webServer.begin(); -``` - -*NOTE*: You will still need to respond to the OPTIONS method for CORS pre-flight in most cases. (unless you are only using GET) - -This is one option: - -```arduino -webServer.onNotFound([](AsyncWebServerRequest *request) { - if (request->method() == HTTP_OPTIONS) { - request->send(200); - } else { - request->send(404); - } -}); -``` diff --git a/libraries/ESPAsyncWebServer/component.mk b/libraries/ESPAsyncWebServer/component.mk deleted file mode 100644 index bb5bb1614..000000000 --- a/libraries/ESPAsyncWebServer/component.mk +++ /dev/null @@ -1,3 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := src -COMPONENT_SRCDIRS := src -CXXFLAGS += -fno-rtti diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/.esp31b.skip b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/.esp31b.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino deleted file mode 100644 index b350dc325..000000000 --- a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino +++ /dev/null @@ -1,211 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -// SKETCH BEGIN -AsyncWebServer server(80); -AsyncWebSocket ws("/ws"); -AsyncEventSource events("/events"); - -void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){ - if(type == WS_EVT_CONNECT){ - Serial.printf("ws[%s][%u] connect\n", server->url(), client->id()); - client->printf("Hello Client %u :)", client->id()); - client->ping(); - } else if(type == WS_EVT_DISCONNECT){ - Serial.printf("ws[%s][%u] disconnect: %u\n", server->url(), client->id()); - } else if(type == WS_EVT_ERROR){ - Serial.printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data); - } else if(type == WS_EVT_PONG){ - Serial.printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len)?(char*)data:""); - } else if(type == WS_EVT_DATA){ - AwsFrameInfo * info = (AwsFrameInfo*)arg; - String msg = ""; - if(info->final && info->index == 0 && info->len == len){ - //the whole message is in a single frame and we got all of it's data - Serial.printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT)?"text":"binary", info->len); - - if(info->opcode == WS_TEXT){ - for(size_t i=0; i < info->len; i++) { - msg += (char) data[i]; - } - } else { - char buff[3]; - for(size_t i=0; i < info->len; i++) { - sprintf(buff, "%02x ", (uint8_t) data[i]); - msg += buff ; - } - } - Serial.printf("%s\n",msg.c_str()); - - if(info->opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } else { - //message is comprised of multiple frames or the frame is split into multiple packets - if(info->index == 0){ - if(info->num == 0) - Serial.printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - Serial.printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len); - } - - Serial.printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len); - - if(info->opcode == WS_TEXT){ - for(size_t i=0; i < info->len; i++) { - msg += (char) data[i]; - } - } else { - char buff[3]; - for(size_t i=0; i < info->len; i++) { - sprintf(buff, "%02x ", (uint8_t) data[i]); - msg += buff ; - } - } - Serial.printf("%s\n",msg.c_str()); - - if((info->index + len) == info->len){ - Serial.printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len); - if(info->final){ - Serial.printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - if(info->message_opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } - } - } - } -} - - -const char* ssid = "*******"; -const char* password = "*******"; -const char * hostName = "esp-async"; -const char* http_username = "admin"; -const char* http_password = "admin"; - -void setup(){ - Serial.begin(115200); - Serial.setDebugOutput(true); - WiFi.hostname(hostName); - WiFi.mode(WIFI_AP_STA); - WiFi.softAP(hostName); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.printf("STA: Failed!\n"); - WiFi.disconnect(false); - delay(1000); - WiFi.begin(ssid, password); - } - - //Send OTA events to the browser - ArduinoOTA.onStart([]() { events.send("Update Start", "ota"); }); - ArduinoOTA.onEnd([]() { events.send("Update End", "ota"); }); - ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) { - char p[32]; - sprintf(p, "Progress: %u%%\n", (progress/(total/100))); - events.send(p, "ota"); - }); - ArduinoOTA.onError([](ota_error_t error) { - if(error == OTA_AUTH_ERROR) events.send("Auth Failed", "ota"); - else if(error == OTA_BEGIN_ERROR) events.send("Begin Failed", "ota"); - else if(error == OTA_CONNECT_ERROR) events.send("Connect Failed", "ota"); - else if(error == OTA_RECEIVE_ERROR) events.send("Recieve Failed", "ota"); - else if(error == OTA_END_ERROR) events.send("End Failed", "ota"); - }); - ArduinoOTA.setHostname(hostName); - ArduinoOTA.begin(); - - MDNS.addService("http","tcp",80); - - SPIFFS.begin(); - - ws.onEvent(onWsEvent); - server.addHandler(&ws); - - events.onConnect([](AsyncEventSourceClient *client){ - client->send("hello!",NULL,millis(),1000); - }); - server.addHandler(&events); - - server.addHandler(new SPIFFSEditor(http_username,http_password)); - - server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/plain", String(ESP.getFreeHeap())); - }); - - server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm"); - - server.onNotFound([](AsyncWebServerRequest *request){ - Serial.printf("NOT_FOUND: "); - if(request->method() == HTTP_GET) - Serial.printf("GET"); - else if(request->method() == HTTP_POST) - Serial.printf("POST"); - else if(request->method() == HTTP_DELETE) - Serial.printf("DELETE"); - else if(request->method() == HTTP_PUT) - Serial.printf("PUT"); - else if(request->method() == HTTP_PATCH) - Serial.printf("PATCH"); - else if(request->method() == HTTP_HEAD) - Serial.printf("HEAD"); - else if(request->method() == HTTP_OPTIONS) - Serial.printf("OPTIONS"); - else - Serial.printf("UNKNOWN"); - Serial.printf(" http://%s%s\n", request->host().c_str(), request->url().c_str()); - - if(request->contentLength()){ - Serial.printf("_CONTENT_TYPE: %s\n", request->contentType().c_str()); - Serial.printf("_CONTENT_LENGTH: %u\n", request->contentLength()); - } - - int headers = request->headers(); - int i; - for(i=0;igetHeader(i); - Serial.printf("_HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str()); - } - - int params = request->params(); - for(i=0;igetParam(i); - if(p->isFile()){ - Serial.printf("_FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size()); - } else if(p->isPost()){ - Serial.printf("_POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } else { - Serial.printf("_GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } - } - - request->send(404); - }); - server.onFileUpload([](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final){ - if(!index) - Serial.printf("UploadStart: %s\n", filename.c_str()); - Serial.printf("%s", (const char*)data); - if(final) - Serial.printf("UploadEnd: %s (%u)\n", filename.c_str(), index+len); - }); - server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){ - if(!index) - Serial.printf("BodyStart: %u\n", total); - Serial.printf("%s", (const char*)data); - if(index + len == total) - Serial.printf("BodyEnd: %u\n", total); - }); - server.begin(); -} - -void loop(){ - ArduinoOTA.handle(); -} diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/.exclude.files b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/.exclude.files deleted file mode 100644 index 955397fa2..000000000 --- a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/.exclude.files +++ /dev/null @@ -1,2 +0,0 @@ -/*.js.gz -/.exclude.files diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ace.js.gz b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ace.js.gz deleted file mode 100644 index 7b175c1c92c541999766de1f36c1e7141f0f7236..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98943 zcmV(#K;*w4iwFoQ!jM=13t?krE^2cC+&gP?+c=V+ukKGsxLXZ5f@H}~W)jhiE0fqa zuFI>E%-w9sS{E%r5+)R>1Hsr{i~s$)0T2W!D#_f=+=u-_;o042H2MLwyk(xuB~KI2 ze<+Kc)Jyz_&yncxkOfJv=do!r+wIg(_)z#1+M(zNeCc)haKV;5VY{6z4!6<#Q?z0W zUk+2jS3HU0u^hx z{=}Q7NtVWJ$b?9RM;0R8ZUIbZlP>a@b#B-^$}`r{1a)qsEcs4$qK-y3Bt9(xND&lWYKB@ z)D&+Lmp76oE^lP$@J7pPhNIMO@NQ_iZJ6BwS%zJvykIe`90t9;`Hjs1sYqptK!-B@ zpw~Z-;@FdZ2q>nh8r69&M07thsM2sc3zooGtmNT{MxiwP2=db?==XCyaH(mU=K8!W z!-}k4uM*@^9@619&(_}3FC3c979+=K>cg2B6$KSF&Xf#DJd|nVftk+_AUqRalOSHe zL9gRL-VZ_I+1=ZvN4muChT&kWaVNllY#Vc_IxKn=>FH?Z_o20~YvY+;C`j{lB%Vue z1Z*Zl!&nir63h|thgr-)_(l}441Y^`qFMtPiar$jGPqsyn7Kp^4N<)w95}<4ER--s zf>PMVD9cAzM_0qEqa&(N*w*Rau8wAX)u(%jUzFP*3!1sifI})mt_p!cVTD`Flsd@# z2W+)RKsOuN&0xtTI4e?c0`l;IFD8QKf=_TK@3yIs*(9Z*Q$&&a)MDJNo%1YfJ`h6e3G309q@@eJ^b6y7HLeG0(cWgd+&sOJmTL&$+ zQpqy8--WGo6Uq5{Vsu#5r<$n|^!;wrLDjk2?^eyI41~h3b>orepPi{Q0_Qn&l#F{$ zv|zLF=x;}>QX>dOsRqJuKJ5Z`qD)>Q2hr>Tf3jYWmnyN93C;n~NMuP}t1<(#8abzr zRh9$nwExiM@ME^<8K{mNwh<_MhHAu%LQR2!In2^r0INjFG`)~ib@~*95-0l2er6Pz zQB*#SsOxzdabe*&V5d#{Iyep(NR4eq<5^Scp2Vig+7-Uyp(6MCPM<_rpIZg0w!mEW zCfcyfFYzw{|MJw@u_a&yt$uLcbU7H$Xrc%J&rnX6VB@-(L8Xsruh*5J{tZaeWq13T z;YYK5FmUxQcoMDBepm*y^+pk3))L7-gf80c$^tmNr|?+zc#y66=69<+t8N5HLZy6e zaZys-m%81!DjMxOaORkh_jrIZkO^pt2}Reus&ddu#T*Yl_%RPf1^MSnn}Wpk83i9R zWM?cKO|UfT_3&qWWC{aS0$0~#&qli)7~=0=M{+$}#wm!6Dn>Wp1@#fhVo>dZnlx+HxMR}exe;59_D&^Ru9p! zU)S|U=Kz3AM#)^cIi&?iT)oVP5LVBmfxF@DykoHlqx1@-l4?z>(vM{a$J%%m?Sq zHm;-W?QK#Xcb~>|PS_t78O7zWzC2AZ zln#>t)50e-SnW_S9Dz47d#CdlPbYU)q|~lonr93%YiH6AFe)~Yh^7O=El{d}7vz-n zQxMFkpAAwP12GZEQ8GwXOnVwx7h)Zbg7s+(@$cG4xYK2SJyQfvBPa!BtO8&BHeS}VPyy|@RycQ8`{qTjR)z_p zS|QGeW{9~JApRr)d9U1I@If>1Qb5s)(uIHaOx+{mBD)p1QfJRvO{2L===ZbJ)JG%M z5f~IGj&mxe8K41w4ScNT`Zm$FW!2F7$FA62U1?`L?!&rWUi|KLd$LbDV6~GJum39V z!M)uI@>3q<5Dw&qFJ3my;iQ`22e^~ZXb#-5dOK_3(~`$vE7}A^b^NK^0-KS7-TiYp zwFFKrfm0YbElW;;SVCY#4X<(_V+oAv^|b!-(l7IjeP-gmg=MP!PvzL3%c>Mul>)0$ zeIJqX72^^Lq&Se*Npmn@qLzJ)1z2kt}im2u9sS_H=w0%kRS(jmcDW;!csyn2I@)KG}c zF_7-PpS~zn7glZBMrM1EWuF_UNjk#lT^-#atWp@A7{T#3aEGErVC4&k|t&P(4Wp0R14$xY( zvQa%x)MTaE*(NY%^e1+oL2F$Q=AfpfxvRPfnm2mRnl$InZuZkk9_*kA4k?Ps&HhW- zLt(u?iHC&wY$|oKguOm@WjADvJ3?sKn&M@4Zub$IdFCD%ywZM^f_O5mFq}K?>cTv9 zSEkYrSV3zXX^5$kB6T5Mil7K@JaaG8D#Ps-&y2GSo|1k!wNGZ9ZrJ%w&;O2;H?j^Z zK|-CYTZt+Uz(Wx4tVY_)|zQKGbUpyA+ zT&c&#Bgd^*b{Hm}#|S@6$9Ki+lEcf0NfAHm**tvCxuI_o{V-JK@rV@S%j&cbLG zymj5=ne5!KP6Q5NsgLLztIX=q92HhmVDv>uR_gXQ>-0LADb1rqIb}CxW|5kxo&|o3 zK1Z5{4j2^ZvO2JiuqIOVY^Z-!_q{Q?uYAF20VnF<#FxN*>!|baMOcQS2^S z*YpC+HPQ!LOZ;9h)|-GT)TgQ=(;aiu0ad?xtSt_lph_1vdm0MFW=<#%!C!jFzV?HO zm-}!qr(#yU7QpE6`E~I zDg-TWlxN9A!jPh<)8`k~7O~HuL(Vb3C4&hL%lEpz!U>*z0CurO1)*$dnW(NB?63=w z{+%W6MBVb$iH10^RPN-ewFbbdVV$8TTd#Aqi%f_KYK*s&^h0t+0(By~BlDhOvUUt7 z+><5hUI4lV`e?p_+4OlhC8g0Ml++C>F=zbk5=wO&4GlG84D~jf4b6_FCo}psd~S0y z%sF`t=j5TJLHiXx&^8VniY@Otm-yUPPcCihKUUX&>`VHOI7kk7y2d7iGg;k#vH?#C0j0u61u%aEU0gGyKD99 zfsFuC!7;i9kBBJJUn)PxWGj)sVHb3MPkj2$?a{6O4qMZTp(P<&kJAC9&6j+MnNGI$ zPNz#E85gz09R2cmScbr3_)c~}&_9FxcSxW0Nk^s~D?ZJ9fTAV&X36i;cyR;JGjKw_ zl7d6`k`(uoc)pUE2&jkUY@e!{o!XWhv`Bw{UQi98)>C9H<#uv(bbEU{ygeDFVs$ir z`t<41-CAy9P--a4FO6&YGm93reJG;`Oymzs2NZ}Ou3;n`bewD)(d?)DkI@R_B#&S( z@u#C14k@RZahR}O^I+TGLEF9EHy_Rpb$AjSFUtJM0Y4dp05F42eUW7^;wZ}+c(wZQ zAW*_iTt^>8Ro{giU1j~Fm0u-?*vw6xIEvUM7va?ZV)Q(THPH6Ntw(m!l3g1ERD?p z>AvQ;2H2rQYk}ddnoP!{(O(EH8#g@BK*?x(S2eHo(h0bMZu5eJnvCv4aucWXPo=SM z#h$`C1s*C0=hbAq=}I$>goh-$$FA1jQ(pF?hpd%@+%nV4I=- zxE#|UoLiE|k4-~^SP)BB^pf%wb7iS^Zz&fm%rgQTCu;rRWx;-bo?_< zzfC~z2ekkY*%ps_ABZ_4)kHjdU!M7^nF%WKn~+*}>Ly*>8~KNk--@|yIt~Sg*AN9z zUbu(xtZ_Ko{X;Ma2j=TPi0pO`g+Gd0d9jYvTw5gk&B~JVJ`c)_?{tXqu;;1rUGUo-nT$&V=NU%^Z(nP{2%-pxEZk!^N zu97BYDC;!g{~|1$P`YZjF}jKe+$ma;zKDR^o^J$iClr1uXF{D++{gAQaFn7vmjA`s zEk+$%XF^-_m!|*VAIJ7tx(>^hTrj|L5jT=QE&M^)Bm_hX7*LcxGDRAn2K5yNbL`|a1bwWzBy`c z2HUlL_?E!A0ieukR(+{5@U_<*^Dy@M?aRxH%k%fw|9Sq`50i)S4-@iX&A~mP;~yvF zg%mNAo=nK|7@CfcA5F+>CL>Z%7=I0uVa^-|O~y2e<>Z*A>MaBc8A6#nqD1XAnLMEz zm2nTEzHUf~#1bB>Pfb&vaYyzcFev@y&OBzAt$Feep%9FBk43(#4 zJ^q^$jjwMS*`3DzE$wWlCBgYgL|>*oo2Hgr4&SQld~ z0GNwoEC7THBw-AbFAzKK{RJY%oxebwxbYW=4mo~-n2v$oi>Fu^Bft@s6ljEfjIhTD z{E;S4`!ZwXm^Oi`p`h>HU%vVH{HIsvX3KH&I>1dp2M`|tG644&PywvRfC$KZ3`2m( z|7Gt_+Z#uYby4&=AJ4y#cxtN&6I2nLhl2QUwEMWr-KVR)?6p;LT^0pNSWN+109e&! ziU0k+k#l08RNd{h_q}Jioh2~mAu=)|GBTovCeXzm>PH8As2JVrq2uUW58X!BdMG}r zxqX!L@dsHp_=7BfqCT`u z0zJf^>upy(lbJ;Hlp{EoD3={lLcLpGkQoow&y2j;)j_`TZ`Pa!{yETG>I|(bX0Ss? zG(E(G5lB6ZBcP|la-K3bBx(ca+5$A!PjNx?BL^E^2I>ekE|k^d;Cki@A^A-b-!JYq z2~|iB44FX9SoN}V6_`H(PA6pi+vt<;-}#T@g}R+LpkL7bo}<+x2uze@H%!ow^o4H!rO-&^)>m(^R7t?O3U*V&oE zmU@&JNd5h_*?B^wZ@Rn=kZK!YednC6PB%(Ppvszynb}mBWK~`9uKg|e_~$V5jad(+ z3MEf^&FmeZN7~*2m0R2;^wglN+zC&sC^-A}M?ch1HM@>K28d%o#o_jc&9#{${DJOc zWa>}xetVb8A>(u|-UHwRBiG3y`TpGr%TxB6{nPVE%gwP5C0OsJ20k`2nXt&l--`={ z(~xiPv$K?V7~r(G@pX6;2Fbe&oEKr|LS()6{W}r_l%)W5)EtLQIz0J9ZfD{g$J-yd zj#0gHMsU%Q7)_*Men_|r81{z12=sR#P5ab9CT`eGIWc9xpz`;aoju=)UlUou;Oy*% z{yHh0jJ_wd_OtLlKo{>H9Q8huw|927!QT!q)#k14%mU4LvU}5OF^M+s?P&`q(Sgw} ziA`aU$eu1}+|3y(jxPKW+K=A&qmE2rbB>L~8t?pyK~gtS4m`2Dahnm>wUX@o4_pmJ znPXz=bfE#B8130mmVT!2WOL>>N8(QD^mK!j;X}5lBNc1YQ&ZUl*l}%0;HFM$`8IFQ zjZ_)@DFbz80gZlXNGAC5?2KQWmwUGWG-z;CZEFetWNpj zAT`T2+dGy)-VGXuyfk7U<#BAzoWmqK|L{2>@oVBIu2o6BhIMUZuDCPcV$KxC+D`0UL3Df^*&inU|HkTi=QSe7zb5l<$)n$7J-q`6AtX~|)S;`oJFF0)l* zkWZZ!V(Jcw2+6d;ZodCWT1jM#Dc@YKRy%Q;k6?B3(fk`zZ00=$@|y3nEZ0XZvm-H- zU%URe+wMYes`P?bM$(xa{F2=V(HLZRq62>L$140(^lacoLF>Q}adi#;} zV*KchTW)*YcDrNma4Dm&m<9kh2~)VDRU0d$t~1+f0lR%m_#)Y`rgUQIe8Ik=v>E|U z>-oHUu(RQFIj^x((`-Y+5SCXdEt;G4crT7*G`moqE#JNy3QYrcUcar_c6`%eb7Yi@ zb%!ZWJqmq&8`qE&oMjXZ75SZjjIKqu0dF-(L3vNuT@$-L`8yDs{Qmbtek`(bJ}Jez zJvS|_KREw<7X-V%`%RouqM>Huye6S4OZj&r<=>kjr6hi8^hqVU)ZBsNDs=5FP5s}f zii)|z#IfaJ&9Ir97RF>`C>hjHc7GY{vd!P^s~$ZvE0Z-cGv(i3XU*`R{+o zo}P^EiRgc4(frNYq)-)j$JMyl!0eAJUBB$j-%*eAhn{XhCj2{3IEe8VMvRKts&g@& zJ#?V8U+9q=|LddIfBOE%Z~y1_IQqZ)F#G$r?~E0z^W!JnQv^q0vp;)WC{cX5dL9di*5oOVgOlfrzFqylFjdG~D>2%Sc7famM&}A_%8%SA4m* zzBa?8HrU>|=si6Z68^opK>~jO^z^iKsJff8v+XX}B%}u!@3Z<1*`P_eUL^Z%SZ-ld z&cTf?x0+rjBDU#9(IBF z-5uBdbHBOfzYY`25C^)o*+CSGw zdZ`+@^6Ta=LTn9Bm?Y+Pt3)Nh-upp;Cv&so-6b6jwRm)+%h#E{J7u8$zn6}*rC`QytP1K{Kl3) z(K!zDuj`lRe`rkq@#^tVcb+caU%h|*{{5Bn`qr(zfB(v>8PzcbwBwbXQMt4Kt23OK zw$N)Lwrj>D22Z%ug9M3vDM4%bdBe`s*26_->+nRTLzM*@#r?Q^V6O%&}T zU%C8iEa#e8=#BU`x(SjbxLyEEOO~IBY$H>ID&puu*D|qhkds^j2*M&W`3#UtL_oR8 zLErVK+q-}c0iTSCZmlj@&L(t~boZGYT-iuTev8@3s1vNitWcQ#5JcBG#Z?Wp37?VO z=1XBh^vdwsEUB_FC80GX5r5dl?hlNqNN6fD!vbr_TeZvP__l~_bQUW?lX@CMdQFg< z#=`s^Sf>2!l{UxO!SLw30gS@@(f_lc^Iwyol_?;+_^wRctd*$<*w4jm8skOp!{|=p z+-ODKQ=I2oqRR>$f6a8{VQkCBv-6w_H+6>-@L;4T(_GS zP5C!$jrk4k+1VEbP<2C~@FU7v5b~dn`=1qpga?9np}jAktUS06K3TITB0Rbdk{~&M z^)n7}N}S<%nPrQ8lE#VJGS6l_ZCRDkQ6uyG6!Sbp&}*TL`b+a+v%7CzhbbwoHaGh$ZsMq^F`0Hg zGu`C?l!3!*#Y8H)je(uF+3`G^hcMgh!hZ&p+0ut#x5J{6^yAcX)YA&EN82#_;*++X zAv;lv2Odg1l6d%qUUHs?OkZ*y;1H*ynQT)gX~vYbxt{8cU;97)kD9xq_ibDHhaiwG zz02Ge5!`YMvPy@01F-p|o=9T-1^nIvev>@!_i?vRY}PhAkE1zai4p$fvuE>#Qj)PX z4>%4#;EO1Y3V)MN|fjg67J;{-l_?Ob$~vbkl5s!s?$m<8tfA=7DH-@6*}Y z$2vJvaKBV%B6GJI$*>|0vmB(*4QV12u5@esl0>04OAC(_@I^eCKp?&gK2`vz?KTf7vt0*pAf(57%H}M=Rw6CoKqjHPRzk*612s=zV9$Zvnsf^mf5tk< zM|8%7^Dc?*h0cH-A|D5j$J7Klmp>kNL4b2L!=1` z4x2Ui7Y;{%@gKbo4(0Y>>>Y}wN@Q_&fP+&pil?W)7?L?Md#iE58atWBBXY>X_7yyi!y(S(f zkr*GxX(YGPTh>peE#`hOJ0EJ>Q|yu5!x!oScgu9DEcGQt9h(VNnPU5d`AwU zeW4CwYl}qyJv%~F@(4{0>|H@MFv9CI-dl>Nv=IDz4$sAB=yXqC5C6GiaqeX}ac!g@NzmIlbG^_h~aPLU+@K@|`vJw%bWNqvG)gHg!ZX)pB ziCb2k4eS5mG9@B(!o2%kJGyRWCcWe&Vmu{hVCtL`m0h^sBtKKhKPK`1q0Unj#X~%= zqS)%rk#Yz3KXN?7X~`7*_2C*MROuW^eu5wO+8yIBEstb~+L{G~UXnA~^n9D&d0U_%d;XZ6L^5V<dGv(K}LA19rGkbki z6g=6?4DRXTG}@4;#?+v7A2IXj=Qwk(<9o)&j{_-2VIsMhseMTTBOh;)Rx#hYF^3Ay z7mA%k9%LT;oJ>*6v80f(9#3okY_dljV`kc;HQ{bdYur%BxYn?ZjWlYLT006N zHg27Jyxc?@ai$@IwhS2MIFI*C8opo(Tt9MhY(oM?%jAMligd2_B%o>3)k~hu`Nuf9 z4w9eZ2X2;wU61ULk8G0|8TTS1-4Po(w>~A1376(gGqTLLG~4c74i@;Jnbi}m1Gj6o z8#U9^3W<=E1#_(ucY_MI4$FF&+zAhU91WcM26oVA(Q(o3OQgGkbIVDbL;k|e)HWfs zBXq3IDR=MOADuF|U+iLl-H&W(|I_`eEdpUe3dZx;h3FvtvF?;G_)5L`uO%DXK%B?4 z-s`;bd47Om&cDgs)UXb|779xr?l`;sa$5)XO-%LO%}XCT z?fLAyVv2g|h}TCi0dH^}W^poMb~wcR2{D0nP>F?CI;WgF2n79BD5{Ur&BKA^oPc?SR zzEi*02Q$M^QvxCL=lsjxfVfgS>N~)mh$5B$ziq|bjFbmFF5*{@Jx9v34@1&WLuR8OsmGmc1k8CjM=LspA(OdRw`gHixwEsW|Z@0fkg(9E& zNjdosr8Hb#7ddf0wTrU|U4f(Qeeue>`bv`bfod@-Z>qYLy`ML&>Eo6m_OZz5ZldiS z`-!}Vu};NLoyM{rj2C9+oorZgqnlRT=#uiZNzdoeLy7VO-F6vlhD+9r4AXKy2#SrE zAWqZ>+{0gE1*S7fjc;W=*c3_lbK=glSg#P(}=u#Wd201Ezz*_r}g2|;NGDW9QVc)edF zLN;mub}T|e+3FBn302~{GmR|vjJ^yo37m2E^b}RY5zUeqhZ06cMN);?C*`wCcVWlU z>*B_m)6ML{U9`>=EpqEDjw32lfM&%L+0!qqB)OTj9SNmF;X z)BD!=Gu3vL-^EZBcjI` z`b?)tF~GzZolzEd`GckO;z%PL&R8?*+&3CBsfk=ubll5^Kn1|wh6%;2x z>g3v)Lve;r0madAC}!PtGX=#*5n@t`X^JSX0*V!x>>EEhrEJD%V%d(B^m0L`uZ&4@ z&C_KcJ%dt9P9ct&6Xe{afx_NjlUt2j9mhpub=)gk{*3yi^yK>D=Jso5QW^E&0<=%o ztfELR3N(fzhGU-b6(?qq($fM3gFP%I9ZQRsU@IXfXBKOTG)y+zpQXT*tb9zFa7y1` z*jtOpH)B&b8kL8oGp<{R?%ZTx^82B@5&@w#N2KQgFf`%4uBXc2g@5f-O)5IXHixp1 z7?qLF6QV#F=}4LDj6@bfqBKA5X(^V;Pn+Tz$^DwdedTjPYjdo)Wak)uAAeorX0wGk zS2Bc>8Mo%uQspS^Kvv3>lr9Krsp&pwVMM{<1ywoQZi5}8N7Z$SO{S9K6@OgJ_)-4k zm_3zKkFj~O`8ZjLi4@JQjKL5{HN^_koro|69Nr7X^c<^Zpt>;Sc}b&l{zY}*5A;YO z2(DH8GQts#`=U4PR?9Kjjak-7$-i$L7;=yUv)HjC^Brj;Gp z1!ZVQ$wZ1Wj#uRRw(4DlYBVf$wP*LNpc5@8&CZoG+8)J`6fzp)v5cKt<#UZ{g|OK`ZZb!G#e(cN1J4Sbr!YEOS^c6T;U=7CD{EGzhfc*llgDCdoU5KdAe$S z^$@4bOZkOvK|V~7#eW2+vEwBqp=fmQ!0o!pK2L7^l!;QsyW%$=lh+r_&5OVyWPl@N zJC3PZd`QFFXtM(ag_u9GHT_BA)zDIO5;r|taryd6tk4>VWc)d0#Flec-y8l@9xy<%R#K+D*K>2J%2sYMGW5 zcLx<4&D=kVn_#=grnsG0Nk8f-X`f4HsELLnZh42yEovKc1`AP8>ZCaS#y?gW0Rm&Of(vLCnyNFcDR8*R5#g5@KYC1rR7&84ptJeI? zmaS&u4zes%zLU?+nE$W6&nk`OQpXkAY20**yJw72$gB8)42=ZWQ>@CE@RZAR`^f`T zxr%`RexbAw?{oIigy9rn80n=wG8*QnOup=4z)0KHx;jNUek9VtDUAyqzxd;Ha9VN| zD4%S~qs);fD?L9F4lU{%H+I}SVNp%Eaexp?>Y;KUrQL+(J(8G?cfeGcB{>oCY*C(# zEYF$51}Vk*HvK|dt>Jq;H)H<>jqrkqqo4_jGHen-)<`dy?oHEgw;CyC$go&ojM-cQ z4Ek{35gVIK;b>aE(8zOCoLFK1e)u|TxxZSA4vhmOmtE{>q3ZcuIaOl3o@rK zz&rIc?HKu0^CS;tK z$=Ib|B$zoKCGY$s0B~2$Pfy{~Q|c6N&wY;^I*~6rc6*jnGbmiUA^ST&aewh2e;Gfx zU&hx54YIMntN#Kr|CjSG?t^>nOyY~p^c~wit6WYR?EMmL&m+pl82=-&W#fk?R~U8~cQ)R0F0J`+!0bE% zXO6F%O!L^~tlC&94PPG)V8E2N@8ht6c{}CHHr}W!i_ZRj@SN1b1ySF%^EdD+T*^wwOTkZ`0jf|;olAl4l-@E3uZp_?$n0TLG z{W1;E{F52iVnwZqc*QT%84pZE;hbEq(%V(C8^P*foaT?aN8}i z3D9!G=PgHnZ%o8@(!hvWzaBT20EnUA(VPg`K`BPjvq^qw?D@Q}KrFdAIsN>?dC54Z z&fi+leBbk~-SR&)6&!*DYQe<3#J0CNH{WA!X38?ktb*s7NqOwu+1YnQ3SlLTO5U0m zLUa_R(i<|E5N-_3U#fHf-$ zs*?O2O?ZFHJ?$o2zeWQYhxa(`U*Co|laJ_izw7?k+WqnShQ z=hYPgPgY49dw7Ces?fY4{atjX*TAvS{DNnWXyOv04utKOI2?F#{3Gsa)$) z!7#JpxSyGEAX~+OR>sh7pe|WzS@gDAFCTk`uefzp3%8)ig~9fzp&aH~7>Rg-6`S|T z=||>yhT{(Y#L_$&>!oXH+uN!j^gdK<|_e-PUR?eRP(Wk=*Fi@~LV0HETPygbc)D;a5$|QdT=x14_rP%9V8^JtVf*W?q z?Y3u1kr(+|9`2thvm@B56`<{CsraF0!jgTA&T?$k?zcRh`aNCpu?-hlq zk|-(avuc?@r6TG?sG7Q zylQ9@X`_-ocb?XSupIOiL#C6Ua=bDmPe zv-=I&-IM5|L$nRmN*IIdSC|d@noszh8f-E8^!M5|%=uD|eJENdVZ!ihhOMbh<+iV+ z9r2Pd|8yz;Ix(@|7P7a7xl8+}Cr{`RkgP4?#to(0I79cxtgsuaHRKz zcY&OH4vJUmLFtuxjkZ7ag{FzjBr&~`b2HW_-+1DB!^W#@XsNO_S+ccTMGFs;y|tMS zCA*13AAiM?$J`UqhRJ~ycAYR)MXV^J`bw_C)ZM{NPL);M6e!bpC2kj@;N{n?FHl}J zG*7vbDVyhV>)65PlfS?H?oV0vApB2EB62Ak)oXuT{Zw-UVFovj$T-Otwx_vDfNiLh zrM?q8z6*>%*GfV95M$k$>5l_@F^Eaz!g}(t9dEARZIke!yl0kv%%4y_+av1kJtta8 zSw#d@Ou7=FHIr=(iQ0)HYSIsn4o14DiI7lkZ z_f9fFDHSA*fp%P!2y9o>ZVX&z_6%4DBr)6C%CQ4;t5>4TR&7Z*4^$Ic_lh+C@q;j4 ze*Izmc;JS5>0zvtNYXcZHLLTn31zmPtvEmQFRvKaOs*;tN2n@lH`|#rNl)1m&`|pO zNXg#^HQ|#-1~E0idYslOOSwR<-+XkwFRBXJ04Ir7YtN|+2BdCCq^YCcu_oGrLvd({ zH8c)4eo_F7f&zXS?x}!i)7C@*yQn(~EKpS*woYc}`NQ1g61)d!Eh6>6d(bl0u9#O1 zHjJAaKgr!?sfg;aef`L)@Mih)8Y_^T@^M6R2@>W_M)q;GQ;t#7A}4D%C!ZOVP8}V$ zY``mi6#7ZYVTrB$VaqQ6f8{$P`?M`NPowyxRH-9oW8x;fbOQ4OE#cPt8vq1nrtheGP$3`%$DDIWOqsY`6N16 z&d04MQTAjx*7AUKAope8Kd@&9mitBF@QD1F<7er8l0*x{ z8`Nou?@Q7&41BW>nL`$;tr*5T#=MD2KbZ`H3Oy&$Q7PDEyI1vpY;R4$ZC}=2)f$8p zffX%ruhn{f3j)x-xert3Z6dfn;kiy~-!y{8H??p0K|uZmM*J1WyjGMk z-_%V27FU!?-vyZE2BFWn!_%W|TGYW1QRrf3B~oOlA{0ARKnC~!LQ4~)2HGZ1R^OYD7FERRZ*7QUPd zN!#YyqpMY&iIK)8tVZQKNYWA6l{6roXamwfwBQ5OM2-_?7cXMI4eR`a)>yZC$s@1) zgp4_}JAP*Fl%xfu?i{e`RhiDsJlyD>o+7f)&E`i4almt`?d(_L3B4UFhZ`BwMB}b~ zl3k3rg9(jJgmqc&JlQ5exQ*WYVwq-Ua?3-!Mft*EDu^vf&>2*`1yCfx(zZM3u(-S1 z;_fUkI4th&?(V*@xGpXWEbi{^?(XjHE|>G2@Bi<;5gF0%R7Z4IWMnMN@$J#Yj@n@tT6kQMe`aOKe^x)6C$Ij5%^!X^4r|w7eaHDaEOO1; z?kZuACFaFI@g9VVm&&MezV=H0xbR87+U)1V+nj9Ub1k5=p(oS9^p+heULZHy$HHNS zh?TI=JF26zr`VAE`LCv(5@Kv3@l*6dx8ya~&&PKXJw*32*Y^W>_-;jW-|_t6)SKEN z@EKG0@pa~7#N%9=KPO=B)BPB1MCm~+n$6w&wb`TNA^53Drlu2gl z!7#4(K#`xMK#)dKT$Y%nYX}C~@QGHw9*{hkXS;K5%$M?e>_4(8clYOK8gUJl+xYuQ z1`6&46TQ^Ne$)31eD)Q0;o;nxr%EKGpJb!M0%2Ib%RO&o&&uLc7YU4kH+XZ?*x+}+ zmp*+5s8-a6!bUMVvoh&ox|(se;(!$mv{(+(FC>;>1CiayQY@H^pg!2EEXU@-rJCc9 z1IjlOZ3w{pni{^qJNt5eUj8E zfI^HMD1|C)3%YP101y2h&Un|(+K^2B z0(u+giCwbMr^e3>$Ko?pPL7>Adn{BwOvs;PBAEIn#%df_QrOuy2BkkCj?q49y`DH7 z9d*jtUcBIbMZhwuOrh2Lv*UUDB<$0Gxzav#ijVl4&;Er(D(mKp#ZVdF9}2SN1E^zJ zt-t1a!=*{%6eVOs#nhG@2Wj7x$Z6PE3ivxHPiSw^4vJ$)JQy&nJSU1JqVVnllTW9x5f;WTGjF@+Gp=jF$S{epgXA?}m*Fi6Scfi)7Hs z6U9YgNc7B1e{-s~NPt3@ywWYra7l^d_RG>Nea;$89V& z3hQw+=LNXPoB7;DO%A0A6L7I{oD2&7ap}o|*p-Fg6Y}ESh#%FK$_F)RG{g@}Lv&sA zAc3s>q7v#vy7nlQF1LwMDefjXBgH{22H@*WP7r?rb#lhPFo`0Z!c=E?7kU@1RgUzVkI`Q8MC!%lx?_TSv>(zj=7AY;BkoVouPGg%*N`vL&V5yM~%k z(|9TkOSF{-zkN}^M?U?l!E&o69Um@k+>hMeuYgtYd7zMUS!vefVYnTbk+58y@q2lR zKCmHQNv3}8x!VdU+xQkh6w>B~ejCD}s<|XK))x}_?1poDX=}k4gNN#E5Yx7~(V<*N zqdVyEE?}WGu3SX}k*xOyqJG}KjbQsQNfV1Z(Nj2<@~e5(-fk-({cUwESNF|4*3yIj z2a_|Wbm8e(mq}AQFRxU-ppNZ~B>#K0Ar9Y1#Px`OjAClaRzf>%!u3<;4lP!bi&f{q8utZ)L6}rEdK4~ScZ*Pn6LXtMhxVA+y@SA|%JJBxNurutV^b1g z)c0siXniKC2D4~Zkv-V)9xj*j!H|k!Tj>w!s7d@&m3Ah-jc!K^X<)3X;~wGcU4X}( z=wfiSN&L-qpRKJ(@GBWaB>OySAg>Xqxt8!`W9nAkWjrp6L|Cb2&MZY)h*Q$_;zlrC zjHNTbmTHz)0cR!B&i3beWE|vXMLHhSc4;zB5()hJNEmZ_z-hg8lmkz+l$K&iGVd+; z_CN;mQ#%-lMJZM}5isbp62fj&qGV@$(nGZQEUbjV14r|X$lO|3kzSloDL~eQ?jyF;d zrp*Vh!l&7wX5!_Ck+b^hQmVaS#>Kns9qSe_(@x#@nWz;cy>s_ZmM{}J8ZC@NVV>@mfq|GBI?F>BX1g=gZe8i%&qSTeDp;+8JDtXhhx#fu16_rIMMN zM-!iNg5-U*Fc%uhgfBw7pY)xdn4GjCf264baKoXFfr6(YEGTnDWmBRo202ye+zfSn zjt;lrZiC19g-nt5`dQdoZ0SSiIuzaePl`NcRkG)Fsi$L_JSe~N> zLXY?LC8u_e|uQ0#}i~E%n=d637a3NXzCDAOrgfV^2*ftNs23e zP{N#(grvUEM;O1Pu;;L(O#g>9&(=^fDw0<5fCVOzzvs^O;Pqt0CT(<({5F8CGK(>@ znVyt^w1NtI>ijx*$o^S{Q&4kOiX#5)EGJ#~Ph-g3+1*^c>0o&K?GpsbGWCav+sIX! zrxzr;lj)?fQgU+=MhZ4Z1L*ofY4umbJ#3tf!{XJ1`pV4n`$6~2L+r-(8OM?4XgDzj zZ^*?KD0zP`sAuFN%yZ=-9Hwy%eQ!Q}4*~VsOds!|gF78|zlioi#uw)|W_Q7IMy%1% znzL<%BeE`MfkeaPIlchj-+~&x^1zH#hPBu)K;{}b_yNoP8p+zMPq#K67q4#Dk@ zBGsTz{!{Sj&)fAn>;MJjmm1~#DEyZ~Y$3|7oKOa<$PD}}?FC#{M!fn()r2ZX)m9!0 z-J-ReLY~U)@fw8pnYq+0^Vs>LCM-77~Z!GJXDm`Io;TeoPUJMaV zii*I;N=nK>15aI(;k`_8IZp}F1hyqpi}^S^2C0uaKhGQ-qfgHoq1A3RgL8}{AjMQh z@y{Ev;G6lB4LzwwS<`O@a4t9^nev-i3la50_x4UUHS>-G_uh3{Wu&ZBr#oZHuDvN3 zt!R!PWei0UoO>3GIqNJ+9qA2Ady>D~1Y3{cBnHGg@GrLSG3MMXc zq5(5Ba{12dU-^D=Zs+}(rgpFq<5OLtw%=f~A_F;_XNGXJQ>;R)`vZ;Abe{TEHFpb! ztTV`tVzTU-*&hbD&t6s^=ao5ZCtB8r?79K7W>%jM+!DST5Sp3tX>ijcw7;9B8YkH`J;7AKw8_;{R2nN z&ON0uexqw`WGM{x6z=*U>i7!tk>ekxvc0aFxjM|nm`%XjU7XY`jp3wQLQMwL^)?qf z3*&tyrq4eDg*KMWXL)u{sq8yq*KA^#{UX09(M%X@xea$As)|K8FJBTPA#wY3Prm<7 z(d(BmIrOgX!S^ytIek}&0XfCUIbveNBi`(b@%>yM{$}DS?DlaK@$+B8P`c~W(z;Ka z8m6I7^Mt?HDnwD;sa~DBbaiOm+AiraFUIedAa=Oz{bY@BW63pI`-;7>P&#_6rS;UJ z0|Z9OddGa7%ppc_OKBN(Vg<$X>YJi#61?N*DZVEb2{4pJIB2m=ak!*7a=&ZYS6jp< zGPM4kKO@)m8uCj_jn?kPB*{ntVpo4M59-}u8R3-dnFwtw_O>`^^cc(u3x~<^TPWS0FnbDBrdoQ8pbG)cO{VPFCBd(maBcb5!B&%iu># ztD-V$+#*qQBK-VI8g9SC=)iHn)NV95o$==WR@4>xr?wGffgSvYB(qz=p??b$hb^Jd z9dA-#cQIC>_$wiUYyjH~YQgRJgPA8{>L0WdCDPov1IXb58*%){AJP2HB7ve5zf(^l z2K+q?(%2nem2I)@#G^7*hc2FfwWMw+qTPnJ%8TP~rg=;KoO6m>ewDM$ue7CYWH*X% z?6t+lI^@fuwjWT9?Dt41l)Of%7ZQDzS@2w@R3e4vPhQ=A9KR0V(ucWCV*{lH`-&TjnvFd47&4sk)gI3%%#J+gpQ- zxU^cuCmFLk7RHI9Z#srnOjK@uKo@g+zts>-w9gMOegM59O$xggt-YYPpMOgINcQoW z55`Igl-x^xY|c=pb)7FOY)PM7G<}%Bf76Sw&2==IP`O_Owt}y!??#klle$s}9Q+;b z$i`G1s5sztYBkd+P-#!n{oX3E&(h=p#a z^k8hfbWj;vZo97-i$`}dE9E&nl2s{gJqYa0`_NSE^2{oGXPSn`Xe{rBOOqjd77Kp* z4PCU1CQLc zLsyG4N-A1pBiPK6WSHOugEm*El84eWX{lO1UN*z;AKry(wK6qg{YWC_s2vIfYWUl) z^y}{nCQ?kJH>6nw-`m!g*M3oF)l#ESz$2n}erw5y@4X40;$LsluMCnvLltOthXQ&P z0K>-z-L?e+TYl*qWbo%hDx$-aTgjVuqg>V{;?vB$3i8_s6m$P<9DK~RaM01TWkn5g z<=;>;jdC(u=rkXuQI%E@+E#&tvbfEvHRtvCfw&4t=w{6{hHfwzVZ3$tY#D5H~!GpInB;?LlFd5Z!BqXTBT9 z;+Ls#zqhp_h^4G%8@S5P9G{W$7fOs^0f=wc!mV>j_ zPbS~>hpN}hn&oxBy%8s4JJz~u5s}F|-+_y76K;Utc9NA}DFg|^s$=>;WN3xEZ3hUy zj#SOoY@b>c&-HW&6%4?Ss=55JfTZj?jvApWNxzU1OUojLF2RD1OrrNuu2=HgyQp2? z%5TyucYhyxsx^bwQ_ntJy!;KI54hn@D}kkaX1_&YA_*^1hA);Zp%Pcb$yv;+v#jtd z#7jB){!8+ha`AMNG)mD#J4O5h+nbc4oaeargFih)*)T@fJzUhb1JI)+fD!Uk>+v_) z8VLPv2g*tM<)e@-VK2C)D>U}Asv5w{557cU^wAFXs^W?DJu<9sxJxRbn5O|-EqL~* zK0V1b)Ou-;@_eWZd@w8%2dnVm$qNBs0WuAei06S*RLpVB5eu}*=ghn{Z~V*XlvX0- zDyug4kJe-Zl3``SXwKTPQa$9*%m3{M?MI<5y4E;)><};a@#jhI`SUGR-CCBGe$J8w zXPqpCZNO-O#*8AVp(8;SWK^(LxN)Bll-*1%s~CHSXZeAv5DLP5y2hgEM(|tG6^bTU zd!C*i>{V1#=;%Dln^c^~{u`n2@qSYqK3@bB3BKs{@# z^OU#Xd|^-`SB06fhm=(5*tpFNR4s#TfuiwoGI_MrPC{fYx_YUH^uQ!gbKC+o!*Shy zqp@$!eby6JllNa0!n_NLT`GQGX>ywib#fVw?cZd{%*@OxM*Qg?OsXjQHc5?f&EBIJ zm{&{pQVLZn^3|NR__bo%VY8_krUJ|q_9w|Mcd0cAPN9Y!mBqrkmA;0x_ zhIq3ocy|B1M336s`RJa=Q^qT8H8{19cVhMY&F zKR0DyV%g@>`+@!>P|$WPxE#JA$@4 zla@7~&7y?0N&V z!Jpp$%4aLtsY`6^gME3A5^xOkRl^mF&C;2idZ}4UM>#mQ0~*sqfMxvsCmLj48)8r# zHiJ1#qQo1F!$4&z#}!qdJ@g%gB})C7aEGX|)2hYp`qi{naf4kK7pt0S+Xjvqy4NTo z9oyLRwX)C+LM@bzzp|>HL!x($3b-Oc75q?RRaNAU&03wdX&x1FgZG+7i$&aW_fCVw+|lk7?bDp> z=Na6)cntRT1v|ofw?3E07E(yxMcWuZ4C7-OWiIC$Z{heDdxeE`w5_sY#WU9_q5j&} zgjL9?PZG)6#=C#UW@--#;`+q@t;#QNj`@Z|(BYs#vsyW~6kz&e6V8n8bpo1HNm72tJOZ%IHeG}@^N|!Uf4vjQchvavXDxF{z za>7eR2E^F!mGIwk_(z=NgA{UtOCF{3|8vi9i07DGRIGSuRDQ2NsS{N zI5t05PwmN_(T9uZcnl_~o9!H*!0$GLcZXVZ|NeSgIO^Bd+2Z)Y=HpjfXA2EjlEFw{DZb}sP^VY!TtOS{68rovG7bGJR$*fAjX z`g#FBg!w*z;t4I0JIY&E)F;dCl4F>zv~j4nOTe-W@g^LZX9`-~O%q0w6ShyxE{8?@0-=bTgk80;d3R8~Z#Sm7 z-%1!oWd88Rjxv6whnZa2hd;DF%#J?YjLs)|(aVh<2Ud2RW~~J|n^1+vGcO*Z)GCt8 zL40TteOrqAVM!-&qAYB{t+TH@o-?lAlGE`^ud8f+sALkQ$-Y$I@Ng4ryN7*yXCsxW zu{8_dr;iU?eC_!7etG%+*(Y{wCjCQcD$A`W^Lx@Ml-1q0zF5t9xu1Hc-5zBO>4B17 zVMKe)!f$?Hu*U^aPLIZGh&A<#vB)nmCL?CjwmP&;Y&GN-Ja z?Mz}f>$(Mt^s#4xvieVCl9_@EtHi!(%%SRPpW>UKfcR>*^Rka|$fGcNyT%@yp2G|> zb>=H!Tg3#1acEN5Ne{&;!`hzgu{Ji&kG^KT)#%5I%{s3?dw-8mCjN0>do#3xm(~$*Gy!Of~=TD34?uym`cy34&-yyhm4Ou<1qd_pmz-&S8H6syVFbj+fnunU4h zJ?YAMB)$O;ALpT4qzl*jZ`7Z)7wVIp4+r$+_ly-cL5;iFh+X*tu}b9JtJXDjWO5(z zUSG9)L@p81Ec#hh%Ylpo1nkLL*u}s?)R1Xj$pD<;v|5p$Wt32a6$!#6*vAlTEv;~iLwl2 zGhyXxgr++Lr)bZXZS9-o#UT z((aGS=z{{Tnyy_v;H!J0b?w%qq&AZs=dyeUQKVSNM6ITcK2}iDAF|%*`Q0` z%o0ER#m3%JkkO2*htA$aoMlx{kM^tbT0#O3iV%!BnF&THSN>TK?aN`3+1*$45SmlH zTi=qpTucb+r(tnHADS`hkVvQGt$ZIIcDpt^u2#IU6M`2;>a>yz=A3JIyKicBxG!ZKeIJb zGYxU@kWDgO&djGQMS`0ytXs>2I}!&BWRd#}p}21N!;+B;K)a>O8MJ*yVIDgLvryO+ zSu(!NCVlr5L?DLB1zkYhQ;>i?N_O-(NW#U>WTdPKnO@XC%cG9(m99A7YA@O`WVno? zadAXRs_E7ISjViTl{k0RkU0FAiE$b&F$<--I0VMLI!|FSqQ9;a8$=;1I%>{oa50*_ zb!RS#v4-3N**~`fKTj68RGh-4l%t6qf?S2$Xbw_|mtYP+;~5AK9GshBPQGUB{1Hf! zoS;Qn-57b|&~5occ$%ndm@=L2!^bUrh}7gZNhV88IzY$|&I3;i?nCC3_z4Gtdo(5Z zm%GVi%LE1bFxz%nf75ZIM!@7Rpa-MQ+Hgx|!KLKrNpk`xeLvbj7Ik_JyHI7f=0nNs zlIEGuG`RrCie;>O#2b|vFK~4J-(E(DckYjO7QKKq5F4D;MfUp=IU5s?SfQG9zo=+P zyk>Rx3%-Rq3S~eeGmTW%qm?BrVZg(6n$*Qd+BXnu-!%_1b3|uw??poy zCxLA50NunbakzV=`p;+tto4AS53Rf^Snjgf=c&z4##`UtB=tWK6v7$&>bH*D%oWeq z%*Usxv{KZJL>2oVz*d#oJ-(85 zYhh@r^$L6ELc-5j%aLU9jrgKmQ z2MK@nEYuz)+iQ2W^4sUGfbE0E8-1-Xk@h572C86Ev{nU96n#Wse>kcf>+tN$`@!g7 zb{;gXuChUY@nOzyP3Lpsj7u5~l>CS#wma;8M4vnieDS@2RTZZn9oGAFCsXHH`R7YT zA;y~v%|fI7jqf54^ZbU9uVEXGw>r+k`@`B+1h|atkG_V*_k}0y7BD;))zC9d z3~V)=ZQ&UWIL(-DkeAvR15`GMMp{LCUa+fZCY&2=b>bNOE zVOc|0h%(b$f4hB$b$@ty4IvgH0XuOqwkLw(U+mZEd9+qRDl3pHyeTFeKN(y489~tX z>t*W#jNOr)aDr$jq{iB^t$&*kQF~`3LE_&2N)g$lypi`XA{>a%N*6KFq-55*T^`15&^t;TBlG(pS zRKBbOa$BqZI_GhCNc9kQ%ZSc%=$RY5G2$U6{EKv|ZHJ6D{4aXAVRhET&O3DQqN8(9 zOZt8tY!~P3??o9l#d2jg)4BwRn$zbnCnwo}nGKmcC|z$9yFXv)4<5(=Ip{b6W1?j4+*oawnahS$p3wcyr2KBb1u8!k7FXMk3t$ z_x;{0nnVsOd`ByqW?FY{PEvIo?)7SDD>7Fx)IQTMU?Frrpk8-w^g0+TbekC6`-v(( zorugBNzS*qXVo_6?yRsBBh>9(<<)zrqg2BIBx)h(4B%1in1*_ZmyJHlB7@#j zhMm=&n^#EAxA}OnY*fP>>{_+$ZB6u>7@W;et5^A?@AmD=cotTpPMjyxJHi&2iC}nx z?FX_}`BU-pHgi|U>NQL5&gah`d<9!CXJ;;56;F`4j^lR$8Q>1?mrAM|<%Kn<7v+90 z$H&ENqu=B9;e@q2vUv2~yvlmYUqw}3GX19}kc865lq1A7^N`(LlXA5@jN_8tC6&#B-%ZLt%Kzz%dXu9Lik>`?>!KnJ(Ka)0OQNv zS!D3Oim6H)oW4(l7G#D;rQJlmFp6;>qXapnpd;4JeBTi~_LW+i1w4pMyD~B>$kppI zuZuO%`hwd#Yz!pOvGgM`EU)k?hAQfoFNyABgbdOq$@S(9aWjivvL&F#+5bh)A+;5I zEd|y(AZ~%2C`u9x5&{((AhI&S4|9$co_}yFT!%M%dk6{C`hRT|vs{;a853@>+CI)GW)d<&xjMAw7Lg?>e}W&jk?X{7^}TLp zUuv&hWbbRD{#@%-r`+BWs3jcAML-jLi;Q2ku*@B9#1>zHUGq2&8@ zt3&zxiRZX#DW_Ha%N=vqAiTkbaMz|NT-+#s4>FOJciHu{t~-p6H{Er$Q07BPL={NA zo(Dq28CoZZzXxC-hBB&Z78*)Ia|CY&0~dthJN6?8k$-_NNU(OEz!QdQ&gxOK9g%0@ z^d3d5obbMe6Ti+=ifu+~T(h0sr);&{7fe^IX7fnA)2EEiw*15OeAq zi}TwkBr0-<#>FaKFb^Y@@@8C=Q2)2U?pV=|Y5FhB@2JxSt~Sgc*6e7$EDF|)pwD>) zh9HPghzKm~=)5dMcH9##NX3ey3xBN2k@aNTx=942REv_9%`h?5kK^JH{GaPGKKleU zV+*%1rSUa;NJLjx<|}M&N(-w zee|~sq__xAcHq(2H|wub`|12&j^z~^fiV%Mg=7nJm^9OYr0c_%=gU%HP7oHKrdMvz z|0KZ#MEQ?k9&P+;X#_Q5&Xq&8)PG(1@&J%nOOSAPmV)gX`WRSq=}?}v*&B3B;&5rX zP|!`;%^KPLP-)t9YV>8KzZNwWPeX-324|#@=(;)g6!jewS54O~&De$EXW4QKN2BS;w!Jc-e8Kjp1fV5rRutqxno-x=vHM0#*zQX({8G_C`o^FsqmLp44%jDrKe|UYy$eV^_JRpLGQxeK6+zU5 z;q!)%W6?%=+8xXhuMLl3x71{e4I;A9|KsW=MwFsg(ux2-b3u}HVwd~jnq?RgilaD& z%uE)Z+K9YzH!X}kGdNoUt+%EzAFBe|J(BrboRD78iE1%>U=7aci?(vs zuQ9typMcD4_YvJQT4iES>h#D=LH#SYNeLd@dS0|I>PD1{Z1Glh$K}QAE?CSu;oY7U z#jB?q0D~YV@ob5)6Wqi~3z$<6tbcMua6yTU1^rt8@yZgE;WzVzQAF^5eerTN^g!G4 z#RMFy23;l8ks0a$GC))Fe4oHN2LQ{!pUJ9$uQG5-7<)R#1W!N2Kd_ijBpcr*TzfZ{ zRY-kmu;tv~<_gKMrL=)lgre6r{Qx1m!IF{ZZn{@Ii(gejbNtw7zTj9Ws{P^54c+V0 zQ6*T^oza{fquCvEZVZV}c2|bsL1?Pd7(O#xxCXJQATwMa9kpp#3PnGi+EFiVXkN(F zWt~0lF45bO{-oPfGlOVkEQ{t0ux5hF6d|KpcWMwqu{ah#g;F3YKPcnX9&3?$QD+PYxS9rfLeX@EG!878!rW?fN}=$H+^s%! zQT9yq44O0L>ah1-BiR$MT~Fc`;@`jr3kPxc7;>mjrh`@qg+jhYa3Ce`ng7`JwC!Z@ zT#x-!DnbYqU&gMH4ACiAk9Y8HB{v>eX=D|8twN&!MDzduW>i1r9-!h=O>k2n?u@h))fA zy=?M!rLR{c22;CZ;PV25_X@#g1Z_OBLyqyY$pBh}U}mh@>!%GU_V`=U4=oaxInfL! zfF>`Uxd4dqUjAFpqTCQ3ke54OULe~I=pG!4jJQ4Kj(_G=;*zXA#yPf=ixWAPAH>5; zH1z>EM*=yxXBz}qAjgL8c0&;C1^}+aj?gC{VkZ2M5{iI^u;@u@!0hlel&`uW#{aoaf;1LPDW>BG^J}Dha zY_ti~z?WB&>Z43-j38~C%c8^5vOi611(omxVJ9IfE{5_1x2_% z5?Lhj0nAX?^0B@vPs(3J)55_2D}h>n+>4^Oa{Wh{*a@n*bj}`Cv504(hMd7zbo{0N z|56m#dZho=B>KG-A`c?Yd3ur|RBj@9o0B*nZX+LVAUguZ6^vO28A(TeTL&QH7UYZ^ zqXUq|@}Gs;at^R=0mc9KSAUSdE(pZKVd)m_43Ni4u*S+W#=4sA4_k#|UxvbW!4eL_ z0f!DMK4FNBE_z#sPjIT5A%P%7{r0rFt4;m%!XMn+JF zH0Bu`$aK*(cHeHSzYR=5@FA593Lg>QAw$EEeK7zPOc~{B2DZrrYOSj0LpQ)1BJsDs zv%F+BA#&`7m?z$`Oj(#!M^DNzFt3|0z4+jgE&yl?oiXobBjY{v4YZ9HwaKu z&%>bf{5`B`&_#Q-ON)F&i>&*9t(0&^u(a|;0@&UG{@Q->pKzW^D&?OM9I3EBs04LY zFkQ_9j`eHRvKLjegSyj*iG4zyrROa}ovUE>`Rp)>QS z$HY3SQh9+jy7XT?M=3)9pQ)yy9Xo@qt?hwPJKBehs*ty@7vecu!7$Ipkhqw~J+{i* zwbm(*>!7s6phWhXWHEIt{wy=)yLT^a#-X~>jdw%t_mItqAP4e@eo_N1r8B}se89pQ}E ze?%jC0>jLU#3>oVnNep<9sf))6{pAwvW0LSLL9VEqd*>80^V0A?-XLD2LoM!V0#Yf z9pW&=;obD`U4>&+8Yr<~V`tfc@C3$3#KJ%v9)Cu7Lw`Ydrcf|w<}PAr>^?vsz=5+@ zOdQ1Xe;cs%ks;s>0l|*`0q{(*V9+dGAZY9%00hom9RJl+7?_01R38NLY#RHEcBjKY^A=q8e91TpGyo4Iwpr3FrT8BYRH2T;?3vdrC%tAG;{-Np!65(e@v#6A}CP-+|2l zeJCle?905k7WnW_38S4+(e>j=zXrfVh{)S^#-l{dZ&qlqc07{7A~}>I!=Mv!5yqU? z6eUzRcYOfTnEdoblig7LdV?)y?tmzdTmF zIRM^R-DMN|YC~t=D&~A*X!ECeafDgTc|D!>eSB z4Y9!H2w{#9zs&TT4QaOQm?E%tuA9z&i({EqidAZ{{);1jOXhQ%Kjv$SH~Z%fe(BJC;`-)7TxS_Alu?B(!z&;8A6I~ zf?EO$|3bAo+!zG-3>dFYmn_zq=zpwg7V6ADN$l%ZB*T|=K_5YZ9XsWK$8~fKPzd&c zE8~NT;i7X}0T_+MG|0zWTrDYi3=iH|Xi#%O{x>O9e>k?jW+*(AB@tmKhB+-MMGTa% z-q_$X%mz9ctvVp|DcrC3DJ=bsTm+56_ym#kz#9aBobkWf_&~}?$ny{)U=*Zu*ij*W zqx_vg32jGH;4;vs@Hb!IH$f!e(_vq8TC>Eihzfr})h(df(m1WX6)n>79nm=&6FV(n zt0d}VIJE7K=!w?6zU(aZdo)gbba zV)@mt+xbLZkdKA)kmC6NBYH8+5Co0O#3YEyxd;I+HEG+A@XuyL0>U3SH3p{iA0Wn72Y3$C$7gh)E^9YXPU zAAe^(w<8F)7Lt#;yiAaL0)WO#X2y~-lmzS^S7ag$a!$LBJ0VBrMST(h>;NBK%Sw`t zAGC#)x+U?CkS>gNbcjjGrSJZOXd)5(p99O35?fzNbz&?iagk@|$)QOs0p#6>~Y!H5jhBd@@8*?@9= zvIqF5w1^_DiOiv`xxoL+=l=zDxkO5s{}-MAL+bLFI+78DIFA2=X^#KH=&vsNpt_U# zL)gu7h890WD)a_&U>6|H@JO5zBMeSt2i76Z*y~Qo5Fa@}=H-4u-1+%`AWeOOy$FCl zt6gCv#6N*YpMZCw?5|ryK*+C%4+i5A0DVvOMl-_xVl$wg^S{<*7is11fWTA%Ho%TO zk*JPrtPRaF0rBS%@O|S~AHPjZMcfrqwyy}$7I2aEC8fN1EQ|cj>JQ>ZuD#cW=f_Rj zMY-8o4bEucMO68#-tCIp*0mOU3u+%nL2ELJx_JwM27K^a4#XM&+nZ@ninwXteBy#D zJo($u2;|ex4cp-r@$67BT59F*%8TjSTswapDAB*qs1G**=_z+iS$z1{d=>dw&-#2^fA-t_`)OzIw(-i? z!uwg-!kN6d|5@2Vlf1a6^GC_$^Y`O^=YEB^d>bvWTeNZD?>~pI(ngijB&q22u651FhB17hX+QvWQ$C zKH?Ji5bEJnJzw!xOg8Zl**C;>4zRcD$)b6(Z80RODo(w|E*?^UGHA-PfThy_DPr|5 z0b;%uC-1GgbED12WS<-XkR_c1;$1-A>yZPIG#T-4(j;Pj|C^%+IAvOMq`g7NzzYyP z1n35NE5uI>CKRUuW%gov5MUreM2ub3N_OWt2L?4QC`AUiDGFhT@g&xIvFTtAMh^&d z4H6|7r^bT@Nc#g;AWOsiLf=4;OOB*_rp{wynj&fdh9Xk{Hh57z10Xf{=c^$!el&%6 zc4s!ID1SLN6o{UiWSUa2YzQI(SXx>J7gU|1@Hm&s@{Y%r%8NT}^*&*66D^&7D9H*|+xe$sR4YjrVH_6o&k z>RYtu(F9bP#H>+cb36av#cWhBXR-LJ)C#Du73kPmV6@|0m>)809(hJ9J$^i~`?XPB zA9vM5=*WP84!-x@bT?4_S`g_wzWXa!)wTazHnbGaP12D-+Thx@Ki+hrz(mgg)93-~g!M+9EhN@Fmf%icn*8@yp&My5^NHYS7&t9!~Xzi)$USNo=R-J9@9MJVk z1M<3`0e$?CYlv#j*2J$x>xB@8VYOi5qeY9U)66k`S70qDWf)Z+>GHhlhZiCe@hxlQ{;a5o52i(!n$eT;$FkJXdHn%E;!+w?a$Yn`qVzIIkZ?(D*XV=pg5GG<2 zTuxWKTVwZ~_+|~<6XYEZL4SEp7^JQ##Z%$ra>nw*NK&0MNhJI~rLM_@(sRX2RIv(A z1DSZDOIBbYApH%1n}1QnwYn5xmPYlpP22woDZ|*bNQsJMA*&YpH}eEFBfp6JgP3%| z>@u{0iy(3D(z6jV;2R)smd#6(dU22M=g0XKYFj$ROlxul5V8)*=f62z|Y6l`moi6RIFPWEjq zF4%?_C`6y@g~{C#;>wcig|1TDqiQEvVoDr_8`PX*;aDeK3L2&3qR%zQ7VC5uT@jtd zw<4wbLAe6CyLzG@Xei+CLiPe~ATOo@A7Bt%XF+Y)#1s||6$b~?#}Md4ousK4620Fh|X1H&Z85qU2c{1h>pMR8NinWlsVIkSSOQjq=9$f zp{4}>9)+dR&KXNE|J`;VN3!p70B~L82pXDq#p?e~l5s6u>-iWI(6OGw%$2gd(32nv zh*mFn=d^2V0>yM-g=WNiC(2&(mymK>6BT)a^r6N=mEuLxLy5|djDE+khsiFI--*Ku zLnp8a&-`~e5&qj>Ec99syky}u((pVLbZT-!T^~xzNgP#42wHGocPWKz9LHabE+=}_ z5~h9u)OP@u$6tQTCJ67ZBo0WW9~A5Vx-It*7VfGE+Zlbd{|^9WK$*XD958c&rTKhBIszmP8IkZGAH5M*?i_S6v4aua;^SjD zBDKzD+XL_K4M{eFm@etecfrbcLEf~xz_$ZZE*g;15ZK=qQ95msXON;M80QXMumiH2 z_@~!tW7PNunL)PTpLM4_q?jRM<`gq0@dT}Edo=4~8u8DX5D=gZxN=BBjo}j5l*9;F zxfzWb{{VaUNKViL0If*`upX^R0}TI+03FvRczhKkJPQDb(EwntJ7TKVy*(;fceTpD z_u}d){k0Rg8`l&xk{*Wz6vOgWSL=uJbTv}CE!9q=R{3_4yJ$(T9%=KeNd`?@MQseZ z4UR%>Z~YR0{VLFufLL>XpaIcE4p&j>(Z>vdhSgq^0x|+5270ws!hMri_nv5msJ*G)Ew0HYWiy z2vVFa17sZ#JvUg=$B;f|q(V=WDGoTCQKN1T5WhlLGX;#9w-I%OI{m(xDF=D}yBh{toeXxN3LWIF#G7 z_Mkrmlz^%7Ea+nmtbrdMvUqEv$U$w- z>CTzRZbX2?Uia|bTa)aQb`wL;;By6}GXMhFEf&!0wO8H%fu2k(_(aWG=pp*lp$-mN z-+*^fRm!Rw(w1X84RDLFAUJGutvb?9>hX2Qn$vn?tr2L=7YHjXJAh`;M(Fb8U(xa- z&kA`~$g^4z6d?2v1_+?vhJXXqHyQ#$MjisvK^~1p0|FF;8H1BmyN%FA=pzvB9I_ix zFv0ACj6b6x23^h3aAX~c07a1nCQ=BAz6X8LMuN36t7pc$GYED;EQdI%k{IcR1E2*|TS zp4C$9kuCy`oFPU&#K?!(A*gROLaX36My1sjqQj&$>hM#8 zXp6PjG4zOM(BVpy^A3OAvKHVASm^W-=r7>3gRMw22QGcp1*~+jt-46-A+3kB-fB(s z9)nGqEo`)Pzk?YHX@=-pnJIJ9U(5_?lXpg>n23NiY|%H?)T4E6q0|jK=qNY6`vHV? z!0&P; z)FFe=;|ERI;Xt~~2sl_)ts%l3VTB)P43LZf_yX*$m~tWMvCOKD6FNBl%MT54SoGzA z0eA&+>f(2IM8He?%Q{7Rgqzm#IH^8L2J$#TSXG=T3;uqh-{oh>JGMdS=@@}O(P5;s z+e7GMAArOMO2b}gBY~)2Cd^n75lXv*q!-9G2mFBS1pnWnn|A!u!>L3cOVGV5dUdv% zBPL!2Td|zkfZ$;b`4loEJUlnB8~%_X1&7ju)j!8iG)w< zS&QC_&eopTrKFdFNI)LO?;(Ko9e{-(!2}6P)wixb>1`#7t#JYR_Y*5eKrIbES0RM2G>H(;l4nXWo23_Yebm z^Swl%M>Y!&VM!loen}tLUh5TotZ0>xkHk{lZks9O4rWB91BVXj1IGa=<+e#2%yh)r z3(yW}O!nJc>mty@7wiSkTal6^J&)-j3=oim5Ghcs*O`-wIX#gkjF-(X%(;H)4`V>6yf-n86MywSYJv{)uAdEmB`?5}ig=ZxhGcnv}(xUApV; zjz~>m(WmQqFWG@h?in&M5s5+|3yv}b znxHK&xBC%TH(+zlLDC~z2O~f($WrzoV%BMMu{t1nL4mIAz+*3w4@`0!>qS>XfMJ{x z>`4Ue1~k&4m2p_vSv z5KfPl6m|d1NGpN;XTa;TwZQYkUxVAf7VpWOQwi4^99N(=-!bwI2R6TW8*#lwz#kn; z{79)fMP}xyF)Tef{>7)p@e||sL+|+8T^NX+gikYepyu8}Z9 z_8A!np*tjcmA*tS5Om&>$^%OgQo=t21lm6!vw+LYGh=}LHdx{V+qE;tR_p*2J0ygD z$#K$~_Yr6#E##)fYl@!_Wz0_hbZOtkoGct%-i??Q#=Rj_pdog{`Dt_ zc~Bq>?6ZQ-2*ysWFzD6N#`ph|AtFK){JGz-wW43ZH9$=*00Nj+1Z*ebk6K{#{%3l; zh?#Xau2CiUdSG9pn!BLV#5pnR3j?yILF&`9C8lhMfXSlB&XA<382@ldj3mw$oHS%M zrq?4L4vY@qs5ivl;T#FX&eP2`uq{v@#jNnL?lsvvsy=4Cj~xI$rqu`Q*I$BZ16lz# zXaS567A=4}X(tc?&a@NOj4K&py@wt2XGpvcSf zZ|CUkoO(O&A(C|X=U|}cINRo6u;=LPoHXU1J9IehseI2LGd`9^JdGk5l$jImlFy#w$ZGo;W7F6XD3CjU}kdhl+!XN_OL!S{y8=V=U=_24i zk6vVvHak;mN3YSnCAzny?kxe%OPb(ikM3|#1YKJW*d5-mwIt>cU0b4S%h7-o-%$=k z$#RZ*<|_o0qN8((&Mir6aEZxVE>Q=lMbbNHfl@%g%;R(iRWm1L6mb0Dty@5{2pt5{ ziYKdbpnI_QSHlIuiWK0Hh^1U%1Axg#K&Bb}Mn;gOD@@O7P8u!XnK4BxOzH|9SYaks zOQc~ltw^zxG1Oh0_x&X)vXBv<1u3#1c0^Rb5@$Zbl5|+;5{L|YF?xbDED+`4ghRkl z)x~#jfPmjUB0TYXi0>i3hxi7Fw?PoJ=g2e1Z$JpQSAgHk0S*HXp^t#?-kh}7R~{X; z_y;rw-JExb*uaG0pS9N?ElF7&A8XQDUlS#>MA;tc!r(`TR9=Ww?2%lE)MWZd9(V{8 zfjS5CE94N-15Bb^zLqeC)WHl$lIZ%MlA z_#lOqQ5zo}`atufpM`(us9PZ*f*uKsP|avYSx^m79bM|v#onAQ_LiVs76|x@ZqEkz zJ6L%$dKJL6Oz2}oQma*y3qraJy3)r7P1l?hZ>WoNl4H$Djzz>by>P@v^hl`+|19X4 z7e3G|Z4CUg_Li#wY0ZGI$2zRpG?LvDdKHP^T{4z|-)Lvu!-Vu^2*`_NS`R4Dn=sJE z3xs7Cf&S9_FcQatOkVf6w1%ESw&?1U~_Lu^6tGANDhLoY*#{-Rsb88Pbk7!XBLSb8a7jr^5;{`mH3=K( zWk3%|Y(Ux~0}?%w#F3s7ESEFlD**VUKSG2YD#gK#Kmy4b!W_gM2_~rnIJRc9C1R<} zd`=?D6~da7r|3p|y&TNC^eO-!7%BdlVRgWw4rvxJ)w4E9PFHI-E>f|_P6HP@AoCY( z1bPPG(K7&0N1Y`CQoBe1^vyvy0dr!lx}@vhCGCGgp|l@RY>9PTVhKTaf=!(@Ij;&3 z<{WX4F4hJJizXLH04kB0B%y%*IbD;nSC{DM0+Rvc%(zVc$Y4!O=$cmz47Q@&C_`WP zA85^O8L^3Yc2|LepLh}c(-9P*!jjedwu>-h8<;n;9mzQbLyzx&KYz{x^a9-vsV|6S)8XPT>AGVf$Z6*!GEH?T`MOjQwvi z_J27UOYcJew6!w`cE?UM~W2guxIacG+=N|!rIg`@27n>~wHcwC7CF83*dydN@pPpzm zB`Z=^#UhSw!duZN-5#5eq_j=yIj_!f3gr%Nsf$RzR^tgDck%XTk)k5A`1W=u^OIwv z)X)3Na~_q$pU>p*M|$|l{AiNB@sml`XgI=|8*|l_p=;c0wQ%Bvy>r^aw!l9d|62?? z3bQW&?MynfM)#Q``cqFki_4FL`Nljgj6`{fV|#w<7cy`Ud+uFHN)TPU4>|Y)wEV#V z6xJI1bMBc@q-_C18q1Q1-NPYr7#D~Kj#UrIR`c6y{M{dQVq8cfWDJyjrJ3pyuYTwyZDCo z8PJCCP+IOUQm!V0$w&eyUk7tFQ{Pz6$>~SblDH{gfTAzcrgw$uKdGIarOl>WfD6ic zaKHFK&?mLB{ZZHs)WF8wIMe5#{fjex$%d%#S*Kv|;C`&|RoI$*z6*C4MYBnc?6!BC zWR?NpvGF=dqd`-b{EwSczhxsPT~w8d0JFNB^qY6lp0e^cO>c}3-v`)oC#w>1PCnPm zmoE)A3D%FM&Y47~zTfnw_2|v!?5w`=Bgc)&CoC(1n3&wfI^)%a+|h_z`D%L~h(b|K zvKm%|#yyu6ba!WG8#YXq^mdcoo!{(YY|hQ=8|M!ejW%&(*N!x;N%(eoz=Gn^07vn<;%>KD5F zeG(#Xa4kJ1Z{0iQjr{EFwLmTcMq}X$n2q4Uy%tOTOvX=seEw;(+XvcvCJhw6nq zq+b66=iO@u8(;PU%bNv%i<6&CnqC(q_tI9@w_wedn4w#Ir&bBxjo|)caGm;>SE5_Q z#gcnUMS^79!)0)p5f(BFoj>f;J4OcUlE}rtld^MM75SI7B3cBWQl!a=dC9L6;>?*R z?pRMQ)dH3=MPKh{TkZ#&sz9X=+%I-oyV4`U;gr3JFg^(XEox!u!9Qa5xC2Zzm+gdLr+;=pA@6Je0}<|H}wg`aPb7WKqW7}~cf zLTece;_%UMLd}=M$Ox+O%Gt(I7DoGEB7K9W54$j{=kjsdC}k&43X%xWf^VNbg){JD zjmT3zz6`F;HxCcHFZGysC5CbLKp8xaiXmF&j;8zZKH~D4Yk8j9t6Mls$;ml-$~&NB z7Si!~E}D>lk_r%!DCaaL5KoD+PA}stg4{>mQ}NU6uUcmA!(2Kr-yaSd)BHL3@;Oef z?d_&kW~+cx=Hty}evZ>UXJQ%`8|cdRH=8LMf`C*ekqg}z2wH$c`X-*FoL>-t6<(%S zTms@N2y&LVrdf3unFc~4*5o6G%`BR7xkkHnhq>*tN>d*}77gM1Uw?L>Jpb|pjAY&(F; zidFF=>5)B{lArfzyOH}u^zyqf&7PhvubgoqT5f!fg#WA)Dsf3(!cq|7)Fq-dnkkje z6#Azj(?E>J2~)d@im}wy-VGV6SUis&qs@IV4qQeJ;cvQ)lVIF(?}KbJu8B5kK$mj9 z!fQV#sy#U8+s$r=lm8)!vzU=tIQ8jV^LIG`FWaXdfNZnP@8|oOc#rH36vzo+AdPom z9^%`2?b`^03a?L=)Y`b_qF1@NlUgG?sG35H31dXh1@RT^>y2hlB=sW_`Hwd^k61>@ zj_P_-(Zll%`;EhclUp?^t>QSPhqwf!ZjH^5NIbdUr`gHJ;N%-#?wgZ1Ir)a?|As_~ zj44lncR-s(TiWGJp78W!RK>H%nl=&7g3`cwoThtvI%Se5$La!0dW~qa>_ZZyOrjy^ z2T{X>&7hzit=3tTs)0_p4V@u`DzD@1{$5vxGl4oWku&2PGjmGyr*{8T&q^yjxiO~d zgx8pgmWTq!dNm_P8RIAsE7=4~>bDp|VZ3_FnbhM`U(B+^OCI(dkHHBfB2WFj-8m*K z=iOs??}SC4uwu;HINJ^k7OTh(gLn_sFWxh{3Bd94^i-=&($68`RXJ)iBdSexiuu_cC$4D}{M^31na-%Qg_F za^UVAx4aRGrKCoFcCQ+~-Rgm{O%paO0T66h8xAjWN^ZnY%-1Br=x(Ov4Vw`gXDoXR zD)FY7G(5MYr#Dwt85~P_+!k%`=yvD@H&=B362}k5uiz8F^+RwUW?7KD{8mZTmOds*!vIS+{f zxo503(bJ*6tdc8LNg{1`;e*WdQ@j*dnA2oz@i`&Kra;p?GGA4-5}PX$gssPqL{5<) z&;rvuMIV?Fj6g0L$xK!JsW1CyT!k3v7x`py=m8|TR9B8p%%w5Nk{&yg0^IWjmMi9- zw&dKTWm9f$gh@0_eAbCTwSE{U{?XMSYGfjLGBz&>pA)0w6erfn73NW7i8 zIqE9PT4bGmASh}X;o422$TKZe%zf#7$Kyfm`wQQ0h;B03iCA~0Vk0vV_x7p%XEFuFP$vY56^%qp^n!ROL#cxPZZ#3Wn^aCi=mvfc*CZE($GfBXuoB{zNR0ETL8WGzd#PxHdj zB1sA0xqqWw@8^Ymf_=6?TVNP27$-?)4B!HIspCZ4{Y%&uZ5-*ODw*qqeF`Ccw%hTk z5SOf4aQ&I$fdUc`4I~I~ED>)Bxuxa77{Q)T2SpzMf16EB2>o7fUOUCLV`=3==_GjA z0e*r}xS0TetQ;0-*5v*!N-lY&D{FQOVQ$=(Qmz&4R5Qamj*d!T9+frgdF| z^ZH&KeXmG9EGx*S*`;?irjC^!3nJfJroUuf71%RwE}GH6$ zTca-4IAgJo!e4YeVuhyC*dlU_?t}M2HYr%N1|}6-%pUkmG+t9cZwxL^w-n2Qe355y zF){cRlV>-ZqvVXrMZqvFTXYFBAd}fdg1}~<@&mJDZOpR521dFJ7(Z*5Ny~SRQS3Zr z+#6CGo-t6lUyp2QzMore9?uxH@Tkg}G8tE0h!ppJED)q+jj!W`UxfuP#wz)u#cepr zlfIhvbu$0bLX}27$6#>-Ti6g7+>FEZM;;CI%%;(($<^(->}H})|I*r4x1q&JQVcLr zwKT2KM0C-08D07GkHxB6-E^dUSh5cM5I6!;Qh@k*lYqwiE6#c_wu;6vil2n($#w9M z1Y6+u>+=)Jn%xB_Jj;47An)Wp$nN56CYuX3*XK3sG*a2>9Q7L~+pq4UQM{^;Jj=6v z%w;qC$h&_8AG~B9Me(v;7Kx7sK})+Qm*0Hjo_zDol~XaPW~l)5A}G4rmEG|p_{2Z~ zZ+uViME0SlE>z3fGmci|vzz6rK&3nYClGsR_!Ou7jTb^N6i=`qvX)& zRI}-d8BuhFhL~`E|-4OX3q|l z`<&zaD)6*MXCC#oY_n`G#4&E4&(Dk^W21=FD1_W!j-r%^vWv0@CiYNs=WGd1Hf~?? z!@z30VM+9}LrGYF!e28KQIzCiM-X)GuztbzYte;hk-aX*rzE~9%Pc82zl2dgI}0va zbaE9oGN3*r8Gh5F8)tl37$%h11$_G6Po|*h$0R0CrY&ox>U$+-y79RnAaqlA?{1jN zaRqnq%tGA=sXWd34O5c)nkBm-c-vV^Qbr^dQ5&BvcA;Fc7u4~eL&pjgvo7mw4Uf=k zdFKUDbkM-Vqy~AQF>jRPrzf1*G1K7t0bEL^PypZ34i_mK!U~eHhw1A6A^TF7+Vm%Z zyeURr4Ks>a(t7tN0lx+|WIcg^HnoCNfoOziNA@Rk#!L&D{g5JfJ)`z%Z>ydKrs`RK zC78yXnz2u4@@Rd5=3=r7s=e8C@@1_$D=vezUUmLLie`~+!b}d75v`|zy1X5q#!Pc& zlLY04)(aZNTe zY{a><%}<5;?uKhD)gNChjXip;_orN2u|GEq)gQPjv%U^80H-MLt>}R| zDa1gGju=Ty4LH{q4QEqzSt ze|Ds|j3=w?!DKMe3oV4SpL2@fT+K9+jheTs`~~U~&4C1q%$5KdoMaM@7&Gz8ArfdF zX9x}~q16A?O5|uP(F@j?AE+tq1%z(i*)w5pcKMe2CG{$zh0po-Wtt|E>&pD zHKm~)6jUCal38~nQ1(==e0FuR*3(OTezhAh_UC*brFY>CsXKWk>uRXdOS-G9B{LgO zpv_thYuQ%;nzdW#N7Xu>oo#o)Cb8B|qE;Jn)YBjJjJNV;M&Cs7bvKcud0qUD#$8#9 zISqawNol(-b7J|`7Xu)9|7GT`lF7&k&4if#lGBxX#f0;N%E z`Rfa&{gKv*?TlIbuKsM8Z=kIa__8O{n=$5F4SlB)Cc9>H;$-L7$>#GrV80!^5PZ9# zGY!*xbGf5eI`6hg5JX(?5}Cll9>~ev6x+M$9os3&sE8luc2aO1W*^cZO)=2dH}UTJ z18vk7?WY%Qnf!ANPEes8kfIv^TF#_`&}O0xpqs}6Y4V>qfhECi%Gd?uvNK+oKp`sw z#w%L=QwSU)CEt!r`L;=t=}M)TiXxENOd)xr?jZh6R-|KX$qs2Zu93{|dG6F3M*dtn zDYMg4+~te{$e${@x9pBW?piT4^}C{P?1_tA+9;|B)XnuZ^}a+;cXLnYTwZJUjqcTt zTz?yt{wTF_`M1Mg|IlKsk_5Yx}i;^B^8zZ z)VDicgpHq)FF=U|5dM@-%?%_y zJw>^>b&M62c9Yl~xaNGgvHn5S6MFV<#(asF`bsFVch$qb zJ-@@__qAc2Zbpy-s~UZCJ6}wrTU@(bmtVTb8EWO{rhtMX$ulJ;8j7waL6h_P3f#F&D|eHU z7>HI}me{2l!GTw0pl5~t%<4`=xd|zH8Q9lo%sQ0Jmq^Cm3N#xN+H8!Z1N|_^zp&K< z&yv1O2Jp3PzRkmj>`jz$JL{%JNf+fLL2?PRZk6>zc@>3U#apNx-saUBwkaaIFiN#4 zyHvtL>?fD$6*1eWCRTQm_7^SNR>?+W5VnJ)-3|V5;p}X4N*~R%*&e6k%|+|!X~S{v zX*NyAi1)JDoI9t@Eaj-GqIy7hNz3Ep(ZF<^H`|P@ zb(JvC92Qr|xKL;RNy#`ejn#5!RiU&iH?shSRPZW!AY#hp>|zYiEO ztzjWH3Lil89MOyv;6oQ7mNexe1Nm|pY4MA}`pX9|msb^g*Pf&nU@hUx%66|aG3=$} zOJ&9zFyaDOxzKNhvRrCzUf@8Gfgz*+1j9-f>S~)xmW^NB%yyPx+y-GZ_-DXFnv^1rHl$}fr)-?iqSwHDvvDp9Sd!;=2WdgYsh($~4F z4SNU%GxDnXad%!-#j!5pp z(l`EIBD2k#8!dj``FoN&qr1vd-kZe2V1|{wi^SoEE-cG?$=R80c<(}4Jt)}ZJ5@aWO_J|X)$I+6zwy6Sfz_-PgJgoit8sv=`r#kf9X^Z zm45}r=@y7p>kjIrLiD{*^<>x7z7#sLWhZ32aAW+`~+&~fvOK^c$AG4nUI zZyNa#G`^{wh}b;ys&!x#$5c3x)bs>)udD6|jQfi~D-AMr#3BJ|imoXK9d$z6J18tg z?i#zY9|7x!Oy=@uSv`}?6Ikvx4{5Nt3wPH^AfGhkV%kSYzL6QdB>}0dUp>h4?B=`luO@eBMO&a1x!dO{n zvZu1@Xxwb8Q79u;G02y| zctV!HGE`euzu!s%vg8<4zFFScaC0~mZ-<{d-pHKg*Pd`y*U41}Xqms3mmh`#q22Q7 zniXvW+k$Tcjj^qq6y&Z_0B#CeNXinHNLk2ACO6JzV*~D`;gPG5fi#LWIuUmP7Bv~s zrGS}BT=iM`q|DVcippT<+oHZU zm*38_{mr%@mig{u71)yvx*T+zrpvWT2qWiW|K@0ms)33QbX7V(Lv9>(my+qRt9hU~ z3CriZAU-NMhmfYrnM^4tKhpH;$g(!53aKif7^2Lt$eI^GaaDCrjU15@DR4L@hc^xs zI!ovc|4sfN5yBOnh!a6$G-EXKFv%jmr%&m={P=ysEBV`SHW6)JG*7Pw2-I8q=qz z`qww+kYJ0PH`vw?v!<14OjyavlFyLZt9ASlyv8R49T^kmMEXX^AtiN&;1J*9H*^Vr zD6)tUzLb$9A`FodX%&W&Sh!FoRZc>lQ6>cDOqSe_8dq`u3x-qD{qjCi{{m8LSj77Z zJ@Y~@vu4ona+lSSbw@4k3+Q?}_Vpdi-Zw7V8HT*@i9dWpqu!&l(*%5Eb3bMy6>bnN zn3|_djVYD>kea6)l5{BbO5EHXHzOlQVr!M?=xW)uK?9pc9S@pDD(WsBnMZO_GO^xJ zrqkFD#yB{*)?Y>saN`nAqYxzr!KAE&Qw(c%D9>@MN;0n(V}a%J~ne>aQsQYf^=Rh%ZN6?J%l%5a7~WgSWNEa>6))n85`rNA5AjR;RW$h<;x~qC;-+=Scr1DZQTOT6U_Zadl7QXL@=twu|wg>G}OfWbv`R zM(Mw1V+DC*1BW6wr_WuH6RQwdDm&sFXUaNR^;R+t0=1ipgAg4GetFnLMK$DNMYM>= zgqeXQHc^J5l!}q+Nl-Y`FQlypf(dX|ChRmk*W73MqTK9{k`1f(6na=M#z4AA0SWD+ zn+jUT4avR}QJT|wBvj;?2~Nph$j7H-t^~6VaN`!j$s%C1zyBB{wW%x^pkSp<3&2wR zxfU`9AH-l8#wW=7C|z`hrRP0!e!-=5nUe=X%ZPpIhvKcPx`543W<7P>^jI?oMwN@w ziXsG0Bv|I^bVcdAVfk)Ksw9LV>mW}sDCd+bqa4db9tW$uOK*Ho%Nb(~|x zmmx6W=1YlD9qtP#QEJ7BDRibsPck9&8Qf^~W5bkSq@wc%uN2HkHxlf=I^KdssnxV3 zlysr%xsL6*p#Du_h~?3K!ewr6l*hllHlY=w&>=YGn;>q0tdASM)f>$Y?_Fl>+$EQF zhSBpQ6JK^J)m+JK(9o~vp1alCNKL@DGahRbmt-=Sy#I1kP zRbe=m{`mY*DnLm=V#9i8)NDHAV-0Zw7N(x096-YZBQvcZ?L~Db2m#Ca5nkeG_>xhhdKT{QM8E-P-&2=QTd%5#60VUdMF)p4)Ce<#Bv=wy~R=@SNIZ=H4Km3xoKP zdFtHTWOO0dg2mUJM%yh+jp%37?xI&MP%F7jC?QX6*S}j7G9&p)RLQ%GN_iWE3z*j{|PNagc#6!7cM&_&)Av- zpdaR5<&6LV@okA@=4z3i#OM7Y7K`zH6-wAm?OjL_QvHfvni#T5lB3e24&^y0OTL(R zN^Uo{!|BCBOn!@tf;()+EwghaA@-pvPRm^H{r9+PEN1{VG*Y_sq(x#(iy98W!qqBz@#x2UwB z(iw?4!*UJ{4IEJ^w<#h{rb41LM`LXq5ZKmlt{=*0ArFjBNqK(S1SOF#sHr%o90Ur{ z1+CR1Gn=z`QAjV;RnUB`Uh3%Ath7F*f7m4EA#D@Wc@`{>cq4!UdAG-w7B68A@^J|n zh!Q7KLfYEumL|Evc_c9|k0`^r3CFpquMlntsb(TtQkn*_75cFwoRP=o#gq^xE2a2H zMqiDSQ=y*Vaw`rjGL*P7j&v)FUAX-@H#Ky_eI4I3t4ZQn!Q)n--*LvpYJU#CxSQP$ zKet)3!!PpGNA4^sAq_w7fEiMxZg!OQp!66tBOzua5NbZBhEK4JOcm0Zcb+EO6*ojR z2|*}<%K1R6)%?r~OLwSbPa#eJvbhgP^Vay;@M|YjMj+yvqmGMwKXOx`P`tGyIoDLh z!InxZ;FW?*Y!`3edD*=BIf%S}Np? z2JuW1mC14V3djbcfUMIvPf{0p8du6rT~Cq(u~Na4YE<^42D8gXi{ z(5lZF$IQ9>hM|NKLdGMjo+YGDtluTY1@^lDt>sL(pj*?Jj2g0`t0^_bQuWL+fw{Ol zGxzbpDRdL|lcVdCF_0ojBAflEr{r8?Azs&G<{RANq$r1(W%VjoLk!Rg&>srux2G~v z8@_n{{d&V<#(D8#^I}Gs-)2RuSdnQY%t&Qs{UrEQ9^qxPKo<>k3qXs;T(WM`%n+l? z)}@^up0Ol@94F6E?7kF|J*!}Ds3bb-O{uikL}?;gc=I~Xt0p?>pIW|-ndI+eM0e~rPNRH{do$e4VQ*rFSK6!>IF%U7Q;7F-ld=%vgr+ zAA-or&}JEIjwC z@>xHPZEZ3f#F!`R7%ZF2m`^6FVQo+LIUxcr(^8`r=jBaHFwf>9oWvvv{2 z_;zcL_U9~|YhwJ!6PI*D*xo1z88SAiDLQkd? z#13PwY^=seZXcEYM2P}m$@cvJb%5GE15gGK{f>a8fJx|%i|IG)?FlG*vy(b=IUw8q zOMz@_0a?Qavb?KMF0pg69c5SE-SVW;8Fk8Rx4L(-Te*pL^0q16 zhrIYmpgBPJ12>r><)N>xgKeBJsjCqQIw8uq)l8h~>YPWP3X%6L;@fNAlk&spI_9&b zl&92E0EQn?Pdmq`yCm6LPrbzHsg7ZBuY&$pzjkOav6{R3M8+crT) za7DURhNxU&3YOEhjH4KqdsCg@O}Eo)PftB^Ku4dmhE*%GHxi_?TuvF{;)6N`l^jVN47EO^kv+@lW{{aHgr$s z8>(>(Rleb{#p61yUYEz=OVl?SwM73$qdsr9+eZKS9OFyH4f&jQJDonS4_`w*-fmaU zU$55|_2J9w%Q!JF`093K+=%zD-x+lIIQrdokI#L-*Xr^%=xZe7#Cr65UaK$Syw*_0 zwN+eO#dSm*z4p)(ah-w8*AuXTFAt|_-g7~$0sN?Y0cq$X-X6E3@hWFXgL@_jjybF6 zzdzn8+$!2KVyrzZSy~k#u?O3{Ono%18+RSWaoLCqU6lBf)j$tbn2G58ou+bXjuI-9 zLenX?W31y%#SD3)Xq1%VIw@Pc)h%-aF@+Lf5*y^kDUxpntm>3esLUztk(ohVQ|22j zy#ylnX@(yu;gjQyuWlrwMsjgMa{J&iyyBL6QYZ35^j2C%J*{VNQb)gY0s{$?f!rM)>xuq!}qh_~JoCF%g zn0GPkA^nsIB?UB`DqnFTA3N4r#z$KZo9Ru}T&8TNT|d4GBQQ0rJE9B9afaH}$CoJQ z4nrOA)n30almAAHQz@ELsYOcRoQCmJOghHSQJ4}_VN!Ks3iDA6kd$whAT#EnURWG` z=WS+l_>M909Uq+#Y#*oDgsvtZvFTGnkw+B;)vUbK4~4mAGPC8z;u&ukx$?qmM4^J& z5l!N%Do6vtUNiEB`W-b{@!f% zI}5BI35v%?D+f0TiZR#>R@9*kXI9}fbEimUr(#zOgtPg09J^ApY49$-p{yWDr=*Wb z1%3=3f=yPhoz$$#fSGXWjcfmB&Dh(zf-)m~f>*7RKt|>>&br%*3i1QjdB_l|Btim$ zlxtAVe+#oaO4QvF-96f+jOVetQz)40iYTO>t*}XsA1coUyYKR%>3>+2(ap3n;`b>? zJ|`hgD(PsCdaNRkjYk!=M^sWc*F{y((pD%fSLl({q*QenuRQ;_Cjr?~$&5)uz)m^JW%?whTq zofXD_wV9TT_sY-4IAek=C{8$C_5A9QTMP61w1Bnk25K)!!HF!(z`FsZuz0h_nJ98F4^H?pJu1(nJ|CoNyd7)mPW*p9^Gr!qIJjgeXo-iG?VeH4~f zoI47Q>Ytu2uS~RCQM{zv^~)=RpwFgo{p0)()B5{l`aW`A-va~$G;a1; zEK6sX-qpAmO&3pklz#&x62*`uXdHz4v&bDQ5r$DFHp;{rgG-2~XKJwtVlSJ0 zm5aOU$?1iw7voZ4Ad$VXY~f45xjcEFUA=Z3GqK@&s;hcu34mcwY^o%HMjlJVR9d!F zqGr}$kX2yD{uUPwml9r%=PGb=`NBnBi04o;<{yJyyfHkE9+z4dW#2+KHBWCBo}Q?F zGQQEgk*2xQ28-G6Z?BCQakE;Yx_NeH7;F$1y+Wz;*6_3K*u0hy1dFv3CvU(!SUqgA zJFcpd(A&VAy2Zrk|79*s^G)T+4Et}4XJ|ZIaz$D$5^Gysv$Jubx_X6qu;z+fhtVp& zWr`>DOVU801H)9yFkY7NQm14&K+X)WyV$eo^Bo%p#8p!YSxI3?PmZ6h;D=(FIJ%S0oh1el(SyhuGY7%R)fYhf3g>JY_xv{&|onFKk_ zZ*2jOMhsilEjpOF;MjX6V+Q-Y6Pasw=mS3i(nZtko^ivB^S zDCj`~b8+!g{7$;GC`4KB{bH^ia!yx|Z-eYEzNWr$JH(X3xS8b1CGSMJ^(>ME?&&#e z;i603JPN!^s!@`(BjDELyaAL&3BYFonwB?t&>G2o7}5QU>={qscOSZ51;|##$rr0~ zU+<8f!mcK+M4|wOFHwn(RMZDi#pMXj{A&@@#tj@V&R}AUxu@jfIt$Mvp z;@$42_`%msqu;5xQhce4_;f0S>0dT~F^r?7@g6MB#oUXDQnf%xTXeg6}N0OU}H!xFW>&B!G zdE(p6FIKTsHz!_E7%{q6#R_tsWb%DrdAN}si`K|znQ#*{tw}|uaz_MonQrv+f}gWi zobuAEE93oEU~kT1IfO`^f~ThvH3Lr{gNETYYp_Ole2w6~3xSwS6$C;4&Nx?_YR_mn zy$qLI@o&kuo=VM7m~)*Ph7rb+ohG+8%B!nwTbmozCIiG5vGcgmRumd+Y?}*zFLa8F z4K^CpO&%ihbgryD(GOmn-C@&RjsfKL4CxLTfN?43MZ)duQskj9iOInR$;ulJ+n$nL z=$IETqga6@$IEJUTer=Ku6{LZ(|u5$6=n3`pOReHeGQ<(*{vl}_iSpI(2 zMrbN17wzrcwtB3F=(&-pU&NcHyG0SJ;UP7&O{7gCH&P4sFPLYt_O5Pc49nIfb1X?G znq>Bh^w-R>M|1oyo~YDpzCsB^B&tIr-{r!q9HqjXn44=VpYWb)hi7B`tXIVy>+^%NbW^;;uhfeU5PscsK{tveI!tZEvnz-el~{ z3Y5Q6vc}Aw=?hsBHwnS%Ek=IF^hkkq>R2IJhV0VDs`oE$@40cxfpRNQj0kzWv0bi8 z%VN^4xFftt=PadJ9>kkD7v#3!>_|?|Bkp`#64ds zuK;SVvpe2rkutvtHjpvX%fpHDjGGkWP;x5lbuxQ}_Hty(zqMtVRf?8k^HF?Ln@ipM z@w92$CLY^{c&)U_p1`2g0hhKAC7jTi<&08t;r8@CLHW$Hsxds-6)G{;eh-j~^OmV} zMP^6Ift{wb{Mb2g|6<0mF0%_C_sTx$Bj2>roy$&I?Z=MWvANucdEChv+sN6n52Uct zbfd3*by?ocHew(_aqa>=cRH6nIc8ln{=gW&8yuVhTyqtgAMos4~qL@3WGAXeqEXzd;!o+0MoLWKoxCyc!!x zswx?_)eHsaN%%&a0G~7((oCo=-w#Q2W!TMgmB8N*4M$n6N&F^3C9%T{hN}ySQ_@Qj z6g_efxT-W9LH}oMn!|or923R)al>=Q`8=&$9>*jb>)KexEB*kYczx(R2IY1{NWPIz zAyg>L`@L!9v6WrAA&h)#&*UxX*r^#D*}FM&&oXV$B(UTC9R1Mp<*%aHaZ zP)WpmfS2+{5d3 zt6ED~WT_{eSrz{fry*5V+HtPgWb~Tv%K-Z=ATb>9kh1p>`DNpn1Q&iZr5h5uye(Qn zCes?qp15r4+5Q`^vkfQQ)>7DxSaKHEwa1~>)O29wmQu$&_X@}%Vn`BY9E zEIX#n!rfMkv*aFH?9V%zm=&Hcl z)srAK;r?Tv>d_o=!(?}8LWY8VVGiCS-nmS4&a!g*Y8yvsmTbaEH9SmyNz&1s^&1YI?`tKb1@%>jx>?5pR6zX|Z*Fs0DgTUtt5c>dOF^ zZjvJ-5~ws{k%lLLl3H_ss^+K!OiNWXY#?U-A4=NGLAY#`FM0)-b6BW=a)t7%U-(t3 zD;jIethRAMjjJ3Vkf{bP;~)WTfExx_gy>ZaYt0y zkE|@_ElGI}HcEZi z+p}{(4ik&BoowGI+bvt|Z`(*5#p;&?=!5lBzq?uqbO$7o~FMB(tnf3zsam?)+e4vKMZmZk41aOawj97*1B?i!5Uw-Fgr@Jb3@LU z-^A)R7n>-)yt(rCT$oW=Wr9gIJW`}?=;%gpWNf7C;n>nJ!*C==kX)+oD^aikf+j_@ z+PGJW6yw+GnBjMXnXs?in3^P;Tk3+@8Oxnn*5BO~Rla+^N=(5)s1Ohb*~aegU=w%I z*vNhGy_S3Jd!GBr_u7++x=a{jevZ@)&TU;11q?yon{IlU;_#hvhg{WP9YBg+Ga?>IpR|tz{>B+OLuKh<%g@MD!pW52xCX4=I|tR{FWN^>AoQX) zTu)d%vW|q!A=Cbv*M5ELnv@qAyED>DlU?~B_vxwr(Z8kLCd9V>N5D>lsbC7<+8~Is z15-kkj$h`T%oP|vkDV76}%w#I&)r3)g*q$&k(E4ZeIjI^5Wy`Q|%)NcC^ zp*wV*p3oL1PD(#+b}_l>ecg84k61FHzunwiB+ZX}=05wI27a*3dilBOU0wJOXJ`1N z59jeq{j)QXYjxn6NY~-%iGSDuoQH!B^8IBJJvEFe^PDpPTgr|G&6sfw^gv0c8{uVXm*QY%7lhD{iwVn1tnFM0#|?ssK|9c2&}uI@qj$ap4emEUTHLSu#sS~Z1(nHy?QyRPN7 zt|q3VHud_3E-`2t8TNAdwF37ft*tRIZ!jc9*3%d=Z`h-0)To%l$QdVkaEU`X+hg|L zfJxzP;|`aR8_G8{hBlZ%M{qfPUMVLiRYr3R*3O6qVIrtBJCaT)=5?Fqfot9>1+~)x zfB5utY7-f#Vd^!qaUoWnoDDYBePDIaS6*=FS+e`E8Na~Bon?zPu) zEZAc7RE}(~7IIDt5Ia_?{P|@svz$<70ihY#Mhv8cDmSR=dy;3sCu4pODrzlV{+CxQ zd;^!)U9r02y2ZHhXz6QguE?d8MnPY-KpVGQNqF0)&fFVKkJ~oYHl%63^EV3rgRMV1 zyCJ*G{Gi={3sKHk4D)Ifz4e2O&E*b+lzxr3^-p&>k&u>?y4nr=UxHsWr-ifk+JBfn zlqj64cX;FtO#Asz=R=+AQN)e?1$mCR@Fm3*H~hVukj3zeYo>SlpgEMvez*_SJ#pM^ zshv4?cB|(-IU92*T}6n3k>v)&qjJ@!p5Dt4U>~j zwcN>DqQfNj$`k#4;LJG}Ots22o`om-+;&d5Q+u9z>l@T}(2U8?-u>n6m3vDMNbj}1 zpiln2I0OK*$N{i7SN!-D(I*Bo8)DiNMbtQ^XB@d%^OHj+?n}h@Arm`+&`C*9 zPiq@q|MF9;c4+8~Z7mVy_b885t9Pn=BJKM%h3IOIdG}F%<;pz}xXN1q-$&1tA;cb# zstg@nO!18A0SRqR@*hN`l<+xL;yj2s2T9pwfuX#Fs>(FmVhgXB))#**QrX)`#ojSr zfmf`pyC;CYo8DEUko_A@4DA`S7yEa%N_>1Fykku&T8Q1d>Ncd9W{=8}MhTkQGu!OP zP{{rm3Q4dRxZJu{Be^;aVp_kh#2dNXAOgd*QpqJ+>!36lMm zrpPWBN^l4r-!>YPYyaA4SmJ_~d#%J{pM0Q?>Aj{J&8vU4Q$ID1Acbpsc~G^LpFPm4 z_I}BMUP65R>WVc9qKU=A;{@@phW5Vj0a9coOwB8G5pE(Rb+2SAf-9z)>C`d5bZ*ep z3T#b7vrS*NggJPSvYwRLN^QAWuF=bcKQhUtS@niZ--Nbb69sK45Ce|)>0U8HOSXksh-)Ts)E7_j+t!@_#ZG#KkE^r8+yrVKXcD{hhA z&8=v+)7HV&ubPW1 z75Fr0GRjgD^|4pMG$E%xx9T%iUv6M(uW)&|eyFUXlulHcrpohrQk5!C1y;==HAKQ7 z;bzCo;g0!8DAE?rj~}gUG%L(T22mJXu8^A=vDvFFkL6qT4z98*P@HBxAN;9wsda*& z)E+^u9qPJaKCxtALiSMX1gY|iH^x#oOB-7(+EB&7`RmX-h5@)m0dcIkIufjl|?eabMk{^hWVaGs4ux;lOOeu7JUXJp=zC z=l6!2&3duN8^gzq?EvTNT>0%ewWxj@var|hKMSKs48YD4=A&s^d;k6;P*Y9Wjjz-5 zGN%zV=u1DKymAazL8cR$Fz=@(EprqT7fmS$s}KI;!FKZ@*P~3H7Xr2ZB6WOa4bs$s zVL((=U0g*{#(4O`J)zsR7&e6p#e;mGC6PvsxGL4eWcReiJ{;!Kn-b^2`78S6*PIErLXy@aH%6Jbp>6~x=37tpT%M{? zAI8t0!w2D?iW#O)l%w5DKBm+5wn=1w{VmM_$vcr2c1B{%*KD_YZpt`AavlW%wy(Ym z=6N=08r*~E6;8&qKUuCBMZ$}za$Tcd@^Kfd$^_OpC{YrL32)Mi_=Hg>WG`DgCzkK4 zB*)<1`10njxp8-sU@Y07E%NY%AgX!$#=qezO)~uswDaAY&E$^X-G-Oj#@*F9M;P_} z<=qu~$Efc7Pq;a<2Ok-)+-v&N*pRI2lm8$)@F1*q?P>2K$UfeKO_nKC#z+$~m7RW{ z?gyA({>XSfM|`P~N`5c8SqTEBBkvRwSED1MD0USXkw;+{QGoj3`l7g6UneIf=>N z8`IXfbxE;?&5qqaOfa8WyB7_!7cNUvFL;a;iTb7M=kjNxCg(3Pn-sw1wqzviFr$AnzhSO6&_b8pa`=keUQUxUus5Al>1adX`6f8Drz`e?I z{l{8O168VZxs*nU#*Adfr&X2GJb@Aay!3S-3JiIbRlg+jGY1yQSzw3qZ>;qu#H;4|F2sh*nbl z6_jBrA5~9M=4(5ghL_Q_hBFb1&Jt=@^k%QjvW~O_!Gy!*XFT%-h?|c3QjNYyq~P!$`gd*v9ww=%zL@D`HK=!N=;xs zGqd@sdcY-YANS#oe*bC16+PWzedU;+gu4aN{WKW!wnz`a?n87%Ry<9&4@Q#tuCf3m z`q02Zf09Tm6^XdpO-YU^>Sb|~=3>vR0G#}}6^Io<^rY&c5V{$k3gbTVomkil&6qO9C8~M-K5e|F zMGrBo2YMM(S*Z}punQh^j_vmd)0>?WV*B>`s*#;zgOavFJ(;4xF_@c1BqYsxlt0A+ zK0wx!fH;i)%(k^Kcm_hBOpi#j>4heNyf0(bWXzg8(nMp=)>m3ntL{zVF4VY&E`YY1 z3SLXVZ+Mw$_&udxQfP1CG$&+FnD}j$4d#@>40q9oS~i@19L`y+deI5$h}CpS|6aKQ z#1hM&Lh|$!q4p*BuQg3jO{+B~Y#KR=Hlc3o``g&MzZHB7xy>Ud;G9j`TqNQaHrCxC z8+V7|fnb|TI6LEFR$4Gx$WmjS0!LA|OkUR5N0CNa)-DoThB;rIlsSUoufo{|iw>rj z>qvXKmd!uaNS&|$`j^E| z-+up>4>rkT(Kt&o&a5y#rDm0~B|b(S z!XS_N$V4ef#7eBRH)xj2>@vQ(5>HGlYq%Uz#k*byrg~S zoEiFG@t@{(D3_6$#_pBr_K#ow!VV*o23MDq;+z*v*K2gp*?t2QsEV>e$bL?WM{xoU zgIu9LJ&`jb2V5^`kh>tE_p|Kvta*2ucX2Q6>r;hgkI8IGCvf!Lm$u1E5`~E)HHCQB zNL7&PP}0hYk|9-SALZDm962t`aMMlZE6_04-$%PI%pc76+|CkK{a3@KFhgqd`T#rP87xuSq@l)p5ez z#_rn8t@=S$Sfz`(Lelen9A7~BT937AlD<}@7TKEv5aNur0|{BL(hK4fQ%WLgE>(&I^hP8UG&X*c!C~y~ zOHY%L!0EtP#fCk3$e_~u;&LgRRAGKlZgaGFYVC9)$LJp}v;av<`rh?`#gWpiQ*lIz z^^%T?^Rha1APKj`A7sR@(cA%Hb`#$ID#e}HJbfQO3p-m|GEJ91n=HMXbJ?h)4j)VL zW|C>)-sK|`E`X+uKfenyvj3634WfNbi67#6ZILCrri(F%iNiOhmzXFEl1=wXY`CB# zUZ>gH^hHCO26y8H6( zF?#s}_nVpT9rcN|B3uauWZ)6K;!Zfejk5UP!r=3`wu!=f?g^-(yFVnsr!d~9;&sL|N7T;zxgZr&o4f(iHZ<0GazDC)@ONbGQ$?ESj{adeJ1L5#cYJTu4FBJS6(|W ztc}4}LQEEOC$aevd}oZHv<=R}Ds^UHk^2Xnq$_Iogz7xuvX(Ildt@+>X=`TA(^GIx z%?hiE<^3Y9@B%b^_r!X(_RPuU@!}VfD(0GL9g5R{6wOI#`rzIZMam~>#E-`ReWt1zR&K0B4%wFVEC0? zaCIDq`+DvU7`fPCnlcY7U%!v?7*%hRl3vS%qkR|s{My+=7b5mlAdejXZ1m%gch*7a)td-bV%4{wcl>3Xn^Yxr6bq59Nz;Yxt%i zNjm#phr58=uYU%=0DiFdDCKx zk|o>OB-1`#lXQ05SsmX#v_#2FBvMUMUSjLNPXV*t!z+9co7ds-~aJ((CM3uwPA<_@WoG+vw3@mg?T@|GsT%?d0Iko z2FSu1&?1~1LI-RhKFS#;02PfQ9!2?Ygo`77q(k{^x$g$j%W|@7XE`s z?;N5&ICWU%15#1`KR5iJ_W+IdS<(18Oj~?n;jo1&zjtzrv>bFD=yGuR4F4Mta{2;DV4pgQa7kg+ zX$mB&cwC~Ta85Uf?hBnqcb)I@ks!Fn87k6lna*YA3j8ZT)A_JaM4NZ_eDB<4zW)W( zwqRz^N;n-5>Qn>4`ZuXY77xx#$;Khg)aeFIyc^-bI{yacC;{I9dw*0~aqM#oSBy-GuVGr)8vY*f*w|L3s# zU%_k}R1PGaOD4L`p&b;oe~WmG!-2sTu^D_zGAMggD%kTPW#X*eHrMO14K4a`YY%WR z^E!cvc6C&d0}wyyjDIM>3)0ZM&g7h_GL$l7AWO}hFDlQK&6X~iS#wn;{mPjtZ=TPS z2KWq+`E-=GNP9JeNt|J5l6t#wG@KEF6J_8s2kY-#gK^R7pGw9sypFP6ynRF`N6#YI z0yCkoRv+P@%YP?GegP25;MjawMb+Ei!V-@vctIu11bPl;=8FQv7x#2P#j4U!7P%Utllq0qRi7<{{UWY0K9`YA zy%#vYkfaz=g@#_%1eT#3w8r8$&!BY*Qqcpz)j4)Mr#mHF^djAfv0Ac=fv(ng%aK@& zmwa#xTBPemy6r`}-O3)meT17B{6X<)kEzXA=8SW(9;p7|GtKp3;X)9mjan@{_Kj%Ad{#LV@Z&C|)} z48Ip%+SaV=3~jpEK9FfMCiFP{RTK57l^LA_*RN=8r76#(=$UL7-7Lr9nNTRhZznWoz<0f&ZTu#_i+Zuu z0HUCj0zqs1rtWb>u35olI^k%3@~iW4C%ze*bxaI`a>`*kodMJH1?K2ZAjN3!#a@!Q z#ZX!V1<+qXQQ8di#XO^*tU;kUjK)!jcLt;iyt4G!^}+3J%lk!G@a45BCo9&vZ%V{G zsD_5@zu13~g-Je6VNKw{qeJ*S=GbstA}{e4UeXra5S7#s(sMpbh*8A73B2eAUtkV3 zIS2H8nP8_p2mi%cONa1y-3fSdz9ayk zX{|eZJL#UM84Y4w+6FIF+6wIi!>DqtACDsq`yFEedD26qRSMpUv*_3*9@4-!uJkgO ze9iw{@xcv^beKD_sIJyi$%soz79Ui~Q^KG+jt57ZUymoaVG}uhH(psyX`g8hE=bcur z9Tq1SWMxbFyJZypTgt^S627mKh=Fwx` z`)d2ibOAwl{*IZu&v|dBMc4sj0X)ToGmF zKXyfG=*dZ#>B8iKmMdL<&v<(8kBkZyMtIW6$$*z-Z`-fww}BvJ`XPb)hxN}&T;D>3 zsWd4lIdX3>8HAf1fVRp!};dfsvisJSWQbcHr zN0OmP5+IpB2Ro9YO5;djAO~88{2}vweT+e>xD$9iQSrHYya)&8~ef9UsD69mk_6Gw@_q3$xac`*@vXZ^q2;qdpFfr&t2G&|Pc-ed9Wzl-(#C z@z3@rroX(`sZyRsZlTWovgm>&aA&`ICr)2B*aEwfV4zVT*s5uPt61~0)HLF5e)uzB z?tczpiUP4ywPlo>MICn_Je>*4F7R$e9XL^EK#T)CPRDJX{EBpSVua%?kXRTc&@*&~ za#?d7>!Px?+SEqdIrEBcolK`unol6PiXENYokfIihHDJb7vqkKz#dGeP{(Ni4w0B$ z>Ge8~zJuX{wCU*3fGhcBjKLnf8`Nvjr`C0Dd(}0*7WDp}!s#GATzvq@7# zddp^j7JgHQj(Q0lcr$+_(c$&J-Jt7m>c&&INhE zHz{*HCxVd@{4G0TI1q;hH%h zlPCD>W+Ty-@B~^qKYHXtrCqyHRhe%d5Yct0u{Ag2St7+?IIbRy#_2v)H#BPsz2%9R zffS?CeqZuzjCn|S*k8&L>FmE+15{A5)~-l%)hM_u@E)U~%4)}YMtN^M0H@I*OD?Y` zBF>sMMaJy9u2G7(-=#GV&?l5$3({uP$WjcKi!RHIiZZLbKHQ+VtIM1jwPiq9v$n`7 zuf3flX+fDLqqfW`uPsBM%F4)Z%tOE;s8PZs7HHJHHLw`Kd(Hh-l z*JSQt=>1FCMRc#rBHmQ(7vfxORoz>Zxehf_RWT;ggtM6&U2;=Wq88Ch)NRgtl__OC z&LI>w72r)9$#(m9Br7J>Fj!F|S9T|g=;K<5B-!*vpE!|RHhT*bFpE6d9nD&$1&N(T z&h#E2rL6Ti1kpw7jK*b#r7#owJNYSU>Y$W*-!grHuJ1sI9YogXSfnq~@!~YxL7(-G zW%>dg-+}xaL{W6Aq%F|lVkd@u9PsXp<$+=^?VHv*)=CEY$%9=mhV8HlG1fq+E}=%=a(#ylA{AzHK0^T zikT(%yp{j%KLD`OcLfBbyyWna`Re=f`Fr%4$riZ^Fb@!QTc~Xtkrq0?+N=Ir@ zC1`^wTInJhgH(!QR9&bGyp9TJCBcg$TeO9-R7Jk_aJR${+WACIRXPB zH#odpRU0~A&(g}QfN;N_121H`idXoeLo6a=seyL+JQ|rZX5kJN!aNC|QBj9YROSUW zdAYbA&VrK{k#J6u1**wHvLfmJfb8ibZDMp#2mDg0TIsW*74P;o20hGpQbax4B*lGx zrRghW<-qK&A|a^ToyY(~_s-+N`4H^5c2Mb8Xjf1grrbNDC7$sbQa7Z&Yh|Qrc2$EY zS@|?RkMPbfp?n)9ikE(ruIO>naTf&V{OlqlofPWTT;wX;>KG9 zS}^C*_;f+8<;?k}!Cy=xL$h$V*mzY$QD0v9dRE}FZ z^^MZFM~bRDLr9qs?YCK1ee#hvfjOLBaDNZd?G-_tOAE z=F$q>fR@&n&=NsV*{FCoy>w|3#J<(GAA@xpD;ebQVM7PAP!Z~6(J-{UmDXx)HD#r8 z|9)Dpd!5U3a>`Xn^XX>Lq`FvuA`T`Ffd6eUCgf{_fYC9AKc!RqOG`>4gjW&-s6`^#3hW@U{s4HuwH{j@vL2$Di<%IJx-`oY>&VFzMo(DXPzfbXbR zcAU$KqNu2RHk@SE$to*AwkVq>2l{xlXg0iQO{p)FMKl`8)10T5l-OC!{6(Bk!XY7$ z2Xv&2JEsmUaP$hRkS06YAhb)t`Czq-zR%-cG!LvDoE8l#m?@Qi>8iQ_bAk=2g?A?g zWGF#x(`TJanMlEj8b0%z=74;#>*X!+tNlFbgOv{pplZNEohT@6_=yPBY)C2<5u;2S ztq@abgJSo9K{$PTtc=uDkGib9Nk%vW)`DJ}lZ_3R>auB5LsGg3{7Uh9 zbP1bMb_Y*GkGh5?NicGwnihgk1Lhul}8rgA6mpk}v3<1=%T40iC1dtshOqciYKIM^qvdvkf74$-Xv zJSYNN!J{YvvU?FhLJ~#2Vbo5iJo@g^M4s{1UEmz%P$`-#jFWY(H>Vj{($R{%qnp=? zC~3E%T)35UL{TA&4c;NnzGPPlL`^LN_4!wj&?kJhh8y$JHY9We8b* zB6X0`iJ^|9?vTZ-r>S`wa7T%r&>uoUd5*@3@lukR+sDa=I4g*BDwYoo8(1FmY=I2b zjiBw|=ApXsHT#;}e$8&bCM)8^Eq@n_B$~er&P23dp0u$_*wq9=#5&@`^9j_Qao{`_ z@^NP@p38P(2o8NiHG>&Meb2R{%hvH%&HH9HboPkBPe>!)lv^YNG*+a0>wZiJKH~6l zCj1bp!Re)MT+Xv|X@KPIMCTzqhsg5%1cfiS6Cl;TGA%tQEpu5fuL~B_Ov- zWx}%~dN9*NehyEV&fs4H*Rt~v%;t;Xskoys08+wx@h(w>X!Nsm^p>7)u^)S#RONR> z*mBNt zJ7TdJU6;gki>alwt87QzQeH=k>4%v{tiRGLW=Bjw4m?$K9gQPZ|L(Zs&Sg1;4IPv; zPy-d$k_jO0&&q^s*W)DQl+Oj>l+B-4f^N<@4ks&SS#3<+DN3%W5E%HB%0f(U?jj z;vC`|(1YgbB<{_F%TYlCZf1k!5W1Q*X6`LH=0N8$h?DtKrxdp4&e_oH$y1wCz*3Uw zP4{fTtl}DIGa4%g&Tdix?~pmTnYk~y7aV;n+Eq&_g=j$O*^*Lbf^cS*)?t~^SSe6; zlL~a8p}8A`m#!K*lye#_h1A`&f%`IWyJLH*C#hc6I7-VJDnCn&=2RQLuoo=~RbMZw zLsi;Px%r{d9B+(@J1$5pkrD;cfO?`gP!NnKT6quSmES#U@(qjh|T7@XA==9kQmDgGMpRc*1 zEl2AZrMr~d_e`fTUJ}OoD=#Iwh+9-w7gjh7c5vj51$M5S;&j+4u9q$4qVNIM{33W1 z@qRmWiZ|_F08sJB{VzedpV<2EyTOOH=pB~|I#wg$Xcwr=B!+&0{k_Xt1}}Cs-=mTA zJ?fs1X!gK`Q{6>|%>AMK+LW6!nyCqbM!txapGDu(vH&?OFD=PHR_C zdDBTpiiTuNzmznjda6{RgfsKwPO-stN?TPRvEB19+Xn4-P5!R8kjSFmC!$6J^_I_m z)mrd?M6F7StCd&n%B#GxXCVjm?is@cG*>zZx4iQ%QWPxy3Gz~%cWU|eY-*>3b0meI z=$?hGM^UzhO(KtUll*_~*cDIDcNshNi2jRL_kvh$$fH?hE~M2!)H_TsbEJQ?XZ%c< zv0Q@2a(?B%DxPA)tzVmOXxHX9%%P%-msr-AgUtI~AWgXk6{n3s$_*6IQ!&$!!d)wP zA&x*Tj@sAb^axFQn9!6`Z?&p5fQbn2^XMq;LvwHqO?BgwdicL4{xHaOzwMQ!ir-f* z*7^Y{#*M^JOaltwvz99N@Ao|;r|$Rbbra8RTq?l2noQ7CWtSNNA4&jMK&ZcyUg1H% z1lb%bqD_IaI1yW%NG^`r4O1=8MrsY4&AwRh0@j%{{t@RUk2$vRSbW{2iEQ+fQ@mXS zM8eT@;*Ed~s1uXpJfSXa3wgbP3U=sOnr5r_f`)5#vQM<{t$M3%6xlS3wA#%n_fblZ z67auE{!hIKb%V>8dKKJ`YH&u58evz)e={~F7x!0!q-Ag^T4z1M<*2F|R|Bgpu*Ou9 zDLL8co-G!`Kt=koBfLevPBNYLzjmax@&m`ggt*7X*oxEIr&;Y-8yO3pPbgJTkWq6`qSH58FVNSh24J@G&`EdGJ|8{Z%C9H8wK}SmC)Pn zj9pUVdzB4v@5X-D;*;hnHv;&SPNv3dyK~4%TMHsTTrt{Z7s??) z{Db%^>QyK5T~Oh3bBuyEQ^ITw!SlT(kdW%agpiNEJs;73y%t@9UOOA66tI=W(aOCDrf ztav*?3n{{-1HFiDix*+C-_3LRRF5$dxn^v6##wQ=KI*?P+e2{Dn^q`dJt_EQ@{GDZy zzR6;6vf1NDR~fsWD`sKr!I2z-!Mqn+%{Fx}7qRz@8Ij+8x)eLtgxerrFFD&l5el6ie)R-WRE#T~VQ02S8r7VN9e;AJQh=~g~ID2hvl7PtMz!ic^B; zY{{ja)gMVJFshe4FqhlX`L&jM zV(nbN4F_&xYONi9gt(j|!z+?Mk*VtsQ$mjkdPQ(?vqDM{I`s@c7%OJE()K|`yxcTz z_7FJ9g_(#fIZ8s(VjluAx3M9`u`F-ODr@TeEWNw$0+l(*hTAydL%G9$la`x){HHcx zpHO-bhQLqkOvl%LVtZ`P<^3(d1&dV9jnGBZ*b!N+jPYTWG|p#`7U`m0waiKjbR_D~ z`BzUBP)OdOt4&woP-Av>+g0jk+675u*>)1&Z z;>#ML>fU(_D95&ZPq z&TBLu^C@Apms>=>xS0|GgST1dx{jgW4Q?u4rCq63eDXi~?t_(a6B$!TrLsxs;zrQ@`^g)&ZIJ+k-_oRP% z>Ve0uIGIG9VW4HyDve4lrw(ek4yKZUpA~rFKcqj%9HH_n1i6HqmGCb(pkeVHWOFRg zLzRVKIAQ;i0YVibKPYh)JeGON{+-f7M0UaEnOu?v72#}U0#5O#^mzxqE|}+5heOQ( zWU%wE0HspZ@s7-^)!MP)fk$Q{h@uq2)SVP>O@x&n+iKeefVe<*Xc5jAB)) zV%53dgG31KCr0nxoLf3d<_m#qX0V}iC`ff~C2o95o%q!H@Y?q$DtUe{IHxF&QtRz4 zy@&{CJkR_0@lb(_HF121?YFV&%^6sauQ{I*m}iRP`R#2v7U0UL(|W-bubrQrq5A5b z=cm4k>vGQB7ny-OsmT^l5wh<=NhADP=^mw=uC}_vG?(~(4sssIqIX`y7HDfYx?e1` zwTz8(;odSAbhBK*HUU3PbayBYwFv%CXYOTENg$Wc&}tE^V)a1N>`lopm>%i|goGqsY*lk%z4oVs|Q{1qd<*22USxRM_9n9t2 zvt74OnIsTf!|v*|###TM0+v2;0fSH#h@&+Nyl$5PF*9*VYoPp`v&Is0yrwEDXfZ6LF^b|o0iI`?*@}j~4(?E!>RY_n8G(#aJS!oG6e zN;?JFdUShBW~*rqSeK_38S?)rBPIiOj8`|~jON&|sl#y)0Cw=r90IDjqX3{`v@fdH zy;8ubji~$CrZE)5V)j?Z5Z#;1DQXlA-l%gjOY zLM;nt$_ux=_>3s7m=|h&5rb>lx@B6uKh;{S=ldi-#VOB-wCL8W*pnTX^Adb6l|JVBZP0JLBY8;abDIeip=w*ijV-DrGaVMt zlF%O+TwAerVfuX|=^Xp8R|hldC;$uZ~bg!848 zj*vCtM<`F54IoWo*N)P6Wvr_v{n;IJ+)?(@4fEv`OG@o(KYl{s$h#S=M3J@{oW;Z2bPOPHP zYtwFmk!*zfCjTCfnfM3}uSCD?<<`_!*k~yImIZY!Z7uR=wAY-<)|4^38Y@?wYO;WzvT}DPaj>|3OLT52b&ot)rQ3+n*0MS@(%?-pUB%4XnOXup2Yrcu?;MRqOVkaCP zG*YHSt~(E{k{c+oKEDAdXykVS)r$z7OKta3q7hcW@&?M%nfE9SYQux3XhC_BJ}FWP zH;w1Pp|jZYNL5P}%)-QnAern0reoYjiHW}p(h>uHlhNpA5y6&y7T3Gdi!Umk?$1!I z*8zHPJ&YRNJVz_33ct>8hi5q`@L$pKyKSaZ?zr3-o{M=z%N__`W3l zB&y$R@O4E=_)dC-SF`*>E#>jcISHYk2N8GT`w}j{8~4WXRWu|L6&ZS@U5JBWXOWKU zDa6$y*wn#K^o%&EfhqZTqqzms*2avDl--!4_ADLKBDGYxP2RjDls3I23rMDjCP4$O zHg(kLXZ)_Y%CUm95KL;7@m0m=N$`diZOHqDo$fgwKMI?BDc2{41Zi0 zsHtKKHS`i5%<;S$rD<`#L+1NCoC_;CezONS7|#e4F)TY+=HSui`}gmIcj3zzJR-(u z5tQeq4-&W#fN_o(Z~-(pHpLo zq3F~%Jjk_gcvH)$p5-y4Pwnwqz8u;&RvD)k1xLBCgd~*A!3-h-H_%i6yB_Yiycs** z^3)&b=w$>|7BQR&5@DtMC@LsUG5f4A+r~*_8t`_76N-v|F~5kz!;hLBYHn=QoLuuJ zW9BFxNz|;d>8PY6Q%yD;J(xYs$b!Mp_Z3za9j%($vwhEKP_RH$X4*kGipeHaQn@d6 zEseQJ*T7&#M>*WaY0bj32r{JN+=jA%@L+Z;==G~zxi=!hRK$>r42gT>a^~>uVdh~F zjpLXk7FJ%7ro$p0lQ|!zm-#Emv+Dz^C#Sw$$$6~2lzT~2(h}OYxGhB z-pox(f|wAB2NTPLIwG?1wAQH~QJE*HwcnQz%VYq8!zWCe-?9^vNM@J9QBTKuTK+00gB4Ks1$X+bqUVK$OL)qBeK- zyzBF(LP}_Wtu_&@h*g@ia6ywb$PlPhcP!y!4>*;IhtZ6Ra@vfFqcHovJB&ix#?T31 zoLhy}ezZD)sCCbnb6H)!%%%!yUcp)>mrXt;LPD6yRAHuQD7vX2GtLH-*jEO4e9t)? zd|DwsTOr4Z@|8l^W$`r(!6CNzL`5(sw$^aaL@G6nks#fwbR z`}7+7@V!qz{fTY5$;3r)1nf{g`D&R)7evh0;V24FxWwsOf?sqB>zGg>)G!>6$pM0j zq^jD2P{Nu1&A3)fPi4hv>&R*aEC$)VPzD;1+lxwjN(_RaB;5)KeXko0htQIKkjIU9 zG-eZmYQ0n$ff>fvaCvK}80phfTn%_a6(vNj5Mj7Vz|?h?K}5q1OKn_vMYe&$UXL=T zdr>#djL;5vbTh3IIePMRNSbFqFb0+W1^U!+7Qxfg-V!1%8=0e%iVnG}h-#}t=jPvs z)ZLE>th8GUrvQiAyn`R{} zCv|u>6>wVAsB@^_oy*9tGK8M=ELKOmSg;>xdKg2Ca?u1{iZ~U|ZXSGxQSU?W)Ey%b zi^sB=!Z>4CUX1#D9{0i7K+Ch~9cvAU?2wtmtJ%ss?MYckJ{8|_Y$y#LBJPQZKJ-yM zNvuVT1iwLDHho6UBaVT^F!N;sH;zEPQNNbJv6OQ+2wK=eUj*mT$vp(B>dQ|*#5kie zV2$60gr3-vxj%#iLz4Bou!A;tMXce0&!LkeL zRDro=cMb3Y)X!x@#Jk{&&6toaw5w7M8P0n3$XbsBHG{IU+KEe1iXNn6af(vY`>9s@ zq*m*l`eQ;P#=#9M*rpNf3DmDaUdAsu!OV1FJdXt!H+T!?Mb$A&uU4=a2Uzwp`@wPEKBFoW+EjF^fYX(_>(=U)(sUE4?+z!6Yxb?72C zrBqi!%s4gTtk(@RicWw5NG~~@Scw4I1#_ovqeyuW3r5KZnuBLWattyi-QQOvS$xw))ES$#6P`@>&E)7H3RQsb~U^TG(}k!)h%PHs^*< zynX3Vso-q{ppP?iD$UVKJ2j2b^m0?*c|MB)&T(`dZDqjm%R5PBeSASMz#Jsv9<9bgXT*%BMufVW;aC25XdR zxvOQ3XeN|mbT?Cdxb%)6eMdb{!0!c12a8;<*1ElI8s!lhM+LMG_N?-%+xdYh|Eemw zIh&umV&MZVG5Y8ri+#0GP&$#|KWsiLBN`4-p>h^SN$PGUbd2?a{>y7CtY$@Mk0!eI zh?0X~;#3^b?iW%VWh^AKszkbjK8RNL8fe?5>4d13$U#mxQy2e=UWblw0liN7{Re+9 zPba+^f#XE)wpwhh;=jq(I{uq&JtqH7b=;QZ#@cU!YVxv?l+EX9X4JAQqNZJz;g%>{ zB1_@x2`tb>%b$*B5~gGX5fdvFeLzBkam(Jgk5)D9Bss-KGwOeb%p`+_IUv-O7hufG zp9fEQFg~nD7C9cP9zhQ=UNIB#xSK%nwnV%!j?vW=ePOS}nN)3FGhy_ixy=KACJ=dD zHRp|ll^9>Rnr`81F%uoxIvH^6r+y9!Vr0uQR7nsf6Uof?lFzj{eHzHdaP2Ek47K0{W^P`dG5TQ3CC(8=-sEEG1ITWV@!R@D0t zx6B9a>5USbm!oW`dbq=v_e@G4;(f@Z`6dz9C(M-%EDgn4_U3g6Zb=BKsA;rp9Y7v&Wy@kKE78*IKlhWNF z5N?ir=$jlKK7*kJmT-OFQ z3C}?et>TC5JN7GoY;LTO{x&O~Jra(m8F!bd`rEe0F&F;T*Mc+6T7=FDHl)w~^5v_w_`rvO;dq=M^2&4&{Cez_PQh?XBJYqOGXeeAR?s;K z)AF6=z;0jocs1}@8&|Cw!vpBLJ^`M!`k>96u@CyjsW@*>l;YB2C^XSgC^Tk|V_1&+ z&OL+r0XvsExQDIJZAZyn4g|V_M~+(g-mB+cIcbfyg6d%rYDDu{gyufUOW*=|wh`v^vEne&B?e^}z3dEy|q1Xmyf}s7C%03D~g&TLou4;0};;9@M&mm08lh{w6*Bu?ha>v~W5aH7DnEt+KHK zEfSWa&AKpZKmeY^lVN-ubI-S0EYl97VC8H6_2_o#YjOLvSi1e1-&Vt21OVr8_h(L#;O{9#|FSH@6gWF2XC-U0R+leNL#b{+ChO;RL zvj9AWG7HK@jMamDn{2gW5msgTIR#5E3EJ=JhFknoK!bFTU(J;5{~Wesx|Pl%EBWSx zkd-`06|yp~S+J@uYnTRG+DsI(5|+u;eJ640`?{Tm-DRs2j_t`J)P88VeqGKFTLOVnmC)GP?}ZnW)~6B@?7K9%2A+Giu&Me5d{ znLL9bLMlHD%T_KfH-Hof5u-U}Y?@QfY<8|?WxSa&gmA7H7?Rp*G=1fSK20do7F;PZ zXtGj&Y*svLU*e@4!L>L5yKBU?dGK-dd~BL^&AO@s)et&;Wrp8G3ZibF;n$G=(&+{* zZ~L*Abc#&*3Sp-2-)`J)-d2}t-fi{d>s7N^|9aKxf4zDPKf)&YU+?Rr_3&|%{C(Wq z2Yn5cfq(k&cl9y;eS&`v;O_(Sca0SKIyu-sAioa|4xZHUpWRdM_Jp+4!WLRBDA{Ul zui?k`Blvr;jUP~Nb!`>uk$<+y-~Gqf>;97`_;&|C4%W!u0}9W<-UIl1KtB$4C=hk{ zXKf$;uD9^x$wU161V5mkwN~>1e6&{g;O`n1YdwZKttZ$(YiAq&?$VF_HTaADtgW`7 z*y<|%Sbqe6AJC5j$XP=O*7tTuKkNJWvAzCy7ydq>AG-vc?I#cM&zeWAx?6O;jjC?*gmHB|HhefW*WiZnPK*9r`S;-r7-cY`7GT2BzKk8ae< zbzU)%Q(3g%Zs1-r0#}!#aaXa~s*9>XiQ*dn+L(A@U~vVcl@P*P02d-E(g#Y+x4URy zGnm-|n^w?@lIf{~L&k2Pra~HFk0yS0dmHIIknd#HY&K0(9m#8X&Xc)OfnG*6D?X2n zO(08aH4G*Q%b1?t-csY|#;fg5e}CA1`F_8{2fd8$?v=UmXHBAvSIV-F@P5t0C;s%W z3GTE2kHA!qB1aicAR}Fh2{7BS^735=j$TNsK3rR!Tw*GbAv}O1SK#nxwPZ`Bj@`1H z-M^pF>2oUuDA!E2znQ1X%t`_57+eWt^x52!=B`xg$5}BVLMzDi3pn+sTOQnMxnc)0 z=>QOmp&~V@WL%4C37}Uz8V}=QFDycU9K$EjDqAH)30B$%hoNmZk|8Ec9Xf7U1a!J5 zqKlWDEwc{tC>{O*>fyi+N-Z7)@(WaYeXQS}DhHM4Cl(Pds z%OQFms{v&R6tzGHVrsiqCUolrT(_v3PjRr^xD1Eis~SxpESDd8HxYGJsKZE^CI(dX1!ndCBGDO1dCYFkc}Tq5;_MxJZG1ym6S*=adBPYR{EMz2DcuF zxxY4XL$3O5WcSl&kigL)XhmxbQ8g!!q5b63=tdnZIr6%KGVsa#1x7Fk~bSk`3Ga`2zr57o*bLD)-tmf)KIBiIuq9ra-f!n(%L$2NfF{ey73fF%G4r*_en% z!T*4SvERmZ^q#O&*N zkBG&P4b7z!rl=_B2V^?8$N~d0w*pxyKzpg>l9b~1cG=$9JW))f_KwX2h-^zf0L`3q z_EK9gY6f}iUdmiqF*kv`Q!-2l`P+E-r#&dGgO0Hf(4JT%y+I%sV*T|Nl?;f0#hief zu~9)x5i?JPOFqH;^_>1L7>u}^(+-5kFs#3v(Q`G+fVn|&BacV$7H_xF<Q7qckF=jZ%c!qx(r4ik-jSujim<#rF)2AvFjDl0BTpXHY zFxQwt(<_3L8@ko0;}g|5t_ePu1VgY9qm`U0vYX3XMTUVk=d&$Vr9R&I&2KGYzTYvf zB{+Qd?%z)c=@n`^D#2+4`XsB>PMP_W!s&UGH(`pQEMydL%lNM1<47N1(*z+ROr^H( z_Y^(EQ-AX;fx1mFpJ4J_$Bi~-@eru4lP2@5^Qp=`N|~b78}4|Pn>d2quuPl?b6vI) zK|X_G%UPj*e(VOFjEQi5%lQ$J05-F89UF+!@>E&GwSlAB-DJx}kCw7$A8e+~XCKrg z>MUGb2%Pom1D{d+`V$Z9g@^UPL+On_@L0q*;@aw?hmU{rdk!&!OWIeZMmGx-KAQCV z@f8yt;nsgvFdB9F#%K(9XaNdBgLn0;I8R~dVVXAN&XzH3= zGrpfy8=Y16(o2Z)z(XqSMg4FxG@T7t?^jX_`qC9;A|F$=Gm$Sz6Yg12a+DF*5l8(# zsKXq}6!r#GX8=N44gnK!i+HdhAxmNcd&5D}c$gQmp!5j_mZHR&2jt*+)kwGS($GY8 zhT|AF&8W)OZ*N-6v ziEvCpfPsl$4s^jq?m2K6Lg#PAn$eD{C-M1bwN;P26{VLte>Kk>193#AQ7QD=Q?6-O zc7@~&XTF~ixV0tczpXqKGN1IgQJ0^|>YE_sX+@M6e$29nWM$22I7p7V&B>NBC&6Te zqy-ap>A+WmAChcaIB>57z9X?3C4i8uf1!pji^KY>$Qec`;zn*;e0~@1h(AgV1 zHi^`Ca6mAh{&J|U^X_>BP&=ei)|UEl8%d=K>ziHMumY^EfUBv$0p{XDtxBX0fG?%V^LxqCusSXWc7mBdFumj4F4X{M~44zdF=ha z_kDL09na2uz#0u_GVLIDzLIxw=;uwyfs}&yQa?Qk8wbJ44l?RvIUG`_aQ46yb7|A^=TimFPFh2Ir5xNap3655 z9QP~U#U9Ns*o9+Qwp!V}Se+S*B^D>rj-^Vou?i|2;l7vu*mqtv2>;h5KKW>?onjNr z*EU*PVep{Y4ue*+>Cd<|n9jg5gT#yDl=Dax2nB`~`gq=<;;PbwA!+x6{Av)u;QH8# z424OWJ&%j%2y9V<${1)`N_daw`x}q9qLT^`zIq=6MZr@?#(P!TQ3G;h0%-^IHT@x+ zC|kVGc7;D1UF`9=dUL=K8A|5N2zkKapL+Zc!TkxlX$ zSYT+ci4DLOX{6%Z2a!0I@jDORU>s_O;280hZJ-chR_zc-fZmcr7v4%xY!IV{B!(Dr zj2f%zeETn>3NG*>UpxkK8g0yduiuf&+nN8kzw8pC%%8x6W>dLteM@8O8ZKC!-Br2K zmG-#Q!NYIAgBrk))V znfiX`w<`LTiVXh&{XUx#O}TF~_xi+m%$YA?=#@-1MILi}ML2yW6DP|<6FGmVX0S=~ z*u9D0rI~WNJVk)^&+S|(ZTn-It4yt@2x)##?N^&RqzI>SPB&;)oQ*=Rutw*&=btEyo4cn=pf(@m@JBO4A|pYdR5QkAB1eTm(J3RU;`wHZcDOD zl1Fh;r>E8uVbcE>g8`z84oJ}@ZCcwjHns~eHkWvlzr?-EX_L!_)g~+b^$%sL333h2 z!s_aSroSZrG#ky9*ZEP$_(KR<(*TWrke%s<(dqyirT>pjGlZcA1IfT&(!ZDfT)I)$ zW@(uSb%Z*H3122kI%Z!!yu~IXvZgw_t&F$S#tF2{~rFSW2uA4c@fp&3g0;{ zYjyQqr+n0*=+X`1+iE}OmUV9l{43}aOe4D7FuRmG1)=q1 zeAVGe3>wm+x`8v~d|;I9r`>8pgqvDY(4`)a$WhT=nq)&FRfAZ72`l4dK-$lvhwFa) zVdu@^W%I?;LAp);dwul&eEVtcZd1q z!S>n8`*@xF`Z5$pwJ9~SzGI;-^-@AOd_Wj4J z_~OORHsqaMoF(UPuO2>p4c_r79AEw#JcfU-UhM3BnPmNy!<~ntS62j<-B%ozt9LtV zwZoltZ2#T)_4=Fh+WNb=fA;#YtBi@{9scOOJ|FP!@Z!y*7xA8mp_x)37e<$m|xmr8B z$Szhs?2s-(4rs<>S5aYVoaqdDcYOA4cCM4{B%E4<|{!K6&D5EZpbh@aTB>YWrzXd$^t@A15nk>Emd7d;NLxY^}C;nZADXZ9RG! zuV1}=^5k`YuwFZ>txTTmtVDZx>(yRs^yX1*{q3{C>Z?!T+WMoxql>-x$E%mG*Q2Mk zw-=A%2hl~oa`EWN_2kjf+REOCM=R@39)G@AU5}pC)+haUYj1u`NPg|QwU!_Lb4eiD zdwKN!aOcCbZ{e5j%BQ{jVDR+$&Uvwy<>$k=7=2%To}E2A_~+&7_~KK4rS|CY-rMy1 zw@0;uA5Z=nzh8Os{?lL2hv%cW;c@ux;k&otkLGApdoZ~CK1eURA09sa@}u|QuVVMz zrLyy_hEGSayxl7cy{o7|LFbx+fjJA^CTIJqTz87k1sF#+eh*6>dnjR z_``$uAKqVo*zTV_ZFYCxK8pvnr#s(&Z12B*cGTR?iw_46$p-uK{LPQS%h6T-?5tRQ z6Lnt?{@Q)K_SgR5D0=(;^FNQb51)Sj>+0dB;vnz!dOPn1U-nm%w}%gRpYMJ-4==xM zuOFPPbk8qpYfqkh?;qA)y?V9x^vye1v7NsT-#^&TzW+5C41%EI&87rOrlfL&gIVfE zAT5+o3KoCv-=!7XqYs=`Jce~=|Kb?m9{o65d647pm9ycql}BqoRwl#mEPwCugE9ZT zy}LblyK?dL$4d5nFUp>tJET{KsU3e= zAFrLSo*(zui?#1-lkRo)y7l5g?Nj(Yf3SMg&!6mm8f4Jsx9`LKcOMSdSJSn(XYXpe z&v)J(eBQr2OW&R!eIBHrC&}}F{&|@^T>0^M^11iy@rO|_nLN4pvHtP$)8O^W)$!ZI zz13Pic+>szEhkHNdH(6k;C=Y{^TqMwcgf_h@O}0zd-nca7Cr6$nCyrBce`&^j{Z8H z^pDT7^ke>ZkPn9+&i`4v{A>UF>bLhtKR&JPzTe*?sJ;HE`Kb5pu>0WE@%Fo`^yOeO z{&;x#@!|WO2mPa3?e&Mp+h=dS43d2J(axC8*epE01FAyQ!{3gl_}|0Pi`^&ir-=^ViwOgXGJHzlNVb9zN)Hhr_p6^{?jp?+*x$ z@2q}*++2s0x43riJ~vli51#KleEe?mX03={{z$%UUyffK4_;sIoxO?%mvO%P?92Q8 z~zYg~g-bb&;-#)+E ze%s4meSQ`VuK)US@NQ?AzaPFj_^|u&{pT0ox4*o)`m+7BcQxF5MZkJmJKlM_zVq<# z`Y&vEe|T{G{b=%Tw7XmJG~N$v*jx;wLktj1?L)H#YMqrXj%31C9OUytk!2uaxiEE<19{!`Y6nZXyP0K(;uor77DR(GM>0)Juy>F zEo5RIu)!s^1sj^|5^ONXPQmM(Iw}v^OXDoE zVjWug7&&^-XNNbkQfCnb#U)vj`ehc5VeUb)^KT6HH(`oJ?-?quLa-co>hk zk@%7ZztWyi_K@vJt62u-bL%!c0#-`aTLMJdr2cwJZ%>k}#wrI~fA^!8=QD^SW>e4F zAWgI$=biGLsiMxrpCgD{L+QjFW=IWn#`Hu*G-fIzS0*7Jvq}0|dCU9>%j^aols0gd zk=~;@N6N#}>hp9!qKVZxLx>3JB9l71k@bIJ^Dv4F1HfP4Jb<9lZ|}!VY6L-+$6p;; zjXK%K9kSJmxEl^RF&dGLGK@MFKlxMaB#ID!?QVYtcJlqhSKU`X#i;)^=Imm;@^)qA z?d6-{VEfb4&rc7(54S%YrQi1+KOKF${M@<>^B2Q!@5Z0EcZ>1vLA1TsefHs9|K0Vg zciWdgF1NotCqmJSi`|#s`!9CFS4X?Uo#El5oj32|@4E+2-|g>b&!06v{PR6Li=Xap z|8x01>}~(}^4HFQz5na= z`Od}avlr>RXV1R<^E%sJ|M+J8$LHo?c>Vgt%j4A-&->5G47|&GgQxMQi$U_)ArSaK zGt=8R(`#&|U%!sGANFJXzI?m4bG3K1*L?K&@aR+RbF_cGckpT# zM)G{^`RmcA__Dw18p%wRhrdMstzWq%AbKdWfBYqau=HAmF+D0j$r(jK^Ow$sq)C1x zWMMC!D9Z~z)lwzp54w8Wuq2p&DwjUnQL?F!O5fEyr3wCY^2%dn#XrI-NU2s zO1lgc(%c%UybgCRf?{CMYk81A!T`#8ROIm~{% z`}SkB6YqZ;H@6>tyxiG6dOLWr{V9F<{hy<>c$BBTB{pC~i?fsjU`>w`4yzVf~qu)0|deGAmZa;l+^bQl=yk{f)_UQ#3;b8Cb#pORQ z_SW|=->p8(kKTO$@bTN=`SWMnKigYcjDpX9G+Uy>KkcX##=pS^B9S%353?8(L1 z%gOeK!KI|Uya?=bKYS7jor$}v)%m=#yFmRbv!jPp6wrlz3si>n>X7( zl4sj525&!ZUv3|Miyyy#zIWVzH;djl$0GOR;<&oH_|9z2?p$uVJN53SpUjzd38%ZW zzO&9xHlDh-|A73*n+tnUU1>9S?84cqx%GT0BI}I1zf4J|mr-srN`PSNb5~GEPvXYG7q-EoREMk|HV7x0$ zc0gYzK(v{2iugSo9g<`a~)gwB;Pm{jjdIV{5O zEKx3t7hTngA_FbU>P6S)x4Kl)RvU__ZLN#8sC;IWR*ODZyxX~LJ)A$VC7 z&K{fdrS_*6eRAjdQp&XTWok9=I$tx|YW?>4n$g+nT>M(Rt+iiAz{NXT|8)#qyt4=Y z0TiAE4FdB=CvMRD#@#$;u{}rBKNGuM>gIWczOfk?FBYXIHW3^Sg8RV(_1oK-k8Zz5 z(HI^WY?C6}%(q*x4DS-(413S_{n++6B^pkZJsB<1DK9CbJ{I$QG_f+4_f48yF(9*gWaacZdkJ@9K@wdq zOQuG6CCVUPf+)fF%Ch9}Cg!^^bPKZDQsql7BdSjISYpPKLT;8O4dj0FVS2^mLh;33N|W!o5yXYR1m_EX zpA(R0X2M5S@?I~_h|nP-wBfb-F7A}{syX;~6{J#Hnt8u$=Lm!8tHaN9x~-+i|I`sx1P2k&3L^i&t4CVGgc({z%n z>)?zoi@-bN7*H!`Ac+U%@-Zi7IQ+-3u6N%b9=$mX7>mcJTH@39$Hydb zT}wRLJ$&=>W$;)_eEIzK{!!3+s3jine>x7<^d^shvduMz1MbKJ(?8-Yh zeDnG^Sbd;(0FxLzXz4vX;}Eu*tLwhy1>>T8)-88b>c-dJ{4-CS_w-cZ5W#d1FtaV` zi3!ANe4xuj^9qkRtXJU2t+FQ#Z>aK7vzewqVZEcSI@*<6mex1F_4ZzhT;TwPPV-wZ zOQn0Ws(N9c<8Yow(3Xya!Cx(>dat8P=n%qO2nJ=>%n=)jd9e2*EiAV@3-8~LSR6fe zYI++G6e!Y<(z>&*gXvI)SB-4`Xht@2HqLyNPjltVwa{|W4V3ODdojYK_%mMUoK$!i z(R=OA=&0>t8e5-1w2`AN? znmZLcKZsmS$_U-=+AKRLJnmIP%?@tFxgCjPx|qr+!|tw38X*H*1EM85qPfAb$PCSx zx_cILR90_M+{ROiFRTmatOKCDEjZj9EG0#k{d5SlwQBao;&a}$pIiGxw7WL?sOkue zF?8-aJgtR;$#Cd&;G%I$7A*m%VeN&8j@}!gF7wXh64x^-1_}3iY+<12c7C07OXh-k zx7(83bAz(N!E&?BmXa~;a&2jXBeonzXMD#%n%!L0FjXWsx3uqCt*w0r(N?QXz4Nh< za)JfzWVg3fRAVUaUqGFs`bxzpX4OQL`bhmU@k01XrE@*h$ZiO0g~-H*q(mdd$*}`DF1WZSrX2IH!KfB`oG~mkU1J>!>Nc<;E%)!ko;;?`a3TC`I7$pF82o zJP2dP{r+Trd>fc7yKi<980z&R6dgqSE~UZK;XZgy#%_`R4TU3YJqzH zH^D|J05LYC@>+G4Mh>VR7CdLNblnS2yR6`*pVG*6ck~+%N0hTRBF{6fjrK1=mZk z8E$6ZjAO^L!``<^UO@887{p%h_BQg2wS?1zM}W=+{U$VUIfLk!K&rAWkh$m=|_qlhfxD1fxFK0e`@Bo7CM#N)={`%JwC{E zG@cL!T5@gG`Pvc2^0)N=4|U8dI{wh6`*d`!WqrwGwJYQL!g{pp`YFyRE*bH=&5$ zTHMu{Q0O6AbtuZ3(V-ZWHl{SSX9p8rpgl(j;)*iaGaGe`)zzFFFq=1J!RJn#Qr4b1 zXG1fmPHj&0uV~`iOt>uU)FGSESSf6Flg3afrCe~7PnkP3ecH_?A~OK0s|{^r2VpOQ zki8$N70&|D^z|AlNTrQAX54H>L#b!n#D#)v#HqF$JGaa0!<^Y*=}=wGdOD9Qb3_+q zv{+SziD*cE;Sl|07%qb$unscy4tsXou?~+LMtEx%L{_YuxfX#fK^c({ z+6Gzm6~sQmo6utdWK>#}b7Qh5HzX0AFWT!p@O8>-AE(Yhq70K=1}hxj6(XhVO-`BI zbPKk#pUf!{G?_HO@78nVoWzq#$@%Jf8sPz!8itj zKBEI(1?E@ODAXEa6;%2Q90U*u76}G4*(JE^QjZ&rfI9X1=US>&OO6)w+1zZmls*13 zoY__BZiu*U-JcV^lN2FS*Yy63?1-96N!>h8mHRb`>}u7mqTXs3`T*`WP5d%}A0>)* z(Y#fk6&Kresm3qkqmmmxE8n=%E6L|Kf>!oI*K~94SXH|STQjLBmDO9#PD~k@+om52 zg${mDy-Ez`J|Q4NsSgu-e7E%Mxx{>%=QCN-;i5HS02z=N{3%GpxJ ze%k$?+uCB?lFvBg9ZgWHK5mhhr9YxX*irV$apAhqv4Im_twHi$UaCU`SNld1>lkahHnMU0Pb zpuY?~H1jf)HY9Z2)F(Cd++NXQb1UdVW4oAV&F!t82KOaq8eUZ!X?W#sRmQ6sGnE@| zc{g&Y9Li(7&=I`QvQ2z=*8Tgk80A%h^1`$L594KQRi!^$su$)Df0}H42GNI%Z69QQ zKIf=-?(Jn8H_&CO z@+f7>brWAmb-m2e3Sa5YqAaPIr?RtFJ%{)$aL1uM)bY)sI<&}B*vCsZMx7+xbP*3i zBo?DRTcs1*witZ6tiX%>zi8fnWolUty8vRdBn{%3a+K;yVYbr_FPb80bIH)bx}7}#waZMimp z8{If32R^uF+_vi)1aeX{rMz|M`ZBZ>l`5&RBRLeH*6nS}ZaVTj7u(O& zF@|jq4@IXN#&FHnOiLJm9j_;7I^knB-RVM&rf2Y%R?#M^78AxJ^$0haMLnH?RJ2|0 zVi~t}XObcjN{tkO@BHCZ=8}V$U|G#P&uPh~+NK!~6peFVy+CoJDR{BcV39 zATcqMAz?+v-?O=~*%+z`yr4T{U~dGg7CvQjaNCcA%&Npq#XvQd0+)|g_f?291;%%5 zDM}O&WYtY&Xx(7DHkuHd%EH~{AV@nC*}n2{E_F$be7RG$+@X#$9f7y1=r4!4$*(U2 zVW`q}`UY?Qzs&g=28E$#sF_8&!6KRmav+&jY(_&)9Ynj?iEBX@fjxI9*0d$p^aFwx z)z9(5L6RwL#C}}2MtIJ&Zk}liq|5JW55SE&yFm4QZgS&w193=~88tql>oQicuSBV& zVjr8)xYoss4{d~-=Tytr3qpc+<4(__FymPiX3RjkpoG2~#lz}w#az33%O9zBbodk9 zN>q&rulGHxw&xFmQSHLN_RoB7&n^YOQGmKGvXzfh{yYryO#jx?F~nQEOmxxMXqM>CAzFh`~51viBgPa<_X zPQg1Pcp>gqsY;|*Ay@_WsU<{IH~w-wdd$V6M{Re=2aqH40pzuKSus!_Kwg>;AnB2( zr72G$hsu-4m_Lc^>n|ZMw@h?K)UWnye4Z@A;jLT}Zd^RAR9FJN+|)nP6_dt$7{m6% z^>{qFlE>&z2d;X? z^9>LtXuQhY*5ewtVyv8H{KM0io8J5jF-@}3U;$xd4k-KrZXP6y!+}DPFkkIaG}{xt znw+|775f}@u;`ROXaE87&aJwusSUF!0}rO?H_~C(He>KiidKzXleEB2Tn!ly8kNF} zT!HGHv4g|13YpgmmDzbK=W(yJ4ON_%<>Xx}*@lZ$mE~kr+Ii-NY!oOHrkx(UxN@88E?rXT=}Ks_k_EFCHY^9|sB znlKDAU;aAz`J5cBVXd_B`eefe5du52k|~A&c(vKXm;s~-LcP2hhXe+~LZ`nOZ&l+B z?ZDvjL-`|h0(R`0RlGu+CB?*KUi+>o!e%$(n&Wudn$ezev^nd#W`v!2?fyof4g3E6 zxZdAzG*V{OfDklQV`*_yRAy4=M18XXyxLf_1q8wc!wicXvCB-^$ZTc@ceJ}DlVPRr zGMqQ%PK+EwdZLYW1n12(rlA*x7*>e-)Fs&sU%vo^|DzH>S{-hX?<9eLdAhQsbr5sl4z zbP9TtgN2nyzbB`@{UDy3ef>!{)tCsJ5fQZ4Ji?;aifN}$R+qHZNj9=ht(JIkV?4>v ztAssXQ5q+W)gvj3#m0&n2J#L|rrA?$tqvIo+7)&9iBLBEE30%RQ$q@#q0|9u#^oSb z7UsD0Jq|4Zwq7ZLo#UC2SL(n`=~)`R>Mwol6B>o4AV^f9$aTQ#GihWtAmR`<1-4zF z8SrkRAUNMNy4(6n^(earTtiZCP)E$s{^`s*O3{JKM1sHu@JX&eeH<(;dmi&qlW0pU-b9WU~_&vMZ zTt({nlxfmE4T-6m*#fH5Tr;h{>QWyyaURyWsB=f_o;s_ShI5H#&6nK-%kgd8P+Z7x zhsXvc;9pB=l{yn5EMx)Yp7)l6NEi!noUr6l~!B~gVDtV*0LWm{Q;-@qy9RaW=*_GapBtrKd)saz*fbTc{O$(7GU zeRBhX8k^og8x>13wv`IFGUcQc>;_k<3JgyO| zLl|#i*eH}|POuM6W>{MbgWi)8D3^=-gT&Fw{9{9X$WIA`-G+XaGm3#_mrWVS$Pd)! z@y)HJhMLuUz#j+oBC=rVwS6%mFDqG*s>>u*N_Kk`jZFtn7-(P)&wF=1w$s}p z5`gvg`=?ubtheTv6qgQ?ae9^~k4QDuRUHW|FY^bFPLKvV@Y-Hn)CbO#PBFcGEL&XW zM2TWC^TrZHTNMmKS7}!uPGDuOia>cCsXKFWE|%e)!v@VkNEo1uZ8YNp(dTnc44c`J z+O&q^O0BBhbdxp>iqY4I0(WUzsdcAYR|^D(@0^9Uu){~s&+lUbhr@c>v7~~nbok&f zW=r#TvOtUq-JgduU`1VtZ>~E7DGgnrL&!}}%KNppkg>CzmQY!HvF@v zpHF_Nohr|lcBTtpgwP9GJFmndu^g~c6GlD%mw@UsAEyh_^r#kq<+J65o-Q@_gAB3ZLcwMqjU476BrM*mjZd6;+ruJ%k>T`qp1xsso?u*pXM-7BhGuE|Q zh=N)Ko;i)%5mr733_sd>ZZwyAx{;yj6P~+A_?IIB4W394)flxei=38h56eo*X+EEj z1B(cZzPk$%t0$Vn1u%}B2?F?KjIz>L!Q>U7{=f)UjA4V+()bW(#UvaaGPW@okW|WE zqHFw>%M?tp*gt>MM*|iAgz%aFOyZ2RS&6PdS|w+2g-W;;Jfv5K@!1NQ4CO0{3grs} zDq}1K^c#lhT~z&6PJLCdfQ!xwVa1m~2} zx9sdwEf_Tta>^a2@3Z0k`^(@13x8GFuRzI1kun7_uS%r&?)MN)bKwy+E$hWWe0!TV z=mL_2YT{Sul7sUpA}!vi?uu!sLPCJvhTsJU>gK##2i7#c5#+#ovdZ5TX4NtYZl;}r zP`GSA?4HZZK*9@5PKwh&wpYli(t%F(D{0i*s(#&S{ON7oLr*&1)SDLBHCrg!HHI1a zh(D{bH|>J(T@5KaQVo~lBrn3G3$*`|Ol*4D*n9J8|Ee3IWaTl9PN>@9u!eVr=^5PZ z4+B>5{o%{oTlSjMpzfhZS(jdu6@^B#{y!c%gx7{1m=nv9(Ir$;%l zf_>QNs}eZs;fsbR>g1O(tVPj4nf9g|=1~PVX@x3dxp8@cSnS_mDA@w*PQ4C>eD7c- z7(}J5Xz|6UPKrj{JMF+b34&Ny6=>TqDxxJFx)fG}gz50&79r5$cF;D(l#@3Cp^gt=MM5AFNER04^IYDeIc^W+O4#cL(;dl4 zs#f4F5O5rXEx=bS_)+yv;fP9;*-JQe9+4J661DifkAiGq8b#Qqcoe0Rg0qp@kqnoD z;J6SQB}_i`Nm$u3TB2(e(KkUp^^%n{E7$T;q$jcA4EDhN%0M>d2o+;)qKMhXY(Bu~ zIP61i66Iyl=4NZly)0UBu{>>of^v;0N=0HDD94?HmRIOa1(D6-agkU5sMHLCQmg#o zbt)aeX>O}VPCGn2$tmxn;MJ}GNsPN_PqXqZya;n_ucBf!-E)i#Lj9cy5!j~r<(=&9Y5~13tw%;b&`~{K-nxG zxkGl6;JKITH%5&A_lr|4z9MBMd4`RlX7w1t%Rq6qE#+4@T zQF+6;eEMaP7CoF-#i-2r0@?xhMnJOZ-5I^#R5zo#r)6r|&}$&>u(k*i2MLoKakTFV zWq%bW1mm)**SI$!pGUys+}@UD=QR6<&L&t)F_I?g?h&c)oFFJIA*jq`3@)A&zt?gm zD7Y2pfQ^8VxhX2ep3;MxQQ%KF$@CjuLAe1m1Bp6U4pisdMf%s#o7WijR3^sBtI4p4 z>BA@bKvA!A6eojWbV#S)=kz1s$H8{eJqHnpuL)Qw$rWNYO`5w2lH7?K_b9)0hzfnQ znCV5pf`ZG127M7oPA!P~(4#N^s(3_KW9%Si4g30MP1zhK&Qq1aa?4XuANWKSQ*Gsg zB@HTsl_Ah+6ovflflR6K$yD zqu_L+TFq1EhuIadktr2UqEj(?8DosmMdJ#KQ4GifD@Ro!OSRw>Vcadhw2P>L6%PRc$CpP=Og+Z>`}G1MDjgY>(}U@Hm#R2P7JX z)LWf&lVDF;uhVTmQ45`%iXcdw$1Kc=sSLVBdOHU@kY z7yo1M(eBuG4zYO1*IfUsCmz=}N>pp9cTeJJw)PH~EuJm7!&>u5iLfj9hzrMvJ4LkNMZ?;T@cRVj)XH3gfo`Jvcp`%jMLmW z(&W^|uBnS*>Jp8v#ithIr^Lr}@@6h7$FE@7?5NYH&s)PC8U%@2pc6HqBQr?M0>p*6 zuQSh2;cJg+H4upXghi&|L9)!F$XV-U6kecTW=|M(!3l3W1};5c#^Qb-#vqYqCJb`F zIs@OAFyHnP%xGgK+iE@4QTdjpo~>$KyKs*(bniT!!-ilP<$R3AzLVWaXs6ENOOD>- z)Y8?J*fR7DWYI|oQxG+vkaY5EaM9L_AwHpS)*w&qswFM;Qq@wgXuJi9^%+X6L25{| zBQP*r839ZFH*N24dO^FGa4RHE<(o8^k!d4owm2)yn{%ojVBAYY_h&)(WyAyd1biD# z6|-pd5+@xYa-q+)a9F&Eu8BljP@M{VOrV7#8^Z69N^RR+f+FObENY*o>`aORkOf?w z#f>tM2E?cv1j~0}r%U4vab9A`FrhOYvdks=%xNA%%{IU zPyI85lOBkd0o+Pb1A)?aR@IR|@cjMY(m#Sl8^RL=f{xE9MmO$73A~{DYcd)ir+ZP~ zBXghJ-iGAw)=`j3i$ijXR@!7yNCTKe2e*&4d+6DU6{Q!`z*>c{jNT2&fy$^h88Un(F8ujU%Zk{W$ghl!$gL#g6OxErU zfqM|^$WDq==KEI)<8TRQwrpt>yz#F~bhoCIs9jvS3O^d`wlo zSG?i;q#~0=&(dqyPDd$S0eX{jHMiAzYCK}A%PJnpAinon7Dd<#>BOzl9h*bW*Bn=_dxJK zbJmz^y6;Cg=>-}5FbaDfN67skvL^sB zN1k~2geVmq6x29@LF)8-jKgh;P;y z;*{)iRcO#69|UDp#HvCHhLjZ@p2Qf$D#GI*fAD+Y6veh*; zYi*znglJV?yY`Ilqy?`D(COAC!GO|Nhir-4U32BeZe-u5@?*Wlg-1||0!qHrjtKoR z{F^yz%+~1kwo1_5F}hO+EM%r$&)CVYVe9HsNM=J3C7YdMV^;`~gvV2M`YsV7fk>9_ z>v?!bNu_Ja{q5j;2M&WV*-{Y!Up`a0_FqyB(3>)!2iqXJu1XIg5#bw=nx}w$D-&udbr5ZV<`{&?~}KQ(X%Bn1L$^aum105~f|*B?ohT zdsx)plXGYkcJ&l)bjrz6n@MyPKO_6&O)|VjqfZl}ooJX|E(FmGfMDiLkTC5hfx>Az z`W}zTXNJ7~LNf;8HA`VU0v6pdbt3&&Ch)GXE&{4+Qk9&$fhz%^qT3uOXQCfGxHbX9 zw4ViOyH8aWGa;G*5MD@_5Yfb+0qHeiZx@}V1=i6uT}sZ+Lb%wZEdZZ$_SCF9LO34A zK>N{yQtkwBBqhIwUc5R3>nxNbfH`-jbfo3(UM(=A!)>#}?eduros)y7w~bNM?S5I_ zj4of8T|QlK@=yIjomJ}q%8`o@r+Y;JP>J%c6IiFTzYs8foNr%*F}jY?8s%p`3P+~+ zKb@X-)RW(R=z5K3D*TaLeq6_I9Th-m)02Wmn^N4ltd93PEe?6 zV9;|(mLm@m(07t7zQfAM-2}vC7o?@2^_WPsRiPQf z2m?&v3%^HE5t5%^QRh^(#arOFWyTl?P0jQ3FwW>;njUBZ!EcG@yC4QNROZM!8%}@{ zdx`|55-n!B1vR+&mTuF+}ifB48B$qHM_~Cc)xEO-s8L~A3>NWPsC&P5jrU@@Xz`>WH z2PpL-ksAfYrO8;mG%NF{XFv(5pq-IPk4_?CBzH>q#2Duj=~hnAuX)PeW)<}8vMF>` z8ea?Mg`I+=5U8&%wM!J&)?fNiX3(kcTk5V_j;}3C~pMWH>KwGoJ_+=_0G) ztZ%)TqeDes_gn?C!Ep{Zk4MdAc_y_oqS<2Kq#_MuFP=@G=%Jcrqu`q{^yp5Ym*+#O zevvKpX@Wnb1v)ACNv@_uHt_rSvyVT60Ar1UysB)6KG_Vx5O>23jZUaxi*9CCcB|h7 z9m1kTVS|%Foy&W1#Pad|`xhh;sLa^&=)-jyLl6_E=N#|yt#gWaZCaW=#yj_>A(6tt zF#!?UBIf*(tyV9{q`@+M4VInsw5$2vX4C5trh(LgpIB`aG)3u=Qra8UYJ%w)1ij8+ zGZ=LS^}3gx4764=&Q=V7tzgGhHl0$5GB;mm_M~W=W=yC}Gh3c@U;0~CpF)G7#z7Lo zmY%5u#1i((_6@%-HO!X83PC+ZBj^UPs$3^idsBVuOAFPV0V$F09*%dh~oD=@q({MK)q zi&-;~m&tCWjdtd6?ZBZ^2ey2sz;Yo@Cee&p&9qqststK`k`%Lv<8u=WR)6-~=)<2W zra5e4B6={pcio-0Xw+L1ECIA@z&>WMUl-#q3_Z4 zPK;j9VYXlBH%isMdB-F?qcQa(_!guZNnWJ_*J%~k!1hVT@0&60qQNy~91GR^R$&pe z$Q1H7Fv(pekz&l9=aE+Xk4~lj{()V32<5jEHKALldmlCqKM_XHlwVLMUsK7d8Qa*L ze1{36hG3rf1Rvc^cl1>h!j7J7>1*+=j#9v_uBtL4PX|mvP+@FtWh*0s3Hy+?*M)Et zFtawuJ9An9IjE!&s==sik>NV;rG59Ld2L9y8Z>5BFi~{9P54T~7P@Wg^pHpxZ4ey1 zzsbN0M-2C(t=n5nzIS$wdI2tLaJ%yf|KwLMVK9+W8R5ID+18{TdR#smB0lx`!z#fF z!F+7df9T`u0>|5q)UOWZ+9zZeTwuh90qG;V?wASSxQw#%pl8Xesn?k?31I!pPvddG zLF5PAj}6MyEEwR~&RiEvZ8Wm)uboyeJi znzUOA)6)Qd6(`^j85cx$!YL1e3o>MWQN(+(!i&+up3k2}IX0>D;j?w*FumgJt%XH& zvZv`9l-PinANBNT5nSC-sdP%23wa^qghXXXRY)x5Ndo?6_*Te>_?K;P_OFu>897lj zM#@_-0GMe=PqI@_^DdwilkP9z>ve=~mUnqz6;N^$g8Pj~-r%$^5{Bf}L6i3reAPlAlSd`H+|pF(j_JJbiJO1Ut2~7!KIIB#vy9k zx#D747$lVQM)w&DHzvb3Jh?%%icwfv1##+0d0L^P23;xVgf*dMg~SeHu; zo8=h+q{MpIuR4I^liL8)Ym4e-c|G&NYU5rn%Hu5R?Xs8CRsK@ighnr@2i2UXR>TL} zwaCxamqp78qI!yRg1KYK^sUd`i_HgP!oZjaFoc#i4AKtXr`%ATt)^y8{g7Z3pZPxR zR_fJ_(xIPfr9nLkb~eiF1-YV+UN(2HC7K%rq_`rVFBTp(%@JgoL6WPgXReFaC|9oBjOE&$ zlGjo4fL$ypC$gB1Kj#cG$zZ=&nkX+nrqg6LA30Iklv$&l2qS<(C$2d;E~1U*mMk!# z7wukqLV28t2xq!TPedxp`NK8vroen4=l+Cbdj3yM+SHu;b2nrO zRV42#dwv*9h{%j@&uKGViv!}GQvLHzFC`MZl@B)YeeTt8Rr-2@#6c%$PaDc-msDHj1oatHOJ?X=!kJ;zbN z@}O7eLJ6VZqm$&ce$mM{)2)avQ07BCLkR447>%Q_s8*ILeqK*Ka5bvEvT$JamW zc`XId`L8PMxx}mBZ&?h+iSkayF-@we zd|!Q1bFzB6H6cQN4Sv-o)w~WrxF@j`($`OAAc6m>!dCUZ=Cu{Sa<8>iA#)EljiT|P zqw$*7sOT#731oNfpgRlth2f>!0z46-gGE30Q}rr%Ty<&cN9bL7rTR7h)2lZA-16uz z=%Mkaw<0Zjx5!SR(bb7~cp~TkNHB69Kzn<#CcX-<4Kr0sm(?mYr9w?9PIg!Zj~Dz{ zD^ATSAbC?y)!-m(!-mo>2tq1go}X^&U1^Yd0P0C}I`wd(imiS-*~+$t?S8u}{rdED zzdpvB6z4^VaMpVNIBT$Ok+(!V+f+lVA>tMpJa9e&1 zjG(a-=y6|~u$q^$<{b(a*GxDa7pcxls_nMxa>-dqv)**x{h8IkAA%!{K#9i9tWC97 zcc_m%n*QbvUj)sXQM>f~3AO9YpHI8aBGXworqgl+TsE79b2b;PE*V}+s9si)-)#^) zD}T!|L0qF|%mDQ_-cWDkM?QP0Lt_OQu{e8bEKdIF@P_(6QpRXUe;V%`mWV`>`cx;fJW=NeW~DDUE)^Ri=Yh7W`JGD`+Po3XC?0J5Gl( z8E>>{g~>3cf{j-=%dHWamkCpK9l8mG%jP^_tnh#ap)w=wE$F|omyYIVtNRaSX;+y8{Eq{6MueU3M)Oog zUAmc3B<6vsMX79XR&70L`AhtdXH?0_0UZ)ruO)tut}oN9r}RZOzX45(q2mgpr$_$M zL(-4c4KI!#XAp@7rdO%@__4qAXw_d@U4J;UE<6{W5P+@9PZp^hpJicotY9-9I5c_gA!2Kl%85TezxX1GkGp9&OQ!1dOeF}8+bfk zY%kSYFc9*8bvy=BFki$YaVbxMJW|3B>&E`f??VYjZowO}y@FKL-r;sQbDKUd5sdD2 z;s55(88Zv3)AP=rf51ulhhT+!@T*PS+O(v7hycf5A3&ISz5NNqipAhl@rWE~E8}E9 zn2bCk%N2jvd2@K#eDQRUZj=9BAH6@{e?Neq`|xLXcl$H^^JQ@MIl$Ea|N84^FNfDFD?69lqYr~#Yvr=lTEY4|e;vMmu%CVZYcLoPM%G)(z^@lMvp}(2 zzwS)`u%ZhCiv}TIXsEm0JU_zCSQUJi!j+j^A*|2emz3B3$)L&5{T&2a-C4JKEyN>6 z@mnGa7IU-C;vg88T8HW7OBQ^JiF_i(cq;_=yVxEz_fTuO^O!k3-VwYJu72z^D;5>K zUtsb}U?*7>Mp2kgvPi3;r&(3_u>PjX5-u$%0fZQI^buL$N-S;EQh@0LE-ekRm{9|g zO3Uvv<&z6I%`uJ{LR(@z_k*LUMVu~RB&Jx3a7|+Y8-mT|7BfCkl1?J-*g;PO=@B0c z-QG6aMbPxA+08wI_#d-yOwDCk8u;hhBUFV{+iKN{wv{TP)6@!n9p%Pe>%P2MHWX(V zYt+DV!0`s)Jnj)<2-c;wKxP5Wh^B7DvL8WF2POPrg}CQ0^w1RWf)JdDX?xsCSjGjg zl7$7guneW01%Vl7*QjJ{HMREHCSbBzjC28FGifgNSW{nX1JZcrRonIQL zLpOF(o}}mw6xax;Zq670OO)V%K6HT*m{sNtp`#fS(k-nZS_hv?xUSY|c!DAQ+Zc!7 zfAuxhg+~o?3X533%Prq1!mgTk&xuqDm^Jid&@PqIxXm6l@X){m!^+cGN4kYD4U$Rk z=cNG<`QjEFsS?eKy7K4dQIjC9wK|iHyfXn)@sr6Z++C4>*rp0nualhQkeY5KC-LbP ze2L69Bn6PvuHw&t6~+%~lIv@=JaZOG@A^vDOT#jL1t$m39`&N)4DAUsj2xjwixR=2 zgf}+!#xkk3e0X|Uh7SzApz=!rlJF12jgsit2>s@7pP1ztC@i>dHp87#c`PA7V zPn=HK6E);b^hW`fqZVx_ zW{?8NgSFPFhi5PxcK>h&2&Pjls}eUBNrh8KvasjHh=90EsTk6sAZB40_nGg)N-w^s zc$9v{NfKqxj$geDXjPgFmI3Hzkul`h4t?q_0o~BP&!#Fo@jZS3TfkVfZQ7zMRNh`35iC$+;_? z6!|x7EhVj`uvOGs+LQydtbwPMA+?k}Yr6_iQ5>&0PnQWxC|XDjIuBYP=dpmmP1D9X zm@4b^+fN&PLZD%`Fk(vDxKs;aGATpf#Nb!(DlE<$-6)1YbC)YwqsyN-Vz$TMFp%y@ zrlj$mlpaDrzTm31Zc%%X;Ni(6930h@TGC2;WzSE=v9cV1?Y#UBCNy&+M!P&(*PF)6 zVm(ccYN6d2%bjR137rh&#^$MPrVgTCCdx=m^|RTmX{KW?F3TupKD7FAmcxYliTDY+ z6j~^}VzF&QUWWhTFF?2zc?@sDm*EMB2X8{OrUTiuuQnIR=8DEW7ReHZ)u0ATgfUj0 z*LBj3An&AnTTO!OB&FMGLblb!+*T8IK6^J4$-@-sIH4gdpwyP04);R2n@+IG>6Gu( zkR$3axB&tnS%NuWQ5Rw65uJN@wvkShgYKfH)K^Z-`U83bBIsp6!Trt{4w7+M5glSuPAZUw z7%782j@vlPHpxtn7n&vN$8<<{$PyP|QoUmmWmP8(Q-@faCc<hvrZH|T;jP?5u!Uy4u#xKJROpwc)X9dbSIB4xXZatdOK}?RH z^41}@tZ9IJChY0=@`lsz<;{kr&9Xy7ROPDn_7YdMn;6D0;(?7a1fh7J)Wrp=PnYQi z2on=m>nN$*sRkTJi&a46u5%!#L=dT%CP3tW3tRpWu7I!E~uBNzd6}q$(Jec6YQVAX&CsKQD12uK1)3(P>U2jn%vA+JWk8`5(#m3 zXVE#D12#Ve&_@1TROH2xGVO-<4Y8!PN=9p-C>-KTKgx4n;6_?gA{i;$%`3VD6Qu zQ$5ngN(@2RZebn?AqiJv`lgDARN(-aQIBiiqE1SLTzn1ZM?}sxm`-x2q54LAl&?pa3?k%=%!q$=v*68?rLXAWuD0$QTa zJ!anUnQ!-fIsxsW4=+~p_(#-+px*F;lbn`8|l#J(8tF-SQMV(UXVxw~PKA?P+sL`!Ii~ zZ4wFybeN$~1)O3s_5>PLnCnGouw>7HK-IArv@q{_4$ zs%2K6jKwSOPZlCQh9$l9$tFh?IU%uRw=aQ&XG{|Aj501e}41prG$^4I_X diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ext-searchbox.js.gz b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/ext-searchbox.js.gz deleted file mode 100644 index cf5b49f6fb0b3b8817e05ddda3e55ca969d64fa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3131 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 VGMhX(j|D9=`)`h{Z=Vz=005Io7cT$+ diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/favicon.ico b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/favicon.ico deleted file mode 100644 index 71b25fe6ee6012a4c26602977262d217af885520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd5)T}YZ?6n@3p3@y{hrv0dyWg4`Ks8LiSs1Zp~iZo)Ag)vw}5=AXod1FBkBZ8nH zm^Z-|?V=!w1lNUBASeXo@J`0^VlWvo2dii2d%G#v{l>?6f6jZJbDr~@k1-K_xw(v1 z9ebI0x7Iqot*#Mb_8XCpMW( zReHVNRa#m)qtR%dYqeVa%E}7s=;*k^yt%pgaZOFlCyT}Mt)ikLSyomSAdHVNiTwQh zYlT9AoSdAi?Ck6_l}cqxrBb4{wllAZC#W|h5(!LCPa_ZrfO4a^w-*$T#l=O$<8hpvoWSq* zr+q%3e_~?7OnSW+IMa^f<71qjo??H0AF)^rR;v~3>+77){QNxD*47Y-M377-5sgNF zZ*FeBB8@*378YW1auP>JN7&xpMmQYC!NCEBhljDWw8S}YZEay}Y>emI+uIY~)4^cy z8F70`_|(9_00svKF*G!U(a}+OJRTk|_-LM-)6~=yc6N5SQH{@((@6bGii?Y1E0xNx zGMVg3&{-mpfX*l>DM4Lb9lE=_xgNW_yPVhI;UPky&|8{|m^5NE!wk}(ie_b}IlBq} zMVOVKdwqR9$B&PX3*3JY_m9Nk&GPc{gN==iJO5F2bv2uvofXmS?P|3;LfBta`3zy6F#O-#g&(F`<>gww4@PB>= d7!xdbpRqYH(Gg7acUp7g|4wmf`3*+E{Q*gMMA`rV diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/index.htm b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/index.htm deleted file mode 100644 index 28f47e995..000000000 --- a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/index.htm +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - WebSocketTester - - - - - 

-    

-      $
-    

-  
-
diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-css.js.gz b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-css.js.gz
deleted file mode 100644
index ebd6fe940ab29aff1fe3b9687ea65eb4a4f83e4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6102
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

diff --git a/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-javascript.js.gz b/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/data/mode-javascript.js.gz
deleted file mode 100644
index c0451c1c5dbe7eb3d41d2a4e0e7946b38e26b47d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6315
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
Z!^aCRntfb
-#include 
-#include 
-#include 
-#include 
-
-AsyncWebServer server(80);
-
-const char* ssid = "YOUR_SSID";
-const char* password = "YOUR_PASSWORD";
-
-const char* PARAM_MESSAGE = "message";
-
-void notFound(AsyncWebServerRequest *request) {
-    request->send(404, "text/plain", "Not found");
-}
-
-void setup() {
-
-    Serial.begin(115200);
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid, password);
-    if (WiFi.waitForConnectResult() != WL_CONNECTED) {
-        Serial.printf("WiFi Failed!\n");
-        return;
-    }
-
-    Serial.print("IP Address: ");
-    Serial.println(WiFi.localIP());
-    Serial.print("Hostname: ");
-    Serial.println(WiFi.hostname());
-
-    server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
-        request->send(200, "text/plain", "Hello, world");
-    });
-
-    // Send a GET request to /get?message=
-    server.on("/get", HTTP_GET, [] (AsyncWebServerRequest *request) {
-        String message;
-        if (request->hasParam(PARAM_MESSAGE)) {
-            message = request->getParam(PARAM_MESSAGE)->value();
-        } else {
-            message = "No message sent";
-        }
-        request->send(200, "text/plain", "Hello, GET: " + message);
-    });
-
-    // Send a POST request to /post with a form field message set to 
-    server.on("/post", HTTP_POST, [](AsyncWebServerRequest *request){
-        String message;
-        if (request->hasParam(PARAM_MESSAGE, true)) {
-            message = request->getParam(PARAM_MESSAGE, true)->value();
-        } else {
-            message = "No message sent";
-        }
-        request->send(200, "text/plain", "Hello, POST: " + message);
-    });
-
-    server.onNotFound(notFound);
-
-    server.begin();
-}
-
-void loop() {
-}
\ No newline at end of file
diff --git a/libraries/ESPAsyncWebServer/keywords.txt b/libraries/ESPAsyncWebServer/keywords.txt
deleted file mode 100644
index c391e6c43..000000000
--- a/libraries/ESPAsyncWebServer/keywords.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-JsonArray	KEYWORD1
-add	KEYWORD2
-createArray	KEYWORD3
diff --git a/libraries/ESPAsyncWebServer/library.json b/libraries/ESPAsyncWebServer/library.json
deleted file mode 100644
index a2f961a91..000000000
--- a/libraries/ESPAsyncWebServer/library.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name":"ESP Async WebServer",
-  "description":"Asynchronous HTTP and WebSocket Server Library for ESP8266 and ESP32",
-  "keywords":"http,async,websocket,webserver",
-  "authors":
-  {
-    "name": "Hristo Gochkov",
-    "maintainer": true
-  },
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/me-no-dev/ESPAsyncWebServer.git"
-  },
-  "version": "1.2.0",
-  "license": "LGPL-3.0",
-  "frameworks": "arduino",
-  "platforms": ["espressif8266", "espressif32"],
-  "dependencies": [
-    {
-      "name": "ESPAsyncTCP",
-      "platforms": "espressif8266"
-    },
-    {
-      "name": "AsyncTCP",
-      "platforms": "espressif32"
-    }
-  ]
-}
diff --git a/libraries/ESPAsyncWebServer/library.properties b/libraries/ESPAsyncWebServer/library.properties
deleted file mode 100644
index 5c144dc3b..000000000
--- a/libraries/ESPAsyncWebServer/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=ESP Async WebServer
-version=1.2.0
-author=Me-No-Dev
-maintainer=Me-No-Dev
-sentence=Async Web Server for ESP8266 and ESP31B
-paragraph=Async Web Server for ESP8266 and ESP31B
-category=Other
-url=https://github.com/me-no-dev/ESPAsyncWebServer
-architectures=*
diff --git a/libraries/ESPAsyncWebServer/src/AsyncEventSource.cpp b/libraries/ESPAsyncWebServer/src/AsyncEventSource.cpp
deleted file mode 100644
index ecb6b0197..000000000
--- a/libraries/ESPAsyncWebServer/src/AsyncEventSource.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "Arduino.h"
-#include "AsyncEventSource.h"
-
-static String generateEventMessage(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  String ev = "";
-
-  if(reconnect){
-    ev += "retry: ";
-    ev += String(reconnect);
-    ev += "\r\n";
-  }
-
-  if(id){
-    ev += "id: ";
-    ev += String(id);
-    ev += "\r\n";
-  }
-
-  if(event != NULL){
-    ev += "event: ";
-    ev += String(event);
-    ev += "\r\n";
-  }
-
-  if(message != NULL){
-    size_t messageLen = strlen(message);
-    char * lineStart = (char *)message;
-    char * lineEnd;
-    do {
-      char * nextN = strchr(lineStart, '\n');
-      char * nextR = strchr(lineStart, '\r');
-      if(nextN == NULL && nextR == NULL){
-        size_t llen = ((char *)message + messageLen) - lineStart;
-        char * ldata = (char *)malloc(llen+1);
-        if(ldata != NULL){
-          memcpy(ldata, lineStart, llen);
-          ldata[llen] = 0;
-          ev += "data: ";
-          ev += ldata;
-          ev += "\r\n\r\n";
-          free(ldata);
-        }
-        lineStart = (char *)message + messageLen;
-      } else {
-        char * nextLine = NULL;
-        if(nextN != NULL && nextR != NULL){
-          if(nextR < nextN){
-            lineEnd = nextR;
-            if(nextN == (nextR + 1))
-              nextLine = nextN + 1;
-            else
-              nextLine = nextR + 1;
-          } else {
-            lineEnd = nextN;
-            if(nextR == (nextN + 1))
-              nextLine = nextR + 1;
-            else
-              nextLine = nextN + 1;
-          }
-        } else if(nextN != NULL){
-          lineEnd = nextN;
-          nextLine = nextN + 1;
-        } else {
-          lineEnd = nextR;
-          nextLine = nextR + 1;
-        }
-
-        size_t llen = lineEnd - lineStart;
-        char * ldata = (char *)malloc(llen+1);
-        if(ldata != NULL){
-          memcpy(ldata, lineStart, llen);
-          ldata[llen] = 0;
-          ev += "data: ";
-          ev += ldata;
-          ev += "\r\n";
-          free(ldata);
-        }
-        lineStart = nextLine;
-        if(lineStart == ((char *)message + messageLen))
-          ev += "\r\n";
-      }
-    } while(lineStart < ((char *)message + messageLen));
-  }
-
-  return ev;
-}
-
-// Message
-
-AsyncEventSourceMessage::AsyncEventSourceMessage(const char * data, size_t len)
-: _data(nullptr), _len(len), _sent(0), _acked(0)
-{
-  _data = (uint8_t*)malloc(_len+1);
-  if(_data == nullptr){
-    _len = 0;
-  } else {
-    memcpy(_data, data, len);
-    _data[_len] = 0;
-  }
-}
-
-AsyncEventSourceMessage::~AsyncEventSourceMessage() {
-     if(_data != NULL)
-        free(_data);
-}
-
-size_t AsyncEventSourceMessage::ack(size_t len, uint32_t time) {
-  // If the whole message is now acked...
-  if(_acked + len > _len){
-     // Return the number of extra bytes acked (they will be carried on to the next message)
-     const size_t extra = _acked + len - _len;
-     _acked = _len;
-     return extra;
-  }
-  // Return that no extra bytes left.
-  _acked += len;
-  return 0;
-}
-
-size_t AsyncEventSourceMessage::send(AsyncClient *client) {
-  const size_t len = _len - _sent;
-  if(client->space() < len){
-    return 0;
-  }
-  size_t sent = client->add((const char *)_data, len);
-  if(client->canSend())
-    client->send();
-  _sent += sent;
-  return sent; 
-}
-
-// Client
-
-AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server)
-: _messageQueue(LinkedList([](AsyncEventSourceMessage *m){ delete  m; }))
-{
-  _client = request->client();
-  _server = server;
-  _lastId = 0;
-  if(request->hasHeader("Last-Event-ID"))
-    _lastId = atoi(request->getHeader("Last-Event-ID")->value().c_str());
-    
-  _client->setRxTimeout(0);
-  _client->onError(NULL, NULL);
-  _client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ ((AsyncEventSourceClient*)(r))->_onAck(len, time); }, this);
-  _client->onPoll([](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onPoll(); }, this);
-  _client->onData(NULL, NULL);
-  _client->onTimeout([this](void *r, AsyncClient* c __attribute__((unused)), uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
-  _client->onDisconnect([this](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onDisconnect(); delete c; }, this);
-
-  _server->_addClient(this);
-  delete request;
-}
-
-AsyncEventSourceClient::~AsyncEventSourceClient(){
-   _messageQueue.free();
-  close();
-}
-
-void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage){
-  if(dataMessage == NULL)
-    return;
-  if(!connected()){
-    delete dataMessage;
-    return;
-  }
-
-  _messageQueue.add(dataMessage);
-
-  _runQueue();
-}
-
-void AsyncEventSourceClient::_onAck(size_t len, uint32_t time){
-  while(len && !_messageQueue.isEmpty()){
-    len = _messageQueue.front()->ack(len, time);
-    if(_messageQueue.front()->finished())
-      _messageQueue.remove(_messageQueue.front());
-  }
-
-  _runQueue();
-}
-
-void AsyncEventSourceClient::_onPoll(){
-  if(!_messageQueue.isEmpty()){
-    _runQueue();
-  }
-}
-
-
-void AsyncEventSourceClient::_onTimeout(uint32_t time __attribute__((unused))){
-  _client->close(true);
-}
-
-void AsyncEventSourceClient::_onDisconnect(){
-  _client = NULL;
-  _server->_handleDisconnect(this);
-}
-
-void AsyncEventSourceClient::close(){
-  if(_client != NULL)
-    _client->close();
-}
-
-void AsyncEventSourceClient::write(const char * message, size_t len){
-  _queueMessage(new AsyncEventSourceMessage(message, len));
-}
-
-void AsyncEventSourceClient::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  String ev = generateEventMessage(message, event, id, reconnect);
-  _queueMessage(new AsyncEventSourceMessage(ev.c_str(), ev.length()));
-}
-
-void AsyncEventSourceClient::_runQueue(){
-  while(!_messageQueue.isEmpty() && _messageQueue.front()->finished()){
-    _messageQueue.remove(_messageQueue.front());
-  }
-
-  for(auto i = _messageQueue.begin(); i != _messageQueue.end(); ++i)
-  {
-    if(!(*i)->sent())
-      (*i)->send(_client);
-  }
-}
-
-
-// Handler
-
-AsyncEventSource::AsyncEventSource(const String& url)
-  : _url(url)
-  , _clients(LinkedList([](AsyncEventSourceClient *c){ delete c; }))
-  , _connectcb(NULL)
-{}
-
-AsyncEventSource::~AsyncEventSource(){
-  close();
-}
-
-void AsyncEventSource::onConnect(ArEventHandlerFunction cb){
-  _connectcb = cb;
-}
-
-void AsyncEventSource::_addClient(AsyncEventSourceClient * client){
-  /*char * temp = (char *)malloc(2054);
-  if(temp != NULL){
-    memset(temp+1,' ',2048);
-    temp[0] = ':';
-    temp[2049] = '\r';
-    temp[2050] = '\n';
-    temp[2051] = '\r';
-    temp[2052] = '\n';
-    temp[2053] = 0;
-    client->write((const char *)temp, 2053);
-    free(temp);
-  }*/
-  
-  _clients.add(client);
-  if(_connectcb)
-    _connectcb(client);
-}
-
-void AsyncEventSource::_handleDisconnect(AsyncEventSourceClient * client){
-  _clients.remove(client);
-}
-
-void AsyncEventSource::close(){
-  for(const auto &c: _clients){
-    if(c->connected())
-      c->close();
-  }
-}
-
-void AsyncEventSource::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  if(_clients.isEmpty())
-    return;
-
-  String ev = generateEventMessage(message, event, id, reconnect);
-  for(const auto &c: _clients){
-    if(c->connected()) {
-      c->write(ev.c_str(), ev.length());
-    }
-  }
-}
-
-size_t AsyncEventSource::count() const {
-  return _clients.count_if([](AsyncEventSourceClient *c){
-    return c->connected();
-  });
-}
-
-bool AsyncEventSource::canHandle(AsyncWebServerRequest *request){
-  if(request->method() != HTTP_GET || !request->url().equals(_url) || !request->isExpectedRequestedConnType(RCT_EVENT))
-    return false;
-  request->addInterestingHeader("Last-Event-ID");
-  return true;
-}
-
-void AsyncEventSource::handleRequest(AsyncWebServerRequest *request){
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-    return request->requestAuthentication();
-  request->send(new AsyncEventSourceResponse(this));
-}
-
-// Response
-
-AsyncEventSourceResponse::AsyncEventSourceResponse(AsyncEventSource *server){
-  _server = server;
-  _code = 200;
-  _contentType = "text/event-stream";
-  _sendContentLength = false;
-  addHeader("Cache-Control", "no-cache");
-  addHeader("Connection","keep-alive");
-}
-
-void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request){
-  String out = _assembleHead(request->version());
-  request->client()->write(out.c_str(), _headLength);
-  _state = RESPONSE_WAIT_ACK;
-}
-
-size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time __attribute__((unused))){
-  if(len){
-    new AsyncEventSourceClient(request, _server);
-  }
-  return 0;
-}
-
diff --git a/libraries/ESPAsyncWebServer/src/AsyncEventSource.h b/libraries/ESPAsyncWebServer/src/AsyncEventSource.h
deleted file mode 100644
index 1b4d604dc..000000000
--- a/libraries/ESPAsyncWebServer/src/AsyncEventSource.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef ASYNCEVENTSOURCE_H_
-#define ASYNCEVENTSOURCE_H_
-
-#include 
-#ifdef ESP32
-#include 
-#else
-#include 
-#endif
-#include 
-
-class AsyncEventSource;
-class AsyncEventSourceResponse;
-class AsyncEventSourceClient;
-typedef std::function ArEventHandlerFunction;
-
-class AsyncEventSourceMessage {
-  private:
-    uint8_t * _data; 
-    size_t _len;
-    size_t _sent;
-    //size_t _ack;
-    size_t _acked; 
-  public:
-    AsyncEventSourceMessage(const char * data, size_t len);
-    ~AsyncEventSourceMessage();
-    size_t ack(size_t len, uint32_t time __attribute__((unused)));
-    size_t send(AsyncClient *client);
-    bool finished(){ return _acked == _len; }
-    bool sent() { return _sent == _len; }
-};
-
-class AsyncEventSourceClient {
-  private:
-    AsyncClient *_client;
-    AsyncEventSource *_server;
-    uint32_t _lastId;
-    LinkedList _messageQueue;
-    void _queueMessage(AsyncEventSourceMessage *dataMessage);
-    void _runQueue();
-
-  public:
-
-    AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
-    ~AsyncEventSourceClient();
-
-    AsyncClient* client(){ return _client; }
-    void close();
-    void write(const char * message, size_t len);
-    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    bool connected() const { return (_client != NULL) && _client->connected(); }
-    uint32_t lastId() const { return _lastId; }
-
-    //system callbacks (do not call)
-    void _onAck(size_t len, uint32_t time);
-    void _onPoll(); 
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
-};
-
-class AsyncEventSource: public AsyncWebHandler {
-  private:
-    String _url;
-    LinkedList _clients;
-    ArEventHandlerFunction _connectcb;
-  public:
-    AsyncEventSource(const String& url);
-    ~AsyncEventSource();
-
-    const char * url() const { return _url.c_str(); }
-    void close();
-    void onConnect(ArEventHandlerFunction cb);
-    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    size_t count() const; //number clinets connected
-
-    //system callbacks (do not call)
-    void _addClient(AsyncEventSourceClient * client);
-    void _handleDisconnect(AsyncEventSourceClient * client);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
-};
-
-class AsyncEventSourceResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-    AsyncEventSource *_server;
-  public:
-    AsyncEventSourceResponse(AsyncEventSource *server);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
-};
-
-
-#endif /* ASYNCEVENTSOURCE_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/AsyncJson.h b/libraries/ESPAsyncWebServer/src/AsyncJson.h
deleted file mode 100644
index 8412159bc..000000000
--- a/libraries/ESPAsyncWebServer/src/AsyncJson.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// AsyncJson.h
-/*
-  Async Response to use with ArduinoJson and AsyncWebServer
-  Written by Andrew Melvin (SticilFace) with help from me-no-dev and BBlanchon.
-
-  Example of callback in use
-
-   server.on("/json", HTTP_ANY, [](AsyncWebServerRequest * request) {
-
-    AsyncJsonResponse * response = new AsyncJsonResponse();
-    JsonObject& root = response->getRoot();
-    root["key1"] = "key number one";
-    JsonObject& nested = root.createNestedObject("nested");
-    nested["key1"] = "key number one";
-
-    response->setLength();
-    request->send(response);
-  });
-
-  --------------------
-
-  Async Request to use with ArduinoJson and AsyncWebServer
-  Written by Arsène von Wyss (avonwyss)
-
-  Example
-
-  AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/rest/endpoint");
-  handler->onRequest([](AsyncWebServerRequest *request, JsonVariant &json) {
-    JsonObject& jsonObj = json.as();
-    // ...
-  });
-  server.addHandler(handler);
-  
-*/
-#ifndef ASYNC_JSON_H_
-#define ASYNC_JSON_H_
-#include 
-
-constexpr char* JSON_MIMETYPE = "application/json";
-
-/*
- * Json Response
- * */
-
-class ChunkPrint : public Print {
-  private:
-    uint8_t* _destination;
-    size_t _to_skip;
-    size_t _to_write;
-    size_t _pos;
-  public:
-    ChunkPrint(uint8_t* destination, size_t from, size_t len)
-      : _destination(destination), _to_skip(from), _to_write(len), _pos{0} {}
-    virtual ~ChunkPrint(){}
-    size_t write(uint8_t c){
-      if (_to_skip > 0) {
-        _to_skip--;
-        return 1;
-      } else if (_to_write > 0) {
-        _to_write--;
-        _destination[_pos++] = c;
-        return 1;
-      }
-      return 0;
-    }
-};
-
-class AsyncJsonResponse: public AsyncAbstractResponse {
-  private:
-    DynamicJsonBuffer _jsonBuffer;
-    JsonVariant _root;
-    bool _isValid;
-  public:
-    AsyncJsonResponse(bool isArray=false): _isValid{false} {
-      _code = 200;
-      _contentType = JSON_MIMETYPE;
-      if(isArray)
-        _root = _jsonBuffer.createArray();
-      else
-        _root = _jsonBuffer.createObject();
-    }
-    ~AsyncJsonResponse() {}
-    JsonVariant & getRoot() { return _root; }
-    bool _sourceValid() const { return _isValid; }
-    size_t setLength() {
-      _contentLength = _root.measureLength();
-      if (_contentLength) { _isValid = true; }
-      return _contentLength;
-    }
-
-   size_t getSize() { return _jsonBuffer.size(); }
-
-    size_t _fillBuffer(uint8_t *data, size_t len){
-      ChunkPrint dest(data, _sentLength, len);
-      _root.printTo( dest ) ;
-      return len;
-    }
-};
-
-typedef std::function ArJsonRequestHandlerFunction;
-
-class AsyncCallbackJsonWebHandler: public AsyncWebHandler {
-private:
-protected:
-  const String _uri;
-  WebRequestMethodComposite _method;
-  ArJsonRequestHandlerFunction _onRequest;
-  int _contentLength;
-  int _maxContentLength;
-public:
-  AsyncCallbackJsonWebHandler(const String& uri, ArJsonRequestHandlerFunction onRequest) : _uri(uri), _method(HTTP_POST|HTTP_PUT|HTTP_PATCH), _onRequest(onRequest), _maxContentLength(16384) {}
-  void setMethod(WebRequestMethodComposite method){ _method = method; }
-  void setMaxContentLength(int maxContentLength){ _maxContentLength = maxContentLength; }
-  void onRequest(ArJsonRequestHandlerFunction fn){ _onRequest = fn; }
-
-  virtual bool canHandle(AsyncWebServerRequest *request) override final{
-    if(!_onRequest)
-      return false;
-
-    if(!(_method & request->method()))
-      return false;
-
-    if(_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri+"/")))
-      return false;
-
-    if (!request->contentType().equalsIgnoreCase(JSON_MIMETYPE))
-      return false;
-
-    request->addInterestingHeader("ANY");
-    return true;
-  }
-
-  virtual void handleRequest(AsyncWebServerRequest *request) override final {
-    if(_onRequest) {
-      if (request->_tempObject != NULL) {
-        DynamicJsonBuffer jsonBuffer;
-        JsonVariant json = jsonBuffer.parse((uint8_t*)(request->_tempObject));
-        if (json.success()) {
-          _onRequest(request, json);
-          return;
-        }
-      }
-      request->send(_contentLength > _maxContentLength ? 413 : 400);
-    } else {
-      request->send(500);
-    }
-  }
-  virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final {
-  }
-  virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
-    if (_onRequest) {
-      _contentLength = total;
-      if (total > 0 && request->_tempObject == NULL && total < _maxContentLength) {
-        request->_tempObject = malloc(total);
-      }
-      if (request->_tempObject != NULL) {
-        memcpy((uint8_t*)(request->_tempObject) + index, data, len);
-      }
-    }
-  }
-  virtual bool isRequestHandlerTrivial() override final {return _onRequest ? false : true;}
-};
-#endif
diff --git a/libraries/ESPAsyncWebServer/src/AsyncWebSocket.cpp b/libraries/ESPAsyncWebServer/src/AsyncWebSocket.cpp
deleted file mode 100644
index f507aa7e0..000000000
--- a/libraries/ESPAsyncWebServer/src/AsyncWebSocket.cpp
+++ /dev/null
@@ -1,1263 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "Arduino.h"
-#include "AsyncWebSocket.h"
-
-#include 
-
-#ifndef ESP8266
-extern "C" {
-typedef struct {
-    uint32_t state[5];
-    uint32_t count[2];
-    unsigned char buffer[64];
-} SHA1_CTX;
-
-void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
-}
-#else
-#include 
-#endif
-
-#define MAX_PRINTF_LEN 64
-
-size_t webSocketSendFrameWindow(AsyncClient *client){
-  if(!client->canSend())
-    return 0;
-  size_t space = client->space();
-  if(space < 9)
-    return 0;
-  return space - 8;
-}
-
-size_t webSocketSendFrame(AsyncClient *client, bool final, uint8_t opcode, bool mask, uint8_t *data, size_t len){
-  if(!client->canSend())
-    return 0;
-  size_t space = client->space();
-  if(space < 2)
-    return 0;
-  uint8_t mbuf[4] = {0,0,0,0};
-  uint8_t headLen = 2;
-  if(len && mask){
-    headLen += 4;
-    mbuf[0] = rand() % 0xFF;
-    mbuf[1] = rand() % 0xFF;
-    mbuf[2] = rand() % 0xFF;
-    mbuf[3] = rand() % 0xFF;
-  }
-  if(len > 125)
-    headLen += 2;
-  if(space < headLen)
-    return 0;
-  space -= headLen;
-
-  if(len > space) len = space;
-
-  uint8_t *buf = (uint8_t*)malloc(headLen);
-  if(buf == NULL){
-    //os_printf("could not malloc %u bytes for frame header\n", headLen);
-    return 0;
-  }
-
-  buf[0] = opcode & 0x0F;
-  if(final)
-    buf[0] |= 0x80;
-  if(len < 126)
-    buf[1] = len & 0x7F;
-  else {
-    buf[1] = 126;
-    buf[2] = (uint8_t)((len >> 8) & 0xFF);
-    buf[3] = (uint8_t)(len & 0xFF);
-  }
-  if(len && mask){
-    buf[1] |= 0x80;
-    memcpy(buf + (headLen - 4), mbuf, 4);
-  }
-  if(client->add((const char *)buf, headLen) != headLen){
-    //os_printf("error adding %lu header bytes\n", headLen);
-    free(buf);
-    return 0;
-  }
-  free(buf);
-
-  if(len){
-    if(len && mask){
-      size_t i;
-      for(i=0;iadd((const char *)data, len) != len){
-      //os_printf("error adding %lu data bytes\n", len);
-      return 0;
-    }
-  }
-  if(!client->send()){
-    //os_printf("error sending frame: %lu\n", headLen+len);
-    return 0;
-  }
-  return len;
-}
-
-
-/*
- *    AsyncWebSocketMessageBuffer
- */
-
-
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer()
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-
-}
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(uint8_t * data, size_t size) 
-  :_data(nullptr)
-  ,_len(size)
-  ,_lock(false)
-  ,_count(0)
-{
-
-  if (!data) {
-    return; 
-  }
-
-  _data = new uint8_t[_len + 1];
-
-  if (_data) {
-    memcpy(_data, data, _len);
-    _data[_len] = 0; 
-  }
-}
-
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(size_t size)
-  :_data(nullptr)
-  ,_len(size)
-  ,_lock(false)
-  ,_count(0)
-{
-  _data = new uint8_t[_len + 1]; 
-
-  if (_data) {
-    _data[_len] = 0; 
-  }
-  
-}
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(const AsyncWebSocketMessageBuffer & copy)
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-  _len = copy._len;
-  _lock = copy._lock;
-  _count = 0;
-
-  if (_len) {
-    _data = new uint8_t[_len + 1]; 
-    _data[_len] = 0; 
-  } 
-
-  if (_data) {
-    memcpy(_data, copy._data, _len);
-    _data[_len] = 0; 
-  }
-
-}
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(AsyncWebSocketMessageBuffer && copy)
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-  _len = copy._len;
-  _lock = copy._lock;
-  _count = 0;
-
-  if (copy._data) {
-    _data = copy._data; 
-    copy._data = nullptr; 
-  } 
-
-}
-
-AsyncWebSocketMessageBuffer::~AsyncWebSocketMessageBuffer()
-{
-    if (_data) {
-      delete[] _data; 
-    }
-}
-
-bool AsyncWebSocketMessageBuffer::reserve(size_t size) 
-{
-  _len = size; 
-
-  if (_data) {
-    delete[] _data;
-    _data = nullptr; 
-  }
-
-  _data = new uint8_t[_len + 1];
-
-  if (_data) {
-    _data[_len] = 0;
-    return true; 
-  } else {
-    return false; 
-  }
-
-}
-
-
-
-/*
- * Control Frame
- */
-
-class AsyncWebSocketControl {
-  private:
-    uint8_t _opcode;
-    uint8_t *_data;
-    size_t _len;
-    bool _mask;
-    bool _finished;
-  public:
-    AsyncWebSocketControl(uint8_t opcode, uint8_t *data=NULL, size_t len=0, bool mask=false)
-      :_opcode(opcode)
-      ,_len(len)
-      ,_mask(len && mask)
-      ,_finished(false)
-  {
-      if(data == NULL)
-        _len = 0;
-      if(_len){
-        if(_len > 125)
-          _len = 125;
-        _data = (uint8_t*)malloc(_len);
-        if(_data == NULL)
-          _len = 0;
-        else memcpy(_data, data, len);
-      } else _data = NULL;
-    }
-    virtual ~AsyncWebSocketControl(){
-      if(_data != NULL)
-        free(_data);
-    }
-    virtual bool finished() const { return _finished; }
-    uint8_t opcode(){ return _opcode; }
-    uint8_t len(){ return _len + 2; }
-    size_t send(AsyncClient *client){
-      _finished = true;
-      return webSocketSendFrame(client, true, _opcode & 0x0F, _mask, _data, _len);
-    }
-};
-
-/*
- * Basic Buffered Message
- */
-
-
-AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode, bool mask)
-  :_len(len)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-{
-  _opcode = opcode & 0x07;
-  _mask = mask;
-  _data = (uint8_t*)malloc(_len+1);
-  if(_data == NULL){
-    _len = 0;
-    _status = WS_MSG_ERROR;
-  } else {
-    _status = WS_MSG_SENDING;
-    memcpy(_data, data, _len);
-    _data[_len] = 0;
-  }
-}
-AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(uint8_t opcode, bool mask)
-  :_len(0)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-  ,_data(NULL)
-{
-  _opcode = opcode & 0x07;
-  _mask = mask;
-  
-}
-
-
-AsyncWebSocketBasicMessage::~AsyncWebSocketBasicMessage() {
-  if(_data != NULL)
-    free(_data);
-}
-
- void AsyncWebSocketBasicMessage::ack(size_t len, uint32_t time)  {
-  _acked += len;
-  if(_sent == _len && _acked == _ack){
-    _status = WS_MSG_SENT;
-  }
-}
- size_t AsyncWebSocketBasicMessage::send(AsyncClient *client)  {
-  if(_status != WS_MSG_SENDING)
-    return 0;
-  if(_acked < _ack){
-    return 0;
-  }
-  if(_sent == _len){
-    if(_acked == _ack)
-      _status = WS_MSG_SENT;
-    return 0;
-  }
-  if(_sent > _len){
-      _status = WS_MSG_ERROR;
-      return 0;
-  }
-
-  size_t toSend = _len - _sent;
-  size_t window = webSocketSendFrameWindow(client);
-
-  if(window < toSend) {
-      toSend = window;
-  }
-
-  _sent += toSend;
-  _ack += toSend + ((toSend < 126)?2:4) + (_mask * 4);
-
-  bool final = (_sent == _len);
-  uint8_t* dPtr = (uint8_t*)(_data + (_sent - toSend));
-  uint8_t opCode = (toSend && _sent == toSend)?_opcode:(uint8_t)WS_CONTINUATION;
-
-  size_t sent = webSocketSendFrame(client, final, opCode, _mask, dPtr, toSend);
-  _status = WS_MSG_SENDING;
-  if(toSend && sent != toSend){
-      _sent -= (toSend - sent);
-      _ack -= (toSend - sent);
-  }
-  return sent;
-}
-
-// bool AsyncWebSocketBasicMessage::reserve(size_t size) { 
-//   if (size) {
-//     _data = (uint8_t*)malloc(size +1);
-//     if (_data) {
-//       memset(_data, 0, size); 
-//       _len = size; 
-//       _status = WS_MSG_SENDING;
-//       return true; 
-//     }
-//   }
-//   return false; 
-//  }
-
-
-/*
- * AsyncWebSocketMultiMessage Message
- */
-
-
-AsyncWebSocketMultiMessage::AsyncWebSocketMultiMessage(AsyncWebSocketMessageBuffer * buffer, uint8_t opcode, bool mask)
-  :_len(0)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-  ,_WSbuffer(nullptr)
-{
-
-  _opcode = opcode & 0x07;
-  _mask = mask;
-
-  if (buffer) {
-    _WSbuffer = buffer; 
-    (*_WSbuffer)++; 
-    _data = buffer->get(); 
-    _len = buffer->length(); 
-    _status = WS_MSG_SENDING;
-    //ets_printf("M: %u\n", _len);
-  } else {
-    _status = WS_MSG_ERROR;
-  }
-  
-} 
-
-
-AsyncWebSocketMultiMessage::~AsyncWebSocketMultiMessage() {
-  if (_WSbuffer) {
-    (*_WSbuffer)--; // decreases the counter. 
-  }
-}
-
- void AsyncWebSocketMultiMessage::ack(size_t len, uint32_t time)  {
-  _acked += len;
-  if(_sent >= _len && _acked >= _ack){
-    _status = WS_MSG_SENT;
-  }
-  //ets_printf("A: %u\n", len);
-}
- size_t AsyncWebSocketMultiMessage::send(AsyncClient *client)  {
-  if(_status != WS_MSG_SENDING)
-    return 0;
-  if(_acked < _ack){
-    return 0;
-  }
-  if(_sent == _len){
-    _status = WS_MSG_SENT;
-    return 0;
-  }
-  if(_sent > _len){
-      _status = WS_MSG_ERROR;
-      //ets_printf("E: %u > %u\n", _sent, _len);
-      return 0;
-  }
-
-  size_t toSend = _len - _sent;
-  size_t window = webSocketSendFrameWindow(client);
-
-  if(window < toSend) {
-      toSend = window;
-  }
-
-  _sent += toSend;
-  _ack += toSend + ((toSend < 126)?2:4) + (_mask * 4);
-
-  //ets_printf("W: %u %u\n", _sent - toSend, toSend);
-
-  bool final = (_sent == _len);
-  uint8_t* dPtr = (uint8_t*)(_data + (_sent - toSend));
-  uint8_t opCode = (toSend && _sent == toSend)?_opcode:(uint8_t)WS_CONTINUATION;
-
-  size_t sent = webSocketSendFrame(client, final, opCode, _mask, dPtr, toSend);
-  _status = WS_MSG_SENDING;
-  if(toSend && sent != toSend){
-      //ets_printf("E: %u != %u\n", toSend, sent);
-      _sent -= (toSend - sent);
-      _ack -= (toSend - sent);
-  }
-  //ets_printf("S: %u %u\n", _sent, sent);
-  return sent;
-}
-
-
-/*
- * Async WebSocket Client
- */
- const char * AWSC_PING_PAYLOAD = "ESPAsyncWebServer-PING";
- const size_t AWSC_PING_PAYLOAD_LEN = 22;
-
-AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server)
-  : _controlQueue(LinkedList([](AsyncWebSocketControl *c){ delete  c; }))
-  , _messageQueue(LinkedList([](AsyncWebSocketMessage *m){ delete  m; }))
-  , _tempObject(NULL)
-{
-  _client = request->client();
-  _server = server;
-  _clientId = _server->_getNextId();
-  _status = WS_CONNECTED;
-  _pstate = 0;
-  _lastMessageTime = millis();
-  _keepAlivePeriod = 0;
-  _client->setRxTimeout(0);
-  _client->onError([](void *r, AsyncClient* c, int8_t error){ ((AsyncWebSocketClient*)(r))->_onError(error); }, this);
-  _client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onAck(len, time); }, this);
-  _client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onDisconnect(); delete c; }, this);
-  _client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onTimeout(time); }, this);
-  _client->onData([](void *r, AsyncClient* c, void *buf, size_t len){ ((AsyncWebSocketClient*)(r))->_onData(buf, len); }, this);
-  _client->onPoll([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onPoll(); }, this);
-  _server->_addClient(this);
-  _server->_handleEvent(this, WS_EVT_CONNECT, NULL, NULL, 0);
-  delete request;
-}
-
-AsyncWebSocketClient::~AsyncWebSocketClient(){
-  _messageQueue.free();
-  _controlQueue.free();
-  _server->_handleEvent(this, WS_EVT_DISCONNECT, NULL, NULL, 0);
-}
-
-void AsyncWebSocketClient::_onAck(size_t len, uint32_t time){
-  _lastMessageTime = millis();
-  if(!_controlQueue.isEmpty()){
-    auto head = _controlQueue.front();
-    if(head->finished()){
-      len -= head->len();
-      if(_status == WS_DISCONNECTING && head->opcode() == WS_DISCONNECT){
-        _controlQueue.remove(head);
-        _status = WS_DISCONNECTED;
-        _client->close(true);
-        return;
-      }
-      _controlQueue.remove(head);
-    }
-  }
-  if(len && !_messageQueue.isEmpty()){
-    _messageQueue.front()->ack(len, time);
-  }
-  _server->_cleanBuffers(); 
-  _runQueue();
-}
-
-void AsyncWebSocketClient::_onPoll(){
-  if(_client->canSend() && (!_controlQueue.isEmpty() || !_messageQueue.isEmpty())){
-    _runQueue();
-  } else if(_keepAlivePeriod > 0 && _controlQueue.isEmpty() && _messageQueue.isEmpty() && (millis() - _lastMessageTime) >= _keepAlivePeriod){
-    ping((uint8_t *)AWSC_PING_PAYLOAD, AWSC_PING_PAYLOAD_LEN);
-  }
-}
-
-void AsyncWebSocketClient::_runQueue(){
-  while(!_messageQueue.isEmpty() && _messageQueue.front()->finished()){
-    _messageQueue.remove(_messageQueue.front());
-  }
-
-  if(!_controlQueue.isEmpty() && (_messageQueue.isEmpty() || _messageQueue.front()->betweenFrames()) && webSocketSendFrameWindow(_client) > (size_t)(_controlQueue.front()->len() - 1)){
-    _controlQueue.front()->send(_client);
-  } else if(!_messageQueue.isEmpty() && _messageQueue.front()->betweenFrames() && webSocketSendFrameWindow(_client)){
-    _messageQueue.front()->send(_client);
-  }
-}
-
-void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
-  if(dataMessage == NULL)
-    return;
-  if(_status != WS_CONNECTED){
-    delete dataMessage;
-    return;
-  }
-  if(_messageQueue.length() > WS_MAX_QUEUED_MESSAGES){
-      ets_printf("ERROR: Too many messages queued\n");
-      delete dataMessage;
-  } else {
-      _messageQueue.add(dataMessage);
-  }
-  if(_client->canSend())
-    _runQueue();
-}
-
-void AsyncWebSocketClient::_queueControl(AsyncWebSocketControl *controlMessage){
-  if(controlMessage == NULL)
-    return;
-  _controlQueue.add(controlMessage);
-  if(_client->canSend())
-    _runQueue();
-}
-
-void AsyncWebSocketClient::close(uint16_t code, const char * message){
-  if(_status != WS_CONNECTED)
-    return;
-  if(code){
-    uint8_t packetLen = 2;
-    if(message != NULL){
-      size_t mlen = strlen(message);
-      if(mlen > 123) mlen = 123;
-      packetLen += mlen;
-    }
-    char * buf = (char*)malloc(packetLen);
-    if(buf != NULL){
-      buf[0] = (uint8_t)(code >> 8);
-      buf[1] = (uint8_t)(code & 0xFF);
-      if(message != NULL){
-        memcpy(buf+2, message, packetLen -2);
-      }
-      _queueControl(new AsyncWebSocketControl(WS_DISCONNECT,(uint8_t*)buf,packetLen));
-      free(buf);
-      return;
-    }
-  }
-  _queueControl(new AsyncWebSocketControl(WS_DISCONNECT));
-}
-
-void AsyncWebSocketClient::ping(uint8_t *data, size_t len){
-  if(_status == WS_CONNECTED)
-    _queueControl(new AsyncWebSocketControl(WS_PING, data, len));
-}
-
-void AsyncWebSocketClient::_onError(int8_t){}
-
-void AsyncWebSocketClient::_onTimeout(uint32_t time){
-  _client->close(true);
-}
-
-void AsyncWebSocketClient::_onDisconnect(){
-  _client = NULL;
-  _server->_handleDisconnect(this);
-}
-
-void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
-  _lastMessageTime = millis();
-  uint8_t *data = (uint8_t*)pbuf;
-  while(plen > 0){
-    if(!_pstate){
-      const uint8_t *fdata = data;
-      _pinfo.index = 0;
-      _pinfo.final = (fdata[0] & 0x80) != 0;
-      _pinfo.opcode = fdata[0] & 0x0F;
-      _pinfo.masked = (fdata[1] & 0x80) != 0;
-      _pinfo.len = fdata[1] & 0x7F;
-      data += 2;
-      plen -= 2;
-      if(_pinfo.len == 126){
-        _pinfo.len = fdata[3] | (uint16_t)(fdata[2]) << 8;
-        data += 2;
-        plen -= 2;
-      } else if(_pinfo.len == 127){
-        _pinfo.len = fdata[9] | (uint16_t)(fdata[8]) << 8 | (uint32_t)(fdata[7]) << 16 | (uint32_t)(fdata[6]) << 24 | (uint64_t)(fdata[5]) << 32 | (uint64_t)(fdata[4]) << 40 | (uint64_t)(fdata[3]) << 48 | (uint64_t)(fdata[2]) << 56;
-        data += 8;
-        plen -= 8;
-      }
-
-      if(_pinfo.masked){
-        memcpy(_pinfo.mask, data, 4);
-        data += 4;
-        plen -= 4;
-      }
-    }
-
-    const size_t datalen = std::min((size_t)(_pinfo.len - _pinfo.index), plen);
-    const auto datalast = data[datalen];
-
-    if(_pinfo.masked){
-      for(size_t i=0;i_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, datalen);
-
-      _pinfo.index += datalen;
-    } else if((datalen + _pinfo.index) == _pinfo.len){
-      _pstate = 0;
-      if(_pinfo.opcode == WS_DISCONNECT){
-        if(datalen){
-          uint16_t reasonCode = (uint16_t)(data[0] << 8) + data[1];
-          char * reasonString = (char*)(data+2);
-          if(reasonCode > 1001){
-            _server->_handleEvent(this, WS_EVT_ERROR, (void *)&reasonCode, (uint8_t*)reasonString, strlen(reasonString));
-          }
-        }
-        if(_status == WS_DISCONNECTING){
-          _status = WS_DISCONNECTED;
-          _client->close(true);
-        } else {
-          _status = WS_DISCONNECTING;
-          _queueControl(new AsyncWebSocketControl(WS_DISCONNECT, data, datalen));
-        }
-      } else if(_pinfo.opcode == WS_PING){
-        _queueControl(new AsyncWebSocketControl(WS_PONG, data, datalen));
-      } else if(_pinfo.opcode == WS_PONG){
-        if(datalen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0)
-          _server->_handleEvent(this, WS_EVT_PONG, NULL, data, datalen);
-      } else if(_pinfo.opcode < 8){//continuation or text/binary frame
-        _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, data, datalen);
-      }
-    } else {
-      //os_printf("frame error: len: %u, index: %llu, total: %llu\n", datalen, _pinfo.index, _pinfo.len);
-      //what should we do?
-      break;
-    }
-
-    // restore byte as _handleEvent may have added a null terminator i.e., data[len] = 0;
-    if (datalen > 0)
-      data[datalen] = datalast;
-
-    data += datalen;
-    plen -= datalen;
-  }
-}
-
-size_t AsyncWebSocketClient::printf(const char *format, ...) {
-  va_list arg;
-  va_start(arg, format);
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
-  char* buffer = temp;
-  size_t len = vsnprintf(temp, MAX_PRINTF_LEN, format, arg);
-  va_end(arg);
-
-  if (len > (MAX_PRINTF_LEN - 1)) {
-    buffer = new char[len + 1];
-    if (!buffer) {
-   	  delete[] temp;
-      return 0;
-    }
-    va_start(arg, format);
-    vsnprintf(buffer, len + 1, format, arg);
-    va_end(arg);
-  }
-  text(buffer, len);
-  if (buffer != temp) {
-    delete[] buffer;
-  }
-  delete[] temp;
-  return len;
-}
-
-#ifndef ESP32
-size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
-  va_list arg;
-  va_start(arg, formatP);
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
-  char* buffer = temp;
-  size_t len = vsnprintf_P(temp, MAX_PRINTF_LEN, formatP, arg);
-  va_end(arg);
-
-  if (len > (MAX_PRINTF_LEN - 1)) {
-    buffer = new char[len + 1];
-    if (!buffer) {
-   	  delete[] temp;
-      return 0;
-    }
-    va_start(arg, formatP);
-    vsnprintf_P(buffer, len + 1, formatP, arg);
-    va_end(arg);
-  }
-  text(buffer, len);
-  if (buffer != temp) {
-    delete[] buffer;
-  }
-  delete[] temp;
-  return len;
-}
-#endif
-
-void AsyncWebSocketClient::text(const char * message, size_t len){
-  _queueMessage(new AsyncWebSocketBasicMessage(message, len));
-}
-void AsyncWebSocketClient::text(const char * message){
-  text(message, strlen(message));
-}
-void AsyncWebSocketClient::text(uint8_t * message, size_t len){
-  text((const char *)message, len);
-}
-void AsyncWebSocketClient::text(char * message){
-  text(message, strlen(message));
-}
-void AsyncWebSocketClient::text(const String &message){
-  text(message.c_str(), message.length());
-}
-void AsyncWebSocketClient::text(const __FlashStringHelper *data){
-  PGM_P p = reinterpret_cast(data);
-  size_t n = 0;
-  while (1) {
-    if (pgm_read_byte(p+n) == 0) break;
-      n += 1;
-  }
-  char * message = (char*) malloc(n+1);
-  if(message){
-    for(size_t b=0; b(data);
-  char * message = (char*) malloc(len);
-  if(message){
-    for(size_t b=0; bremoteIP();
-}
-
-uint16_t AsyncWebSocketClient::remotePort() {
-    if(!_client) {
-        return 0;
-    }
-    return _client->remotePort();
-}
-
-
-
-/*
- * Async Web Socket - Each separate socket location
- */
-
-AsyncWebSocket::AsyncWebSocket(const String& url)
-  :_url(url)
-  ,_clients(LinkedList([](AsyncWebSocketClient *c){ delete c; }))
-  ,_cNextId(1)
-  ,_enabled(true)
-  ,_buffers(LinkedList([](AsyncWebSocketMessageBuffer *b){ delete b; }))
-{
-  _eventHandler = NULL;
-}
-
-AsyncWebSocket::~AsyncWebSocket(){}
-
-void AsyncWebSocket::_handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
-  if(_eventHandler != NULL){
-    _eventHandler(this, client, type, arg, data, len);
-  }
-}
-
-void AsyncWebSocket::_addClient(AsyncWebSocketClient * client){
-  _clients.add(client);
-}
-
-void AsyncWebSocket::_handleDisconnect(AsyncWebSocketClient * client){
-  
-  _clients.remove_first([=](AsyncWebSocketClient * c){
-    return c->id() == client->id();
-  });
-}
-
-size_t AsyncWebSocket::count() const {
-  return _clients.count_if([](AsyncWebSocketClient * c){
-    return c->status() == WS_CONNECTED;
-  });
-}
-
-AsyncWebSocketClient * AsyncWebSocket::client(uint32_t id){
-  for(const auto &c: _clients){
-    if(c->id() == id && c->status() == WS_CONNECTED){
-      return c;
-    }
-  }
-  return nullptr;
-}
-
-
-void AsyncWebSocket::close(uint32_t id, uint16_t code, const char * message){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->close(code, message);
-}
-
-void AsyncWebSocket::closeAll(uint16_t code, const char * message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->close(code, message);
-  }
-}
-
-void AsyncWebSocket::ping(uint32_t id, uint8_t *data, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->ping(data, len);
-}
-
-void AsyncWebSocket::pingAll(uint8_t *data, size_t len){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->ping(data, len);
-  }
-}
-
-void AsyncWebSocket::text(uint32_t id, const char * message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->text(message, len);
-}
-
-void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer * buffer){
-  if (!buffer) return;
-  buffer->lock(); 
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED){
-        c->text(buffer);
-    }
-  }
-  buffer->unlock();
-  _cleanBuffers(); 
-}
-
-
-void AsyncWebSocket::textAll(const char * message, size_t len){
-  AsyncWebSocketMessageBuffer * WSBuffer = makeBuffer((uint8_t *)message, len); 
-    textAll(WSBuffer); 
-}
-
-void AsyncWebSocket::binary(uint32_t id, const char * message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->binary(message, len);
-}
-
-void AsyncWebSocket::binaryAll(const char * message, size_t len){
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer((uint8_t *)message, len); 
-  binaryAll(buffer); 
-}
-
-void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer * buffer)
-{
-  if (!buffer) return;
-  buffer->lock(); 
-    for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->binary(buffer);
-  }
-  buffer->unlock(); 
-  _cleanBuffers(); 
-}
-
-void AsyncWebSocket::message(uint32_t id, AsyncWebSocketMessage *message){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->message(message);
-}
-
-void AsyncWebSocket::messageAll(AsyncWebSocketMultiMessage *message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->message(message);
-  }
-  _cleanBuffers(); 
-}
-
-size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
-  AsyncWebSocketClient * c = client(id);
-  if(c){
-    va_list arg;
-    va_start(arg, format);
-    size_t len = c->printf(format, arg);
-    va_end(arg);
-    return len;
-  }
-  return 0;
-}
-
-size_t AsyncWebSocket::printfAll(const char *format, ...) {
-  va_list arg;
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
-  va_start(arg, format);
-  size_t len = vsnprintf(temp, MAX_PRINTF_LEN, format, arg);
-  va_end(arg);
-  delete[] temp;
-  
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer(len); 
-  if (!buffer) {
-    return 0;
-  }
-
-  va_start(arg, format);
-  vsnprintf( (char *)buffer->get(), len + 1, format, arg);
-  va_end(arg);
-
-  textAll(buffer);
-  return len;
-}
-
-#ifndef ESP32
-size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL){
-    va_list arg;
-    va_start(arg, formatP);
-    size_t len = c->printf_P(formatP, arg);
-    va_end(arg);
-    return len;
-  }
-  return 0;
-}
-#endif
-
-size_t AsyncWebSocket::printfAll_P(PGM_P formatP, ...) {
-  va_list arg;
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
-  va_start(arg, formatP);
-  size_t len = vsnprintf_P(temp, MAX_PRINTF_LEN, formatP, arg);
-  va_end(arg);
-  delete[] temp;
-  
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer(len + 1); 
-  if (!buffer) {
-    return 0;
-  }
-
-  va_start(arg, formatP);
-  vsnprintf_P((char *)buffer->get(), len + 1, formatP, arg);
-  va_end(arg);
-
-  textAll(buffer);
-  return len;
-}
-
-void AsyncWebSocket::text(uint32_t id, const char * message){
-  text(id, message, strlen(message));
-}
-void AsyncWebSocket::text(uint32_t id, uint8_t * message, size_t len){
-  text(id, (const char *)message, len);
-}
-void AsyncWebSocket::text(uint32_t id, char * message){
-  text(id, message, strlen(message));
-}
-void AsyncWebSocket::text(uint32_t id, const String &message){
-  text(id, message.c_str(), message.length());
-}
-void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *message){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL)
-    c->text(message);
-}
-void AsyncWebSocket::textAll(const char * message){
-  textAll(message, strlen(message));
-}
-void AsyncWebSocket::textAll(uint8_t * message, size_t len){
-  textAll((const char *)message, len);
-}
-void AsyncWebSocket::textAll(char * message){
-  textAll(message, strlen(message));
-}
-void AsyncWebSocket::textAll(const String &message){
-  textAll(message.c_str(), message.length());
-}
-void AsyncWebSocket::textAll(const __FlashStringHelper *message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->text(message);
-  }
-}
-void AsyncWebSocket::binary(uint32_t id, const char * message){
-  binary(id, message, strlen(message));
-}
-void AsyncWebSocket::binary(uint32_t id, uint8_t * message, size_t len){
-  binary(id, (const char *)message, len);
-}
-void AsyncWebSocket::binary(uint32_t id, char * message){
-  binary(id, message, strlen(message));
-}
-void AsyncWebSocket::binary(uint32_t id, const String &message){
-  binary(id, message.c_str(), message.length());
-}
-void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL)
-    c-> binary(message, len);
-}
-void AsyncWebSocket::binaryAll(const char * message){
-  binaryAll(message, strlen(message));
-}
-void AsyncWebSocket::binaryAll(uint8_t * message, size_t len){
-  binaryAll((const char *)message, len);
-}
-void AsyncWebSocket::binaryAll(char * message){
-  binaryAll(message, strlen(message));
-}
-void AsyncWebSocket::binaryAll(const String &message){
-  binaryAll(message.c_str(), message.length());
-}
-void AsyncWebSocket::binaryAll(const __FlashStringHelper *message, size_t len){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c-> binary(message, len);
-  }
- }
-
-const char * WS_STR_CONNECTION = "Connection";
-const char * WS_STR_UPGRADE = "Upgrade";
-const char * WS_STR_ORIGIN = "Origin";
-const char * WS_STR_VERSION = "Sec-WebSocket-Version";
-const char * WS_STR_KEY = "Sec-WebSocket-Key";
-const char * WS_STR_PROTOCOL = "Sec-WebSocket-Protocol";
-const char * WS_STR_ACCEPT = "Sec-WebSocket-Accept";
-const char * WS_STR_UUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-
-bool AsyncWebSocket::canHandle(AsyncWebServerRequest *request){
-  if(!_enabled)
-    return false;
-  
-  if(request->method() != HTTP_GET || !request->url().equals(_url) || !request->isExpectedRequestedConnType(RCT_WS))
-    return false;
-
-  request->addInterestingHeader(WS_STR_CONNECTION);
-  request->addInterestingHeader(WS_STR_UPGRADE);
-  request->addInterestingHeader(WS_STR_ORIGIN);
-  request->addInterestingHeader(WS_STR_VERSION);
-  request->addInterestingHeader(WS_STR_KEY);
-  request->addInterestingHeader(WS_STR_PROTOCOL);
-  return true;
-}
-
-void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request){
-  if(!request->hasHeader(WS_STR_VERSION) || !request->hasHeader(WS_STR_KEY)){
-    request->send(400);
-    return;
-  }
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str())){
-    return request->requestAuthentication();
-  }
-  AsyncWebHeader* version = request->getHeader(WS_STR_VERSION);
-  if(version->value().toInt() != 13){
-    AsyncWebServerResponse *response = request->beginResponse(400);
-    response->addHeader(WS_STR_VERSION,"13");
-    request->send(response);
-    return;
-  }
-  AsyncWebHeader* key = request->getHeader(WS_STR_KEY);
-  AsyncWebServerResponse *response = new AsyncWebSocketResponse(key->value(), this);
-  if(request->hasHeader(WS_STR_PROTOCOL)){
-    AsyncWebHeader* protocol = request->getHeader(WS_STR_PROTOCOL);
-    //ToDo: check protocol
-    response->addHeader(WS_STR_PROTOCOL, protocol->value());
-  }
-  request->send(response);
-}
-
-AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(size_t size)
-{
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(size); 
-  if (buffer) {
-    _buffers.add(buffer);
-  }
-  return buffer; 
-}
-
-AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t size)
-{
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(data, size); 
-  
-  if (buffer) {
-    _buffers.add(buffer);
-  }
-
-  return buffer; 
-}
-
-void AsyncWebSocket::_cleanBuffers()
-{
-  for(AsyncWebSocketMessageBuffer * c: _buffers){
-    if(c && c->canDelete()){
-        _buffers.remove(c);
-    }
-  }
-}
-
-
-/*
- * Response to Web Socket request - sends the authorization and detaches the TCP Client from the web server
- * Authentication code from https://github.com/Links2004/arduinoWebSockets/blob/master/src/WebSockets.cpp#L480
- */
-
-AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket *server){
-  _server = server;
-  _code = 101;
-  _sendContentLength = false;
-
-  uint8_t * hash = (uint8_t*)malloc(20);
-  if(hash == NULL){
-    _state = RESPONSE_FAILED;
-    return;
-  }
-  char * buffer = (char *) malloc(33);
-  if(buffer == NULL){
-    free(hash);
-    _state = RESPONSE_FAILED;
-    return;
-  }
-#ifdef ESP8266
-  sha1(key + WS_STR_UUID, hash);
-#else
-  (String&)key += WS_STR_UUID;
-  SHA1_CTX ctx;
-  SHA1Init(&ctx);
-  SHA1Update(&ctx, (const unsigned char*)key.c_str(), key.length());
-  SHA1Final(hash, &ctx);
-#endif
-  base64_encodestate _state;
-  base64_init_encodestate(&_state);
-  int len = base64_encode_block((const char *) hash, 20, buffer, &_state);
-  len = base64_encode_blockend((buffer + len), &_state);
-  addHeader(WS_STR_CONNECTION, WS_STR_UPGRADE);
-  addHeader(WS_STR_UPGRADE, "websocket");
-  addHeader(WS_STR_ACCEPT,buffer);
-  free(buffer);
-  free(hash);
-}
-
-void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request){
-  if(_state == RESPONSE_FAILED){
-    request->client()->close(true);
-    return;
-  }
-  String out = _assembleHead(request->version());
-  request->client()->write(out.c_str(), _headLength);
-  _state = RESPONSE_WAIT_ACK;
-}
-
-size_t AsyncWebSocketResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
-  if(len){
-    new AsyncWebSocketClient(request, _server);
-  }
-  return 0;
-}
diff --git a/libraries/ESPAsyncWebServer/src/AsyncWebSocket.h b/libraries/ESPAsyncWebServer/src/AsyncWebSocket.h
deleted file mode 100644
index 06b942a9f..000000000
--- a/libraries/ESPAsyncWebServer/src/AsyncWebSocket.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef ASYNCWEBSOCKET_H_
-#define ASYNCWEBSOCKET_H_
-
-#include 
-#ifdef ESP32
-#include 
-#define WS_MAX_QUEUED_MESSAGES 32
-#else
-#include 
-#define WS_MAX_QUEUED_MESSAGES 8
-#endif
-#include 
-
-class AsyncWebSocket;
-class AsyncWebSocketResponse;
-class AsyncWebSocketClient;
-class AsyncWebSocketControl;
-
-typedef struct {
-    /** Message type as defined by enum AwsFrameType.
-     * Note: Applications will only see WS_TEXT and WS_BINARY.
-     * All other types are handled by the library. */
-    uint8_t message_opcode;
-    /** Frame number of a fragmented message. */
-    uint32_t num;
-    /** Is this the last frame in a fragmented message ?*/
-    uint8_t final;
-    /** Is this frame masked? */
-    uint8_t masked;
-    /** Message type as defined by enum AwsFrameType.
-     * This value is the same as message_opcode for non-fragmented
-     * messages, but may also be WS_CONTINUATION in a fragmented message. */
-    uint8_t opcode;
-    /** Length of the current frame.
-     * This equals the total length of the message if num == 0 && final == true */
-    uint64_t len;
-    /** Mask key */
-    uint8_t mask[4];
-    /** Offset of the data inside the current frame. */
-    uint64_t index;
-} AwsFrameInfo;
-
-typedef enum { WS_DISCONNECTED, WS_CONNECTED, WS_DISCONNECTING } AwsClientStatus;
-typedef enum { WS_CONTINUATION, WS_TEXT, WS_BINARY, WS_DISCONNECT = 0x08, WS_PING, WS_PONG } AwsFrameType;
-typedef enum { WS_MSG_SENDING, WS_MSG_SENT, WS_MSG_ERROR } AwsMessageStatus;
-typedef enum { WS_EVT_CONNECT, WS_EVT_DISCONNECT, WS_EVT_PONG, WS_EVT_ERROR, WS_EVT_DATA } AwsEventType;
-
-class AsyncWebSocketMessageBuffer {
-  private:
-    uint8_t * _data;
-    size_t _len;
-    bool _lock; 
-    uint32_t _count;  
-
-  public:
-    AsyncWebSocketMessageBuffer();
-    AsyncWebSocketMessageBuffer(size_t size);
-    AsyncWebSocketMessageBuffer(uint8_t * data, size_t size); 
-    AsyncWebSocketMessageBuffer(const AsyncWebSocketMessageBuffer &); 
-    AsyncWebSocketMessageBuffer(AsyncWebSocketMessageBuffer &&); 
-    ~AsyncWebSocketMessageBuffer(); 
-    void operator ++(int i) { _count++; }
-    void operator --(int i) {  if (_count > 0) { _count--; } ;  }
-    bool reserve(size_t size);
-    void lock() { _lock = true; }
-    void unlock() { _lock = false; }
-    uint8_t * get() { return _data; }
-    size_t length() { return _len; }
-    uint32_t count() { return _count; }
-    bool canDelete() { return (!_count && !_lock); } 
-
-    friend AsyncWebSocket; 
-
-};
-
-class AsyncWebSocketMessage {
-  protected:
-    uint8_t _opcode;
-    bool _mask;
-    AwsMessageStatus _status;
-  public:
-    AsyncWebSocketMessage():_opcode(WS_TEXT),_mask(false),_status(WS_MSG_ERROR){}
-    virtual ~AsyncWebSocketMessage(){}
-    virtual void ack(size_t len __attribute__((unused)), uint32_t time __attribute__((unused))){}
-    virtual size_t send(AsyncClient *client __attribute__((unused))){ return 0; }
-    virtual bool finished(){ return _status != WS_MSG_SENDING; }
-    virtual bool betweenFrames() const { return false; }
-};
-
-class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage {
-  private:
-    size_t _len;
-    size_t _sent;
-    size_t _ack;
-    size_t _acked;
-    uint8_t * _data;
-public:
-    AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false);
-    AsyncWebSocketBasicMessage(uint8_t opcode=WS_TEXT, bool mask=false);
-    virtual ~AsyncWebSocketBasicMessage() override;
-    virtual bool betweenFrames() const override { return _acked == _ack; }
-    virtual void ack(size_t len, uint32_t time) override ;
-    virtual size_t send(AsyncClient *client) override ;
-};
-
-class AsyncWebSocketMultiMessage: public AsyncWebSocketMessage {
-  private:
-    uint8_t * _data;
-    size_t _len;
-    size_t _sent;
-    size_t _ack;
-    size_t _acked;
-    AsyncWebSocketMessageBuffer * _WSbuffer; 
-public:
-    AsyncWebSocketMultiMessage(AsyncWebSocketMessageBuffer * buffer, uint8_t opcode=WS_TEXT, bool mask=false); 
-    virtual ~AsyncWebSocketMultiMessage() override;
-    virtual bool betweenFrames() const override { return _acked == _ack; }
-    virtual void ack(size_t len, uint32_t time) override ;
-    virtual size_t send(AsyncClient *client) override ;
-};
-
-class AsyncWebSocketClient {
-  private:
-    AsyncClient *_client;
-    AsyncWebSocket *_server;
-    uint32_t _clientId;
-    AwsClientStatus _status;
-
-    LinkedList _controlQueue;
-    LinkedList _messageQueue;
-
-    uint8_t _pstate;
-    AwsFrameInfo _pinfo;
-
-    uint32_t _lastMessageTime;
-    uint32_t _keepAlivePeriod;
-
-    void _queueMessage(AsyncWebSocketMessage *dataMessage);
-    void _queueControl(AsyncWebSocketControl *controlMessage);
-    void _runQueue();
-
-  public:
-    void *_tempObject;
-
-    AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server);
-    ~AsyncWebSocketClient();
-
-    //client id increments for the given server
-    uint32_t id(){ return _clientId; }
-    AwsClientStatus status(){ return _status; }
-    AsyncClient* client(){ return _client; }
-    AsyncWebSocket *server(){ return _server; }
-    AwsFrameInfo const &pinfo() const { return _pinfo; }
-
-    IPAddress remoteIP();
-    uint16_t  remotePort();
-
-    //control frames
-    void close(uint16_t code=0, const char * message=NULL);
-    void ping(uint8_t *data=NULL, size_t len=0);
-
-    //set auto-ping period in seconds. disabled if zero (default)
-    void keepAlivePeriod(uint16_t seconds){
-      _keepAlivePeriod = seconds * 1000;
-    }
-    uint16_t keepAlivePeriod(){
-      return (uint16_t)(_keepAlivePeriod / 1000);
-    }
-
-    //data packets
-    void message(AsyncWebSocketMessage *message){ _queueMessage(message); }
-
-    size_t printf(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
-#ifndef ESP32
-    size_t printf_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
-#endif
-    void text(const char * message, size_t len);
-    void text(const char * message);
-    void text(uint8_t * message, size_t len);
-    void text(char * message);
-    void text(const String &message);
-    void text(const __FlashStringHelper *data);
-    void text(AsyncWebSocketMessageBuffer *buffer); 
-
-    void binary(const char * message, size_t len);
-    void binary(const char * message);
-    void binary(uint8_t * message, size_t len);
-    void binary(char * message);
-    void binary(const String &message);
-    void binary(const __FlashStringHelper *data, size_t len);
-    void binary(AsyncWebSocketMessageBuffer *buffer); 
-
-    //system callbacks (do not call)
-    void _onAck(size_t len, uint32_t time);
-    void _onError(int8_t);
-    void _onPoll();
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
-    void _onData(void *pbuf, size_t plen);
-};
-
-typedef std::function AwsEventHandler;
-
-//WebServer Handler implementation that plays the role of a socket server
-class AsyncWebSocket: public AsyncWebHandler {
-  private:
-    String _url;
-    LinkedList _clients;
-    uint32_t _cNextId;
-    AwsEventHandler _eventHandler;
-    bool _enabled;
-  public:
-    AsyncWebSocket(const String& url);
-    ~AsyncWebSocket();
-    const char * url() const { return _url.c_str(); }
-    void enable(bool e){ _enabled = e; }
-    bool enabled() const { return _enabled; }
-
-    size_t count() const;
-    AsyncWebSocketClient * client(uint32_t id);
-    bool hasClient(uint32_t id){ return client(id) != NULL; }
-
-    void close(uint32_t id, uint16_t code=0, const char * message=NULL);
-    void closeAll(uint16_t code=0, const char * message=NULL);
-
-    void ping(uint32_t id, uint8_t *data=NULL, size_t len=0);
-    void pingAll(uint8_t *data=NULL, size_t len=0); //  done
-
-    void text(uint32_t id, const char * message, size_t len);
-    void text(uint32_t id, const char * message);
-    void text(uint32_t id, uint8_t * message, size_t len);
-    void text(uint32_t id, char * message);
-    void text(uint32_t id, const String &message);
-    void text(uint32_t id, const __FlashStringHelper *message);
-
-    void textAll(const char * message, size_t len);
-    void textAll(const char * message);
-    void textAll(uint8_t * message, size_t len);
-    void textAll(char * message);
-    void textAll(const String &message);
-    void textAll(const __FlashStringHelper *message); //  need to convert
-    void textAll(AsyncWebSocketMessageBuffer * buffer); 
-
-    void binary(uint32_t id, const char * message, size_t len);
-    void binary(uint32_t id, const char * message);
-    void binary(uint32_t id, uint8_t * message, size_t len);
-    void binary(uint32_t id, char * message);
-    void binary(uint32_t id, const String &message);
-    void binary(uint32_t id, const __FlashStringHelper *message, size_t len);
-
-    void binaryAll(const char * message, size_t len);
-    void binaryAll(const char * message);
-    void binaryAll(uint8_t * message, size_t len);
-    void binaryAll(char * message);
-    void binaryAll(const String &message);
-    void binaryAll(const __FlashStringHelper *message, size_t len);
-    void binaryAll(AsyncWebSocketMessageBuffer * buffer); 
-
-    void message(uint32_t id, AsyncWebSocketMessage *message);
-    void messageAll(AsyncWebSocketMultiMessage *message);
-
-    size_t printf(uint32_t id, const char *format, ...)  __attribute__ ((format (printf, 3, 4)));
-    size_t printfAll(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
-#ifndef ESP32
-    size_t printf_P(uint32_t id, PGM_P formatP, ...)  __attribute__ ((format (printf, 3, 4)));
-#endif
-    size_t printfAll_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
-
-    //event listener
-    void onEvent(AwsEventHandler handler){
-      _eventHandler = handler;
-    }
-
-    //system callbacks (do not call)
-    uint32_t _getNextId(){ return _cNextId++; }
-    void _addClient(AsyncWebSocketClient * client);
-    void _handleDisconnect(AsyncWebSocketClient * client);
-    void _handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
-
-
-    //  messagebuffer functions/objects. 
-    AsyncWebSocketMessageBuffer * makeBuffer(size_t size = 0); 
-    AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size); 
-    LinkedList _buffers;
-    void _cleanBuffers(); 
-};
-
-//WebServer response to authenticate the socket and detach the tcp client from the web server request
-class AsyncWebSocketResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-    AsyncWebSocket *_server;
-  public:
-    AsyncWebSocketResponse(const String& key, AsyncWebSocket *server);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
-};
-
-
-#endif /* ASYNCWEBSOCKET_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/ESPAsyncWebServer.h b/libraries/ESPAsyncWebServer/src/ESPAsyncWebServer.h
deleted file mode 100644
index de6f0cd1a..000000000
--- a/libraries/ESPAsyncWebServer/src/ESPAsyncWebServer.h
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef _ESPAsyncWebServer_H_
-#define _ESPAsyncWebServer_H_
-
-#include "Arduino.h"
-
-#include 
-#include "FS.h"
-
-#include "StringArray.h"
-
-#ifdef ESP32
-#include 
-#include 
-#elif defined(ESP8266)
-#include 
-#include 
-#else
-#error Platform not supported
-#endif
-
-#define DEBUGF(...) //Serial.printf(__VA_ARGS__)
-
-class AsyncWebServer;
-class AsyncWebServerRequest;
-class AsyncWebServerResponse;
-class AsyncWebHeader;
-class AsyncWebParameter;
-class AsyncWebRewrite;
-class AsyncWebHandler;
-class AsyncStaticWebHandler;
-class AsyncCallbackWebHandler;
-class AsyncResponseStream;
-
-#ifndef WEBSERVER_H
-typedef enum {
-  HTTP_GET     = 0b00000001,
-  HTTP_POST    = 0b00000010,
-  HTTP_DELETE  = 0b00000100,
-  HTTP_PUT     = 0b00001000,
-  HTTP_PATCH   = 0b00010000,
-  HTTP_HEAD    = 0b00100000,
-  HTTP_OPTIONS = 0b01000000,
-  HTTP_ANY     = 0b01111111,
-} WebRequestMethod;
-#endif
-
-//if this value is returned when asked for data, packet will not be sent and you will be asked for data again
-#define RESPONSE_TRY_AGAIN 0xFFFFFFFF
-
-typedef uint8_t WebRequestMethodComposite;
-typedef std::function ArDisconnectHandler;
-
-/*
- * PARAMETER :: Chainable object to hold GET/POST and FILE parameters
- * */
-
-class AsyncWebParameter {
-  private:
-    String _name;
-    String _value;
-    size_t _size;
-    bool _isForm;
-    bool _isFile;
-
-  public:
-
-    AsyncWebParameter(const String& name, const String& value, bool form=false, bool file=false, size_t size=0): _name(name), _value(value), _size(size), _isForm(form), _isFile(file){}
-    const String& name() const { return _name; }
-    const String& value() const { return _value; }
-    size_t size() const { return _size; }
-    bool isPost() const { return _isForm; }
-    bool isFile() const { return _isFile; }
-};
-
-/*
- * HEADER :: Chainable object to hold the headers
- * */
-
-class AsyncWebHeader {
-  private:
-    String _name;
-    String _value;
-
-  public:
-    AsyncWebHeader(const String& name, const String& value): _name(name), _value(value){}
-    AsyncWebHeader(const String& data): _name(), _value(){
-      if(!data) return;
-      int index = data.indexOf(':');
-      if (index < 0) return;
-      _name = data.substring(0, index);
-      _value = data.substring(index + 2);
-    }
-    ~AsyncWebHeader(){}
-    const String& name() const { return _name; }
-    const String& value() const { return _value; }
-    String toString() const { return String(_name+": "+_value+"\r\n"); }
-};
-
-/*
- * REQUEST :: Each incoming Client is wrapped inside a Request and both live together until disconnect
- * */
-
-typedef enum { RCT_NOT_USED = -1, RCT_DEFAULT = 0, RCT_HTTP, RCT_WS, RCT_EVENT, RCT_MAX } RequestedConnectionType;
-
-typedef std::function AwsResponseFiller;
-typedef std::function AwsTemplateProcessor;
-
-class AsyncWebServerRequest {
-  using File = fs::File;
-  using FS = fs::FS;
-  friend class AsyncWebServer;
-  private:
-    AsyncClient* _client;
-    AsyncWebServer* _server;
-    AsyncWebHandler* _handler;
-    AsyncWebServerResponse* _response;
-    StringArray _interestingHeaders;
-    ArDisconnectHandler _onDisconnectfn;
-
-    String _temp;
-    uint8_t _parseState;
-
-    uint8_t _version;
-    WebRequestMethodComposite _method;
-    String _url;
-    String _host;
-    String _contentType;
-    String _boundary;
-    String _authorization;
-    RequestedConnectionType _reqconntype;
-    void _removeNotInterestingHeaders();
-    bool _isDigest;
-    bool _isMultipart;
-    bool _isPlainPost;
-    bool _expectingContinue;
-    size_t _contentLength;
-    size_t _parsedLength;
-
-    LinkedList _headers;
-    LinkedList _params;
-
-    uint8_t _multiParseState;
-    uint8_t _boundaryPosition;
-    size_t _itemStartIndex;
-    size_t _itemSize;
-    String _itemName;
-    String _itemFilename;
-    String _itemType;
-    String _itemValue;
-    uint8_t *_itemBuffer;
-    size_t _itemBufferIndex;
-    bool _itemIsFile;
-
-    void _onPoll();
-    void _onAck(size_t len, uint32_t time);
-    void _onError(int8_t error);
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
-    void _onData(void *buf, size_t len);
-
-    void _addParam(AsyncWebParameter*);
-
-    bool _parseReqHead();
-    bool _parseReqHeader();
-    void _parseLine();
-    void _parsePlainPostChar(uint8_t data);
-    void _parseMultipartPostByte(uint8_t data, bool last);
-    void _addGetParams(const String& params);
-
-    void _handleUploadStart();
-    void _handleUploadByte(uint8_t data, bool last);
-    void _handleUploadEnd();
-
-  public:
-    File _tempFile;
-    void *_tempObject;
-
-    AsyncWebServerRequest(AsyncWebServer*, AsyncClient*);
-    ~AsyncWebServerRequest();
-
-    AsyncClient* client(){ return _client; }
-    uint8_t version() const { return _version; }
-    WebRequestMethodComposite method() const { return _method; }
-    const String& url() const { return _url; }
-    const String& host() const { return _host; }
-    const String& contentType() const { return _contentType; }
-    size_t contentLength() const { return _contentLength; }
-    bool multipart() const { return _isMultipart; }
-    const char * methodToString() const;
-    const char * requestedConnTypeToString() const;
-    RequestedConnectionType requestedConnType() const { return _reqconntype; }
-    bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2 = RCT_NOT_USED, RequestedConnectionType erct3 = RCT_NOT_USED);
-    void onDisconnect (ArDisconnectHandler fn);
-
-    //hash is the string representation of:
-    // base64(user:pass) for basic or
-    // user:realm:md5(user:realm:pass) for digest
-    bool authenticate(const char * hash);
-    bool authenticate(const char * username, const char * password, const char * realm = NULL, bool passwordIsHash = false);
-    void requestAuthentication(const char * realm = NULL, bool isDigest = true);
-
-    void setHandler(AsyncWebHandler *handler){ _handler = handler; }
-    void addInterestingHeader(const String& name);
-
-    void redirect(const String& url);
-
-    void send(AsyncWebServerResponse *response);
-    void send(int code, const String& contentType=String(), const String& content=String());
-    void send(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    void send(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    void send(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    void send(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    void sendChunked(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    void send_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    void send_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback=nullptr);
-
-    AsyncWebServerResponse *beginResponse(int code, const String& contentType=String(), const String& content=String());
-    AsyncWebServerResponse *beginResponse(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    AsyncWebServerResponse *beginChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    AsyncResponseStream *beginResponseStream(const String& contentType, size_t bufferSize=1460);
-    AsyncWebServerResponse *beginResponse_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback=nullptr);
-
-    size_t headers() const;                     // get header count
-    bool hasHeader(const String& name) const;   // check if header exists
-    bool hasHeader(const __FlashStringHelper * data) const;   // check if header exists
-
-    AsyncWebHeader* getHeader(const String& name) const;
-    AsyncWebHeader* getHeader(const __FlashStringHelper * data) const;
-    AsyncWebHeader* getHeader(size_t num) const;
-
-    size_t params() const;                      // get arguments count
-    bool hasParam(const String& name, bool post=false, bool file=false) const;
-    bool hasParam(const __FlashStringHelper * data, bool post=false, bool file=false) const;
-
-    AsyncWebParameter* getParam(const String& name, bool post=false, bool file=false) const;
-    AsyncWebParameter* getParam(const __FlashStringHelper * data, bool post, bool file) const; 
-    AsyncWebParameter* getParam(size_t num) const;
-
-    size_t args() const { return params(); }     // get arguments count
-    const String& arg(const String& name) const; // get request argument value by name
-    const String& arg(const __FlashStringHelper * data) const; // get request argument value by F(name)    
-    const String& arg(size_t i) const;           // get request argument value by number
-    const String& argName(size_t i) const;       // get request argument name by number
-    bool hasArg(const char* name) const;         // check if argument exists
-    bool hasArg(const __FlashStringHelper * data) const;         // check if F(argument) exists
-
-    const String& header(const char* name) const;// get request header value by name
-    const String& header(const __FlashStringHelper * data) const;// get request header value by F(name)    
-    const String& header(size_t i) const;        // get request header value by number
-    const String& headerName(size_t i) const;    // get request header name by number
-    String urlDecode(const String& text) const;
-};
-
-/*
- * FILTER :: Callback to filter AsyncWebRewrite and AsyncWebHandler (done by the Server)
- * */
-
-typedef std::function ArRequestFilterFunction;
-
-bool ON_STA_FILTER(AsyncWebServerRequest *request);
-
-bool ON_AP_FILTER(AsyncWebServerRequest *request);
-
-/*
- * REWRITE :: One instance can be handle any Request (done by the Server)
- * */
-
-class AsyncWebRewrite {
-  protected:
-    String _from;
-    String _toUrl;
-    String _params;
-    ArRequestFilterFunction _filter;
-  public:
-    AsyncWebRewrite(const char* from, const char* to): _from(from), _toUrl(to), _params(String()), _filter(NULL){
-      int index = _toUrl.indexOf('?');
-      if (index > 0) {
-        _params = _toUrl.substring(index +1);
-        _toUrl = _toUrl.substring(0, index);
-      }
-    }
-    AsyncWebRewrite& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
-    bool filter(AsyncWebServerRequest *request) const { return _filter == NULL || _filter(request); }
-    const String& from(void) const { return _from; }
-    const String& toUrl(void) const { return _toUrl; }
-    const String& params(void) const { return _params; }
-};
-
-/*
- * HANDLER :: One instance can be attached to any Request (done by the Server)
- * */
-
-class AsyncWebHandler {
-  protected:
-    ArRequestFilterFunction _filter;
-    String _username;
-    String _password;
-  public:
-    AsyncWebHandler():_username(""), _password(""){}
-    AsyncWebHandler& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
-    AsyncWebHandler& setAuthentication(const char *username, const char *password){  _username = String(username);_password = String(password); return *this; };
-    bool filter(AsyncWebServerRequest *request){ return _filter == NULL || _filter(request); }
-    virtual ~AsyncWebHandler(){}
-    virtual bool canHandle(AsyncWebServerRequest *request __attribute__((unused))){
-      return false;
-    }
-    virtual void handleRequest(AsyncWebServerRequest *request __attribute__((unused))){}
-    virtual void handleUpload(AsyncWebServerRequest *request  __attribute__((unused)), const String& filename __attribute__((unused)), size_t index __attribute__((unused)), uint8_t *data __attribute__((unused)), size_t len __attribute__((unused)), bool final  __attribute__((unused))){}
-    virtual void handleBody(AsyncWebServerRequest *request __attribute__((unused)), uint8_t *data __attribute__((unused)), size_t len __attribute__((unused)), size_t index __attribute__((unused)), size_t total __attribute__((unused))){}
-    virtual bool isRequestHandlerTrivial(){return true;}
-};
-
-/*
- * RESPONSE :: One instance is created for each Request (attached by the Handler)
- * */
-
-typedef enum {
-  RESPONSE_SETUP, RESPONSE_HEADERS, RESPONSE_CONTENT, RESPONSE_WAIT_ACK, RESPONSE_END, RESPONSE_FAILED
-} WebResponseState;
-
-class AsyncWebServerResponse {
-  protected:
-    int _code;
-    LinkedList _headers;
-    String _contentType;
-    size_t _contentLength;
-    bool _sendContentLength;
-    bool _chunked;
-    size_t _headLength;
-    size_t _sentLength;
-    size_t _ackedLength;
-    size_t _writtenLength;
-    WebResponseState _state;
-    const char* _responseCodeToString(int code);
-
-  public:
-    AsyncWebServerResponse();
-    virtual ~AsyncWebServerResponse();
-    virtual void setCode(int code);
-    virtual void setContentLength(size_t len);
-    virtual void setContentType(const String& type);
-    virtual void addHeader(const String& name, const String& value);
-    virtual String _assembleHead(uint8_t version);
-    virtual bool _started() const;
-    virtual bool _finished() const;
-    virtual bool _failed() const;
-    virtual bool _sourceValid() const;
-    virtual void _respond(AsyncWebServerRequest *request);
-    virtual size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-};
-
-/*
- * SERVER :: One instance
- * */
-
-typedef std::function ArRequestHandlerFunction;
-typedef std::function ArUploadHandlerFunction;
-typedef std::function ArBodyHandlerFunction;
-
-class AsyncWebServer {
-  protected:
-    AsyncServer _server;
-    LinkedList _rewrites;
-    LinkedList _handlers;
-    AsyncCallbackWebHandler* _catchAllHandler;
-
-  public:
-    AsyncWebServer(uint16_t port);
-    ~AsyncWebServer();
-
-    void begin();
-
-#if ASYNC_TCP_SSL_ENABLED
-    void onSslFileRequest(AcSSlFileHandler cb, void* arg);
-    void beginSecure(const char *cert, const char *private_key_file, const char *password);
-#endif
-
-    AsyncWebRewrite& addRewrite(AsyncWebRewrite* rewrite);
-    bool removeRewrite(AsyncWebRewrite* rewrite);
-    AsyncWebRewrite& rewrite(const char* from, const char* to);
-
-    AsyncWebHandler& addHandler(AsyncWebHandler* handler);
-    bool removeHandler(AsyncWebHandler* handler);
-  
-    AsyncCallbackWebHandler& on(const char* uri, ArRequestHandlerFunction onRequest);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody);
-
-    AsyncStaticWebHandler& serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control = NULL);
-
-    void onNotFound(ArRequestHandlerFunction fn);  //called when handler is not assigned
-    void onFileUpload(ArUploadHandlerFunction fn); //handle file uploads
-    void onRequestBody(ArBodyHandlerFunction fn); //handle posts with plain body content (JSON often transmitted this way as a request)
-
-    void reset(); //remove all writers and handlers, with onNotFound/onFileUpload/onRequestBody 
-  
-    void _handleDisconnect(AsyncWebServerRequest *request);
-    void _attachHandler(AsyncWebServerRequest *request);
-    void _rewriteRequest(AsyncWebServerRequest *request);
-};
-
-class DefaultHeaders {
-  using headers_t = LinkedList;
-  headers_t _headers;
-  
-  DefaultHeaders()
-  :_headers(headers_t([](AsyncWebHeader *h){ delete h; }))
-  {}
-public:
-  using ConstIterator = headers_t::ConstIterator;
-
-  void addHeader(const String& name, const String& value){
-    _headers.add(new AsyncWebHeader(name, value));
-  }  
-  
-  ConstIterator begin() const { return _headers.begin(); }
-  ConstIterator end() const { return _headers.end(); }
-
-  DefaultHeaders(DefaultHeaders const &) = delete;
-  DefaultHeaders &operator=(DefaultHeaders const &) = delete;
-  static DefaultHeaders &Instance() {
-    static DefaultHeaders instance;
-    return instance;
-  }
-};
-
-#include "WebResponseImpl.h"
-#include "WebHandlerImpl.h"
-#include "AsyncWebSocket.h"
-#include "AsyncEventSource.h"
-
-#endif /* _AsyncWebServer_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/SPIFFSEditor.cpp b/libraries/ESPAsyncWebServer/src/SPIFFSEditor.cpp
deleted file mode 100644
index a84fa87dd..000000000
--- a/libraries/ESPAsyncWebServer/src/SPIFFSEditor.cpp
+++ /dev/null
@@ -1,544 +0,0 @@
-#include "SPIFFSEditor.h"
-#include 
-
-//File: edit.htm.gz, Size: 4151
-#define edit_htm_gz_len 4151
-const uint8_t edit_htm_gz[] PROGMEM = {
- 0x1F, 0x8B, 0x08, 0x08, 0xB8, 0x94, 0xB1, 0x59, 0x00, 0x03, 0x65, 0x64, 0x69, 0x74, 0x2E, 0x68,
- 0x74, 0x6D, 0x00, 0xB5, 0x3A, 0x0B, 0x7B, 0xDA, 0xB8, 0xB2, 0x7F, 0xC5, 0x71, 0xCF, 0x66, 0xED,
- 0x83, 0x31, 0x90, 0xA4, 0xD9, 0xD6, 0xC4, 0xC9, 0x42, 0x92, 0x36, 0x6D, 0xF3, 0x6A, 0x80, 0xB6,
- 0x69, 0x4F, 0xEE, 0x7E, 0xC2, 0x16, 0xA0, 0xC6, 0x96, 0x5D, 0x5B, 0x0E, 0x49, 0x59, 0xFE, 0xFB,
- 0x9D, 0x91, 0x6C, 0xB0, 0x09, 0x69, 0x77, 0xCF, 0xBD, 0xBB, 0xDD, 0x2D, 0x92, 0x46, 0x33, 0x9A,
- 0x19, 0xCD, 0x53, 0xDE, 0xBD, 0x8D, 0xA3, 0x8B, 0xC3, 0xFE, 0xF5, 0xE5, 0xB1, 0x36, 0x11, 0x61,
- 0xB0, 0xBF, 0x87, 0x7F, 0x6B, 0x01, 0xE1, 0x63, 0x97, 0xF2, 0xFD, 0x3D, 0xC1, 0x44, 0x40, 0xF7,
- 0x8F, 0x7B, 0x97, 0xDA, 0xB1, 0xCF, 0x44, 0x94, 0xEC, 0x35, 0xD4, 0xCA, 0x5E, 0x2A, 0x1E, 0x02,
- 0xAA, 0x85, 0xD4, 0x67, 0xC4, 0x4D, 0xBD, 0x84, 0xC2, 0x66, 0xDB, 0x0B, 0x67, 0xDF, 0xEB, 0x8C,
- 0xFB, 0xF4, 0xDE, 0xD9, 0x6E, 0x36, 0xDB, 0x71, 0x94, 0x32, 0xC1, 0x22, 0xEE, 0x90, 0x61, 0x1A,
- 0x05, 0x99, 0xA0, 0xED, 0x80, 0x8E, 0x84, 0xF3, 0x3C, 0xBE, 0x6F, 0x0F, 0xA3, 0xC4, 0xA7, 0x89,
- 0xD3, 0x8A, 0xEF, 0x35, 0x00, 0x31, 0x5F, 0x7B, 0xB6, 0xB3, 0xB3, 0xD3, 0x1E, 0x12, 0xEF, 0x76,
- 0x9C, 0x44, 0x19, 0xF7, 0xEB, 0x5E, 0x14, 0x44, 0x89, 0xF3, 0x6C, 0xF4, 0x1C, 0xFF, 0xB4, 0x7D,
- 0x96, 0xC6, 0x01, 0x79, 0x70, 0x78, 0xC4, 0x29, 0xE0, 0xDE, 0xD7, 0xD3, 0x09, 0xF1, 0xA3, 0xA9,
- 0xD3, 0xD4, 0x9A, 0x5A, 0xAB, 0x09, 0x44, 0x92, 0xF1, 0x90, 0x18, 0x4D, 0x0B, 0xFF, 0xD8, 0x3B,
- 0x66, 0x7B, 0x14, 0x71, 0x51, 0x4F, 0xD9, 0x77, 0xEA, 0xB4, 0xB6, 0xE0, 0x34, 0x39, 0x1D, 0x91,
- 0x90, 0x05, 0x0F, 0x4E, 0x4A, 0x78, 0x5A, 0x4F, 0x69, 0xC2, 0x46, 0x6A, 0x79, 0x4A, 0xD9, 0x78,
- 0x22, 0x9C, 0xDF, 0x9A, 0xCD, 0x39, 0xF0, 0xAF, 0x65, 0xC1, 0x2C, 0x60, 0x29, 0x20, 0xA3, 0x78,
- 0xEA, 0x3C, 0x11, 0xC5, 0x4E, 0x53, 0xB1, 0xDE, 0x6C, 0x87, 0x24, 0x19, 0x33, 0x0E, 0x83, 0x98,
- 0xF8, 0x3E, 0xE3, 0x63, 0x47, 0xA1, 0x05, 0x6C, 0xB6, 0x90, 0x36, 0xA1, 0x01, 0x11, 0xEC, 0x8E,
- 0xB6, 0x43, 0xC6, 0xEB, 0x53, 0xE6, 0x8B, 0x89, 0xB3, 0x0B, 0x3C, 0xB6, 0xBD, 0x2C, 0x49, 0x41,
- 0xA6, 0x38, 0x62, 0x5C, 0xD0, 0x44, 0xA2, 0xA5, 0x31, 0xE1, 0xB3, 0x5C, 0x54, 0x54, 0x40, 0x21,
- 0x27, 0xE3, 0x01, 0xE3, 0xB4, 0x3E, 0x0C, 0x22, 0xEF, 0x76, 0x71, 0xD2, 0x6E, 0x7C, 0x9F, 0x9F,
- 0xE5, 0x4C, 0xA2, 0x3B, 0x9A, 0xCC, 0x96, 0xEA, 0x92, 0xD8, 0x15, 0x60, 0x85, 0x34, 0xA5, 0x74,
- 0x6E, 0x8B, 0xBB, 0x0C, 0xA0, 0x96, 0xFC, 0x05, 0x29, 0x17, 0xFC, 0x2F, 0x45, 0x5A, 0x11, 0x5C,
- 0xA1, 0x30, 0x1E, 0x67, 0x62, 0xF6, 0xF8, 0x2A, 0xA3, 0x98, 0x78, 0x4C, 0x3C, 0xA0, 0xFC, 0xB0,
- 0x6D, 0x86, 0xBA, 0x04, 0xAC, 0x24, 0x24, 0x81, 0x86, 0x3A, 0xD7, 0x3E, 0xD0, 0xC4, 0x27, 0x9C,
- 0x58, 0x9D, 0x84, 0x91, 0xC0, 0xEA, 0x2D, 0xB5, 0x5E, 0x0F, 0xA3, 0xEF, 0xF5, 0x0C, 0xC6, 0x30,
- 0x0F, 0xA8, 0x27, 0x94, 0x92, 0xE1, 0x1E, 0x86, 0xB7, 0x4C, 0x3C, 0x06, 0x3C, 0x5A, 0x28, 0xA9,
- 0x4B, 0x2A, 0x69, 0xA2, 0x2E, 0xB0, 0x25, 0xD5, 0x83, 0x1C, 0x4B, 0xC9, 0x95, 0x50, 0xF5, 0x61,
- 0x24, 0x44, 0x14, 0x4A, 0x93, 0x5B, 0x08, 0xAC, 0x49, 0xAB, 0x79, 0xF1, 0xE8, 0x46, 0xD6, 0x6B,
- 0xBF, 0x44, 0xBE, 0x0D, 0x7A, 0x15, 0xCC, 0x23, 0x41, 0x9D, 0x04, 0x6C, 0xCC, 0x9D, 0x90, 0xF9,
- 0x7E, 0x40, 0x4B, 0x56, 0xEB, 0x64, 0x49, 0x60, 0xF8, 0x44, 0x10, 0x87, 0x85, 0x64, 0x4C, 0x1B,
- 0x31, 0x1F, 0x03, 0x34, 0xA5, 0xBB, 0x3B, 0x16, 0xFB, 0xD0, 0xBD, 0xB8, 0x9A, 0x36, 0xDF, 0xBD,
- 0x1E, 0x47, 0x1D, 0xF8, 0xE7, 0xBC, 0x37, 0x98, 0x1C, 0x0F, 0xC6, 0x30, 0xEA, 0xE2, 0xB4, 0xF3,
- 0xFE, 0xB0, 0xF3, 0x1E, 0x7E, 0x0E, 0x5B, 0xB5, 0xAF, 0xA3, 0x6F, 0xB8, 0xD0, 0x7D, 0xED, 0x77,
- 0xFB, 0x83, 0xE3, 0x4E, 0xE7, 0x5D, 0xE3, 0xCD, 0xF9, 0xF4, 0xE3, 0xBB, 0x5D, 0x04, 0x77, 0x83,
- 0xE6, 0xD5, 0x87, 0x49, 0x73, 0xB0, 0xF5, 0x32, 0xF4, 0x4F, 0xFC, 0x89, 0x17, 0x0E, 0x3A, 0xEF,
- 0x3F, 0x5E, 0xDD, 0x5D, 0x87, 0x83, 0x71, 0xEF, 0x63, 0x6B, 0xF2, 0x79, 0xEB, 0x43, 0xEF, 0xF3,
- 0xC7, 0x57, 0xB7, 0xF4, 0xD3, 0xC9, 0xDB, 0xCF, 0xFD, 0x29, 0x20, 0x1C, 0x45, 0xBD, 0xC1, 0x55,
- 0xF7, 0x43, 0x77, 0xFC, 0xB9, 0xEB, 0x1D, 0xDF, 0x0F, 0x83, 0xF3, 0xEE, 0xEB, 0xCE, 0xB0, 0xB3,
- 0xE5, 0x51, 0x3A, 0xEE, 0x5F, 0x75, 0xB3, 0x37, 0xEF, 0x2E, 0xC6, 0x8C, 0x4D, 0x7A, 0x9F, 0xCF,
- 0xFB, 0xDE, 0xE1, 0xF3, 0xD3, 0xC1, 0x49, 0x87, 0x4D, 0xCE, 0xDF, 0x5E, 0x35, 0x6F, 0x5F, 0xBF,
- 0x3B, 0x3C, 0xF2, 0xAE, 0xDF, 0x5E, 0xEF, 0x1E, 0x6D, 0x37, 0x7E, 0xFB, 0xED, 0xCC, 0xBF, 0x60,
- 0xBC, 0x7F, 0xF7, 0xBD, 0x33, 0x3E, 0x9C, 0xBE, 0x78, 0x48, 0xFB, 0x93, 0x37, 0x77, 0xBC, 0xF1,
- 0x21, 0xFA, 0xFA, 0xE6, 0xE1, 0x0C, 0xFE, 0xBB, 0xBC, 0xAC, 0x0D, 0x7B, 0xAD, 0x74, 0xF0, 0xFE,
- 0xCD, 0x87, 0xAD, 0xF4, 0xE5, 0xF3, 0xB8, 0x7B, 0x74, 0x74, 0x17, 0x0E, 0x2F, 0x1B, 0xA1, 0x7F,
- 0x3B, 0x12, 0x2F, 0xB6, 0x45, 0x7C, 0x3D, 0xCE, 0x3E, 0x7F, 0x7B, 0xFE, 0x76, 0xD2, 0xB8, 0xA0,
- 0xE4, 0x7A, 0x52, 0x7B, 0xF8, 0xFE, 0xF0, 0x62, 0xD2, 0x3F, 0xB9, 0x3B, 0x0F, 0xC8, 0xFD, 0xF9,
- 0xB9, 0xF7, 0x3D, 0xAC, 0x05, 0xE4, 0xE5, 0x45, 0x3F, 0x20, 0x49, 0x6B, 0xE0, 0x77, 0x1A, 0xB5,
- 0xC3, 0xAD, 0xCE, 0x8E, 0x48, 0xAE, 0x0E, 0xF9, 0xD1, 0xF6, 0xD7, 0xDE, 0x8B, 0x6E, 0xB7, 0x15,
- 0x0D, 0xBF, 0x6D, 0xBD, 0xBE, 0xDD, 0x7D, 0x3D, 0xD8, 0x7D, 0x3F, 0x7C, 0xDF, 0xE9, 0xED, 0x74,
- 0x07, 0xE4, 0xBA, 0xF7, 0xBE, 0x33, 0xDA, 0x19, 0x4E, 0x26, 0xEF, 0xDE, 0xF5, 0x5F, 0xF9, 0x9D,
- 0xEF, 0x49, 0xE7, 0x62, 0xDA, 0xB9, 0x3F, 0x1E, 0x74, 0x4E, 0x6A, 0xEF, 0x8E, 0xCF, 0x9A, 0xAD,
- 0xDE, 0xF5, 0xF6, 0xF8, 0x6C, 0x77, 0xDA, 0x4D, 0x8F, 0x3B, 0xEF, 0xBB, 0xCD, 0xF1, 0xDB, 0x5A,
- 0x48, 0x3E, 0x47, 0x87, 0xDB, 0xE3, 0x37, 0xBB, 0xEC, 0xF2, 0x9A, 0x74, 0xDE, 0x74, 0xDF, 0xA6,
- 0xEC, 0x2A, 0x3C, 0x19, 0x34, 0x3B, 0x9D, 0xD3, 0x0B, 0xFA, 0xEA, 0x70, 0x9B, 0xBC, 0xDB, 0xF2,
- 0x3E, 0x82, 0xFE, 0x07, 0x9F, 0xE8, 0x6F, 0xB5, 0xCE, 0xF4, 0xA2, 0x19, 0x78, 0x2F, 0x69, 0xFF,
- 0xE4, 0xBA, 0x2F, 0x6F, 0xE7, 0x38, 0x78, 0xD5, 0xBF, 0xED, 0x65, 0xEF, 0xC3, 0xC3, 0x43, 0x53,
- 0xE3, 0x51, 0x3D, 0xA1, 0x31, 0x25, 0xA2, 0x1C, 0xAE, 0x16, 0xFE, 0x01, 0xB6, 0xB5, 0xB4, 0xC2,
- 0xDC, 0x4F, 0x05, 0xBD, 0x17, 0x75, 0x9F, 0x7A, 0x51, 0x42, 0xE4, 0x1E, 0x40, 0xA0, 0x09, 0x9A,
- 0xD8, 0xFC, 0x77, 0x19, 0x3F, 0x35, 0x15, 0x3F, 0x35, 0xC2, 0x7D, 0xCD, 0x28, 0x1C, 0x01, 0x83,
- 0x87, 0x4F, 0xEF, 0x98, 0x47, 0xEB, 0x31, 0xBB, 0xA7, 0x41, 0x5D, 0x22, 0x3B, 0x4D, 0x73, 0x26,
- 0xFD, 0xAD, 0xD8, 0x46, 0x38, 0x98, 0x9A, 0xA4, 0x5A, 0x2C, 0xF8, 0x5F, 0x89, 0x47, 0x21, 0xB0,
- 0x81, 0xCB, 0x84, 0xF8, 0xAB, 0x7C, 0x27, 0x4A, 0xEA, 0xC3, 0x6C, 0x3C, 0x62, 0xF7, 0xE0, 0xD0,
- 0x23, 0xC6, 0x99, 0xA0, 0x5A, 0x2B, 0x9D, 0xFF, 0x5E, 0x90, 0xB9, 0xA5, 0x0F, 0xA3, 0x84, 0x84,
- 0x34, 0xD5, 0xFE, 0x22, 0x99, 0xD9, 0x28, 0x89, 0xC2, 0x65, 0x10, 0x99, 0x8B, 0xA8, 0x34, 0x99,
- 0xCF, 0x9F, 0x65, 0x71, 0x10, 0x11, 0x10, 0x73, 0x4D, 0xE4, 0x50, 0xF1, 0x34, 0x91, 0x6E, 0xB5,
- 0x88, 0xAB, 0xB9, 0x9B, 0x6D, 0xA1, 0x5B, 0x96, 0xDD, 0x7A, 0x6B, 0x67, 0xE9, 0xBA, 0x75, 0xB9,
- 0x17, 0xE3, 0xFD, 0x9A, 0x4C, 0x81, 0xF1, 0xA0, 0x14, 0xEE, 0x9E, 0x09, 0x50, 0xE9, 0x13, 0x87,
- 0xCB, 0x43, 0xF2, 0xC8, 0xB0, 0x60, 0x40, 0x05, 0xEA, 0x96, 0x8C, 0xD4, 0x85, 0x24, 0xB0, 0x6F,
- 0xFE, 0x8C, 0xCA, 0xBC, 0x67, 0x3D, 0x8B, 0x13, 0xB8, 0x0D, 0x3A, 0xFD, 0x11, 0xCD, 0x42, 0xA6,
- 0x2A, 0x6D, 0x45, 0x53, 0x65, 0xBC, 0x5C, 0x84, 0x65, 0xDA, 0x93, 0xBC, 0x16, 0xA4, 0x1F, 0x4B,
- 0x05, 0xE0, 0x05, 0x37, 0xCF, 0x91, 0x9B, 0x1F, 0x6A, 0x75, 0x7B, 0xF7, 0x97, 0x9C, 0x87, 0x9D,
- 0xE6, 0x2F, 0x73, 0x3B, 0xDF, 0x5B, 0xA4, 0xE4, 0x56, 0x13, 0xFE, 0x29, 0x32, 0xEF, 0x8B, 0x25,
- 0x0B, 0xC3, 0xE7, 0xF8, 0xA7, 0x60, 0x10, 0xE9, 0x94, 0x80, 0xDB, 0x3B, 0x2F, 0x5F, 0xF8, 0xC3,
- 0x02, 0x98, 0x0B, 0xF6, 0x24, 0x3C, 0x21, 0x3E, 0xCB, 0x52, 0xE7, 0x79, 0xF3, 0x97, 0x5C, 0x9F,
- 0x5B, 0x3B, 0x28, 0xFB, 0xE2, 0x2E, 0x71, 0xB2, 0xB4, 0xD8, 0x34, 0x66, 0x5C, 0xDB, 0x4A, 0x35,
- 0xBC, 0x6F, 0x92, 0x2C, 0x0C, 0xB3, 0x92, 0xED, 0xE7, 0xBF, 0x2F, 0x4D, 0x13, 0xF7, 0xCF, 0x9A,
- 0xBF, 0xCC, 0x44, 0x02, 0xD9, 0x64, 0x04, 0xB9, 0xC6, 0x49, 0x22, 0x41, 0x04, 0x35, 0x9A, 0xE6,
- 0x1C, 0x84, 0x5B, 0x03, 0xD8, 0xDE, 0x6D, 0xFA, 0x74, 0x6C, 0xCE, 0xE7, 0x7B, 0x0D, 0x99, 0xD7,
- 0xA0, 0x6C, 0xF1, 0x12, 0x16, 0x8B, 0xFD, 0x51, 0xC6, 0x3D, 0xE4, 0x41, 0x1B, 0x53, 0x83, 0x9A,
- 0xB3, 0x84, 0x8A, 0x2C, 0xE1, 0x9A, 0x1F, 0x79, 0x19, 0x1A, 0xBB, 0x3D, 0xA6, 0xE2, 0x58, 0xD9,
- 0x7D, 0xF7, 0xE1, 0x8D, 0x0F, 0x3B, 0xE6, 0x0B, 0x04, 0x6F, 0x2D, 0x02, 0x38, 0x30, 0x9C, 0x97,
- 0xE3, 0x54, 0xF6, 0x43, 0x82, 0x01, 0x22, 0xEF, 0xE8, 0x83, 0x41, 0x2D, 0xB1, 0x40, 0xA4, 0x36,
- 0xAE, 0x1B, 0xC5, 0x2E, 0x80, 0x71, 0x73, 0x76, 0x07, 0x4A, 0x20, 0x2E, 0xFD, 0x22, 0x6E, 0x2C,
- 0xE6, 0x72, 0xF8, 0x69, 0xE7, 0xBB, 0xC9, 0x1E, 0x3B, 0xA8, 0xB7, 0x1C, 0xB2, 0xCF, 0x0E, 0x5A,
- 0xE0, 0x5E, 0x65, 0x6E, 0xE4, 0xB9, 0xAF, 0x58, 0x40, 0x07, 0xB9, 0xC3, 0xE1, 0x31, 0x48, 0x6C,
- 0xB1, 0x85, 0x28, 0xE2, 0x5B, 0xCD, 0xE6, 0x86, 0x4B, 0x0F, 0x48, 0x00, 0x39, 0xCC, 0xD0, 0x8F,
- 0xAF, 0xAE, 0x2E, 0xAE, 0xBE, 0xE8, 0x35, 0x5A, 0xD3, 0x6F, 0x1C, 0x4D, 0xAF, 0x71, 0xD3, 0x11,
- 0x76, 0x42, 0x47, 0x09, 0x4D, 0x27, 0x97, 0x44, 0x4C, 0x8C, 0xD4, 0xBE, 0x23, 0x41, 0x56, 0x16,
- 0x84, 0xA1, 0xDC, 0xC8, 0xA2, 0x70, 0x39, 0x9D, 0x6A, 0xAF, 0x40, 0xCD, 0x47, 0x90, 0xEA, 0xDA,
- 0xC2, 0x26, 0x71, 0x4C, 0xB9, 0x6F, 0xE8, 0x31, 0x20, 0xEA, 0x16, 0x35, 0xAD, 0x84, 0x7E, 0xCB,
- 0x68, 0x2A, 0x52, 0x1B, 0x2C, 0xD7, 0xD0, 0x2F, 0x07, 0x7D, 0xDD, 0xD2, 0x1B, 0xE8, 0x47, 0x3A,
- 0xF0, 0x46, 0xCC, 0x39, 0x52, 0x89, 0x5C, 0xD0, 0xA4, 0x3E, 0xCC, 0xC0, 0xA0, 0xB8, 0x6E, 0xB6,
- 0x23, 0x9B, 0x71, 0x4E, 0x93, 0x93, 0xFE, 0xD9, 0xA9, 0xAB, 0x5F, 0x29, 0x46, 0xB4, 0x53, 0x28,
- 0x48, 0x74, 0x4B, 0x5E, 0x51, 0x7E, 0xC8, 0xE1, 0x84, 0x05, 0xBE, 0x11, 0x99, 0x6D, 0x24, 0xE1,
- 0x49, 0x12, 0xB2, 0x40, 0x01, 0x0A, 0x9E, 0x2D, 0x1E, 0x62, 0xEA, 0xEA, 0x23, 0x50, 0x86, 0x6E,
- 0x79, 0x76, 0x98, 0x05, 0x82, 0xC5, 0x01, 0x75, 0x37, 0x5A, 0x30, 0xE3, 0x60, 0x41, 0xAE, 0x8E,
- 0xB9, 0x19, 0x61, 0xCC, 0x77, 0x75, 0x15, 0xA1, 0xF2, 0xB8, 0xB6, 0xEE, 0x14, 0x4F, 0x9D, 0x92,
- 0x56, 0x4E, 0x49, 0xCB, 0xB8, 0x4A, 0xE0, 0x34, 0x3F, 0x18, 0xC3, 0x3C, 0xCE, 0xD4, 0x51, 0x05,
- 0xCC, 0xA7, 0x23, 0x02, 0x9C, 0x7C, 0x40, 0x6D, 0xBA, 0x7A, 0x63, 0xDD, 0x41, 0xA9, 0x3A, 0xC8,
- 0xAF, 0x6A, 0xC4, 0x2F, 0x6B, 0x44, 0xDD, 0xEE, 0x3A, 0x64, 0x5F, 0x21, 0x07, 0x55, 0xE4, 0xA0,
- 0x8C, 0x7C, 0x28, 0x8D, 0x64, 0x1D, 0x72, 0xA0, 0x90, 0x93, 0x8A, 0x88, 0x89, 0x14, 0x51, 0x85,
- 0xBD, 0x3A, 0x6A, 0x13, 0x05, 0xD2, 0xAD, 0xA4, 0x22, 0x66, 0x62, 0x83, 0x97, 0x92, 0x61, 0x40,
- 0x7D, 0x77, 0xA3, 0x09, 0x33, 0x2C, 0xB6, 0xDD, 0xAD, 0xE6, 0x9A, 0x33, 0x12, 0x75, 0x46, 0x56,
- 0x65, 0x30, 0x2B, 0x33, 0xA8, 0xF5, 0xC8, 0x1D, 0xD5, 0xD6, 0x31, 0x98, 0x99, 0x56, 0x60, 0x47,
- 0xDC, 0x0B, 0x98, 0x77, 0xEB, 0x2E, 0xBD, 0xC5, 0x9C, 0xB1, 0x85, 0x85, 0x5A, 0x5C, 0x06, 0xBA,
- 0x01, 0x94, 0x5E, 0x8B, 0xA5, 0x7C, 0x80, 0xFA, 0x9E, 0x5B, 0xD9, 0x5A, 0x02, 0xDC, 0xA6, 0xF7,
- 0xD4, 0x3B, 0x8C, 0xC2, 0x90, 0xA0, 0xED, 0xA6, 0xC0, 0x41, 0x3E, 0xD1, 0xCD, 0xB9, 0x15, 0xAD,
- 0xC5, 0x79, 0xC2, 0x45, 0x2C, 0x7F, 0x3D, 0x8B, 0x23, 0x03, 0x5C, 0xCE, 0xF5, 0x6C, 0xD4, 0x61,
- 0x6A, 0x83, 0x1E, 0xC7, 0x62, 0xF2, 0x13, 0x17, 0x2A, 0x0C, 0x54, 0xA2, 0x7C, 0x69, 0xDE, 0x58,
- 0x0B, 0x91, 0x56, 0x7C, 0xEA, 0xA2, 0xB7, 0xE2, 0x54, 0xA8, 0xBC, 0x8A, 0x5D, 0x9A, 0x4B, 0x1D,
- 0x94, 0x61, 0xB9, 0xBD, 0x2F, 0xA0, 0xFA, 0x7C, 0x0E, 0xE7, 0x01, 0xFF, 0x13, 0x68, 0xF9, 0xE8,
- 0x5F, 0x17, 0x60, 0xC9, 0xA3, 0x34, 0x78, 0x8B, 0xBB, 0x0D, 0xE3, 0xC0, 0xF9, 0x8F, 0x6D, 0x7C,
- 0xF9, 0x1F, 0xFB, 0xA6, 0x66, 0x9A, 0x07, 0xFF, 0x6A, 0x48, 0x0D, 0x1B, 0xC2, 0xFC, 0xD2, 0xBA,
- 0xB1, 0x08, 0x80, 0xED, 0x7F, 0x9B, 0xFF, 0xB1, 0x25, 0xB8, 0x02, 0x6B, 0xDF, 0x45, 0x90, 0x49,
- 0xF0, 0x24, 0x34, 0xB0, 0x68, 0xA4, 0x91, 0xCD, 0x4D, 0x43, 0xB8, 0xA4, 0x72, 0x8D, 0x35, 0x51,
- 0xD3, 0x6D, 0x88, 0x53, 0x50, 0x5B, 0xAC, 0x04, 0xBF, 0x3E, 0x24, 0x7A, 0x15, 0x5B, 0x17, 0x00,
- 0xC9, 0x3D, 0xCA, 0x0C, 0x3D, 0x22, 0x97, 0x52, 0xCB, 0x0C, 0x02, 0x42, 0xA7, 0x89, 0xE7, 0x2A,
- 0xAD, 0x1D, 0x14, 0x30, 0x17, 0xA2, 0xE0, 0xBC, 0x1C, 0x2D, 0x15, 0xEA, 0xAA, 0xFD, 0x17, 0x0A,
- 0xA3, 0xD6, 0x12, 0x8A, 0x04, 0x31, 0xAD, 0xD8, 0x79, 0xC6, 0x72, 0x75, 0x4C, 0x59, 0xBA, 0x35,
- 0x59, 0x5D, 0x96, 0xAD, 0x04, 0xAE, 0x2F, 0x8D, 0xFE, 0xD7, 0x3D, 0x16, 0x8E, 0xB5, 0x12, 0x3F,
- 0xF8, 0x97, 0xFB, 0x2B, 0x46, 0xE4, 0xCD, 0x3F, 0xBC, 0x21, 0x70, 0x05, 0xA6, 0x41, 0x6D, 0x1E,
- 0x4D, 0x0D, 0xB3, 0xF6, 0xAB, 0xAE, 0x49, 0x8A, 0xAE, 0x1E, 0x92, 0xFB, 0xBC, 0xA7, 0xC4, 0x8C,
- 0xD7, 0xD6, 0x70, 0x5E, 0xB4, 0x28, 0xF9, 0x82, 0xEC, 0xE6, 0x48, 0x26, 0xA2, 0xB6, 0x56, 0x64,
- 0x52, 0xD5, 0xCA, 0xE8, 0x5A, 0x63, 0xFF, 0xD7, 0x4A, 0x40, 0xB7, 0x98, 0xBA, 0x4E, 0x15, 0x8C,
- 0xB3, 0x00, 0x1C, 0x93, 0x3E, 0x1D, 0x69, 0x03, 0x26, 0x03, 0x75, 0x35, 0x46, 0x5A, 0x81, 0xC1,
- 0xCC, 0x03, 0xC3, 0x2B, 0xFB, 0xF3, 0x1E, 0x16, 0xBF, 0xFB, 0x97, 0xAA, 0xAA, 0x81, 0xD4, 0x8B,
- 0x33, 0x5D, 0x59, 0x59, 0xD5, 0x4B, 0xE0, 0xD2, 0x08, 0xA0, 0x5B, 0x8B, 0x3C, 0x3A, 0x8C, 0xFC,
- 0x87, 0x52, 0xF6, 0x4D, 0xBB, 0x0F, 0x87, 0x01, 0x49, 0xD3, 0x73, 0xB8, 0x01, 0x43, 0xF7, 0x42,
- 0x50, 0xB8, 0xB2, 0xC2, 0xFD, 0xE6, 0xE6, 0x66, 0x15, 0x29, 0xA1, 0x21, 0x14, 0xDB, 0x8A, 0x2B,
- 0xF0, 0x49, 0xD3, 0xF1, 0x81, 0x30, 0x18, 0xD2, 0x1A, 0xC6, 0xF0, 0x25, 0xE3, 0x47, 0x5C, 0x71,
- 0xF4, 0xF4, 0x22, 0xA6, 0xFC, 0x33, 0xDC, 0x95, 0x32, 0xCB, 0x1A, 0xAD, 0xA6, 0x68, 0xFA, 0x8F,
- 0xD8, 0x3E, 0xCA, 0x0D, 0x76, 0xC1, 0x7A, 0xBA, 0x56, 0xA1, 0xFC, 0x9F, 0x61, 0xB9, 0x94, 0x28,
- 0xD6, 0x70, 0x9C, 0x40, 0x80, 0x5A, 0xC3, 0x31, 0xC4, 0x1A, 0x41, 0x17, 0xFC, 0x26, 0x6B, 0xF9,
- 0xCD, 0xFE, 0x19, 0x7E, 0x97, 0x76, 0x1E, 0x15, 0x25, 0x91, 0xAA, 0xAF, 0x50, 0x02, 0x9F, 0xDD,
- 0xE9, 0xA6, 0x15, 0xB9, 0x55, 0x0A, 0x50, 0x1B, 0x46, 0x41, 0xD0, 0x8F, 0xE2, 0x83, 0x27, 0xD6,
- 0x9D, 0xC5, 0x7A, 0x31, 0xC8, 0xD9, 0x5C, 0x6E, 0xB1, 0xBC, 0xB5, 0x44, 0x4F, 0xA1, 0xEC, 0x5F,
- 0x4B, 0x15, 0x01, 0x3F, 0x23, 0x8B, 0x7B, 0xAC, 0xD4, 0xA5, 0x36, 0x28, 0x0F, 0x56, 0x3F, 0xD5,
- 0x3C, 0xCB, 0x5F, 0xCC, 0xAE, 0x6B, 0x51, 0x9B, 0xC0, 0x38, 0x57, 0x92, 0x8B, 0x4A, 0xB2, 0xC8,
- 0x13, 0x01, 0xA8, 0x58, 0xC7, 0x2E, 0xC4, 0x4D, 0x6B, 0x7A, 0x7C, 0xBF, 0x5C, 0x83, 0xC2, 0xDF,
- 0xF5, 0xD5, 0x12, 0x33, 0x08, 0xC4, 0xD3, 0x95, 0x4B, 0x29, 0x5F, 0x37, 0x29, 0x8A, 0x0E, 0x62,
- 0x47, 0xA3, 0x51, 0x4A, 0xC5, 0x47, 0x0C, 0x49, 0x56, 0xB2, 0x98, 0x9F, 0xC8, 0x90, 0x04, 0x8C,
- 0x45, 0x3C, 0x8C, 0xB2, 0x94, 0x46, 0x99, 0xA8, 0xA4, 0x16, 0x63, 0x21, 0xCC, 0x5E, 0xFA, 0xE7,
- 0x9F, 0x8B, 0xC9, 0x7E, 0x5A, 0x0B, 0x96, 0xD3, 0xEB, 0x3D, 0xBF, 0x34, 0xD9, 0xF7, 0x6B, 0x89,
- 0xB9, 0x7A, 0xE9, 0xFF, 0x67, 0x4B, 0x21, 0x65, 0x4B, 0xF1, 0xB0, 0x54, 0x2E, 0x62, 0x62, 0x29,
- 0xE6, 0xC9, 0x82, 0x91, 0x97, 0x7C, 0x16, 0x0D, 0x1A, 0x2B, 0x25, 0x55, 0x9E, 0x97, 0x7D, 0x95,
- 0x43, 0x40, 0x59, 0x71, 0xE5, 0x35, 0x11, 0x06, 0x34, 0xE0, 0x63, 0x64, 0xF2, 0x41, 0xEB, 0xA7,
- 0xD1, 0x94, 0x26, 0x87, 0x24, 0xA5, 0x06, 0x24, 0xCD, 0x65, 0xDC, 0x41, 0xA8, 0xE9, 0x04, 0xEB,
- 0x76, 0x6D, 0x6E, 0x12, 0x05, 0xCE, 0x33, 0x77, 0xC4, 0xB1, 0x26, 0x03, 0xF9, 0xB2, 0xCA, 0x09,
- 0xD4, 0xC6, 0xBE, 0x12, 0xA4, 0x3E, 0x52, 0x25, 0xA8, 0x61, 0x5A, 0xD0, 0x76, 0xC0, 0x35, 0x5F,
- 0x26, 0x51, 0x4C, 0xC6, 0xB2, 0x07, 0x83, 0x35, 0x74, 0x0F, 0xA4, 0x66, 0x6D, 0x34, 0x91, 0x60,
- 0xA9, 0x73, 0x29, 0xFC, 0x66, 0xD9, 0xC2, 0x70, 0x4B, 0x57, 0xC9, 0xB0, 0xBD, 0xF4, 0xA5, 0x35,
- 0x59, 0x83, 0xE0, 0x0B, 0x6C, 0x62, 0xE0, 0x1E, 0x68, 0x64, 0xF2, 0x7B, 0x00, 0x77, 0x6B, 0xB6,
- 0xA3, 0x3D, 0xD6, 0x8E, 0x6A, 0x35, 0x53, 0x55, 0xE9, 0xAE, 0x0B, 0x6D, 0x4E, 0x74, 0x23, 0x0B,
- 0x4B, 0x10, 0xAA, 0x9A, 0x59, 0x0C, 0x38, 0x1B, 0x81, 0xAA, 0xBA, 0xC0, 0x11, 0xD6, 0x98, 0x66,
- 0xA9, 0x23, 0xF1, 0x97, 0x1D, 0xC9, 0x13, 0xB5, 0x07, 0x95, 0xF5, 0x05, 0xD4, 0x31, 0xAB, 0x25,
- 0x86, 0x30, 0xD3, 0x29, 0x13, 0xDE, 0x04, 0x03, 0x90, 0x07, 0x5A, 0xD5, 0x05, 0x14, 0xB5, 0x8E,
- 0x1C, 0x4D, 0x44, 0xB8, 0x1C, 0x05, 0xF9, 0xF0, 0x6B, 0x9A, 0x0F, 0xBC, 0xB4, 0x18, 0xDD, 0x97,
- 0x80, 0x50, 0xD2, 0xE6, 0xE0, 0x88, 0x8F, 0xF2, 0x21, 0xF4, 0xB2, 0x05, 0x9D, 0x02, 0x58, 0xFC,
- 0xC6, 0x71, 0x3E, 0x8A, 0x27, 0xC5, 0x68, 0x42, 0xEF, 0x17, 0x78, 0x51, 0x01, 0xF5, 0xA9, 0xEE,
- 0x28, 0x1B, 0xDB, 0x68, 0xCE, 0xF3, 0x41, 0x6B, 0x29, 0x7F, 0xF0, 0xFF, 0x28, 0x7F, 0xCC, 0xC7,
- 0x85, 0x34, 0x71, 0x31, 0x1A, 0xB3, 0x42, 0x96, 0x61, 0x18, 0xFF, 0x90, 0x93, 0xA4, 0xD4, 0x13,
- 0x97, 0x7A, 0x5A, 0xF1, 0xB3, 0xB6, 0x53, 0x98, 0x8E, 0x31, 0xAA, 0xF8, 0xE3, 0xC8, 0xF6, 0xF0,
- 0xF7, 0x3C, 0xF2, 0x65, 0x6D, 0x69, 0x5A, 0xA1, 0x31, 0x82, 0x3A, 0x57, 0x37, 0xCB, 0x7E, 0x9A,
- 0xFD, 0xB7, 0xAD, 0xE8, 0xD1, 0xF1, 0xE9, 0x71, 0xFF, 0xB8, 0x5C, 0x38, 0x23, 0xE7, 0x25, 0x93,
- 0x8A, 0x2B, 0x5D, 0xFA, 0xB2, 0x22, 0x80, 0x02, 0x1B, 0x45, 0x01, 0x7B, 0xDD, 0xDC, 0x54, 0x7E,
- 0xF1, 0xB6, 0x77, 0x71, 0x6E, 0xC7, 0x24, 0x01, 0x8F, 0x24, 0x15, 0xE6, 0xC2, 0x82, 0x44, 0xF9,
- 0xE0, 0xD7, 0xC7, 0xA5, 0x72, 0x5D, 0x7E, 0x61, 0x70, 0xC4, 0xDC, 0x52, 0xA7, 0xA9, 0x7E, 0x78,
- 0xE2, 0x62, 0x5D, 0x99, 0xBF, 0x04, 0x41, 0x72, 0x1A, 0x2D, 0x13, 0x55, 0x11, 0x67, 0x46, 0xE5,
- 0x30, 0x2F, 0xEE, 0xB2, 0x75, 0x0D, 0xD3, 0xC8, 0xB4, 0xC4, 0x84, 0xA5, 0xE5, 0x46, 0xA5, 0x12,
- 0x14, 0xFE, 0xA2, 0xB6, 0xE7, 0x8B, 0x91, 0x24, 0xB7, 0x5A, 0x73, 0xAB, 0x6F, 0x41, 0x2A, 0x3E,
- 0x58, 0x04, 0x23, 0x66, 0x39, 0xDB, 0x16, 0x77, 0xA3, 0x43, 0xEE, 0x61, 0x5C, 0x7F, 0xBA, 0x35,
- 0x78, 0xD2, 0x3C, 0x79, 0x61, 0x9E, 0xFC, 0xB1, 0x7B, 0x2E, 0x1C, 0x45, 0xF9, 0xDA, 0xE2, 0x98,
- 0xF6, 0x10, 0x58, 0xBB, 0x6D, 0x2F, 0x7D, 0x18, 0x20, 0xD2, 0x83, 0xCB, 0x00, 0xF4, 0x63, 0x58,
- 0xFF, 0x4A, 0xEE, 0x88, 0x7A, 0x09, 0xAA, 0xA2, 0xAD, 0x73, 0x54, 0xD8, 0xEE, 0xFD, 0x81, 0xA3,
- 0xF2, 0xCE, 0x65, 0x18, 0x48, 0x97, 0xC3, 0x92, 0x37, 0x8B, 0x75, 0xC1, 0x61, 0x19, 0x31, 0x64,
- 0x6C, 0x00, 0xE3, 0xCD, 0x5D, 0x49, 0x13, 0xD5, 0x1C, 0xB4, 0xF0, 0x1B, 0x08, 0x8A, 0x4F, 0x39,
- 0xCE, 0x9A, 0x38, 0xAD, 0x62, 0x72, 0xC5, 0x23, 0xC8, 0x4A, 0x67, 0x89, 0xC0, 0x6E, 0x10, 0x0D,
- 0x0D, 0x7C, 0x64, 0x9A, 0xA1, 0xB6, 0x1D, 0x3E, 0x37, 0xD7, 0xBC, 0xD9, 0x54, 0xFA, 0x4B, 0x62,
- 0x79, 0xD5, 0xB0, 0x8B, 0x1C, 0x56, 0xCC, 0x75, 0x7D, 0x1F, 0xF4, 0xA3, 0x4E, 0x29, 0xAF, 0x48,
- 0xA4, 0x53, 0xD1, 0x83, 0xC4, 0x86, 0xA2, 0x41, 0xBE, 0x91, 0x40, 0x44, 0x72, 0x4A, 0x33, 0x5D,
- 0xC7, 0xCA, 0xD2, 0x0B, 0x28, 0x49, 0x7A, 0xB2, 0x73, 0x95, 0x49, 0x6B, 0x25, 0x06, 0xFE, 0xC8,
- 0xD7, 0xF0, 0xC7, 0xA1, 0xD0, 0xA3, 0x83, 0x9B, 0x49, 0x2B, 0x83, 0xA4, 0x23, 0x64, 0x83, 0xA9,
- 0x37, 0xE4, 0xBB, 0xA8, 0x2D, 0x2F, 0xCB, 0xB4, 0x16, 0x50, 0x70, 0x71, 0x83, 0xBB, 0x11, 0x30,
- 0x52, 0x5A, 0xC4, 0x9E, 0x94, 0xA8, 0xC7, 0x8F, 0x10, 0x1F, 0x53, 0x4A, 0x20, 0x06, 0x20, 0xA6,
- 0x40, 0xD0, 0xA7, 0x42, 0x8A, 0x54, 0xE6, 0x92, 0x53, 0x2A, 0x20, 0xCA, 0x48, 0xCD, 0xE2, 0xC1,
- 0x85, 0x78, 0xD4, 0x46, 0xD6, 0x80, 0xFD, 0xDC, 0xBD, 0x73, 0x33, 0xDE, 0x90, 0x68, 0x09, 0x56,
- 0x36, 0x3D, 0x9A, 0xA6, 0x52, 0x5C, 0x54, 0xC7, 0x19, 0xF8, 0xA8, 0xA1, 0x03, 0x5A, 0x23, 0x84,
- 0x11, 0x1E, 0x84, 0x8A, 0x01, 0x40, 0x7F, 0x42, 0xC3, 0x1C, 0x22, 0x70, 0x08, 0x20, 0x82, 0xA0,
- 0x7F, 0x49, 0x0D, 0xF7, 0x64, 0x05, 0xC9, 0xF8, 0xD8, 0x6D, 0x35, 0xF0, 0x9D, 0x66, 0x95, 0xEC,
- 0x20, 0xA5, 0xBD, 0x68, 0x24, 0xFA, 0x64, 0x98, 0x1A, 0x50, 0x00, 0xAC, 0xD9, 0x01, 0xA0, 0x1E,
- 0x24, 0x5E, 0x63, 0x2B, 0x3F, 0xEF, 0x04, 0x2A, 0xBB, 0x00, 0xAB, 0xBB, 0x8E, 0x87, 0x5F, 0x39,
- 0x4F, 0x19, 0xA7, 0x39, 0x26, 0x00, 0x7B, 0x93, 0x68, 0x7A, 0x99, 0x30, 0x2E, 0xCE, 0x64, 0x1B,
- 0x6A, 0x6C, 0xB4, 0xE4, 0xF5, 0xA9, 0x87, 0x15, 0x79, 0x3F, 0xC5, 0x8B, 0xCB, 0x0C, 0xF3, 0xBA,
- 0x53, 0x79, 0x77, 0xB1, 0x86, 0x70, 0x21, 0x50, 0x66, 0x38, 0xB3, 0x29, 0x74, 0xB0, 0xFA, 0xA1,
- 0x48, 0x82, 0x7A, 0x4F, 0xB7, 0x42, 0xE2, 0xC1, 0x44, 0xED, 0x81, 0xF9, 0xDC, 0xC2, 0xD8, 0xE1,
- 0x94, 0x83, 0x5A, 0x0A, 0xB5, 0x02, 0x45, 0xC6, 0x95, 0xCD, 0x98, 0x35, 0x1D, 0x6A, 0x58, 0x88,
- 0x61, 0xE0, 0xAF, 0xFE, 0x05, 0x0F, 0x1E, 0x1C, 0xC8, 0x55, 0x3F, 0xE1, 0x23, 0xE3, 0x7E, 0xF4,
- 0x23, 0x3E, 0x3E, 0xAF, 0xF0, 0xF1, 0x79, 0x1D, 0x1F, 0xB4, 0xAA, 0x3C, 0x98, 0x0C, 0x80, 0xEC,
- 0x19, 0xE1, 0x64, 0x4C, 0x13, 0x58, 0xC0, 0x43, 0x50, 0x25, 0x7F, 0x8B, 0xB3, 0x84, 0xFE, 0x98,
- 0xB3, 0xDE, 0x84, 0x8D, 0xC4, 0x23, 0xFE, 0x8A, 0xD5, 0xFF, 0x82, 0x4B, 0x3C, 0x70, 0x3D, 0x97,
- 0x79, 0x6D, 0x5A, 0x49, 0x28, 0x3F, 0x7E, 0x2B, 0x91, 0x7E, 0xE4, 0x42, 0x78, 0xA9, 0x38, 0xC8,
- 0xDF, 0xB7, 0xF4, 0x00, 0xBC, 0x11, 0xF8, 0x29, 0x35, 0x75, 0xBC, 0x0B, 0xA5, 0xFC, 0x29, 0x30,
- 0x64, 0xA8, 0xC0, 0x47, 0xDD, 0xD9, 0xDC, 0x12, 0xAE, 0x01, 0x8A, 0xF1, 0xA3, 0x29, 0xB0, 0xEA,
- 0xC9, 0x02, 0xD7, 0x9E, 0x40, 0x26, 0x04, 0x91, 0xE0, 0x48, 0xC8, 0xA7, 0x8D, 0x2F, 0x07, 0x9B,
- 0x37, 0x35, 0xC8, 0x43, 0x2E, 0xFC, 0x98, 0x2E, 0x0C, 0x36, 0x6F, 0xFE, 0x6D, 0x36, 0xC6, 0xCC,
- 0x5A, 0x76, 0xA4, 0x96, 0x4C, 0xF6, 0xF4, 0x0B, 0xBF, 0x71, 0x09, 0x48, 0x5D, 0x49, 0x78, 0x45,
- 0x34, 0x03, 0x6B, 0x43, 0x61, 0xE1, 0x07, 0xFF, 0x47, 0x09, 0xF8, 0x91, 0x9E, 0x07, 0xCE, 0xBD,
- 0xE6, 0x3D, 0x5E, 0x2F, 0x3E, 0x85, 0xE9, 0x56, 0xE9, 0xC1, 0x4A, 0xC7, 0xEF, 0x53, 0x3A, 0x76,
- 0x59, 0xA2, 0x14, 0x4A, 0x14, 0x59, 0x88, 0x1A, 0x6A, 0x50, 0x0E, 0x51, 0x98, 0x89, 0x17, 0xCD,
- 0x81, 0x02, 0x9B, 0x73, 0x34, 0x5B, 0x3A, 0x02, 0x0F, 0xF4, 0xF5, 0x45, 0xEE, 0xFC, 0x74, 0x76,
- 0x7A, 0x22, 0x44, 0x7C, 0xA5, 0x62, 0x22, 0xD0, 0xAA, 0x2E, 0x2C, 0x2F, 0xCF, 0x9C, 0x89, 0xE4,
- 0xA1, 0x28, 0x75, 0x30, 0x31, 0x28, 0x87, 0xFE, 0x74, 0x31, 0xFC, 0x0A, 0x71, 0xD6, 0xD0, 0xCF,
- 0x52, 0x48, 0x58, 0x5B, 0x36, 0xA2, 0xF7, 0xFB, 0x97, 0xF6, 0xAE, 0xDD, 0x84, 0xBA, 0x00, 0xB4,
- 0x0A, 0x69, 0x19, 0xEE, 0x7D, 0xFE, 0xB7, 0x90, 0xB7, 0xFF, 0x1E, 0x32, 0x83, 0xA8, 0x95, 0x42,
- 0x58, 0x2A, 0xF0, 0xAB, 0xB8, 0x93, 0x24, 0x9A, 0x4A, 0xB4, 0xE3, 0x24, 0xC1, 0x4B, 0xE9, 0x43,
- 0x85, 0xA2, 0x0D, 0x61, 0x31, 0xA5, 0x89, 0xE6, 0x47, 0x34, 0xD5, 0x78, 0x24, 0xB4, 0x34, 0x8B,
- 0x63, 0x68, 0x5C, 0x56, 0xF4, 0x61, 0xEB, 0xC5, 0xEB, 0xCB, 0xFB, 0x8C, 0x66, 0xD4, 0xCF, 0x97,
- 0x69, 0x52, 0xD1, 0x0B, 0x56, 0x50, 0xDF, 0x10, 0xEE, 0x7E, 0xB9, 0xC9, 0xEB, 0xA9, 0x8C, 0x73,
- 0x8C, 0xA2, 0x1B, 0x2D, 0x35, 0x07, 0xE9, 0x26, 0x40, 0xD5, 0xE5, 0x59, 0x10, 0xCC, 0xDB, 0x2B,
- 0xB4, 0xA0, 0xF1, 0x8A, 0x44, 0x24, 0x9F, 0xCB, 0x67, 0x7F, 0xE4, 0xC9, 0xA9, 0xE2, 0x82, 0x50,
- 0xF2, 0x54, 0xA9, 0x36, 0xAD, 0x0D, 0x63, 0x83, 0x6A, 0x8C, 0xA7, 0x82, 0x70, 0x0F, 0xAF, 0x51,
- 0xE9, 0xC2, 0x2C, 0x6A, 0x29, 0xDC, 0xDE, 0x46, 0x5F, 0xCB, 0x6D, 0xE9, 0x89, 0x7C, 0x2A, 0x25,
- 0xE3, 0xAE, 0xAE, 0x63, 0x55, 0x45, 0xB1, 0x3E, 0x25, 0x61, 0x5A, 0x26, 0x5B, 0x54, 0x06, 0x26,
- 0x77, 0x0B, 0x70, 0x9B, 0x06, 0x29, 0x1C, 0xBD, 0x7E, 0x7F, 0xCE, 0x46, 0xD1, 0xCE, 0x11, 0x80,
- 0x69, 0xC5, 0x3E, 0x93, 0xD7, 0xE0, 0x24, 0xCC, 0x73, 0x07, 0x32, 0xE9, 0x4A, 0x03, 0x0E, 0xA9,
- 0x98, 0x44, 0xFE, 0x81, 0x7E, 0xA0, 0x3B, 0x3A, 0xFC, 0xBB, 0x09, 0x35, 0x47, 0xCD, 0xA5, 0xD0,
- 0xA4, 0xFA, 0x74, 0x70, 0xF5, 0x06, 0xC2, 0x53, 0x0C, 0xA5, 0x01, 0x17, 0x50, 0x34, 0xD7, 0x74,
- 0x7C, 0x7A, 0x7D, 0x0C, 0x29, 0xC8, 0x7F, 0x21, 0x37, 0x66, 0xBB, 0xAA, 0x6C, 0xB8, 0xF3, 0xEA,
- 0x75, 0x56, 0x2E, 0x03, 0x7A, 0x61, 0x8C, 0x58, 0x0F, 0x29, 0x7E, 0xFB, 0x7B, 0xF4, 0x9E, 0x8D,
- 0x15, 0xD2, 0x6A, 0x5D, 0x6F, 0xCE, 0x76, 0x90, 0x67, 0x89, 0xD5, 0x43, 0x2C, 0x70, 0x97, 0x1F,
- 0x29, 0x59, 0x95, 0x35, 0xDC, 0xF6, 0x48, 0x10, 0xE0, 0xC7, 0x5A, 0x03, 0x1B, 0x6A, 0x22, 0xB2,
- 0xD4, 0x42, 0x22, 0x29, 0x08, 0x90, 0xD2, 0x3E, 0x84, 0x39, 0xD3, 0x92, 0x65, 0x86, 0xB2, 0xA1,
- 0xBC, 0xFF, 0xC5, 0x9A, 0xA3, 0x64, 0x46, 0xE8, 0xCE, 0xF9, 0x6C, 0x73, 0x53, 0xD8, 0x85, 0x99,
- 0x18, 0x05, 0x52, 0x8A, 0x01, 0x1C, 0x9A, 0x7D, 0x68, 0x2D, 0x8C, 0xB2, 0x90, 0x58, 0xAB, 0x3D,
- 0xD2, 0xB6, 0x51, 0x55, 0x03, 0x54, 0x7C, 0x46, 0x01, 0x03, 0xCE, 0xB2, 0x24, 0x80, 0xA8, 0x8B,
- 0x39, 0xBA, 0xB2, 0x2D, 0xC5, 0xBA, 0xD0, 0x84, 0x0E, 0xEC, 0x67, 0xC8, 0x12, 0x95, 0x97, 0xAD,
- 0xA2, 0x27, 0x12, 0xC5, 0x77, 0x95, 0x9E, 0xC8, 0x6F, 0xE5, 0x84, 0xAA, 0xC8, 0x77, 0x88, 0x2F,
- 0x13, 0x5C, 0xD4, 0xD1, 0x13, 0xA0, 0x24, 0x83, 0x52, 0x34, 0x60, 0x2A, 0x2C, 0x37, 0xEE, 0xEB,
- 0xD3, 0xE9, 0xB4, 0x8E, 0xDF, 0x6A, 0xEB, 0x70, 0x82, 0xB2, 0x02, 0x5F, 0x5F, 0xC7, 0x21, 0x47,
- 0x15, 0x58, 0xF8, 0x6E, 0xE1, 0xAC, 0xBA, 0xE8, 0x42, 0x7F, 0x2B, 0xDE, 0xD4, 0xAA, 0xD2, 0x59,
- 0xE1, 0x73, 0x79, 0xDB, 0x7B, 0x3B, 0x2B, 0x20, 0x32, 0xC4, 0xAF, 0xB2, 0x90, 0x69, 0x20, 0x0D,
- 0x3B, 0xE5, 0x46, 0x56, 0x25, 0x85, 0x65, 0x5C, 0xB0, 0xE3, 0x2C, 0x9D, 0x18, 0x33, 0x60, 0xDD,
- 0x11, 0x96, 0xD2, 0x95, 0x43, 0x2D, 0x65, 0xB7, 0x0E, 0xB7, 0x0A, 0xFB, 0x70, 0x30, 0x83, 0x94,
- 0x79, 0xFB, 0xF3, 0x4F, 0x39, 0x5B, 0xDE, 0xF6, 0x92, 0x62, 0x71, 0xE1, 0xF3, 0xFC, 0xA9, 0x35,
- 0xAF, 0x69, 0xA5, 0xD1, 0xAF, 0xC4, 0x97, 0xBD, 0x46, 0xFE, 0x19, 0x3B, 0xFF, 0x9C, 0xAD, 0x81,
- 0xB1, 0x43, 0x23, 0x2A, 0xDC, 0x4C, 0x8C, 0xEA, 0x2F, 0x34, 0xE6, 0x63, 0x79, 0x29, 0xBF, 0x2D,
- 0xA0, 0x54, 0xA9, 0xD3, 0x68, 0x78, 0x3E, 0xFF, 0x9A, 0x42, 0x19, 0x1D, 0x65, 0xFE, 0x28, 0x20,
- 0x09, 0xC5, 0x82, 0xA3, 0x41, 0xBE, 0x92, 0xFB, 0x46, 0xC0, 0x86, 0x69, 0x03, 0x93, 0x6D, 0xCB,
- 0xDE, 0xB2, 0x77, 0x71, 0x64, 0x7F, 0x4D, 0xF7, 0x57, 0x4F, 0xD8, 0x5F, 0x34, 0x69, 0x58, 0x0B,
- 0xE7, 0xB5, 0xAB, 0x8A, 0x4D, 0x6A, 0x83, 0xFB, 0xC4, 0xA7, 0x70, 0x3D, 0x6F, 0xB3, 0xCC, 0xB6,
- 0x1A, 0xE4, 0x5F, 0x60, 0xD4, 0x31, 0xBA, 0x95, 0x2F, 0x92, 0xF4, 0x81, 0x7B, 0x18, 0x5B, 0x17,
- 0x54, 0x26, 0x70, 0x49, 0xD5, 0x87, 0x34, 0xB9, 0xD3, 0x9C, 0x2F, 0x39, 0xC3, 0xB7, 0x3C, 0xA8,
- 0x03, 0xE4, 0x37, 0x9C, 0x72, 0x39, 0xB0, 0xBF, 0x07, 0x5D, 0x33, 0x2A, 0x41, 0x79, 0xB1, 0x26,
- 0x9B, 0xE6, 0x7C, 0x02, 0x82, 0x01, 0x70, 0xB1, 0xA3, 0x48, 0xCD, 0x2B, 0xCB, 0x98, 0x9B, 0x57,
- 0x96, 0x54, 0xE2, 0x5F, 0x59, 0xCC, 0xDB, 0x9F, 0xFC, 0xDB, 0x4C, 0xF9, 0x7F, 0x5B, 0x28, 0x36,
- 0x32, 0xF9, 0xE1, 0x09, 0xF7, 0x56, 0x3F, 0x45, 0xAD, 0x47, 0x51, 0xBB, 0xF7, 0xFF, 0x17, 0x53,
- 0xE8, 0x9D, 0x36, 0x92, 0x29, 0x00, 0x00
-};
-
-#define SPIFFS_MAXLENGTH_FILEPATH 32
-const char *excludeListFile = "/.exclude.files";
-
-typedef struct ExcludeListS {
-    char *item;
-    ExcludeListS *next;
-} ExcludeList;
-
-static ExcludeList *excludes = NULL;
-
-static bool matchWild(const char *pattern, const char *testee) {
-  const char *nxPat = NULL, *nxTst = NULL;
-
-  while (*testee) {
-    if (( *pattern == '?' ) || (*pattern == *testee)){
-      pattern++;testee++;
-      continue;
-    }
-    if (*pattern=='*'){
-      nxPat=pattern++; nxTst=testee;
-      continue;
-    }
-    if (nxPat){ 
-      pattern = nxPat+1; testee=++nxTst;
-      continue;
-    }
-    return false;
-  }
-  while (*pattern=='*'){pattern++;}  
-  return (*pattern == 0);
-}
-
-static bool addExclude(const char *item){
-    size_t len = strlen(item);
-    if(!len){
-        return false;
-    }
-    ExcludeList *e = (ExcludeList *)malloc(sizeof(ExcludeList));
-    if(!e){
-        return false;
-    }
-    e->item = (char *)malloc(len+1);
-    if(!e->item){
-        free(e);
-        return false;
-    }
-    memcpy(e->item, item, len+1);
-    e->next = excludes;
-    excludes = e;
-    return true;
-}
-
-static void loadExcludeList(fs::FS &_fs, const char *filename){
-    static char linebuf[SPIFFS_MAXLENGTH_FILEPATH];
-    fs::File excludeFile=_fs.open(filename, "r");
-    if(!excludeFile){
-        //addExclude("/*.js.gz");
-        return;
-    }
-#ifdef ESP32
-    if(excludeFile.isDirectory()){
-      excludeFile.close();
-      return;
-    }
-#endif
-    if (excludeFile.size() > 0){
-      uint8_t idx;
-      bool isOverflowed = false;
-      while (excludeFile.available()){
-        linebuf[0] = '\0';
-        idx = 0;
-        int lastChar;
-        do {
-          lastChar = excludeFile.read();
-          if(lastChar != '\r'){
-            linebuf[idx++] = (char) lastChar;
-          }
-        } while ((lastChar >= 0) && (lastChar != '\n') && (idx < SPIFFS_MAXLENGTH_FILEPATH));
-
-        if(isOverflowed){
-          isOverflowed = (lastChar != '\n');
-          continue;
-        }
-        isOverflowed = (idx >= SPIFFS_MAXLENGTH_FILEPATH);
-        linebuf[idx-1] = '\0';
-        if(!addExclude(linebuf)){
-            excludeFile.close();
-            return;
-        }
-      }
-    }
-    excludeFile.close();
-}
-
-static bool isExcluded(fs::FS &_fs, const char *filename) {
-  if(excludes == NULL){
-      loadExcludeList(_fs, excludeListFile);
-  }
-  ExcludeList *e = excludes;
-  while(e){
-    if (matchWild(e->item, filename)){
-      return true;
-    }
-    e = e->next;
-  }
-  return false;
-}
-
-// WEB HANDLER IMPLEMENTATION
-
-#ifdef ESP32
-SPIFFSEditor::SPIFFSEditor(const fs::FS& fs, const String& username, const String& password)
-#else
-SPIFFSEditor::SPIFFSEditor(const String& username, const String& password, const fs::FS& fs)
-#endif
-:_fs(fs)
-,_username(username)
-,_password(password)
-,_authenticated(false)
-,_startTime(0)
-{}
-
-bool SPIFFSEditor::canHandle(AsyncWebServerRequest *request){
-  if(request->url().equalsIgnoreCase("/edit")){
-    if(request->method() == HTTP_GET){
-      if(request->hasParam("list"))
-        return true;
-      if(request->hasParam("edit")){
-        request->_tempFile = _fs.open(request->arg("edit"), "r");
-        if(!request->_tempFile){
-          return false;
-        }
-#ifdef ESP32
-        if(request->_tempFile.isDirectory()){
-          request->_tempFile.close();
-          return false;
-        }
-#endif
-      }
-      if(request->hasParam("download")){
-        request->_tempFile = _fs.open(request->arg("download"), "r");
-        if(!request->_tempFile){
-          return false;
-        }
-#ifdef ESP32
-        if(request->_tempFile.isDirectory()){
-          request->_tempFile.close();
-          return false;
-        }
-#endif
-      }
-      request->addInterestingHeader("If-Modified-Since");
-      return true;
-    }
-    else if(request->method() == HTTP_POST)
-      return true;
-    else if(request->method() == HTTP_DELETE)
-      return true;
-    else if(request->method() == HTTP_PUT)
-      return true;
-
-  }
-  return false;
-}
-
-
-void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request){
-  if(_username.length() && _password.length() && !request->authenticate(_username.c_str(), _password.c_str()))
-    return request->requestAuthentication();
-
-  if(request->method() == HTTP_GET){
-    if(request->hasParam("list")){
-      String path = request->getParam("list")->value();
-#ifdef ESP32
-      File dir = _fs.open(path);
-#else
-      Dir dir = _fs.openDir(path);
-#endif
-      path = String();
-      String output = "[";
-#ifdef ESP32
-      File entry = dir.openNextFile();
-      while(entry){
-#else
-      while(dir.next()){
-        fs::File entry = dir.openFile("r");
-#endif
-        if (isExcluded(_fs, entry.name())) {
-#ifdef ESP32
-            entry = dir.openNextFile();
-#endif
-            continue;
-        }
-        if (output != "[") output += ',';
-        output += "{\"type\":\"";
-        output += "file";
-        output += "\",\"name\":\"";
-        output += String(entry.name());
-        output += "\",\"size\":";
-        output += String(entry.size());
-        output += "}";
-#ifdef ESP32
-        entry = dir.openNextFile();
-#else
-        entry.close();
-#endif
-      }
-#ifdef ESP32
-      dir.close();
-#endif
-      output += "]";
-      request->send(200, "application/json", output);
-      output = String();
-    }
-    else if(request->hasParam("edit") || request->hasParam("download")){
-      request->send(request->_tempFile, request->_tempFile.name(), String(), request->hasParam("download"));
-    }
-    else {
-      const char * buildTime = __DATE__ " " __TIME__ " GMT";
-      if (request->header("If-Modified-Since").equals(buildTime)) {
-        request->send(304);
-      } else {
-        AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", edit_htm_gz, edit_htm_gz_len);
-        response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Last-Modified", buildTime);
-        request->send(response);
-      }
-    }
-  } else if(request->method() == HTTP_DELETE){
-    if(request->hasParam("path", true)){
-        _fs.remove(request->getParam("path", true)->value());
-      request->send(200, "", "DELETE: "+request->getParam("path", true)->value());
-    } else
-      request->send(404);
-  } else if(request->method() == HTTP_POST){
-    if(request->hasParam("data", true, true) && _fs.exists(request->getParam("data", true, true)->value()))
-      request->send(200, "", "UPLOADED: "+request->getParam("data", true, true)->value());
-    else
-      request->send(500);
-  } else if(request->method() == HTTP_PUT){
-    if(request->hasParam("path", true)){
-      String filename = request->getParam("path", true)->value();
-      if(_fs.exists(filename)){
-        request->send(200);
-      } else {
-        fs::File f = _fs.open(filename, "w");
-        if(f){
-          f.write((uint8_t)0x00);
-          f.close();
-          request->send(200, "", "CREATE: "+filename);
-        } else {
-          request->send(500);
-        }
-      }
-    } else
-      request->send(400);
-  }
-}
-
-void SPIFFSEditor::handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final){
-  if(!index){
-    if(!_username.length() || request->authenticate(_username.c_str(),_password.c_str())){
-      _authenticated = true;
-      request->_tempFile = _fs.open(filename, "w");
-      _startTime = millis();
-    }
-  }
-  if(_authenticated && request->_tempFile){
-    if(len){
-      request->_tempFile.write(data,len);
-    }
-    if(final){
-      request->_tempFile.close();
-    }
-  }
-}
diff --git a/libraries/ESPAsyncWebServer/src/SPIFFSEditor.h b/libraries/ESPAsyncWebServer/src/SPIFFSEditor.h
deleted file mode 100644
index 3586429e1..000000000
--- a/libraries/ESPAsyncWebServer/src/SPIFFSEditor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SPIFFSEditor_H_
-#define SPIFFSEditor_H_
-#include 
-
-class SPIFFSEditor: public AsyncWebHandler {
-  private:
-    fs::FS _fs;
-    String _username;
-    String _password; 
-    bool _authenticated;
-    uint32_t _startTime;
-  public:
-#ifdef ESP32
-    SPIFFSEditor(const fs::FS& fs, const String& username=String(), const String& password=String());
-#else
-    SPIFFSEditor(const String& username=String(), const String& password=String(), const fs::FS& fs=SPIFFS);
-#endif
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
-    virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final;
-    virtual bool isRequestHandlerTrivial() override final {return false;}
-};
-
-#endif
diff --git a/libraries/ESPAsyncWebServer/src/StringArray.h b/libraries/ESPAsyncWebServer/src/StringArray.h
deleted file mode 100644
index 4c0aa7019..000000000
--- a/libraries/ESPAsyncWebServer/src/StringArray.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef STRINGARRAY_H_
-#define STRINGARRAY_H_
-
-#include "stddef.h"
-#include "WString.h"
-
-template 
-class LinkedListNode {
-    T _value;
-  public:
-    LinkedListNode* next;
-    LinkedListNode(const T val): _value(val), next(nullptr) {}
-    ~LinkedListNode(){}
-    const T& value() const { return _value; };
-    T& value(){ return _value; }
-};
-
-template  class Item = LinkedListNode>
-class LinkedList {
-  public:
-    typedef Item ItemType;
-    typedef std::function OnRemove;
-    typedef std::function Predicate;
-  private:
-    ItemType* _root;
-    OnRemove _onRemove;
-
-    class Iterator {
-      ItemType* _node;
-    public:
-      Iterator(ItemType* current = nullptr) : _node(current) {}
-      Iterator(const Iterator& i) : _node(i._node) {}
-      Iterator& operator ++() { _node = _node->next; return *this; }
-      bool operator != (const Iterator& i) const { return _node != i._node; }
-      const T& operator * () const { return _node->value(); }
-      const T* operator -> () const { return &_node->value(); }
-    };
-    
-  public:
-    typedef const Iterator ConstIterator;
-    ConstIterator begin() const { return ConstIterator(_root); }
-    ConstIterator end() const { return ConstIterator(nullptr); }
-
-    LinkedList(OnRemove onRemove) : _root(nullptr), _onRemove(onRemove) {}
-    ~LinkedList(){}
-    void add(const T& t){
-      auto it = new ItemType(t);
-      if(!_root){
-        _root = it;
-      } else {
-        auto i = _root;
-        while(i->next) i = i->next;
-        i->next = it;
-      }
-    }
-    T& front() const {
-      return _root->value();
-    }
-    
-    bool isEmpty() const {
-      return _root == nullptr;
-    }
-    size_t length() const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        i++;
-        it = it->next;
-      }
-      return i;
-    }
-    size_t count_if(Predicate predicate) const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        if (!predicate){
-          i++;
-        }
-        else if (predicate(it->value())) {
-          i++;
-        }
-        it = it->next;
-      }
-      return i;
-    }
-    const T* nth(size_t N) const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        if(i++ == N)
-          return &(it->value());
-        it = it->next;
-      }
-      return nullptr;
-    }
-    bool remove(const T& t){
-      auto it = _root;
-      auto pit = _root;
-      while(it){
-        if(it->value() == t){
-          if(it == _root){
-            _root = _root->next;
-          } else {
-            pit->next = it->next;
-          }
-          
-          if (_onRemove) {
-            _onRemove(it->value());
-          }
-          
-          delete it;
-          return true;
-        }
-        pit = it;
-        it = it->next;
-      }
-      return false;
-    }
-    bool remove_first(Predicate predicate){
-      auto it = _root;
-      auto pit = _root;
-      while(it){
-        if(predicate(it->value())){
-          if(it == _root){
-            _root = _root->next;
-          } else {
-            pit->next = it->next;
-          }
-          if (_onRemove) {
-            _onRemove(it->value());
-          }
-          delete it;
-          return true;
-        }
-        pit = it;
-        it = it->next;
-      }
-      return false;
-    }
-    
-    void free(){
-      while(_root != nullptr){
-        auto it = _root;
-        _root = _root->next;
-        if (_onRemove) {
-          _onRemove(it->value());
-        }
-        delete it;
-      }
-      _root = nullptr;
-    }
-};
-
-
-class StringArray : public LinkedList {
-public:
-  
-  StringArray() : LinkedList(nullptr) {}
-  
-  bool containsIgnoreCase(const String& str){
-    for (const auto& s : *this) {
-      if (str.equalsIgnoreCase(s)) {
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-
-
-
-#endif /* STRINGARRAY_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/WebAuthentication.cpp b/libraries/ESPAsyncWebServer/src/WebAuthentication.cpp
deleted file mode 100644
index 2feca5420..000000000
--- a/libraries/ESPAsyncWebServer/src/WebAuthentication.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "WebAuthentication.h"
-#include 
-#ifdef ESP32
-#include "mbedtls/md5.h"
-#else
-#include "md5.h"
-#endif
-
-
-// Basic Auth hash = base64("username:password")
-
-bool checkBasicAuthentication(const char * hash, const char * username, const char * password){
-  if(username == NULL || password == NULL || hash == NULL)
-    return false;
-
-  size_t toencodeLen = strlen(username)+strlen(password)+1;
-  size_t encodedLen = base64_encode_expected_len(toencodeLen);
-  if(strlen(hash) != encodedLen)
-    return false;
-
-  char *toencode = new char[toencodeLen+1];
-  if(toencode == NULL){
-    return false;
-  }
-  char *encoded = new char[base64_encode_expected_len(toencodeLen)+1];
-  if(encoded == NULL){
-    delete[] toencode;
-    return false;
-  }
-  sprintf(toencode, "%s:%s", username, password);
-  if(base64_encode_chars(toencode, toencodeLen, encoded) > 0 && memcmp(hash, encoded, encodedLen) == 0){
-    delete[] toencode;
-    delete[] encoded;
-    return true;
-  }
-  delete[] toencode;
-  delete[] encoded;
-  return false;
-}
-
-static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or more
-#ifdef ESP32
-    mbedtls_md5_context _ctx;
-#else
-    md5_context_t _ctx;
-#endif
-  uint8_t i;
-  uint8_t * _buf = (uint8_t*)malloc(16);
-  if(_buf == NULL)
-    return false;
-  memset(_buf, 0x00, 16);
-#ifdef ESP32
-  mbedtls_md5_init(&_ctx);
-  mbedtls_md5_starts(&_ctx);
-  mbedtls_md5_update(&_ctx, data, len);
-  mbedtls_md5_finish(&_ctx, _buf);
-#else
-  MD5Init(&_ctx);
-  MD5Update(&_ctx, data, len);
-  MD5Final(_buf, &_ctx);
-#endif
-  for(i = 0; i < 16; i++) {
-    sprintf(output + (i * 2), "%02x", _buf[i]);
-  }
-  free(_buf);
-  return true;
-}
-
-static String genRandomMD5(){
-#ifdef ESP8266
-  uint32_t r = RANDOM_REG32;
-#else
-  uint32_t r = rand();
-#endif
-  char * out = (char*)malloc(33);
-  if(out == NULL || !getMD5((uint8_t*)(&r), 4, out))
-    return "";
-  String res = String(out);
-  free(out);
-  return res;
-}
-
-static String stringMD5(const String& in){
-  char * out = (char*)malloc(33);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
-    return "";
-  String res = String(out);
-  free(out);
-  return res;
-}
-
-String generateDigestHash(const char * username, const char * password, const char * realm){
-  if(username == NULL || password == NULL || realm == NULL){
-    return "";
-  }
-  char * out = (char*)malloc(33);
-  String res = String(username);
-  res.concat(":");
-  res.concat(realm);
-  res.concat(":");
-  String in = res;
-  in.concat(password);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
-    return "";
-  res.concat(out);
-  free(out);
-  return res;
-}
-
-String requestDigestAuthentication(const char * realm){
-  String header = "realm=\"";
-  if(realm == NULL)
-    header.concat("asyncesp");
-  else
-    header.concat(realm);
-  header.concat( "\", qop=\"auth\", nonce=\"");
-  header.concat(genRandomMD5());
-  header.concat("\", opaque=\"");
-  header.concat(genRandomMD5());
-  header.concat("\"");
-  return header;
-}
-
-bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri){
-  if(username == NULL || password == NULL || header == NULL || method == NULL){
-    //os_printf("AUTH FAIL: missing requred fields\n");
-    return false;
-  }
-
-  String myHeader = String(header);
-  int nextBreak = myHeader.indexOf(",");
-  if(nextBreak < 0){
-    //os_printf("AUTH FAIL: no variables\n");
-    return false;
-  }
-
-  String myUsername = String();
-  String myRealm = String();
-  String myNonce = String();
-  String myUri = String();
-  String myResponse = String();
-  String myQop = String();
-  String myNc = String();
-  String myCnonce = String();
-
-  myHeader += ", ";
-  do {
-    String avLine = myHeader.substring(0, nextBreak);
-    avLine.trim();
-    myHeader = myHeader.substring(nextBreak+1);
-    nextBreak = myHeader.indexOf(",");
-
-    int eqSign = avLine.indexOf("=");
-    if(eqSign < 0){
-      //os_printf("AUTH FAIL: no = sign\n");
-      return false;
-    }
-    String varName = avLine.substring(0, eqSign);
-    avLine = avLine.substring(eqSign + 1);
-    if(avLine.startsWith("\"")){
-      avLine = avLine.substring(1, avLine.length() - 1);
-    }
-
-    if(varName.equals("username")){
-      if(!avLine.equals(username)){
-        //os_printf("AUTH FAIL: username\n");
-        return false;
-      }
-      myUsername = avLine;
-    } else if(varName.equals("realm")){
-      if(realm != NULL && !avLine.equals(realm)){
-        //os_printf("AUTH FAIL: realm\n");
-        return false;
-      }
-      myRealm = avLine;
-    } else if(varName.equals("nonce")){
-      if(nonce != NULL && !avLine.equals(nonce)){
-        //os_printf("AUTH FAIL: nonce\n");
-        return false;
-      }
-      myNonce = avLine;
-    } else if(varName.equals("opaque")){
-      if(opaque != NULL && !avLine.equals(opaque)){
-        //os_printf("AUTH FAIL: opaque\n");
-        return false;
-      }
-    } else if(varName.equals("uri")){
-      if(uri != NULL && !avLine.equals(uri)){
-        //os_printf("AUTH FAIL: uri\n");
-        return false;
-      }
-      myUri = avLine;
-    } else if(varName.equals("response")){
-      myResponse = avLine;
-    } else if(varName.equals("qop")){
-      myQop = avLine;
-    } else if(varName.equals("nc")){
-      myNc = avLine;
-    } else if(varName.equals("cnonce")){
-      myCnonce = avLine;
-    }
-  } while(nextBreak > 0);
-
-  String ha1 = (passwordIsHash) ? String(password) : stringMD5(myUsername + ":" + myRealm + ":" + String(password));
-  String ha2 = String(method) + ":" + myUri;
-  String response = ha1 + ":" + myNonce + ":" + myNc + ":" + myCnonce + ":" + myQop + ":" + stringMD5(ha2);
-
-  if(myResponse.equals(stringMD5(response))){
-    //os_printf("AUTH SUCCESS\n");
-    return true;
-  }
-
-  //os_printf("AUTH FAIL: password\n");
-  return false;
-}
diff --git a/libraries/ESPAsyncWebServer/src/WebAuthentication.h b/libraries/ESPAsyncWebServer/src/WebAuthentication.h
deleted file mode 100644
index ff68265d9..000000000
--- a/libraries/ESPAsyncWebServer/src/WebAuthentication.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef WEB_AUTHENTICATION_H_
-#define WEB_AUTHENTICATION_H_
-
-#include "Arduino.h"
-
-bool checkBasicAuthentication(const char * header, const char * username, const char * password);
-String requestDigestAuthentication(const char * realm);
-bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri);
-
-//for storing hashed versions on the device that can be authenticated against
-String generateDigestHash(const char * username, const char * password, const char * realm);
-
-#endif
diff --git a/libraries/ESPAsyncWebServer/src/WebHandlerImpl.h b/libraries/ESPAsyncWebServer/src/WebHandlerImpl.h
deleted file mode 100644
index b2da6fe50..000000000
--- a/libraries/ESPAsyncWebServer/src/WebHandlerImpl.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef ASYNCWEBSERVERHANDLERIMPL_H_
-#define ASYNCWEBSERVERHANDLERIMPL_H_
-
-
-#include "stddef.h"
-#include 
-
-class AsyncStaticWebHandler: public AsyncWebHandler {
-   using File = fs::File;
-   using FS = fs::FS;
-  private:
-    bool _getFile(AsyncWebServerRequest *request);
-    bool _fileExists(AsyncWebServerRequest *request, const String& path);
-    uint8_t _countBits(const uint8_t value) const;
-  protected:
-    FS _fs;
-    String _uri;
-    String _path;
-    String _default_file;
-    String _cache_control;
-    String _last_modified;
-    AwsTemplateProcessor _callback;
-    bool _isDir;
-    bool _gzipFirst;
-    uint8_t _gzipStats;
-  public:
-    AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
-    AsyncStaticWebHandler& setIsDir(bool isDir);
-    AsyncStaticWebHandler& setDefaultFile(const char* filename);
-    AsyncStaticWebHandler& setCacheControl(const char* cache_control);
-    AsyncStaticWebHandler& setLastModified(const char* last_modified);
-    AsyncStaticWebHandler& setLastModified(struct tm* last_modified);
-  #ifdef ESP8266
-    AsyncStaticWebHandler& setLastModified(time_t last_modified);
-    AsyncStaticWebHandler& setLastModified(); //sets to current time. Make sure sntp is runing and time is updated
-  #endif
-    AsyncStaticWebHandler& setTemplateProcessor(AwsTemplateProcessor newCallback) {_callback = newCallback; return *this;}
-};
-
-class AsyncCallbackWebHandler: public AsyncWebHandler {
-  private:
-  protected:
-    String _uri;
-    WebRequestMethodComposite _method;
-    ArRequestHandlerFunction _onRequest;
-    ArUploadHandlerFunction _onUpload;
-    ArBodyHandlerFunction _onBody;
-  public:
-    AsyncCallbackWebHandler() : _uri(), _method(HTTP_ANY), _onRequest(NULL), _onUpload(NULL), _onBody(NULL){}
-    void setUri(const String& uri){ _uri = uri; }
-    void setMethod(WebRequestMethodComposite method){ _method = method; }
-    void onRequest(ArRequestHandlerFunction fn){ _onRequest = fn; }
-    void onUpload(ArUploadHandlerFunction fn){ _onUpload = fn; }
-    void onBody(ArBodyHandlerFunction fn){ _onBody = fn; }
-
-    virtual bool canHandle(AsyncWebServerRequest *request) override final{
-
-      if(!_onRequest)
-        return false;
-
-      if(!(_method & request->method()))
-        return false;
-
-      if(_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri+"/")))
-        return false;
-
-      request->addInterestingHeader("ANY");
-      return true;
-    }
-  
-    virtual void handleRequest(AsyncWebServerRequest *request) override final {
-      if(_onRequest)
-        _onRequest(request);
-      else
-        request->send(500);
-    }
-    virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final {
-      if(_onUpload)
-        _onUpload(request, filename, index, data, len, final);
-    }
-    virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
-      if(_onBody)
-        _onBody(request, data, len, index, total);
-    }
-    virtual bool isRequestHandlerTrivial() override final {return _onRequest ? false : true;}
-};
-
-#endif /* ASYNCWEBSERVERHANDLERIMPL_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/WebHandlers.cpp b/libraries/ESPAsyncWebServer/src/WebHandlers.cpp
deleted file mode 100644
index 1f435e68a..000000000
--- a/libraries/ESPAsyncWebServer/src/WebHandlers.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "ESPAsyncWebServer.h"
-#include "WebHandlerImpl.h"
-
-AsyncStaticWebHandler::AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control)
-  : _fs(fs), _uri(uri), _path(path), _default_file("index.htm"), _cache_control(cache_control), _last_modified(""), _callback(nullptr)
-{
-  // Ensure leading '/'
-  if (_uri.length() == 0 || _uri[0] != '/') _uri = "/" + _uri;
-  if (_path.length() == 0 || _path[0] != '/') _path = "/" + _path;
-
-  // If path ends with '/' we assume a hint that this is a directory to improve performance.
-  // However - if it does not end with '/' we, can't assume a file, path can still be a directory.
-  _isDir = _path[_path.length()-1] == '/';
-
-  // Remove the trailing '/' so we can handle default file
-  // Notice that root will be "" not "/"
-  if (_uri[_uri.length()-1] == '/') _uri = _uri.substring(0, _uri.length()-1);
-  if (_path[_path.length()-1] == '/') _path = _path.substring(0, _path.length()-1);
-
-  // Reset stats
-  _gzipFirst = false;
-  _gzipStats = 0xF8;
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setIsDir(bool isDir){
-  _isDir = isDir;
-  return *this;
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setDefaultFile(const char* filename){
-  _default_file = String(filename);
-  return *this;
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setCacheControl(const char* cache_control){
-  _cache_control = String(cache_control);
-  return *this;
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(const char* last_modified){
-  _last_modified = String(last_modified);
-  return *this;
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(struct tm* last_modified){
-  char result[30];
-  strftime (result,30,"%a, %d %b %Y %H:%M:%S %Z", last_modified);
-  return setLastModified((const char *)result);
-}
-
-#ifdef ESP8266
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(time_t last_modified){
-  return setLastModified((struct tm *)gmtime(&last_modified));
-}
-
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(){
-  time_t last_modified;
-  if(time(&last_modified) == 0) //time is not yet set
-    return *this;
-  return setLastModified(last_modified);
-}
-#endif
-bool AsyncStaticWebHandler::canHandle(AsyncWebServerRequest *request){
-  if(request->method() != HTTP_GET 
-    || !request->url().startsWith(_uri) 
-    || !request->isExpectedRequestedConnType(RCT_DEFAULT, RCT_HTTP)
-  ){
-    return false;
-  }
-  if (_getFile(request)) {
-    // We interested in "If-Modified-Since" header to check if file was modified
-    if (_last_modified.length())
-      request->addInterestingHeader("If-Modified-Since");
-
-    if(_cache_control.length())
-      request->addInterestingHeader("If-None-Match");
-
-    DEBUGF("[AsyncStaticWebHandler::canHandle] TRUE\n");
-    return true;
-  }
-
-  return false;
-}
-
-bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
-{
-  // Remove the found uri
-  String path = request->url().substring(_uri.length());
-
-  // We can skip the file check and look for default if request is to the root of a directory or that request path ends with '/'
-  bool canSkipFileCheck = (_isDir && path.length() == 0) || (path.length() && path[path.length()-1] == '/');
-
-  path = _path + path;
-
-  // Do we have a file or .gz file
-  if (!canSkipFileCheck && _fileExists(request, path))
-    return true;
-
-  // Can't handle if not default file
-  if (_default_file.length() == 0)
-    return false;
-
-  // Try to add default file, ensure there is a trailing '/' ot the path.
-  if (path.length() == 0 || path[path.length()-1] != '/')
-    path += "/";
-  path += _default_file;
-
-  return _fileExists(request, path);
-}
-
-#ifdef ESP32
-#define FILE_IS_REAL(f) (f == true && !f.isDirectory())
-#else
-#define FILE_IS_REAL(f) (f == true)
-#endif
-
-bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const String& path)
-{
-  bool fileFound = false;
-  bool gzipFound = false;
-
-  String gzip = path + ".gz";
-
-  if (_gzipFirst) {
-    request->_tempFile = _fs.open(gzip, "r");
-    gzipFound = FILE_IS_REAL(request->_tempFile);
-    if (!gzipFound){
-      request->_tempFile = _fs.open(path, "r");
-      fileFound = FILE_IS_REAL(request->_tempFile);
-    }
-  } else {
-    request->_tempFile = _fs.open(path, "r");
-    fileFound = FILE_IS_REAL(request->_tempFile);
-    if (!fileFound){
-      request->_tempFile = _fs.open(gzip, "r");
-      gzipFound = FILE_IS_REAL(request->_tempFile);
-    }
-  }
-
-  bool found = fileFound || gzipFound;
-
-  if (found) {
-    // Extract the file name from the path and keep it in _tempObject
-    size_t pathLen = path.length();
-    char * _tempPath = (char*)malloc(pathLen+1);
-    snprintf(_tempPath, pathLen+1, "%s", path.c_str());
-    request->_tempObject = (void*)_tempPath;
-
-    // Calculate gzip statistic
-    _gzipStats = (_gzipStats << 1) + (gzipFound ? 1 : 0);
-    if (_gzipStats == 0x00) _gzipFirst = false; // All files are not gzip
-    else if (_gzipStats == 0xFF) _gzipFirst = true; // All files are gzip
-    else _gzipFirst = _countBits(_gzipStats) > 4; // IF we have more gzip files - try gzip first
-  }
-
-  return found;
-}
-
-uint8_t AsyncStaticWebHandler::_countBits(const uint8_t value) const
-{
-  uint8_t w = value;
-  uint8_t n;
-  for (n=0; w!=0; n++) w&=w-1;
-  return n;
-}
-
-void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request)
-{
-  // Get the filename from request->_tempObject and free it
-  String filename = String((char*)request->_tempObject);
-  free(request->_tempObject);
-  request->_tempObject = NULL;
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-      return request->requestAuthentication();
-
-  if (request->_tempFile == true) {
-    String etag = String(request->_tempFile.size());
-    if (_last_modified.length() && _last_modified == request->header("If-Modified-Since")) {
-      request->_tempFile.close();
-      request->send(304); // Not modified
-    } else if (_cache_control.length() && request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag)) {
-      request->_tempFile.close();
-      AsyncWebServerResponse * response = new AsyncBasicResponse(304); // Not modified
-      response->addHeader("Cache-Control", _cache_control);
-      response->addHeader("ETag", etag);
-      request->send(response);
-    } else {
-      AsyncWebServerResponse * response = new AsyncFileResponse(request->_tempFile, filename, String(), false, _callback);
-      if (_last_modified.length())
-        response->addHeader("Last-Modified", _last_modified);
-      if (_cache_control.length()){
-        response->addHeader("Cache-Control", _cache_control);
-        response->addHeader("ETag", etag);
-      }
-      request->send(response);
-    }
-  } else {
-    request->send(404);
-  }
-}
diff --git a/libraries/ESPAsyncWebServer/src/WebRequest.cpp b/libraries/ESPAsyncWebServer/src/WebRequest.cpp
deleted file mode 100644
index dbcb92766..000000000
--- a/libraries/ESPAsyncWebServer/src/WebRequest.cpp
+++ /dev/null
@@ -1,998 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "ESPAsyncWebServer.h"
-#include "WebResponseImpl.h"
-#include "WebAuthentication.h"
-
-#ifndef ESP8266
-#define os_strlen strlen
-#endif
-
-static const String SharedEmptyString = String();
-
-#define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '='))
-
-enum { PARSE_REQ_START, PARSE_REQ_HEADERS, PARSE_REQ_BODY, PARSE_REQ_END, PARSE_REQ_FAIL };
-
-AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer* s, AsyncClient* c)
-  : _client(c)
-  , _server(s)
-  , _handler(NULL)
-  , _response(NULL)
-  , _temp()
-  , _parseState(0)
-  , _version(0)
-  , _method(HTTP_ANY)
-  , _url()
-  , _host()
-  , _contentType()
-  , _boundary()
-  , _authorization()
-  , _reqconntype(RCT_HTTP)
-  , _isDigest(false)
-  , _isMultipart(false)
-  , _isPlainPost(false)
-  , _expectingContinue(false)
-  , _contentLength(0)
-  , _parsedLength(0)
-  , _headers(LinkedList([](AsyncWebHeader *h){ delete h; }))
-  , _params(LinkedList([](AsyncWebParameter *p){ delete p; }))
-  , _multiParseState(0)
-  , _boundaryPosition(0)
-  , _itemStartIndex(0)
-  , _itemSize(0)
-  , _itemName()
-  , _itemFilename()
-  , _itemType()
-  , _itemValue()
-  , _itemBuffer(0)
-  , _itemBufferIndex(0)
-  , _itemIsFile(false)
-  , _tempObject(NULL)
-{
-  c->onError([](void *r, AsyncClient* c, int8_t error){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onError(error); }, this);
-  c->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onAck(len, time); }, this);
-  c->onDisconnect([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onDisconnect(); delete c; }, this);
-  c->onTimeout([](void *r, AsyncClient* c, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onTimeout(time); }, this);
-  c->onData([](void *r, AsyncClient* c, void *buf, size_t len){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onData(buf, len); }, this);
-  c->onPoll([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onPoll(); }, this);
-}
-
-AsyncWebServerRequest::~AsyncWebServerRequest(){
-  _headers.free();
-
-  _params.free();
-
-  _interestingHeaders.free();
-
-  if(_response != NULL){
-    delete _response;
-  }
-
-  if(_tempObject != NULL){
-    free(_tempObject);
-  }
-
-  if(_tempFile){
-    _tempFile.close();
-  }
-}
-
-void AsyncWebServerRequest::_onData(void *buf, size_t len){
-  size_t i = 0;
-  while (true) {
-
-  if(_parseState < PARSE_REQ_BODY){
-    // Find new line in buf
-    char *str = (char*)buf;
-    for (i = 0; i < len; i++) {
-      if (str[i] == '\n') {
-        break;
-      }
-    }
-    if (i == len) { // No new line, just add the buffer in _temp
-      char ch = str[len-1];
-      str[len-1] = 0;
-      _temp.reserve(_temp.length()+len);
-      _temp.concat(str);
-      _temp.concat(ch);
-    } else { // Found new line - extract it and parse
-      str[i] = 0; // Terminate the string at the end of the line.
-      _temp.concat(str);
-      _temp.trim();
-      _parseLine();
-      if (++i < len) {
-        // Still have more buffer to process
-        buf = str+i;
-        len-= i;
-        continue;
-      }
-    }
-  } else if(_parseState == PARSE_REQ_BODY){
-    // A handler should be already attached at this point in _parseLine function.
-    // If handler does nothing (_onRequest is NULL), we don't need to really parse the body.
-    const bool needParse = _handler && !_handler->isRequestHandlerTrivial();
-    if(_isMultipart){
-      if(needParse){
-        size_t i;
-        for(i=0; i end) equal = end;
-    String name = params.substring(start, equal);
-    String value = equal + 1 < end ? params.substring(equal + 1, end) : String();
-    _addParam(new AsyncWebParameter(urlDecode(name), urlDecode(value)));
-    start = end + 1;
-  }
-}
-
-bool AsyncWebServerRequest::_parseReqHead(){
-  // Split the head into method, url and version
-  int index = _temp.indexOf(' ');
-  String m = _temp.substring(0, index);
-  index = _temp.indexOf(' ', index+1);
-  String u = _temp.substring(m.length()+1, index);
-  _temp = _temp.substring(index+1);
-
-  if(m == "GET"){
-    _method = HTTP_GET;
-  } else if(m == "POST"){
-    _method = HTTP_POST;
-  } else if(m == "DELETE"){
-    _method = HTTP_DELETE;
-  } else if(m == "PUT"){
-    _method = HTTP_PUT;
-  } else if(m == "PATCH"){
-    _method = HTTP_PATCH;
-  } else if(m == "HEAD"){
-    _method = HTTP_HEAD;
-  } else if(m == "OPTIONS"){
-    _method = HTTP_OPTIONS;
-  }
-
-  String g = String();
-  index = u.indexOf('?');
-  if(index > 0){
-    g = u.substring(index +1);
-    u = u.substring(0, index);
-  }
-  _url = urlDecode(u);
-  _addGetParams(g);
-
-  if(!_temp.startsWith("HTTP/1.0"))
-    _version = 1;
-
-  _temp = String();
-  return true;
-}
-
-bool strContains(String src, String find, bool mindcase = true) {
-  int pos=0, i=0;
-  const int slen = src.length();
-  const int flen = find.length();
-
-  if (slen < flen) return false;
-  while (pos <= (slen - flen)) {
-    for (i=0; i < flen; i++) {
-      if (mindcase) {
-        if (src[pos+i] != find[i]) i = flen + 1; // no match
-      } else if (tolower(src[pos+i]) != tolower(find[i])) i = flen + 1; // no match
-    }
-    if (i == flen) return true;
-    pos++;
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::_parseReqHeader(){
-  int index = _temp.indexOf(':');
-  if(index){
-    String name = _temp.substring(0, index);
-    String value = _temp.substring(index + 2);
-    if(name.equalsIgnoreCase("Host")){
-      _host = value;
-    } else if(name.equalsIgnoreCase("Content-Type")){
-      if (value.startsWith("multipart/")){
-        _boundary = value.substring(value.indexOf('=')+1);
-        _boundary.replace("\"","");
-        _contentType = value.substring(0, value.indexOf(';'));
-        _isMultipart = true;
-      } else {
-        _contentType = value;
-      }
-    } else if(name.equalsIgnoreCase("Content-Length")){
-      _contentLength = atoi(value.c_str());
-    } else if(name.equalsIgnoreCase("Expect") && value == "100-continue"){
-      _expectingContinue = true;
-    } else if(name.equalsIgnoreCase("Authorization")){
-      if(value.length() > 5 && value.substring(0,5).equalsIgnoreCase("Basic")){
-        _authorization = value.substring(6);
-      } else if(value.length() > 6 && value.substring(0,6).equalsIgnoreCase("Digest")){
-        _isDigest = true;
-        _authorization = value.substring(7);
-      }
-    } else {
-      if(name.equalsIgnoreCase("Upgrade") && value.equalsIgnoreCase("websocket")){
-        // WebSocket request can be uniquely identified by header: [Upgrade: websocket]
-        _reqconntype = RCT_WS;
-      } else {
-        if(name.equalsIgnoreCase("Accept") && strContains(value, "text/event-stream", false)){
-          // WebEvent request can be uniquely identified by header:  [Accept: text/event-stream]
-          _reqconntype = RCT_EVENT;
-        }
-      }
-    }
-    _headers.add(new AsyncWebHeader(name, value));
-  }
-  _temp = String();
-  return true;
-}
-
-void AsyncWebServerRequest::_parsePlainPostChar(uint8_t data){
-  if(data && (char)data != '&')
-    _temp += (char)data;
-  if(!data || (char)data == '&' || _parsedLength == _contentLength){
-    String name = "body";
-    String value = _temp;
-    if(!_temp.startsWith("{") && !_temp.startsWith("[") && _temp.indexOf('=') > 0){
-      name = _temp.substring(0, _temp.indexOf('='));
-      value = _temp.substring(_temp.indexOf('=') + 1);
-    }
-    _addParam(new AsyncWebParameter(urlDecode(name), urlDecode(value), true));
-    _temp = String();
-  }
-}
-
-void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last){
-  _itemBuffer[_itemBufferIndex++] = data;
-
-  if(last || _itemBufferIndex == 1460){
-    //check if authenticated before calling the upload
-    if(_handler)
-      _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
-    _itemBufferIndex = 0;
-  }
-}
-
-enum {
-  EXPECT_BOUNDARY,
-  PARSE_HEADERS,
-  WAIT_FOR_RETURN1,
-  EXPECT_FEED1,
-  EXPECT_DASH1,
-  EXPECT_DASH2,
-  BOUNDARY_OR_DATA,
-  DASH3_OR_RETURN2,
-  EXPECT_FEED2,
-  PARSING_FINISHED,
-  PARSE_ERROR
-};
-
-void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
-#define itemWriteByte(b) do { _itemSize++; if(_itemIsFile) _handleUploadByte(b, last); else _itemValue+=(char)(b); } while(0)
-
-  if(!_parsedLength){
-    _multiParseState = EXPECT_BOUNDARY;
-    _temp = String();
-    _itemName = String();
-    _itemFilename = String();
-    _itemType = String();
-  }
-
-  if(_multiParseState == WAIT_FOR_RETURN1){
-    if(data != '\r'){
-      itemWriteByte(data);
-    } else {
-      _multiParseState = EXPECT_FEED1;
-    }
-  } else if(_multiParseState == EXPECT_BOUNDARY){
-    if(_parsedLength < 2 && data != '-'){
-      _multiParseState = PARSE_ERROR;
-      return;
-    } else if(_parsedLength - 2 < _boundary.length() && _boundary.c_str()[_parsedLength - 2] != data){
-      _multiParseState = PARSE_ERROR;
-      return;
-    } else if(_parsedLength - 2 == _boundary.length() && data != '\r'){
-      _multiParseState = PARSE_ERROR;
-      return;
-    } else if(_parsedLength - 3 == _boundary.length()){
-      if(data != '\n'){
-        _multiParseState = PARSE_ERROR;
-        return;
-      }
-      _multiParseState = PARSE_HEADERS;
-      _itemIsFile = false;
-    }
-  } else if(_multiParseState == PARSE_HEADERS){
-    if((char)data != '\r' && (char)data != '\n')
-       _temp += (char)data;
-    if((char)data == '\n'){
-      if(_temp.length()){
-        if(_temp.length() > 12 && _temp.substring(0, 12).equalsIgnoreCase("Content-Type")){
-          _itemType = _temp.substring(14);
-          _itemIsFile = true;
-        } else if(_temp.length() > 19 && _temp.substring(0, 19).equalsIgnoreCase("Content-Disposition")){
-          _temp = _temp.substring(_temp.indexOf(';') + 2);
-          while(_temp.indexOf(';') > 0){
-            String name = _temp.substring(0, _temp.indexOf('='));
-            String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.indexOf(';') - 1);
-            if(name == "name"){
-              _itemName = nameVal;
-            } else if(name == "filename"){
-              _itemFilename = nameVal;
-              _itemIsFile = true;
-            }
-            _temp = _temp.substring(_temp.indexOf(';') + 2);
-          }
-          String name = _temp.substring(0, _temp.indexOf('='));
-          String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.length() - 1);
-          if(name == "name"){
-            _itemName = nameVal;
-          } else if(name == "filename"){
-            _itemFilename = nameVal;
-            _itemIsFile = true;
-          }
-        }
-        _temp = String();
-      } else {
-        _multiParseState = WAIT_FOR_RETURN1;
-        //value starts from here
-        _itemSize = 0;
-        _itemStartIndex = _parsedLength;
-        _itemValue = String();
-        if(_itemIsFile){
-          if(_itemBuffer)
-            free(_itemBuffer);
-          _itemBuffer = (uint8_t*)malloc(1460);
-          if(_itemBuffer == NULL){
-            _multiParseState = PARSE_ERROR;
-            return;
-          }
-          _itemBufferIndex = 0;
-        }
-      }
-    }
-  } else if(_multiParseState == EXPECT_FEED1){
-    if(data != '\n'){
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
-    } else {
-      _multiParseState = EXPECT_DASH1;
-    }
-  } else if(_multiParseState == EXPECT_DASH1){
-    if(data != '-'){
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n');  _parseMultipartPostByte(data, last);
-    } else {
-      _multiParseState = EXPECT_DASH2;
-    }
-  } else if(_multiParseState == EXPECT_DASH2){
-    if(data != '-'){
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  _parseMultipartPostByte(data, last);
-    } else {
-      _multiParseState = BOUNDARY_OR_DATA;
-      _boundaryPosition = 0;
-    }
-  } else if(_multiParseState == BOUNDARY_OR_DATA){
-    if(_boundaryPosition < _boundary.length() && _boundary.c_str()[_boundaryPosition] != data){
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
-      uint8_t i;
-      for(i=0; i<_boundaryPosition; i++)
-        itemWriteByte(_boundary.c_str()[i]);
-      _parseMultipartPostByte(data, last);
-    } else if(_boundaryPosition == _boundary.length() - 1){
-      _multiParseState = DASH3_OR_RETURN2;
-      if(!_itemIsFile){
-        _addParam(new AsyncWebParameter(_itemName, _itemValue, true));
-      } else {
-        if(_itemSize){
-          //check if authenticated before calling the upload
-          if(_handler) _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, true);
-          _itemBufferIndex = 0;
-          _addParam(new AsyncWebParameter(_itemName, _itemFilename, true, true, _itemSize));
-        }
-        free(_itemBuffer);
-        _itemBuffer = NULL;
-      }
-
-    } else {
-      _boundaryPosition++;
-    }
-  } else if(_multiParseState == DASH3_OR_RETURN2){
-    if(data == '-' && (_contentLength - _parsedLength - 4) != 0){
-      //os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
-      _contentLength = _parsedLength + 4;//lets close the request gracefully
-    }
-    if(data == '\r'){
-      _multiParseState = EXPECT_FEED2;
-    } else if(data == '-' && _contentLength == (_parsedLength + 4)){
-      _multiParseState = PARSING_FINISHED;
-    } else {
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
-      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
-      _parseMultipartPostByte(data, last);
-    }
-  } else if(_multiParseState == EXPECT_FEED2){
-    if(data == '\n'){
-      _multiParseState = PARSE_HEADERS;
-      _itemIsFile = false;
-    } else {
-      _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
-      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
-      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
-    }
-  }
-}
-
-void AsyncWebServerRequest::_parseLine(){
-  if(_parseState == PARSE_REQ_START){
-    if(!_temp.length()){
-      _parseState = PARSE_REQ_FAIL;
-      _client->close();
-    } else {
-      _parseReqHead();
-      _parseState = PARSE_REQ_HEADERS;
-    }
-    return;
-  }
-
-  if(_parseState == PARSE_REQ_HEADERS){
-    if(!_temp.length()){
-      //end of headers
-      _server->_rewriteRequest(this);
-      _server->_attachHandler(this);
-      _removeNotInterestingHeaders();
-      if(_expectingContinue){
-        const char * response = "HTTP/1.1 100 Continue\r\n\r\n";
-        _client->write(response, os_strlen(response));
-      }
-      //check handler for authentication
-      if(_contentLength){
-        _parseState = PARSE_REQ_BODY;
-      } else {
-        _parseState = PARSE_REQ_END;
-        if(_handler) _handler->handleRequest(this);
-        else send(501);
-      }
-    } else _parseReqHeader();
-  }
-}
-
-size_t AsyncWebServerRequest::headers() const{
-  return _headers.length();
-}
-
-bool AsyncWebServerRequest::hasHeader(const String& name) const {
-  for(const auto& h: _headers){
-    if(h->name().equalsIgnoreCase(name)){
-      return true;
-    }
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::hasHeader(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = 0;
-  while (1) {
-    if (pgm_read_byte(p+n) == 0) break;
-      n += 1;
-  }
-  char * name = (char*) malloc(n+1);
-  name[n] = 0; 
-  if (name) {
-    for(size_t b=0; bname().equalsIgnoreCase(name)){
-      return h;
-    }
-  }
-  return nullptr;
-}
-
-AsyncWebHeader* AsyncWebServerRequest::getHeader(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p); 
-    AsyncWebHeader* result = getHeader( String(name)); 
-    free(name); 
-    return result; 
-  } else {
-    return nullptr; 
-  }
-}
-
-AsyncWebHeader* AsyncWebServerRequest::getHeader(size_t num) const {
-  auto header = _headers.nth(num);
-  return header ? *header : nullptr;
-}
-
-size_t AsyncWebServerRequest::params() const {
-  return _params.length();
-}
-
-bool AsyncWebServerRequest::hasParam(const String& name, bool post, bool file) const {
-  for(const auto& p: _params){
-    if(p->name() == name && p->isPost() == post && p->isFile() == file){
-      return true;
-    }
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::hasParam(const __FlashStringHelper * data, bool post, bool file) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-
-  char * name = (char*) malloc(n+1);
-  name[n] = 0; 
-  if (name) {
-    strcpy_P(name,p);    
-    bool result = hasParam( name, post, file); 
-    free(name); 
-    return result; 
-  } else {
-    return false; 
-  }
-}
-
-AsyncWebParameter* AsyncWebServerRequest::getParam(const String& name, bool post, bool file) const {
-  for(const auto& p: _params){
-    if(p->name() == name && p->isPost() == post && p->isFile() == file){
-      return p;
-    }
-  }
-  return nullptr;
-}
-
-AsyncWebParameter* AsyncWebServerRequest::getParam(const __FlashStringHelper * data, bool post, bool file) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);   
-    AsyncWebParameter* result = getParam(name, post, file); 
-    free(name); 
-    return result; 
-  } else {
-    return nullptr; 
-  }
-}
-
-AsyncWebParameter* AsyncWebServerRequest::getParam(size_t num) const {
-  auto param = _params.nth(num);
-  return param ? *param : nullptr;
-}
-
-void AsyncWebServerRequest::addInterestingHeader(const String& name){
-  if(!_interestingHeaders.containsIgnoreCase(name))
-    _interestingHeaders.add(name);
-}
-
-void AsyncWebServerRequest::send(AsyncWebServerResponse *response){
-  _response = response;
-  if(_response == NULL){
-    _client->close(true);
-    _onDisconnect();
-    return;
-  }
-  if(!_response->_sourceValid()){
-    delete response;
-    _response = NULL;
-    send(500);
-  }
-  else {
-    _client->setRxTimeout(0);
-    _response->_respond(this);
-  }
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(int code, const String& contentType, const String& content){
-  return new AsyncBasicResponse(code, contentType, content);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(fs.exists(path) || (!download && fs.exists(path+".gz")))
-    return new AsyncFileResponse(fs, path, contentType, download, callback);
-  return NULL;
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(content == true)
-    return new AsyncFileResponse(content, path, contentType, download, callback);
-  return NULL;
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback){
-  return new AsyncStreamResponse(stream, contentType, len, callback);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  return new AsyncCallbackResponse(contentType, len, callback, templateCallback);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  if(_version)
-    return new AsyncChunkedResponse(contentType, callback, templateCallback);
-  return new AsyncCallbackResponse(contentType, 0, callback, templateCallback);
-}
-
-AsyncResponseStream * AsyncWebServerRequest::beginResponseStream(const String& contentType, size_t bufferSize){
-  return new AsyncResponseStream(contentType, bufferSize);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback){
-  return new AsyncProgmemResponse(code, contentType, content, len, callback);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback){
-  return beginResponse_P(code, contentType, (const uint8_t *)content, strlen_P(content), callback);
-}
-
-void AsyncWebServerRequest::send(int code, const String& contentType, const String& content){
-  send(beginResponse(code, contentType, content));
-}
-
-void AsyncWebServerRequest::send(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(fs.exists(path) || (!download && fs.exists(path+".gz"))){
-    send(beginResponse(fs, path, contentType, download, callback));
-  } else send(404);
-}
-
-void AsyncWebServerRequest::send(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(content == true){
-    send(beginResponse(content, path, contentType, download, callback));
-  } else send(404);
-}
-
-void AsyncWebServerRequest::send(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback){
-  send(beginResponse(stream, contentType, len, callback));
-}
-
-void AsyncWebServerRequest::send(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  send(beginResponse(contentType, len, callback, templateCallback));
-}
-
-void AsyncWebServerRequest::sendChunked(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  send(beginChunkedResponse(contentType, callback, templateCallback));
-}
-
-void AsyncWebServerRequest::send_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback){
-  send(beginResponse_P(code, contentType, content, len, callback));
-}
-
-void AsyncWebServerRequest::send_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback){
-  send(beginResponse_P(code, contentType, content, callback));
-}
-
-void AsyncWebServerRequest::redirect(const String& url){
-  AsyncWebServerResponse * response = beginResponse(302);
-  response->addHeader("Location",url);
-  send(response);
-}
-
-bool AsyncWebServerRequest::authenticate(const char * username, const char * password, const char * realm, bool passwordIsHash){
-  if(_authorization.length()){
-    if(_isDigest)
-      return checkDigestAuthentication(_authorization.c_str(), methodToString(), username, password, realm, passwordIsHash, NULL, NULL, NULL);
-    else if(!passwordIsHash)
-      return checkBasicAuthentication(_authorization.c_str(), username, password);
-    else
-      return _authorization.equals(password);
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::authenticate(const char * hash){
-  if(!_authorization.length() || hash == NULL)
-    return false;
-
-  if(_isDigest){
-    String hStr = String(hash);
-    int separator = hStr.indexOf(":");
-    if(separator <= 0)
-      return false;
-    String username = hStr.substring(0, separator);
-    hStr = hStr.substring(separator + 1);
-    separator = hStr.indexOf(":");
-    if(separator <= 0)
-      return false;
-    String realm = hStr.substring(0, separator);
-    hStr = hStr.substring(separator + 1);
-    return checkDigestAuthentication(_authorization.c_str(), methodToString(), username.c_str(), hStr.c_str(), realm.c_str(), true, NULL, NULL, NULL);
-  }
-
-  return (_authorization.equals(hash));
-}
-
-void AsyncWebServerRequest::requestAuthentication(const char * realm, bool isDigest){
-  AsyncWebServerResponse * r = beginResponse(401);
-  if(!isDigest && realm == NULL){
-    r->addHeader("WWW-Authenticate", "Basic realm=\"Login Required\"");
-  } else if(!isDigest){
-    String header = "Basic realm=\"";
-    header.concat(realm);
-    header.concat("\"");
-    r->addHeader("WWW-Authenticate", header);
-  } else {
-    String header = "Digest ";
-    header.concat(requestDigestAuthentication(realm));
-    r->addHeader("WWW-Authenticate", header);
-  }
-  send(r);
-}
-
-bool AsyncWebServerRequest::hasArg(const char* name) const {
-  for(const auto& arg: _params){
-    if(arg->name() == name){
-      return true;
-    }
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::hasArg(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);    
-    bool result = hasArg( name ); 
-    free(name); 
-    return result; 
-  } else {
-    return false; 
-  }
-}
-
-
-const String& AsyncWebServerRequest::arg(const String& name) const {
-  for(const auto& arg: _params){
-    if(arg->name() == name){
-      return arg->value();
-    }
-  }
-  return SharedEmptyString;
-}
-
-const String& AsyncWebServerRequest::arg(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);
-    const String & result = arg( String(name) ); 
-    free(name); 
-    return result; 
-  } else {
-    return SharedEmptyString;
-  }
-
-}
-
-const String& AsyncWebServerRequest::arg(size_t i) const {
-  return getParam(i)->value();
-}
-
-const String& AsyncWebServerRequest::argName(size_t i) const {
-  return getParam(i)->name();
-}
-
-const String& AsyncWebServerRequest::header(const char* name) const {
-  AsyncWebHeader* h = getHeader(String(name));
-  return h ? h->value() : SharedEmptyString;
-}
-
-const String& AsyncWebServerRequest::header(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);  
-    const String & result = header( (const char *)name ); 
-    free(name); 
-    return result; 
-  } else {
-    return SharedEmptyString; 
-  }
-};  
-
-
-const String& AsyncWebServerRequest::header(size_t i) const {
-  AsyncWebHeader* h = getHeader(i);
-  return h ?  h->value() : SharedEmptyString;
-}
-
-const String& AsyncWebServerRequest::headerName(size_t i) const {
-  AsyncWebHeader* h = getHeader(i);
-  return h ? h->name() : SharedEmptyString;
-}
-
-String AsyncWebServerRequest::urlDecode(const String& text) const {
-  char temp[] = "0x00";
-  unsigned int len = text.length();
-  unsigned int i = 0;
-  String decoded = String();
-  decoded.reserve(len); // Allocate the string internal buffer - never longer from source text
-  while (i < len){
-    char decodedChar;
-    char encodedChar = text.charAt(i++);
-    if ((encodedChar == '%') && (i + 1 < len)){
-      temp[2] = text.charAt(i++);
-      temp[3] = text.charAt(i++);
-      decodedChar = strtol(temp, NULL, 16);
-    } else if (encodedChar == '+') {
-      decodedChar = ' ';
-    } else {
-      decodedChar = encodedChar;  // normal ascii char
-    }
-    decoded.concat(decodedChar);
-  }
-  return decoded;
-}
-
-
-const char * AsyncWebServerRequest::methodToString() const {
-  if(_method == HTTP_ANY) return "ANY";
-  else if(_method & HTTP_GET) return "GET";
-  else if(_method & HTTP_POST) return "POST";
-  else if(_method & HTTP_DELETE) return "DELETE";
-  else if(_method & HTTP_PUT) return "PUT";
-  else if(_method & HTTP_PATCH) return "PATCH";
-  else if(_method & HTTP_HEAD) return "HEAD";
-  else if(_method & HTTP_OPTIONS) return "OPTIONS";
-  return "UNKNOWN";
-}
-
-const char *AsyncWebServerRequest::requestedConnTypeToString() const {
-  switch (_reqconntype) {
-    case RCT_NOT_USED: return "RCT_NOT_USED";
-    case RCT_DEFAULT:  return "RCT_DEFAULT";
-    case RCT_HTTP:     return "RCT_HTTP";
-    case RCT_WS:       return "RCT_WS";
-    case RCT_EVENT:    return "RCT_EVENT";
-    default:           return "ERROR";
-  }
-}
-
-bool AsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) {
-    bool res = false;
-    if ((erct1 != RCT_NOT_USED) && (erct1 == _reqconntype)) res = true;
-    if ((erct2 != RCT_NOT_USED) && (erct2 == _reqconntype)) res = true;
-    if ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype)) res = true;
-    return res;
-}
diff --git a/libraries/ESPAsyncWebServer/src/WebResponseImpl.h b/libraries/ESPAsyncWebServer/src/WebResponseImpl.h
deleted file mode 100644
index 9a64e3a52..000000000
--- a/libraries/ESPAsyncWebServer/src/WebResponseImpl.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef ASYNCWEBSERVERRESPONSEIMPL_H_
-#define ASYNCWEBSERVERRESPONSEIMPL_H_
-
-#ifdef Arduino_h
-// arduino is not compatible with std::vector
-#undef min
-#undef max
-#endif
-#include 
-// It is possible to restore these defines, but one can use _min and _max instead. Or std::min, std::max.
-
-class AsyncBasicResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-  public:
-    AsyncBasicResponse(int code, const String& contentType=String(), const String& content=String());
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
-};
-
-class AsyncAbstractResponse: public AsyncWebServerResponse {
-  private:
-    String _head;
-    // Data is inserted into cache at begin(). 
-    // This is inefficient with vector, but if we use some other container, 
-    // we won't be able to access it as contiguous array of bytes when reading from it,
-    // so by gaining performance in one place, we'll lose it in another.
-    std::vector _cache;
-    size_t _readDataFromCacheOrContent(uint8_t* data, const size_t len);
-    size_t _fillBufferAndProcessTemplates(uint8_t* buf, size_t maxLen);
-  protected:
-    AwsTemplateProcessor _callback;
-  public:
-    AsyncAbstractResponse(AwsTemplateProcessor callback=nullptr);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return false; }
-    virtual size_t _fillBuffer(uint8_t *buf __attribute__((unused)), size_t maxLen __attribute__((unused))) { return 0; }
-};
-
-#ifndef TEMPLATE_PLACEHOLDER
-#define TEMPLATE_PLACEHOLDER '%'
-#endif
-
-#define TEMPLATE_PARAM_NAME_LENGTH 32
-class AsyncFileResponse: public AsyncAbstractResponse {
-  using File = fs::File;
-  using FS = fs::FS;
-  private:
-    File _content;
-    String _path;
-    void _setContentType(const String& path);
-  public:
-    AsyncFileResponse(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncFileResponse(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    ~AsyncFileResponse();
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-};
-
-class AsyncStreamResponse: public AsyncAbstractResponse {
-  private:
-    Stream *_content;
-  public:
-    AsyncStreamResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-};
-
-class AsyncCallbackResponse: public AsyncAbstractResponse {
-  private:
-    AwsResponseFiller _content;
-    size_t _filledLength;
-  public:
-    AsyncCallbackResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-};
-
-class AsyncChunkedResponse: public AsyncAbstractResponse {
-  private:
-    AwsResponseFiller _content;
-    size_t _filledLength;
-  public:
-    AsyncChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-};
-
-class AsyncProgmemResponse: public AsyncAbstractResponse {
-  private:
-    const uint8_t * _content;
-    size_t _readLength;
-  public:
-    AsyncProgmemResponse(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    bool _sourceValid() const { return true; }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-};
-
-class cbuf;
-
-class AsyncResponseStream: public AsyncAbstractResponse, public Print {
-  private:
-    cbuf *_content;
-  public:
-    AsyncResponseStream(const String& contentType, size_t bufferSize);
-    ~AsyncResponseStream();
-    bool _sourceValid() const { return (_state < RESPONSE_END); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-    size_t write(const uint8_t *data, size_t len);
-    size_t write(uint8_t data);
-    using Print::write;
-};
-
-#endif /* ASYNCWEBSERVERRESPONSEIMPL_H_ */
diff --git a/libraries/ESPAsyncWebServer/src/WebResponses.cpp b/libraries/ESPAsyncWebServer/src/WebResponses.cpp
deleted file mode 100644
index cca6b5324..000000000
--- a/libraries/ESPAsyncWebServer/src/WebResponses.cpp
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "ESPAsyncWebServer.h"
-#include "WebResponseImpl.h"
-#include "cbuf.h"
-
-// Since ESP8266 does not link memchr by default, here's its implementation.
-void* memchr(void* ptr, int ch, size_t count)
-{
-  unsigned char* p = static_cast(ptr);
-  while(count--)
-    if(*p++ == static_cast(ch))
-      return --p;
-  return nullptr;
-}
-
-
-/*
- * Abstract Response
- * */
-const char* AsyncWebServerResponse::_responseCodeToString(int code) {
-  switch (code) {
-    case 100: return "Continue";
-    case 101: return "Switching Protocols";
-    case 200: return "OK";
-    case 201: return "Created";
-    case 202: return "Accepted";
-    case 203: return "Non-Authoritative Information";
-    case 204: return "No Content";
-    case 205: return "Reset Content";
-    case 206: return "Partial Content";
-    case 300: return "Multiple Choices";
-    case 301: return "Moved Permanently";
-    case 302: return "Found";
-    case 303: return "See Other";
-    case 304: return "Not Modified";
-    case 305: return "Use Proxy";
-    case 307: return "Temporary Redirect";
-    case 400: return "Bad Request";
-    case 401: return "Unauthorized";
-    case 402: return "Payment Required";
-    case 403: return "Forbidden";
-    case 404: return "Not Found";
-    case 405: return "Method Not Allowed";
-    case 406: return "Not Acceptable";
-    case 407: return "Proxy Authentication Required";
-    case 408: return "Request Time-out";
-    case 409: return "Conflict";
-    case 410: return "Gone";
-    case 411: return "Length Required";
-    case 412: return "Precondition Failed";
-    case 413: return "Request Entity Too Large";
-    case 414: return "Request-URI Too Large";
-    case 415: return "Unsupported Media Type";
-    case 416: return "Requested range not satisfiable";
-    case 417: return "Expectation Failed";
-    case 500: return "Internal Server Error";
-    case 501: return "Not Implemented";
-    case 502: return "Bad Gateway";
-    case 503: return "Service Unavailable";
-    case 504: return "Gateway Time-out";
-    case 505: return "HTTP Version not supported";
-    default:  return "";
-  }
-}
-
-AsyncWebServerResponse::AsyncWebServerResponse()
-  : _code(0)
-  , _headers(LinkedList([](AsyncWebHeader *h){ delete h; }))
-  , _contentType()
-  , _contentLength(0)
-  , _sendContentLength(true)
-  , _chunked(false)
-  , _headLength(0)
-  , _sentLength(0)
-  , _ackedLength(0)
-  , _writtenLength(0)
-  , _state(RESPONSE_SETUP)
-{
-  for(auto header: DefaultHeaders::Instance()) {
-    _headers.add(new AsyncWebHeader(header->name(), header->value()));
-  }
-}
-
-AsyncWebServerResponse::~AsyncWebServerResponse(){
-  _headers.free();
-}
-
-void AsyncWebServerResponse::setCode(int code){
-  if(_state == RESPONSE_SETUP)
-    _code = code;
-}
-
-void AsyncWebServerResponse::setContentLength(size_t len){
-  if(_state == RESPONSE_SETUP)
-    _contentLength = len;
-}
-
-void AsyncWebServerResponse::setContentType(const String& type){
-  if(_state == RESPONSE_SETUP)
-    _contentType = type;
-}
-
-void AsyncWebServerResponse::addHeader(const String& name, const String& value){
-  _headers.add(new AsyncWebHeader(name, value));
-}
-
-String AsyncWebServerResponse::_assembleHead(uint8_t version){
-  if(version){
-    addHeader("Accept-Ranges","none");
-    if(_chunked)
-      addHeader("Transfer-Encoding","chunked");
-  }
-  String out = String();
-  int bufSize = 300;
-  char buf[bufSize];
-
-  snprintf(buf, bufSize, "HTTP/1.%d %d %s\r\n", version, _code, _responseCodeToString(_code));
-  out.concat(buf);
-
-  if(_sendContentLength) {
-    snprintf(buf, bufSize, "Content-Length: %d\r\n", _contentLength);
-    out.concat(buf);
-  }
-  if(_contentType.length()) {
-    snprintf(buf, bufSize, "Content-Type: %s\r\n", _contentType.c_str());
-    out.concat(buf);
-  }
-
-  for(const auto& header: _headers){
-    snprintf(buf, bufSize, "%s: %s\r\n", header->name().c_str(), header->value().c_str());
-    out.concat(buf);
-  }
-  _headers.free();
-
-  out.concat("\r\n");
-  _headLength = out.length();
-  return out;
-}
-
-bool AsyncWebServerResponse::_started() const { return _state > RESPONSE_SETUP; }
-bool AsyncWebServerResponse::_finished() const { return _state > RESPONSE_WAIT_ACK; }
-bool AsyncWebServerResponse::_failed() const { return _state == RESPONSE_FAILED; }
-bool AsyncWebServerResponse::_sourceValid() const { return false; }
-void AsyncWebServerResponse::_respond(AsyncWebServerRequest *request){ _state = RESPONSE_END; request->client()->close(); }
-size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){ return 0; }
-
-/*
- * String/Code Response
- * */
-AsyncBasicResponse::AsyncBasicResponse(int code, const String& contentType, const String& content){
-  _code = code;
-  _content = content;
-  _contentType = contentType;
-  if(_content.length()){
-    _contentLength = _content.length();
-    if(!_contentType.length())
-      _contentType = "text/plain";
-  }
-  addHeader("Connection","close");
-}
-
-void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
-  _state = RESPONSE_HEADERS;
-  String out = _assembleHead(request->version());
-  size_t outLen = out.length();
-  size_t space = request->client()->space();
-  if(!_contentLength && space >= outLen){
-    _writtenLength += request->client()->write(out.c_str(), outLen);
-    _state = RESPONSE_WAIT_ACK;
-  } else if(_contentLength && space >= outLen + _contentLength){
-    out += _content;
-    outLen += _contentLength;
-    _writtenLength += request->client()->write(out.c_str(), outLen);
-    _state = RESPONSE_WAIT_ACK;
-  } else if(space && space < outLen){
-    String partial = out.substring(0, space);
-    _content = out.substring(space) + _content;
-    _contentLength += outLen - space;
-    _writtenLength += request->client()->write(partial.c_str(), partial.length());
-    _state = RESPONSE_CONTENT;
-  } else if(space > outLen && space < (outLen + _contentLength)){
-    size_t shift = space - outLen;
-    outLen += shift;
-    _sentLength += shift;
-    out += _content.substring(0, shift);
-    _content = _content.substring(shift);
-    _writtenLength += request->client()->write(out.c_str(), outLen);
-    _state = RESPONSE_CONTENT;
-  } else {
-    _content = out + _content;
-    _contentLength += outLen;
-    _state = RESPONSE_CONTENT;
-  }
-}
-
-size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
-  _ackedLength += len;
-  if(_state == RESPONSE_CONTENT){
-    size_t available = _contentLength - _sentLength;
-    size_t space = request->client()->space();
-    //we can fit in this packet
-    if(space > available){
-      _writtenLength += request->client()->write(_content.c_str(), available);
-      _content = String();
-      _state = RESPONSE_WAIT_ACK;
-      return available;
-    }
-    //send some data, the rest on ack
-    String out = _content.substring(0, space);
-    _content = _content.substring(space);
-    _sentLength += space;
-    _writtenLength += request->client()->write(out.c_str(), space);
-    return space;
-  } else if(_state == RESPONSE_WAIT_ACK){
-    if(_ackedLength >= _writtenLength){
-      _state = RESPONSE_END;
-    }
-  }
-  return 0;
-}
-
-
-/*
- * Abstract Response
- * */
-
-AsyncAbstractResponse::AsyncAbstractResponse(AwsTemplateProcessor callback): _callback(callback)
-{
-  // In case of template processing, we're unable to determine real response size
-  if(callback) {
-    _contentLength = 0;
-    _sendContentLength = false;
-    _chunked = true;
-  }
-}
-
-void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){
-  addHeader("Connection","close");
-  _head = _assembleHead(request->version());
-  _state = RESPONSE_HEADERS;
-  _ack(request, 0, 0);
-}
-
-size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
-  if(!_sourceValid()){
-    _state = RESPONSE_FAILED;
-    request->client()->close();
-    return 0;
-  }
-  _ackedLength += len;
-  size_t space = request->client()->space();
-
-  size_t headLen = _head.length();
-  if(_state == RESPONSE_HEADERS){
-    if(space >= headLen){
-      _state = RESPONSE_CONTENT;
-      space -= headLen;
-    } else {
-      String out = _head.substring(0, space);
-      _head = _head.substring(space);
-      _writtenLength += request->client()->write(out.c_str(), out.length());
-      return out.length();
-    }
-  }
-
-  if(_state == RESPONSE_CONTENT){
-    size_t outLen;
-    if(_chunked){
-      if(space <= 8){
-        return 0;
-      }
-      outLen = space;
-    } else if(!_sendContentLength){
-      outLen = space;
-    } else {
-      outLen = ((_contentLength - _sentLength) > space)?space:(_contentLength - _sentLength);
-    }
-
-    uint8_t *buf = (uint8_t *)malloc(outLen+headLen);
-    if (!buf) {
-      // os_printf("_ack malloc %d failed\n", outLen+headLen);
-      return 0;
-    }
-
-    if(headLen){
-      memcpy(buf, _head.c_str(), _head.length());
-    }
-
-    size_t readLen = 0;
-
-    if(_chunked){
-      // HTTP 1.1 allows leading zeros in chunk length. Or spaces may be added.
-      // See RFC2616 sections 2, 3.6.1.
-      readLen = _fillBufferAndProcessTemplates(buf+headLen+6, outLen - 8);
-      if(readLen == RESPONSE_TRY_AGAIN){
-          free(buf);
-          return 0;
-      }
-      outLen = sprintf((char*)buf+headLen, "%x", readLen) + headLen;
-      while(outLen < headLen + 4) buf[outLen++] = ' ';
-      buf[outLen++] = '\r';
-      buf[outLen++] = '\n';
-      outLen += readLen;
-      buf[outLen++] = '\r';
-      buf[outLen++] = '\n';
-    } else {
-      readLen = _fillBufferAndProcessTemplates(buf+headLen, outLen);
-      if(readLen == RESPONSE_TRY_AGAIN){
-          free(buf);
-          return 0;
-      }
-      outLen = readLen + headLen;
-    }
-
-    if(headLen){
-        _head = String();
-    }
-
-    if(outLen){
-        _writtenLength += request->client()->write((const char*)buf, outLen);
-    }
-
-    if(_chunked){
-        _sentLength += readLen;
-    } else {
-        _sentLength += outLen - headLen;
-    }
-
-    free(buf);
-
-    if((_chunked && readLen == 0) || (!_sendContentLength && outLen == 0) || (!_chunked && _sentLength == _contentLength)){
-      _state = RESPONSE_WAIT_ACK;
-    }
-    return outLen;
-
-  } else if(_state == RESPONSE_WAIT_ACK){
-    if(!_sendContentLength || _ackedLength >= _writtenLength){
-      _state = RESPONSE_END;
-      if(!_chunked && !_sendContentLength)
-        request->client()->close(true);
-    }
-  }
-  return 0;
-}
-
-size_t AsyncAbstractResponse::_readDataFromCacheOrContent(uint8_t* data, const size_t len)
-{
-    // If we have something in cache, copy it to buffer
-    const size_t readFromCache = std::min(len, _cache.size());
-    if(readFromCache) {
-      memcpy(data, _cache.data(), readFromCache);
-      _cache.erase(_cache.begin(), _cache.begin() + readFromCache);
-    }
-    // If we need to read more...
-    const size_t needFromFile = len - readFromCache;
-    const size_t readFromContent = _fillBuffer(data + readFromCache, needFromFile);
-    return readFromCache + readFromContent;
-}
-
-size_t AsyncAbstractResponse::_fillBufferAndProcessTemplates(uint8_t* data, size_t len)
-{
-  if(!_callback)
-    return _fillBuffer(data, len);
-
-  const size_t originalLen = len;
-  len = _readDataFromCacheOrContent(data, len);
-  // Now we've read 'len' bytes, either from cache or from file
-  // Search for template placeholders
-  uint8_t* pTemplateStart = data;
-  while((pTemplateStart < &data[len]) && (pTemplateStart = (uint8_t*)memchr(pTemplateStart, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart + 1))) { // data[0] ... data[len - 1]
-    uint8_t* pTemplateEnd = (pTemplateStart < &data[len - 1]) ? (uint8_t*)memchr(pTemplateStart + 1, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart) : nullptr;
-    // temporary buffer to hold parameter name
-    uint8_t buf[TEMPLATE_PARAM_NAME_LENGTH + 1];
-    String paramName;
-    // If closing placeholder is found:
-    if(pTemplateEnd) {
-      // prepare argument to callback
-      const size_t paramNameLength = std::min(sizeof(buf) - 1, (unsigned int)(pTemplateEnd - pTemplateStart - 1));
-      if(paramNameLength) {
-        memcpy(buf, pTemplateStart + 1, paramNameLength);
-        buf[paramNameLength] = 0;
-        paramName = String(reinterpret_cast(buf));
-      } else { // double percent sign encountered, this is single percent sign escaped.
-        // remove the 2nd percent sign
-        memmove(pTemplateEnd, pTemplateEnd + 1, &data[len] - pTemplateEnd - 1);
-        len += _readDataFromCacheOrContent(&data[len - 1], 1) - 1;
-        ++pTemplateStart;
-      }
-    } else if(&data[len - 1] - pTemplateStart + 1 < TEMPLATE_PARAM_NAME_LENGTH + 2) { // closing placeholder not found, check if it's in the remaining file data
-      memcpy(buf, pTemplateStart + 1, &data[len - 1] - pTemplateStart);
-      const size_t readFromCacheOrContent = _readDataFromCacheOrContent(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PARAM_NAME_LENGTH + 2 - (&data[len - 1] - pTemplateStart + 1));
-      if(readFromCacheOrContent) {
-        pTemplateEnd = (uint8_t*)memchr(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PLACEHOLDER, readFromCacheOrContent);
-        if(pTemplateEnd) {
-          // prepare argument to callback
-          *pTemplateEnd = 0;
-          paramName = String(reinterpret_cast(buf));
-          // Copy remaining read-ahead data into cache
-          _cache.insert(_cache.begin(), pTemplateEnd + 1, buf + (&data[len - 1] - pTemplateStart) + readFromCacheOrContent);
-          pTemplateEnd = &data[len - 1];
-        }
-        else // closing placeholder not found in file data, store found percent symbol as is and advance to the next position
-        {
-          // but first, store read file data in cache
-          _cache.insert(_cache.begin(), buf + (&data[len - 1] - pTemplateStart), buf + (&data[len - 1] - pTemplateStart) + readFromCacheOrContent);
-          ++pTemplateStart;
-        }
-      }
-      else // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
-        ++pTemplateStart;
-    }
-    else // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
-      ++pTemplateStart;
-    if(paramName.length()) {
-      // call callback and replace with result.
-      // Everything in range [pTemplateStart, pTemplateEnd] can be safely replaced with parameter value.
-      // Data after pTemplateEnd may need to be moved.
-      // The first byte of data after placeholder is located at pTemplateEnd + 1.
-      // It should be located at pTemplateStart + numBytesCopied (to begin right after inserted parameter value).
-      const String paramValue(_callback(paramName));
-      const char* pvstr = paramValue.c_str();
-      const unsigned int pvlen = paramValue.length();
-      const size_t numBytesCopied = std::min(pvlen, static_cast(&data[originalLen - 1] - pTemplateStart + 1));
-      // make room for param value
-      // 1. move extra data to cache if parameter value is longer than placeholder AND if there is no room to store
-      if((pTemplateEnd + 1 < pTemplateStart + numBytesCopied) && (originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1) < len)) {
-        _cache.insert(_cache.begin(), &data[originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1)], &data[len]);
-        //2. parameter value is longer than placeholder text, push the data after placeholder which not saved into cache further to the end
-        memmove(pTemplateStart + numBytesCopied, pTemplateEnd + 1, &data[originalLen] - pTemplateStart - numBytesCopied);
-      } else if(pTemplateEnd + 1 != pTemplateStart + numBytesCopied)
-        //2. Either parameter value is shorter than placeholder text OR there is enough free space in buffer to fit.
-        //   Move the entire data after the placeholder
-        memmove(pTemplateStart + numBytesCopied, pTemplateEnd + 1, &data[len] - pTemplateEnd - 1);
-      // 3. replace placeholder with actual value
-      memcpy(pTemplateStart, pvstr, numBytesCopied);
-      // If result is longer than buffer, copy the remainder into cache (this could happen only if placeholder text itself did not fit entirely in buffer)
-      if(numBytesCopied < pvlen) {
-        _cache.insert(_cache.begin(), pvstr + numBytesCopied, pvstr + pvlen);
-      } else if(pTemplateStart + numBytesCopied < pTemplateEnd + 1) { // result is copied fully; if result is shorter than placeholder text...
-        // there is some free room, fill it from cache
-        const size_t roomFreed = pTemplateEnd + 1 - pTemplateStart - numBytesCopied;
-        const size_t totalFreeRoom = originalLen - len + roomFreed;
-        len += _readDataFromCacheOrContent(&data[len - roomFreed], totalFreeRoom) - roomFreed;
-      } else { // result is copied fully; it is longer than placeholder text
-        const size_t roomTaken = pTemplateStart + numBytesCopied - pTemplateEnd - 1;
-        len = std::min(len + roomTaken, originalLen);
-      }
-    }
-  } // while(pTemplateStart)
-  return len;
-}
-
-
-/*
- * File Response
- * */
-
-AsyncFileResponse::~AsyncFileResponse(){
-  if(_content)
-    _content.close();
-}
-
-void AsyncFileResponse::_setContentType(const String& path){
-  if (path.endsWith(".html")) _contentType = "text/html";
-  else if (path.endsWith(".htm")) _contentType = "text/html";
-  else if (path.endsWith(".css")) _contentType = "text/css";
-  else if (path.endsWith(".json")) _contentType = "application/json";
-  else if (path.endsWith(".js")) _contentType = "application/javascript";
-  else if (path.endsWith(".png")) _contentType = "image/png";
-  else if (path.endsWith(".gif")) _contentType = "image/gif";
-  else if (path.endsWith(".jpg")) _contentType = "image/jpeg";
-  else if (path.endsWith(".ico")) _contentType = "image/x-icon";
-  else if (path.endsWith(".svg")) _contentType = "image/svg+xml";
-  else if (path.endsWith(".eot")) _contentType = "font/eot";
-  else if (path.endsWith(".woff")) _contentType = "font/woff";
-  else if (path.endsWith(".woff2")) _contentType = "font/woff2";
-  else if (path.endsWith(".ttf")) _contentType = "font/ttf";
-  else if (path.endsWith(".xml")) _contentType = "text/xml";
-  else if (path.endsWith(".pdf")) _contentType = "application/pdf";
-  else if (path.endsWith(".zip")) _contentType = "application/zip";
-  else if(path.endsWith(".gz")) _contentType = "application/x-gzip";
-  else _contentType = "text/plain";
-}
-
-AsyncFileResponse::AsyncFileResponse(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback): AsyncAbstractResponse(callback){
-  _code = 200;
-  _path = path;
-
-  if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
-    _path = _path+".gz";
-    addHeader("Content-Encoding", "gzip");
-    _callback = nullptr; // Unable to process zipped templates
-    _sendContentLength = true;
-    _chunked = false;
-  }
-
-  _content = fs.open(_path, "r");
-  _contentLength = _content.size();
-
-  if(contentType == "")
-    _setContentType(path);
-  else
-    _contentType = contentType;
-
-  int filenameStart = path.lastIndexOf('/') + 1;
-  char buf[26+path.length()-filenameStart];
-  char* filename = (char*)path.c_str() + filenameStart;
-
-  if(download) {
-    // set filename and force download
-    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
-  } else {
-    // set filename and force rendering
-    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
-  }
-  addHeader("Content-Disposition", buf);
-}
-
-AsyncFileResponse::AsyncFileResponse(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback): AsyncAbstractResponse(callback){
-  _code = 200;
-  _path = path;
-
-  if(!download && String(content.name()).endsWith(".gz") && !path.endsWith(".gz")){
-    addHeader("Content-Encoding", "gzip");
-    _callback = nullptr; // Unable to process gzipped templates
-    _sendContentLength = true;
-    _chunked = false;
-  }
-
-  _content = content;
-  _contentLength = _content.size();
-
-  if(contentType == "")
-    _setContentType(path);
-  else
-    _contentType = contentType;
-
-  int filenameStart = path.lastIndexOf('/') + 1;
-  char buf[26+path.length()-filenameStart];
-  char* filename = (char*)path.c_str() + filenameStart;
-
-  if(download) {
-    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
-  } else {
-    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
-  }
-  addHeader("Content-Disposition", buf);
-}
-
-size_t AsyncFileResponse::_fillBuffer(uint8_t *data, size_t len){
-  return _content.read(data, len);
-}
-
-/*
- * Stream Response
- * */
-
-AsyncStreamResponse::AsyncStreamResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback): AsyncAbstractResponse(callback) {
-  _code = 200;
-  _content = &stream;
-  _contentLength = len;
-  _contentType = contentType;
-}
-
-size_t AsyncStreamResponse::_fillBuffer(uint8_t *data, size_t len){
-  size_t available = _content->available();
-  size_t outLen = (available > len)?len:available;
-  size_t i;
-  for(i=0;iread();
-  return outLen;
-}
-
-/*
- * Callback Response
- * */
-
-AsyncCallbackResponse::AsyncCallbackResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback): AsyncAbstractResponse(templateCallback) {
-  _code = 200;
-  _content = callback;
-  _contentLength = len;
-  if(!len)
-    _sendContentLength = false;
-  _contentType = contentType;
-  _filledLength = 0;
-}
-
-size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){
-  size_t ret = _content(data, len, _filledLength);
-  if(ret != RESPONSE_TRY_AGAIN){
-      _filledLength += ret;
-  }
-  return ret;
-}
-
-/*
- * Chunked Response
- * */
-
-AsyncChunkedResponse::AsyncChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor processorCallback): AsyncAbstractResponse(processorCallback) {
-  _code = 200;
-  _content = callback;
-  _contentLength = 0;
-  _contentType = contentType;
-  _sendContentLength = false;
-  _chunked = true;
-  _filledLength = 0;
-}
-
-size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len){
-  size_t ret = _content(data, len, _filledLength);
-  if(ret != RESPONSE_TRY_AGAIN){
-      _filledLength += ret;
-  }
-  return ret;
-}
-
-/*
- * Progmem Response
- * */
-
-AsyncProgmemResponse::AsyncProgmemResponse(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback): AsyncAbstractResponse(callback) {
-  _code = code;
-  _content = content;
-  _contentType = contentType;
-  _contentLength = len;
-  _readLength = 0;
-}
-
-size_t AsyncProgmemResponse::_fillBuffer(uint8_t *data, size_t len){
-  size_t left = _contentLength - _readLength;
-  if (left > len) {
-    memcpy_P(data, _content + _readLength, len);
-    _readLength += len;
-    return len;
-  }
-  memcpy_P(data, _content + _readLength, left);
-  _readLength += left;
-  return left;
-}
-
-
-/*
- * Response Stream (You can print/write/printf to it, up to the contentLen bytes)
- * */
-
-AsyncResponseStream::AsyncResponseStream(const String& contentType, size_t bufferSize){
-  _code = 200;
-  _contentLength = 0;
-  _contentType = contentType;
-  _content = new cbuf(bufferSize);
-}
-
-AsyncResponseStream::~AsyncResponseStream(){
-  delete _content;
-}
-
-size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen){
-  return _content->read((char*)buf, maxLen);
-}
-
-size_t AsyncResponseStream::write(const uint8_t *data, size_t len){
-  if(_started())
-    return 0;
-
-  if(len > _content->room()){
-    size_t needed = len - _content->room();
-    _content->resizeAdd(needed);
-  }
-  size_t written = _content->write((const char*)data, len);
-  _contentLength += written;
-  return written;
-}
-
-size_t AsyncResponseStream::write(uint8_t data){
-  return write(&data, 1);
-}
diff --git a/libraries/ESPAsyncWebServer/src/WebServer.cpp b/libraries/ESPAsyncWebServer/src/WebServer.cpp
deleted file mode 100644
index e6cd0c6c0..000000000
--- a/libraries/ESPAsyncWebServer/src/WebServer.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library 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 library 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 library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "ESPAsyncWebServer.h"
-#include "WebHandlerImpl.h"
-
-bool ON_STA_FILTER(AsyncWebServerRequest *request) {
-  return WiFi.localIP() == request->client()->localIP();
-}
-
-bool ON_AP_FILTER(AsyncWebServerRequest *request) {
-  return WiFi.localIP() != request->client()->localIP();
-}
-
-
-AsyncWebServer::AsyncWebServer(uint16_t port)
-  : _server(port)
-  , _rewrites(LinkedList([](AsyncWebRewrite* r){ delete r; }))
-  , _handlers(LinkedList([](AsyncWebHandler* h){ delete h; }))
-{
-  _catchAllHandler = new AsyncCallbackWebHandler();
-  if(_catchAllHandler == NULL)
-    return;
-  _server.onClient([](void *s, AsyncClient* c){
-    if(c == NULL)
-      return;
-    c->setRxTimeout(3);
-    AsyncWebServerRequest *r = new AsyncWebServerRequest((AsyncWebServer*)s, c);
-    if(r == NULL){
-      c->close(true);
-      c->free();
-      delete c;
-    }
-  }, this);
-}
-
-AsyncWebServer::~AsyncWebServer(){
-  reset();
-  delete _catchAllHandler;
-}
-
-AsyncWebRewrite& AsyncWebServer::addRewrite(AsyncWebRewrite* rewrite){
-  _rewrites.add(rewrite);
-  return *rewrite;
-}
-
-bool AsyncWebServer::removeRewrite(AsyncWebRewrite *rewrite){
-  return _rewrites.remove(rewrite);
-}
-
-AsyncWebRewrite& AsyncWebServer::rewrite(const char* from, const char* to){
-  return addRewrite(new AsyncWebRewrite(from, to));
-}
-
-AsyncWebHandler& AsyncWebServer::addHandler(AsyncWebHandler* handler){
-  _handlers.add(handler);
-  return *handler;
-}
-
-bool AsyncWebServer::removeHandler(AsyncWebHandler *handler){
-  return _handlers.remove(handler);
-}
-
-void AsyncWebServer::begin(){
-  _server.setNoDelay(true);
-  _server.begin();
-}
-
-#if ASYNC_TCP_SSL_ENABLED
-void AsyncWebServer::onSslFileRequest(AcSSlFileHandler cb, void* arg){
-  _server.onSslFileRequest(cb, arg);
-}
-
-void AsyncWebServer::beginSecure(const char *cert, const char *key, const char *password){
-  _server.beginSecure(cert, key, password);
-}
-#endif
-
-void AsyncWebServer::_handleDisconnect(AsyncWebServerRequest *request){
-  delete request;
-}
-
-void AsyncWebServer::_rewriteRequest(AsyncWebServerRequest *request){
-  for(const auto& r: _rewrites){
-    if (r->from() == request->_url && r->filter(request)){
-      request->_url = r->toUrl();
-      request->_addGetParams(r->params());
-    }
-  }
-}
-
-void AsyncWebServer::_attachHandler(AsyncWebServerRequest *request){
-  for(const auto& h: _handlers){
-    if (h->filter(request) && h->canHandle(request)){
-      request->setHandler(h);
-      return;
-    }
-  }
-  
-  request->addInterestingHeader("ANY");
-  request->setHandler(_catchAllHandler);
-}
-
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->setMethod(method);
-  handler->onRequest(onRequest);
-  handler->onUpload(onUpload);
-  handler->onBody(onBody);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->setMethod(method);
-  handler->onRequest(onRequest);
-  handler->onUpload(onUpload);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->setMethod(method);
-  handler->onRequest(onRequest);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, ArRequestHandlerFunction onRequest){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->onRequest(onRequest);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncStaticWebHandler& AsyncWebServer::serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control){
-  AsyncStaticWebHandler* handler = new AsyncStaticWebHandler(uri, fs, path, cache_control);
-  addHandler(handler);
-  return *handler;
-}
-
-void AsyncWebServer::onNotFound(ArRequestHandlerFunction fn){
-  _catchAllHandler->onRequest(fn);
-}
-
-void AsyncWebServer::onFileUpload(ArUploadHandlerFunction fn){
-  _catchAllHandler->onUpload(fn);
-}
-
-void AsyncWebServer::onRequestBody(ArBodyHandlerFunction fn){
-  _catchAllHandler->onBody(fn);
-}
-
-void AsyncWebServer::reset(){
-  _rewrites.free();
-  _handlers.free();
-  
-  if (_catchAllHandler != NULL){
-    _catchAllHandler->onRequest(NULL);
-    _catchAllHandler->onUpload(NULL);
-    _catchAllHandler->onBody(NULL);
-  }
-}
-
diff --git a/libraries/ESPAsyncWebServer/src/edit.htm b/libraries/ESPAsyncWebServer/src/edit.htm
deleted file mode 100644
index 43d498455..000000000
--- a/libraries/ESPAsyncWebServer/src/edit.htm
+++ /dev/null
@@ -1,627 +0,0 @@
-
-
-
-
-ESP Editor
-
-
-
-
-
-
-  

-  

-  

-  

-  
-  
-
-
diff --git a/libraries/ESPAsyncWebServer/travis/common.sh b/libraries/ESPAsyncWebServer/travis/common.sh
deleted file mode 100644
index 57bede343..000000000
--- a/libraries/ESPAsyncWebServer/travis/common.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-function build_sketches()
-{
-    local arduino=$1
-    local srcpath=$2
-    local platform=$3
-    local sketches=$(find $srcpath -name *.ino)
-    for sketch in $sketches; do
-        local sketchdir=$(dirname $sketch)
-        if [[ -f "$sketchdir/.$platform.skip" ]]; then
-            echo -e "\n\n ------------ Skipping $sketch ------------ \n\n";
-            continue
-        fi
-        echo -e "\n\n ------------ Building $sketch ------------ \n\n";
-        $arduino --verify $sketch;
-        local result=$?
-        if [ $result -ne 0 ]; then
-            echo "Build failed ($1)"
-            return $result
-        fi
-    done
-}
diff --git a/libraries/arduinoWebSockets/.gitignore b/libraries/arduinoWebSockets/.gitignore
deleted file mode 100644
index 44b2c85f8..000000000
--- a/libraries/arduinoWebSockets/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-/tests/webSocketServer/node_modules
diff --git a/libraries/arduinoWebSockets/.travis.yml b/libraries/arduinoWebSockets/.travis.yml
deleted file mode 100644
index 14693dd82..000000000
--- a/libraries/arduinoWebSockets/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-sudo: false
-language: bash
-os:
-  - linux
-env:
-  matrix:
-    - CPU="esp8266" BOARD="esp8266com:esp8266:generic:CpuFrequency=80" IDE_VERSION=1.6.5
-    - CPU="esp8266" BOARD="esp8266com:esp8266:generic:CpuFrequency=80,FlashSize=1M0,FlashMode=qio,FlashFreq=80" IDE_VERSION=1.8.5
-    - CPU="esp8266" BOARD="esp8266com:esp8266:generic:CpuFrequency=80,Debug=Serial1" IDE_VERSION=1.6.5
-    - CPU="esp32" BOARD="espressif:esp32:esp32:FlashFreq=80" IDE_VERSION=1.6.5
-    - CPU="esp32" BOARD="espressif:esp32:esp32:FlashFreq=80" IDE_VERSION=1.8.5
-
-script:
-  - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
-  - sleep 3
-  - export DISPLAY=:1.0
-  - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz
-  - tar xf arduino-$IDE_VERSION-linux64.tar.xz
-  - mv arduino-$IDE_VERSION $HOME/arduino_ide
-  - export PATH="$HOME/arduino_ide:$PATH"
-  - which arduino
-  - mkdir -p $HOME/Arduino/libraries
-  - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/arduinoWebSockets
-  - source $TRAVIS_BUILD_DIR/travis/common.sh
-  - get_core $CPU
-  - cd $TRAVIS_BUILD_DIR
-  - arduino --board $BOARD --save-prefs
-  - arduino --get-pref sketchbook.path
-  - build_sketches arduino $HOME/Arduino/libraries/arduinoWebSockets/examples/$CPU $CPU
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/1aa78fbe15080b0c2e37
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
diff --git a/libraries/arduinoWebSockets/LICENSE b/libraries/arduinoWebSockets/LICENSE
deleted file mode 100644
index f166cc57b..000000000
--- a/libraries/arduinoWebSockets/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This library 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 library 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 library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  , 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/README.md b/libraries/arduinoWebSockets/README.md
deleted file mode 100644
index 63eef3e2a..000000000
--- a/libraries/arduinoWebSockets/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-WebSocket Server and Client for Arduino [![Build Status](https://travis-ci.org/Links2004/arduinoWebSockets.svg?branch=master)](https://travis-ci.org/Links2004/arduinoWebSockets)
-===========================================
-
-a WebSocket Server and Client for Arduino based on RFC6455.
-
-
-##### Supported features of RFC6455 #####
- - text frame
- - binary frame
- - connection close
- - ping
- - pong
- - continuation frame
-
-##### Limitations #####
- - max input length is limited to the ram size and the ```WEBSOCKETS_MAX_DATA_SIZE``` define
- - max output length has no limit (the hardware is the limit)
- - Client send big frames with mask 0x00000000 (on AVR all frames)
- - continuation frame reassembly need to be handled in the application code
-
- ##### Limitations for Async #####
- - Functions called from within the context of the websocket event might not honor `yield()` and/or `delay()`.  See [this issue](https://github.com/Links2004/arduinoWebSockets/issues/58#issuecomment-192376395) for more info and a potential workaround.
- - wss / SSL is not possible.
-
-##### Supported Hardware #####
- - ESP8266 [Arduino for ESP8266](https://github.com/esp8266/Arduino/)
- - ESP32 [Arduino for ESP32](https://github.com/espressif/arduino-esp32)
- - ESP31B
- - Particle with STM32 ARM Cortex M3
- - ATmega328 with Ethernet Shield (ATmega branch)
- - ATmega328 with enc28j60 (ATmega branch)
- - ATmega2560 with Ethernet Shield (ATmega branch)
- - ATmega2560 with enc28j60 (ATmega branch)
-
-###### Note: ######
-
-  version 2.0 and up is not compatible with AVR/ATmega, check ATmega branch.
-
-  Arduino for AVR not supports std namespace of c++.
-
-### wss / SSL ###
- supported for:
- - wss client on the ESP8266
- - wss / SSL is not natively supported in WebSocketsServer however it is possible to achieve secure websockets
-   by running the device behind an SSL proxy. See [Nginx](examples/Nginx/esp8266.ssl.reverse.proxy.conf) for a
-   sample Nginx server configuration file to enable this.
-
-### ESP Async TCP ###
-
-This libary can run in Async TCP mode on the ESP.
-
-The mode can be activated in the ```WebSockets.h``` (see WEBSOCKETS_NETWORK_TYPE define).
-
-[ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) libary is required.
-
-
-### High Level Client API ###
-
- - `begin` : Initiate connection sequence to the websocket host.
-```
-void begin(const char *host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
-void begin(String host, uint16_t port, String url = "/", String protocol = "arduino");
- ```
- - `onEvent`: Callback to handle for websocket events
-
- ```
- void onEvent(WebSocketClientEvent cbEvent);
- ```
-
- - `WebSocketClientEvent`: Handler for websocket events
- ```
- void (*WebSocketClientEvent)(WStype_t type, uint8_t * payload, size_t length)
- ```
-Where `WStype_t type` is defined as:
-  ```
-  typedef enum {
-      WStype_ERROR,
-      WStype_DISCONNECTED,
-      WStype_CONNECTED,
-      WStype_TEXT,
-      WStype_BIN,
-  	WStype_FRAGMENT_TEXT_START,
-  	WStype_FRAGMENT_BIN_START,
-  	WStype_FRAGMENT,
-  	WStype_FRAGMENT_FIN,
-  } WStype_t;
-  ```
-
-### Issues ###
-Submit issues to: https://github.com/Links2004/arduinoWebSockets/issues
-
-[![Join the chat at https://gitter.im/Links2004/arduinoWebSockets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Links2004/arduinoWebSockets?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-### License and credits ###
-
-The library is licensed under [LGPLv2.1](https://github.com/Links2004/arduinoWebSockets/blob/master/LICENSE)
-
-[libb64](http://libb64.sourceforge.net/) written by Chris Venter. It is distributed under Public Domain see [LICENSE](https://github.com/Links2004/arduinoWebSockets/blob/master/src/libb64/LICENSE).
diff --git a/libraries/arduinoWebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf b/libraries/arduinoWebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf
deleted file mode 100644
index ec5aa89fa..000000000
--- a/libraries/arduinoWebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-# ESP8266 nginx SSL reverse proxy configuration file (tested and working on nginx v1.10.0)
-
-# proxy cache location
-proxy_cache_path /opt/etc/nginx/cache levels=1:2 keys_zone=ESP8266_cache:10m max_size=10g inactive=5m use_temp_path=off;
-
-# webserver proxy
-server {
-
-    # general server parameters
-    listen                      50080;
-    server_name                 myDomain.net;
-    access_log                  /opt/var/log/nginx/myDomain.net.access.log;       
-
-    # SSL configuration
-    ssl                         on;
-    ssl_certificate             /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/fullchain.pem;
-    ssl_certificate_key         /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/privkey.pem;
-    ssl_session_cache           builtin:1000  shared:SSL:10m;
-    ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers                 HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
-    ssl_prefer_server_ciphers   on;
-    
-    location / {
-
-      # proxy caching configuration
-      proxy_cache             ESP8266_cache;
-      proxy_cache_revalidate  on;
-      proxy_cache_min_uses    1;
-      proxy_cache_use_stale   off;
-      proxy_cache_lock        on;
-      # proxy_cache_bypass      $http_cache_control;      
-      # include the sessionId cookie value as part of the cache key - keeps the cache per user
-      # proxy_cache_key         $proxy_host$request_uri$cookie_sessionId;
-
-      # header pass through configuration
-      proxy_set_header        Host $host;      
-      proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header        X-Forwarded-Proto $scheme;      
-
-      # ESP8266 custom headers which identify to the device that it's running through an SSL proxy     
-      proxy_set_header        X-SSL On;
-      proxy_set_header        X-SSL-WebserverPort 50080;
-      proxy_set_header        X-SSL-WebsocketPort 50081;
-
-      # extra debug headers      
-      add_header              X-Proxy-Cache $upstream_cache_status;
-      add_header              X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      # actual proxying configuration
-      proxy_ssl_session_reuse on;
-      # target the IP address of the device with proxy_pass
-      proxy_pass              http://192.168.0.20;
-      proxy_read_timeout      90;
-    }
- }
-
-# websocket proxy
-server {
-
-    # general server parameters
-    listen                      50081;
-    server_name                 myDomain.net;
-    access_log                  /opt/var/log/nginx/myDomain.net.wss.access.log;
-
-    # SSL configuration
-    ssl                         on;
-    ssl_certificate             /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/fullchain.pem;
-    ssl_certificate_key         /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/privkey.pem;
-    ssl_session_cache           builtin:1000  shared:SSL:10m;
-    ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers                 HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
-    ssl_prefer_server_ciphers   on;
-    
-    location / {     
-
-      # websocket upgrade tunnel configuration
-      proxy_pass                    http://192.168.0.20:81;
-      proxy_http_version            1.1;
-      proxy_set_header Upgrade      $http_upgrade;
-      proxy_set_header Connection   "Upgrade";
-      proxy_read_timeout            86400;
-    }
- }
diff --git a/libraries/arduinoWebSockets/examples/avr/WebSocketClientAVR/WebSocketClientAVR.ino b/libraries/arduinoWebSockets/examples/avr/WebSocketClientAVR/WebSocketClientAVR.ino
deleted file mode 100644
index 9d49d1498..000000000
--- a/libraries/arduinoWebSockets/examples/avr/WebSocketClientAVR/WebSocketClientAVR.ino
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * WebSocketClientAVR.ino
- *
- *  Created on: 10.12.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-
-
-// Enter a MAC address for your controller below.
-// Newer Ethernet shields have a MAC address printed on a sticker on the shield
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
-
-// Set the static IP address to use if the DHCP fails to assign
-IPAddress ip(192, 168, 0, 177);
-
-WebSocketsClient webSocket;
-
-
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            Serial.println("[WSc] Disconnected!\n");
-            break;
-        case WStype_CONNECTED:
-            {
-                Serial.print("[WSc] Connected to url: ");
-                Serial.println((char *)payload);
-                // send message to server when Connected
-                webSocket.sendTXT("Connected");
-            }
-            break;
-        case WStype_TEXT:
-            Serial.print("[WSc] get text: ");
-            Serial.println((char *)payload);
-            // send message to server
-            // webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            Serial.print("[WSc] get binary length: ");
-            Serial.println(length);
-           // hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup()
-{
-    // Open serial communications and wait for port to open:
-    Serial.begin(115200);
-    while (!Serial) {}
-
-    // start the Ethernet connection:
-    if (Ethernet.begin(mac) == 0) {
-      Serial.println("Failed to configure Ethernet using DHCP");
-      // no point in carrying on, so do nothing forevermore:
-      // try to congifure using IP address instead of DHCP:
-      Ethernet.begin(mac, ip);
-    }
-
-    webSocket.begin("192.168.0.123", 8011);
-    webSocket.onEvent(webSocketEvent);
-
-}
-
-
-void loop()
-{
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp32/WebSocketClient/WebSocketClient.ino b/libraries/arduinoWebSockets/examples/esp32/WebSocketClient/WebSocketClient.ino
deleted file mode 100644
index 41a2b703f..000000000
--- a/libraries/arduinoWebSockets/examples/esp32/WebSocketClient/WebSocketClient.ino
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * WebSocketClient.ino
- *
- *  Created on: 24.05.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-
-
-WiFiMulti WiFiMulti;
-WebSocketsClient webSocket;
-
-HardwareSerial Serial1(2);
-
-#define USE_SERIAL Serial1
-
-void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
-	const uint8_t* src = (const uint8_t*) mem;
-	USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-	for(uint32_t i = 0; i < len; i++) {
-		if(i % cols == 0) {
-			USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-		}
-		USE_SERIAL.printf("%02X ", *src);
-		src++;
-	}
-	USE_SERIAL.printf("\n");
-}
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-	switch(type) {
-		case WStype_DISCONNECTED:
-			USE_SERIAL.printf("[WSc] Disconnected!\n");
-			break;
-		case WStype_CONNECTED:
-			USE_SERIAL.printf("[WSc] Connected to url: %s\n", payload);
-
-			// send message to server when Connected
-			webSocket.sendTXT("Connected");
-			break;
-		case WStype_TEXT:
-			USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-			break;
-		case WStype_BIN:
-			USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-			hexdump(payload, length);
-
-			// send data to server
-			// webSocket.sendBIN(payload, length);
-			break;
-	}
-
-}
-
-void setup() {
-	// USE_SERIAL.begin(921600);
-	USE_SERIAL.begin(115200);
-
-	//Serial.setDebugOutput(true);
-	USE_SERIAL.setDebugOutput(true);
-
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-
-	for(uint8_t t = 4; t > 0; t--) {
-		USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-		USE_SERIAL.flush();
-		delay(1000);
-	}
-
-	WiFiMulti.addAP("SSID", "passpasspass");
-
-	//WiFi.disconnect();
-	while(WiFiMulti.run() != WL_CONNECTED) {
-		delay(100);
-	}
-
-	// server address, port and URL
-	webSocket.begin("192.168.0.123", 81, "/");
-
-	// event handler
-	webSocket.onEvent(webSocketEvent);
-
-	// use HTTP Basic Authorization this is optional remove if not needed
-	webSocket.setAuthorization("user", "Password");
-
-	// try ever 5000 again if connection has failed
-	webSocket.setReconnectInterval(5000);
-
-}
-
-void loop() {
-	webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino b/libraries/arduinoWebSockets/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino
deleted file mode 100644
index dc3427b1d..000000000
--- a/libraries/arduinoWebSockets/examples/esp32/WebSocketClientSSL/WebSocketClientSSL.ino
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * WebSocketClientSSL.ino
- *
- *  Created on: 10.12.2015
- *
- *  note SSL is only possible with the ESP8266
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-
-
-WiFiMulti WiFiMulti;
-WebSocketsClient webSocket;
-
-HardwareSerial Serial1(2);
-
-#define USE_SERIAL Serial1
-
-void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
-	const uint8_t* src = (const uint8_t*) mem;
-	USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-	for(uint32_t i = 0; i < len; i++) {
-		if(i % cols == 0) {
-			USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-		}
-		USE_SERIAL.printf("%02X ", *src);
-		src++;
-	}
-	USE_SERIAL.printf("\n");
-}
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[WSc] Disconnected!\n");
-            break;
-        case WStype_CONNECTED:
-            {
-                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
-
-			    // send message to server when Connected
-				webSocket.sendTXT("Connected");
-            }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-      for(uint8_t t = 4; t > 0; t--) {
-          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-          USE_SERIAL.flush();
-          delay(1000);
-      }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    //WiFi.disconnect();
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    webSocket.beginSSL("192.168.0.123", 81);
-    webSocket.onEvent(webSocketEvent);
-
-}
-
-void loop() {
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp32/WebSocketServer/WebSocketServer.ino b/libraries/arduinoWebSockets/examples/esp32/WebSocketServer/WebSocketServer.ino
deleted file mode 100644
index 7ebf8cab9..000000000
--- a/libraries/arduinoWebSockets/examples/esp32/WebSocketServer/WebSocketServer.ino
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * WebSocketServer.ino
- *
- *  Created on: 22.05.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-
-WiFiMulti WiFiMulti;
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-HardwareSerial Serial1(2);
-
-#define USE_SERIAL Serial1
-
-void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
-	const uint8_t* src = (const uint8_t*) mem;
-	USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
-	for(uint32_t i = 0; i < len; i++) {
-		if(i % cols == 0) {
-			USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
-		}
-		USE_SERIAL.printf("%02X ", *src);
-		src++;
-	}
-	USE_SERIAL.printf("\n");
-}
-
-void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[%u] Disconnected!\n", num);
-            break;
-        case WStype_CONNECTED:
-            {
-                IPAddress ip = webSocket.remoteIP(num);
-                USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
-
-				// send message to client
-				webSocket.sendTXT(num, "Connected");
-            }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
-
-            // send message to client
-            // webSocket.sendTXT(num, "message here");
-
-            // send data to all connected clients
-            // webSocket.broadcastTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[%u] get binary length: %u\n", num, length);
-            hexdump(payload, length);
-
-            // send message to client
-            // webSocket.sendBIN(num, payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-    for(uint8_t t = 4; t > 0; t--) {
-        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-        USE_SERIAL.flush();
-        delay(1000);
-    }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    webSocket.begin();
-    webSocket.onEvent(webSocketEvent);
-}
-
-void loop() {
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClient/WebSocketClient.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketClient/WebSocketClient.ino
deleted file mode 100644
index b990c13ac..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClient/WebSocketClient.ino
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * WebSocketClient.ino
- *
- *  Created on: 24.05.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-WebSocketsClient webSocket;
-
-#define USE_SERIAL Serial1
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-	switch(type) {
-		case WStype_DISCONNECTED:
-			USE_SERIAL.printf("[WSc] Disconnected!\n");
-			break;
-		case WStype_CONNECTED: {
-			USE_SERIAL.printf("[WSc] Connected to url: %s\n", payload);
-
-			// send message to server when Connected
-			webSocket.sendTXT("Connected");
-		}
-			break;
-		case WStype_TEXT:
-			USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-			break;
-		case WStype_BIN:
-			USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-			hexdump(payload, length);
-
-			// send data to server
-			// webSocket.sendBIN(payload, length);
-			break;
-	}
-
-}
-
-void setup() {
-	// USE_SERIAL.begin(921600);
-	USE_SERIAL.begin(115200);
-
-	//Serial.setDebugOutput(true);
-	USE_SERIAL.setDebugOutput(true);
-
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-
-	for(uint8_t t = 4; t > 0; t--) {
-		USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-		USE_SERIAL.flush();
-		delay(1000);
-	}
-
-	WiFiMulti.addAP("SSID", "passpasspass");
-
-	//WiFi.disconnect();
-	while(WiFiMulti.run() != WL_CONNECTED) {
-		delay(100);
-	}
-
-	// server address, port and URL
-	webSocket.begin("192.168.0.123", 81, "/");
-
-	// event handler
-	webSocket.onEvent(webSocketEvent);
-
-	// use HTTP Basic Authorization this is optional remove if not needed
-	webSocket.setAuthorization("user", "Password");
-
-	// try ever 5000 again if connection has failed
-	webSocket.setReconnectInterval(5000);
-
-}
-
-void loop() {
-	webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSSL/WebSocketClientSSL.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSSL/WebSocketClientSSL.ino
deleted file mode 100644
index d45060e97..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSSL/WebSocketClientSSL.ino
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * WebSocketClientSSL.ino
- *
- *  Created on: 10.12.2015
- *
- *  note SSL is only possible with the ESP8266
- *
- */
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-WebSocketsClient webSocket;
-
-
-#define USE_SERIAL Serial1
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[WSc] Disconnected!\n");
-            break;
-        case WStype_CONNECTED:
-            {
-                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
-				
-			    // send message to server when Connected
-				webSocket.sendTXT("Connected");
-            }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-      for(uint8_t t = 4; t > 0; t--) {
-          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-          USE_SERIAL.flush();
-          delay(1000);
-      }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    //WiFi.disconnect();
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    webSocket.beginSSL("192.168.0.123", 81);
-    webSocket.onEvent(webSocketEvent);
-
-}
-
-void loop() {
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSocketIO/WebSocketClientSocketIO.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSocketIO/WebSocketClientSocketIO.ino
deleted file mode 100644
index 40e343e27..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientSocketIO/WebSocketClientSocketIO.ino
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * WebSocketClientSocketIO.ino
- *
- *  Created on: 06.06.2016
- *
- */
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-WebSocketsClient webSocket;
-
-
-#define USE_SERIAL Serial1
-
-#define MESSAGE_INTERVAL 30000
-#define HEARTBEAT_INTERVAL 25000
-
-uint64_t messageTimestamp = 0;
-uint64_t heartbeatTimestamp = 0;
-bool isConnected = false;
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[WSc] Disconnected!\n");
-            isConnected = false;
-            break;
-        case WStype_CONNECTED:
-            {
-                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
-                isConnected = true;
-
-			    // send message to server when Connected
-                // socket.io upgrade confirmation message (required)
-				webSocket.sendTXT("5");
-            }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-			// send message to server
-			// webSocket.sendTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-      for(uint8_t t = 4; t > 0; t--) {
-          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-          USE_SERIAL.flush();
-          delay(1000);
-      }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    //WiFi.disconnect();
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    webSocket.beginSocketIO("192.168.0.123", 81);
-    //webSocket.setAuthorization("user", "Password"); // HTTP Basic Authorization
-    webSocket.onEvent(webSocketEvent);
-
-}
-
-void loop() {
-    webSocket.loop();
-
-    if(isConnected) {
-
-        uint64_t now = millis();
-
-        if(now - messageTimestamp > MESSAGE_INTERVAL) {
-            messageTimestamp = now;
-            // example socket.io message with type "messageType" and JSON payload
-            webSocket.sendTXT("42[\"messageType\",{\"greeting\":\"hello\"}]");
-        }
-        if((now - heartbeatTimestamp) > HEARTBEAT_INTERVAL) {
-            heartbeatTimestamp = now;
-            // socket.io heartbeat message
-            webSocket.sendTXT("2");
-        }
-    }
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStomp/WebSocketClientStomp.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStomp/WebSocketClientStomp.ino
deleted file mode 100644
index a0eb011fd..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStomp/WebSocketClientStomp.ino
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    WebSocketClientStomp.ino
-
-    Example for connecting and maintining a connection with a STOMP websocket connection.
-    In this example, we connect to a Spring application (see https://docs.spring.io/spring/docs/current/spring-framework-reference/html/websocket.html).
-
-    Created on: 25.09.2017
-    Author: Martin Becker , Contact: becker@informatik.uni-wuerzburg.de
-*/
-
-// PRE
-
-#define USE_SERIAL Serial
-
-
-// LIBRARIES
-
-#include 
-#include 
-
-#include 
-#include 
-
-
-// SETTINGS
-
-const char* wlan_ssid             = "yourssid";
-const char* wlan_password         = "somepassword";
-
-const char* ws_host               = "the.host.net";
-const int   ws_port               = 80;
-
-// URL for STOMP endpoint.
-// For the default config of Spring's STOMP support, the default URL is "/socketentry/websocket".
-const char* stompUrl            = "/socketentry/websocket"; // don't forget the leading "/" !!!
-
-
-// VARIABLES
-
-WebSocketsClient webSocket;
-
-
-// FUNCTIONS
-
-/**
- * STOMP messages need to be NULL-terminated (i.e., \0 or \u0000).
- * However, when we send a String or a char[] array without specifying 
- * a length, the size of the message payload is derived by strlen() internally,
- * thus dropping any NULL values appended to the "msg"-String.
- * 
- * To solve this, we first convert the String to a NULL terminated char[] array
- * via "c_str" and set the length of the payload to include the NULL value.
- */
-void sendMessage(String & msg) {
-    webSocket.sendTXT(msg.c_str(), msg.length() + 1);
-}
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-    switch (type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[WSc] Disconnected!\n");
-            break;
-        case WStype_CONNECTED:
-            {
-                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
-                
-                String msg = "CONNECT\r\naccept-version:1.1,1.0\r\nheart-beat:10000,10000\r\n\r\n";
-                sendMessage(msg);
-            }
-            break;
-        case WStype_TEXT:
-            {
-                // #####################
-                // handle STOMP protocol
-                // #####################
-
-                String text = (char*) payload;
-                USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-                if (text.startsWith("CONNECTED")) {
-
-                    // subscribe to some channels
-
-                    String msg = "SUBSCRIBE\nid:sub-0\ndestination:/user/queue/messages\n\n";
-                    sendMessage(msg);
-                    delay(1000);
-
-                    // and send a message
-
-                    msg = "SEND\ndestination:/app/message\n\n{\"user\":\"esp\",\"message\":\"Hello!\"}";
-                    sendMessage(msg);
-                    delay(1000);
-                    
-                } else {
-
-                    // do something with messages
-                    
-                }
-
-                break;
-            }
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-
-    // setup serial
-
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-
-
-    // connect to WiFi
-
-    USE_SERIAL.print("Logging into WLAN: "); Serial.print(wlan_ssid); Serial.print(" ...");
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(wlan_ssid, wlan_password);
-
-    while (WiFi.status() != WL_CONNECTED) {
-        delay(500);
-        USE_SERIAL.print(".");
-    }
-    USE_SERIAL.println(" success.");
-    USE_SERIAL.print("IP: "); USE_SERIAL.println(WiFi.localIP());
-
-
-    // connect to websocket
-    webSocket.begin(ws_host, ws_port, stompUrl);
-    webSocket.setExtraHeaders(); // remove "Origin: file://" header because it breaks the connection with Spring's default websocket config
-    //    webSocket.setExtraHeaders("foo: I am so funny\r\nbar: not"); // some headers, in case you feel funny
-    webSocket.onEvent(webSocketEvent);
-}
-
-void loop() {
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStompOverSockJs/WebSocketClientStompOverSockJs.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStompOverSockJs/WebSocketClientStompOverSockJs.ino
deleted file mode 100644
index cb0c45be3..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketClientStompOverSockJs/WebSocketClientStompOverSockJs.ino
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    WebSocketClientStompOverSockJs.ino
-
-    Example for connecting and maintining a connection with a SockJS+STOMP websocket connection.
-    In this example, we connect to a Spring application (see https://docs.spring.io/spring/docs/current/spring-framework-reference/html/websocket.html).
-
-    Created on: 18.07.2017
-    Author: Martin Becker , Contact: becker@informatik.uni-wuerzburg.de
-*/
-
-// PRE
-
-#define USE_SERIAL Serial
-
-
-// LIBRARIES
-
-#include 
-#include 
-
-#include 
-#include 
-
-
-// SETTINGS
-
-const char* wlan_ssid             = "yourssid";
-const char* wlan_password         = "somepassword";
-
-const char* ws_host               = "the.host.net";
-const int   ws_port               = 80;
-
-// base URL for SockJS (websocket) connection
-// The complete URL will look something like this(cf. http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-36):
-// ws://://<3digits>//websocket
-// For the default config of Spring's SockJS/STOMP support, the default base URL is "/socketentry/".
-const char* ws_baseurl            = "/socketentry/"; // don't forget leading and trailing "/" !!!
-
-
-// VARIABLES
-
-WebSocketsClient webSocket;
-
-
-// FUNCTIONS
-
-void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
-
-    switch (type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[WSc] Disconnected!\n");
-            break;
-        case WStype_CONNECTED:
-            {
-                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
-            }
-            break;
-        case WStype_TEXT:
-            {
-                // #####################
-                // handle SockJs+STOMP protocol
-                // #####################
-
-                String text = (char*) payload;
-
-                USE_SERIAL.printf("[WSc] get text: %s\n", payload);
-
-                if (payload[0] == 'h') {
-
-                    USE_SERIAL.println("Heartbeat!");
-
-                } else if (payload[0] == 'o') {
-
-                    // on open connection
-                    char *msg = "[\"CONNECT\\naccept-version:1.1,1.0\\nheart-beat:10000,10000\\n\\n\\u0000\"]";
-                    webSocket.sendTXT(msg);
-
-                } else if (text.startsWith("a[\"CONNECTED")) {
-
-                    // subscribe to some channels
-
-                    char *msg = "[\"SUBSCRIBE\\nid:sub-0\\ndestination:/user/queue/messages\\n\\n\\u0000\"]";
-                    webSocket.sendTXT(msg);
-                    delay(1000);
-
-                    // and send a message
-
-                    msg = "[\"SEND\\ndestination:/app/message\\n\\n{\\\"user\\\":\\\"esp\\\",\\\"message\\\":\\\"Hello!\\\"}\\u0000\"]";
-                    webSocket.sendTXT(msg);
-                    delay(1000);
-                }
-
-                break;
-            }
-        case WStype_BIN:
-            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
-            hexdump(payload, length);
-
-            // send data to server
-            // webSocket.sendBIN(payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-
-    // setup serial
-
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-
-
-    // connect to WiFi
-
-    USE_SERIAL.print("Logging into WLAN: "); Serial.print(wlan_ssid); Serial.print(" ...");
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(wlan_ssid, wlan_password);
-
-    while (WiFi.status() != WL_CONNECTED) {
-        delay(500);
-        USE_SERIAL.print(".");
-    }
-    USE_SERIAL.println(" success.");
-    USE_SERIAL.print("IP: "); USE_SERIAL.println(WiFi.localIP());
-
-
-    // #####################
-    // create socket url according to SockJS protocol (cf. http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-36)
-    // #####################
-    String socketUrl = ws_baseurl;
-    socketUrl += random(0, 999);
-    socketUrl += "/";
-    socketUrl += random(0, 999999); // should be a random string, but this works (see )
-    socketUrl += "/websocket";
-
-    // connect to websocket
-    webSocket.begin(ws_host, ws_port, socketUrl);
-    webSocket.setExtraHeaders(); // remove "Origin: file://" header because it breaks the connection with Spring's default websocket config
-    //    webSocket.setExtraHeaders("foo: I am so funny\r\nbar: not"); // some headers, in case you feel funny
-    webSocket.onEvent(webSocketEvent);
-}
-
-void loop() {
-    webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer/WebSocketServer.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer/WebSocketServer.ino
deleted file mode 100644
index 1ac3002d2..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer/WebSocketServer.ino
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * WebSocketServer.ino
- *
- *  Created on: 22.05.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-#define USE_SERIAL Serial1
-
-void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[%u] Disconnected!\n", num);
-            break;
-        case WStype_CONNECTED:
-            {
-                IPAddress ip = webSocket.remoteIP(num);
-                USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
-				
-				// send message to client
-				webSocket.sendTXT(num, "Connected");
-            }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
-
-            // send message to client
-            // webSocket.sendTXT(num, "message here");
-
-            // send data to all connected clients
-            // webSocket.broadcastTXT("message here");
-            break;
-        case WStype_BIN:
-            USE_SERIAL.printf("[%u] get binary length: %u\n", num, length);
-            hexdump(payload, length);
-
-            // send message to client
-            // webSocket.sendBIN(num, payload, length);
-            break;
-    }
-
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-    for(uint8_t t = 4; t > 0; t--) {
-        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-        USE_SERIAL.flush();
-        delay(1000);
-    }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    webSocket.begin();
-    webSocket.onEvent(webSocketEvent);
-}
-
-void loop() {
-    webSocket.loop();
-}
-
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino
deleted file mode 100644
index 5fed1a959..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerAllFunctionsDemo/WebSocketServerAllFunctionsDemo.ino
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * WebSocketServerAllFunctionsDemo.ino
- *
- *  Created on: 10.05.2018
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define LED_RED     15
-#define LED_GREEN   12
-#define LED_BLUE    13
-
-#define USE_SERIAL Serial
-
-ESP8266WiFiMulti WiFiMulti;
-
-ESP8266WebServer server(80);
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[%u] Disconnected!\n", num);
-            break;
-        case WStype_CONNECTED: {
-            IPAddress ip = webSocket.remoteIP(num);
-            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
-
-            // send message to client
-            webSocket.sendTXT(num, "Connected");
-        }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
-
-            if(payload[0] == '#') {
-                // we get RGB data
-
-                // decode rgb data
-                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
-
-                analogWrite(LED_RED, ((rgb >> 16) & 0xFF));
-                analogWrite(LED_GREEN, ((rgb >> 8) & 0xFF));
-                analogWrite(LED_BLUE, ((rgb >> 0) & 0xFF));
-            }
-
-            break;
-    }
-
-}
-
-void setup() {
-    //USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-    for(uint8_t t = 4; t > 0; t--) {
-        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-        USE_SERIAL.flush();
-        delay(1000);
-    }
-
-    pinMode(LED_RED, OUTPUT);
-    pinMode(LED_GREEN, OUTPUT);
-    pinMode(LED_BLUE, OUTPUT);
-
-    digitalWrite(LED_RED, 1);
-    digitalWrite(LED_GREEN, 1);
-    digitalWrite(LED_BLUE, 1);
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    // start webSocket server
-    webSocket.begin();
-    webSocket.onEvent(webSocketEvent);
-
-    if(MDNS.begin("esp8266")) {
-        USE_SERIAL.println("MDNS responder started");
-    }
-
-    // handle index
-    server.on("/", []() {
-        // send index.html
-        server.send(200, "text/html", "LED Control:

R: 
G: 
B: 
");
-    });
-
-    server.begin();
-
-    // Add service to MDNS
-    MDNS.addService("http", "tcp", 80);
-    MDNS.addService("ws", "tcp", 81);
-
-    digitalWrite(LED_RED, 0);
-    digitalWrite(LED_GREEN, 0);
-    digitalWrite(LED_BLUE, 0);
-
-}
-
-unsigned long last_10sec = 0;
-unsigned int counter = 0;
-
-void loop() {
-    unsigned long t = millis();
-    webSocket.loop();
-    server.handleClient();
-
-    if((t - last_10sec) > 10 * 1000) {
-        counter++;
-        bool ping = (counter % 2);
-        int i = webSocket.connectedClients(ping);
-        USE_SERIAL.printf("%d Connected websocket clients ping: %d\n", i, ping);
-        last_10sec = millis();
-    }
-}
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerFragmentation/WebSocketServerFragmentation.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerFragmentation/WebSocketServerFragmentation.ino
deleted file mode 100644
index 84c9775d9..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerFragmentation/WebSocketServerFragmentation.ino
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * WebSocketServer.ino
- *
- *  Created on: 22.05.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-#define USE_SERIAL Serial
-
-String fragmentBuffer = "";
-
-void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-
-	switch(type) {
-		case WStype_DISCONNECTED:
-			USE_SERIAL.printf("[%u] Disconnected!\n", num);
-			break;
-		case WStype_CONNECTED: {
-			IPAddress ip = webSocket.remoteIP(num);
-			USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
-
-			// send message to client
-			webSocket.sendTXT(num, "Connected");
-		}
-			break;
-		case WStype_TEXT:
-			USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
-			break;
-		case WStype_BIN:
-			USE_SERIAL.printf("[%u] get binary length: %u\n", num, length);
-			hexdump(payload, length);
-			break;
-
-		// Fragmentation / continuation opcode handling
-		// case WStype_FRAGMENT_BIN_START:
-		case WStype_FRAGMENT_TEXT_START:
-			fragmentBuffer = (char*)payload;
-			USE_SERIAL.printf("[%u] get start start of Textfragment: %s\n", num, payload);
-			break;
-		case WStype_FRAGMENT:
-			fragmentBuffer += (char*)payload;
-			USE_SERIAL.printf("[%u] get Textfragment : %s\n", num, payload);
-			break;
-		case WStype_FRAGMENT_FIN:
-			fragmentBuffer += (char*)payload;
-			USE_SERIAL.printf("[%u] get end of Textfragment: %s\n", num, payload);
-			USE_SERIAL.printf("[%u] full frame: %s\n", num, fragmentBuffer.c_str());
-			break;
-	}
-
-}
-
-void setup() {
-	// USE_SERIAL.begin(921600);
-	USE_SERIAL.begin(115200);
-
-	//Serial.setDebugOutput(true);
-	USE_SERIAL.setDebugOutput(true);
-
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-	USE_SERIAL.println();
-
-	for(uint8_t t = 4; t > 0; t--) {
-		USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-		USE_SERIAL.flush();
-		delay(1000);
-	}
-
-	WiFiMulti.addAP("SSID", "passpasspass");
-
-	while(WiFiMulti.run() != WL_CONNECTED) {
-		delay(100);
-	}
-
-	webSocket.begin();
-	webSocket.onEvent(webSocketEvent);
-}
-
-void loop() {
-	webSocket.loop();
-}
-
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerHttpHeaderValidation/WebSocketServerHttpHeaderValidation.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerHttpHeaderValidation/WebSocketServerHttpHeaderValidation.ino
deleted file mode 100644
index 8bc646c4f..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServerHttpHeaderValidation/WebSocketServerHttpHeaderValidation.ino
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * WebSocketServerHttpHeaderValidation.ino
- *
- *  Created on: 08.06.2016
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-ESP8266WiFiMulti WiFiMulti;
-
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-#define USE_SERIAL Serial1
-
-const unsigned long int validSessionId = 12345; //some arbitrary value to act as a valid sessionId
-
-/*
- * Returns a bool value as an indicator to describe whether a user is allowed to initiate a websocket upgrade
- * based on the value of a cookie. This function expects the rawCookieHeaderValue to look like this "sessionId=|"
- */
-bool isCookieValid(String rawCookieHeaderValue) {
-
-	if (rawCookieHeaderValue.indexOf("sessionId") != -1) {
-		String sessionIdStr = rawCookieHeaderValue.substring(rawCookieHeaderValue.indexOf("sessionId=") + 10, rawCookieHeaderValue.indexOf("|"));
-		unsigned long int sessionId = strtoul(sessionIdStr.c_str(), NULL, 10);
-		return sessionId == validSessionId;
-	}
-	return false;
-}
-
-/*
- * The WebSocketServerHttpHeaderValFunc delegate passed to webSocket.onValidateHttpHeader
- */
-bool validateHttpHeader(String headerName, String headerValue) {
-
-	//assume a true response for any headers not handled by this validator
-	bool valid = true;
-
-	if(headerName.equalsIgnoreCase("Cookie")) {
-		//if the header passed is the Cookie header, validate it according to the rules in 'isCookieValid' function
-		valid = isCookieValid(headerValue);
-	}
-
-	return valid;
-}
-
-void setup() {
-    // USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //Serial.setDebugOutput(true);
-    USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-    for(uint8_t t = 4; t > 0; t--) {
-        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-        USE_SERIAL.flush();
-        delay(1000);
-    }
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    //connecting clients must supply a valid session cookie at websocket upgrade handshake negotiation time
-    const char * headerkeys[] = { "Cookie" };
-    size_t headerKeyCount = sizeof(headerkeys) / sizeof(char*);
-    webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys, headerKeyCount);
-    webSocket.begin();
-}
-
-void loop() {
-    webSocket.loop();
-}
-
diff --git a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino b/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
deleted file mode 100644
index 8f32e753a..000000000
--- a/libraries/arduinoWebSockets/examples/esp8266/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * WebSocketServer_LEDcontrol.ino
- *
- *  Created on: 26.11.2015
- *
- */
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define LED_RED     15
-#define LED_GREEN   12
-#define LED_BLUE    13
-
-#define USE_SERIAL Serial
-
-
-ESP8266WiFiMulti WiFiMulti;
-
-ESP8266WebServer server(80);
-WebSocketsServer webSocket = WebSocketsServer(81);
-
-void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-
-    switch(type) {
-        case WStype_DISCONNECTED:
-            USE_SERIAL.printf("[%u] Disconnected!\n", num);
-            break;
-        case WStype_CONNECTED: {
-            IPAddress ip = webSocket.remoteIP(num);
-            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
-
-            // send message to client
-            webSocket.sendTXT(num, "Connected");
-        }
-            break;
-        case WStype_TEXT:
-            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
-
-            if(payload[0] == '#') {
-                // we get RGB data
-
-                // decode rgb data
-                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
-
-                analogWrite(LED_RED,    ((rgb >> 16) & 0xFF));
-                analogWrite(LED_GREEN,  ((rgb >> 8) & 0xFF));
-                analogWrite(LED_BLUE,   ((rgb >> 0) & 0xFF));
-            }
-
-            break;
-    }
-
-}
-
-void setup() {
-    //USE_SERIAL.begin(921600);
-    USE_SERIAL.begin(115200);
-
-    //USE_SERIAL.setDebugOutput(true);
-
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-    USE_SERIAL.println();
-
-    for(uint8_t t = 4; t > 0; t--) {
-        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
-        USE_SERIAL.flush();
-        delay(1000);
-    }
-
-    pinMode(LED_RED, OUTPUT);
-    pinMode(LED_GREEN, OUTPUT);
-    pinMode(LED_BLUE, OUTPUT);
-
-    digitalWrite(LED_RED, 1);
-    digitalWrite(LED_GREEN, 1);
-    digitalWrite(LED_BLUE, 1);
-
-    WiFiMulti.addAP("SSID", "passpasspass");
-
-    while(WiFiMulti.run() != WL_CONNECTED) {
-        delay(100);
-    }
-
-    // start webSocket server
-    webSocket.begin();
-    webSocket.onEvent(webSocketEvent);
-
-    if(MDNS.begin("esp8266")) {
-        USE_SERIAL.println("MDNS responder started");
-    }
-
-    // handle index
-    server.on("/", []() {
-        // send index.html
-        server.send(200, "text/html", "LED Control:

R: 
G: 
B: 
");
-    });
-
-    server.begin();
-
-    // Add service to MDNS
-    MDNS.addService("http", "tcp", 80);
-    MDNS.addService("ws", "tcp", 81);
-
-    digitalWrite(LED_RED, 0);
-    digitalWrite(LED_GREEN, 0);
-    digitalWrite(LED_BLUE, 0);
-
-}
-
-void loop() {
-    webSocket.loop();
-    server.handleClient();
-}
diff --git a/libraries/arduinoWebSockets/examples/particle/ParticleWebSocketClient/application.cpp b/libraries/arduinoWebSockets/examples/particle/ParticleWebSocketClient/application.cpp
deleted file mode 100644
index 461228f39..000000000
--- a/libraries/arduinoWebSockets/examples/particle/ParticleWebSocketClient/application.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* To compile using make CLI, create a folder under \firmware\user\applications and copy application.cpp there.
-*  Then, copy src files under particleWebSocket folder.
-*/
-
-#include "application.h"
-#include "particleWebSocket/WebSocketsClient.h"
-
-WebSocketsClient webSocket;
-
-void webSocketEvent(WStype_t type, uint8_t* payload, size_t length)
-{
-	switch (type)
-	{
-	case WStype_DISCONNECTED:
-		Serial.printlnf("[WSc] Disconnected!");
-		break;
-	case WStype_CONNECTED:
-		Serial.printlnf("[WSc] Connected to URL: %s", payload);
-		webSocket.sendTXT("Connected\r\n");
-		break;
-	case WStype_TEXT:
-		Serial.printlnf("[WSc] get text: %s", payload);
-		break;
-	case WStype_BIN:
-		Serial.printlnf("[WSc] get binary length: %u", length);
-		break;
-	}
-}
-
-void setup()
-{
-	Serial.begin(9600);
-	
-	WiFi.setCredentials("[SSID]", "[PASSWORD]", WPA2, WLAN_CIPHER_AES_TKIP);
-	WiFi.connect();
-	    
-	webSocket.begin("192.168.1.153", 85, "/ClientService/?variable=Test1212");
-	webSocket.onEvent(webSocketEvent);
-}
-
-void loop()
-{
-	webSocket.sendTXT("Hello world!");
-	delay(500);
-	webSocket.loop();
-}
diff --git a/libraries/arduinoWebSockets/library.json b/libraries/arduinoWebSockets/library.json
deleted file mode 100644
index 0dbd62d2c..000000000
--- a/libraries/arduinoWebSockets/library.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "WebSockets",
-    "description": "WebSocket Server and Client for Arduino based on RFC6455",
-    "keywords": "wifi, http, web, server, client, websocket",
-    "authors": [
-        {
-            "name": "Markus Sattler",
-            "url": "https://github.com/Links2004",
-            "maintainer": true
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Links2004/arduinoWebSockets.git"
-    },
-    "version": "2.1.0",
-    "license": "LGPL-2.1",
-    "export": {
-        "exclude": [
-            "tests"
-        ]
-    },
-    "frameworks": "arduino",
-    "platforms": "atmelavr, espressif8266, espressif32"
-}
diff --git a/libraries/arduinoWebSockets/library.properties b/libraries/arduinoWebSockets/library.properties
deleted file mode 100644
index 14e1fe95d..000000000
--- a/libraries/arduinoWebSockets/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=WebSockets
-version=2.1.0
-author=Markus Sattler
-maintainer=Markus Sattler
-sentence=WebSockets for Arduino (Server + Client)
-paragraph=use 2.x.x for ESP and 1.3 for AVR
-category=Communication
-url=https://github.com/Links2004/arduinoWebSockets
-architectures=*
diff --git a/libraries/arduinoWebSockets/src/WebSockets.cpp b/libraries/arduinoWebSockets/src/WebSockets.cpp
deleted file mode 100644
index 44b9e9a96..000000000
--- a/libraries/arduinoWebSockets/src/WebSockets.cpp
+++ /dev/null
@@ -1,654 +0,0 @@
-/**
- * @file WebSockets.cpp
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "WebSockets.h"
-
-#ifdef ESP8266
-#include 
-#endif
-
-extern "C" {
-#ifdef CORE_HAS_LIBB64
-#include 
-#else
-#include "libb64/cencode_inc.h"
-#endif
-}
-
-#ifdef ESP8266
-#include 
-#elif defined(ESP32)
-#include 
-#else
-
-extern "C" {
-#include "libsha1/libsha1.h"
-}
-
-#endif
-
-
-/**
- *
- * @param client WSclient_t *  ptr to the client struct
- * @param code uint16_t see RFC
- * @param reason ptr to the disconnect reason message
- * @param reasonLen length of the disconnect reason message
- */
-void WebSockets::clientDisconnect(WSclient_t * client, uint16_t code, char * reason, size_t reasonLen) {
-    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] clientDisconnect code: %u\n", client->num, code);
-    if(client->status == WSC_CONNECTED && code) {
-        if(reason) {
-            sendFrame(client, WSop_close, (uint8_t *) reason, reasonLen);
-        } else {
-            uint8_t buffer[2];
-            buffer[0] = ((code >> 8) & 0xFF);
-            buffer[1] = (code & 0xFF);
-            sendFrame(client, WSop_close, &buffer[0], 2);
-        }
-    }
-    clientDisconnect(client);
-}
-
-/**
- *
- * @param client WSclient_t *   ptr to the client struct
- * @param opcode WSopcode_t
- * @param payload uint8_t *     ptr to the payload
- * @param length size_t         length of the payload
- * @param mask bool             add dummy mask to the frame (needed for web browser)
- * @param fin bool              can be used to send data in more then one frame (set fin on the last frame)
- * @param headerToPayload bool  set true if the payload has reserved 14 Byte at the beginning to dynamically add the Header (payload neet to be in RAM!)
- * @return true if ok
- */
-bool WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool mask, bool fin, bool headerToPayload) {
-
-    if(client->tcp && !client->tcp->connected()) {
-        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not Connected!?\n", client->num);
-        return false;
-    }
-
-    if(client->status != WSC_CONNECTED) {
-        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not in WSC_CONNECTED state!?\n", client->num);
-        return false;
-    }
-
-    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] ------- send message frame -------\n", client->num);
-    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] fin: %u opCode: %u mask: %u length: %u headerToPayload: %u\n", client->num, fin, opcode, mask, length, headerToPayload);
-
-    if(opcode == WSop_text) {
-        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] text: %s\n", client->num, (payload + (headerToPayload ? 14 : 0)));
-    }
-
-    uint8_t maskKey[4] = { 0x00, 0x00, 0x00, 0x00 };
-    uint8_t buffer[WEBSOCKETS_MAX_HEADER_SIZE] = { 0 };
-
-    uint8_t headerSize;
-    uint8_t * headerPtr;
-    uint8_t * payloadPtr = payload;
-    bool useInternBuffer = false;
-    bool ret = true;
-
-    // calculate header Size
-    if(length < 126) {
-        headerSize = 2;
-    } else if(length < 0xFFFF) {
-        headerSize = 4;
-    } else {
-        headerSize = 10;
-    }
-
-    if(mask) {
-        headerSize += 4;
-    }
-
-#ifdef WEBSOCKETS_USE_BIG_MEM
-    // only for ESP since AVR has less HEAP
-    // try to send data in one TCP package (only if some free Heap is there)
-    if(!headerToPayload && ((length > 0) && (length < 1400)) && (GET_FREE_HEAP > 6000)) {
-        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] pack to one TCP package...\n", client->num);
-        uint8_t * dataPtr = (uint8_t *) malloc(length + WEBSOCKETS_MAX_HEADER_SIZE);
-        if(dataPtr) {
-            memcpy((dataPtr + WEBSOCKETS_MAX_HEADER_SIZE), payload, length);
-            headerToPayload = true;
-            useInternBuffer = true;
-            payloadPtr = dataPtr;
-        }
-    }
-#endif
-
-    // set Header Pointer
-    if(headerToPayload) {
-        // calculate offset in payload
-        headerPtr = (payloadPtr + (WEBSOCKETS_MAX_HEADER_SIZE - headerSize));
-    } else {
-        headerPtr = &buffer[0];
-    }
-
-    // create header
-
-    // byte 0
-    *headerPtr = 0x00;
-    if(fin) {
-        *headerPtr |= bit(7);    ///< set Fin
-    }
-    *headerPtr |= opcode;        ///< set opcode
-    headerPtr++;
-
-    // byte 1
-    *headerPtr = 0x00;
-    if(mask) {
-        *headerPtr |= bit(7);    ///< set mask
-    }
-
-    if(length < 126) {
-        *headerPtr |= length;
-        headerPtr++;
-    } else if(length < 0xFFFF) {
-        *headerPtr |= 126;
-        headerPtr++;
-        *headerPtr = ((length >> 8) & 0xFF);
-        headerPtr++;
-        *headerPtr = (length & 0xFF);
-        headerPtr++;
-    } else {
-        // Normally we never get here (to less memory)
-        *headerPtr |= 127;
-        headerPtr++;
-        *headerPtr = 0x00;
-        headerPtr++;
-        *headerPtr = 0x00;
-        headerPtr++;
-        *headerPtr = 0x00;
-        headerPtr++;
-        *headerPtr = 0x00;
-        headerPtr++;
-        *headerPtr = ((length >> 24) & 0xFF);
-        headerPtr++;
-        *headerPtr = ((length >> 16) & 0xFF);
-        headerPtr++;
-        *headerPtr = ((length >> 8) & 0xFF);
-        headerPtr++;
-        *headerPtr = (length & 0xFF);
-        headerPtr++;
-    }
-
-    if(mask) {
-        if(useInternBuffer) {
-            // if we use a Intern Buffer we can modify the data
-            // by this fact its possible the do the masking
-            for(uint8_t x = 0; x < sizeof(maskKey); x++) {
-                maskKey[x] = random(0xFF);
-                *headerPtr = maskKey[x];
-                headerPtr++;
-            }
-
-            uint8_t * dataMaskPtr;
-
-            if(headerToPayload) {
-                dataMaskPtr = (payloadPtr + WEBSOCKETS_MAX_HEADER_SIZE);
-            } else {
-                dataMaskPtr = payloadPtr;
-            }
-
-            for(size_t x = 0; x < length; x++) {
-                dataMaskPtr[x] = (dataMaskPtr[x] ^ maskKey[x % 4]);
-            }
-
-        } else {
-            *headerPtr = maskKey[0];
-            headerPtr++;
-            *headerPtr = maskKey[1];
-            headerPtr++;
-            *headerPtr = maskKey[2];
-            headerPtr++;
-            *headerPtr = maskKey[3];
-            headerPtr++;
-        }
-    }
-
-#ifndef NODEBUG_WEBSOCKETS
-    unsigned long start = micros();
-#endif
-
-    if(headerToPayload) {
-        // header has be added to payload
-        // payload is forced to reserved 14 Byte but we may not need all based on the length and mask settings
-        // offset in payload is calculatetd 14 - headerSize
-        if(write(client, &payloadPtr[(WEBSOCKETS_MAX_HEADER_SIZE - headerSize)], (length + headerSize)) != (length + headerSize)) {
-            ret = false;
-        }
-    } else {
-        // send header
-        if(write(client, &buffer[0], headerSize) != headerSize) {
-            ret = false;
-        }
-
-        if(payloadPtr && length > 0) {
-            // send payload
-            if(write(client, &payloadPtr[0], length) != length) {
-                ret = false;
-            }
-        }
-    }
-
-    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] sending Frame Done (%luus).\n", client->num, (micros() - start));
-
-#ifdef WEBSOCKETS_USE_BIG_MEM
-    if(useInternBuffer && payloadPtr) {
-        free(payloadPtr);
-    }
-#endif
-
-    return ret;
-}
-
-/**
- * callen when HTTP header is done
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSockets::headerDone(WSclient_t * client) {
-    client->status = WSC_CONNECTED;
-    client->cWsRXsize = 0;
-    DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done.\n", client->num);
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    client->cHttpLine = "";
-    handleWebsocket(client);
-#endif
-}
-
-/**
- * handle the WebSocket stream
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSockets::handleWebsocket(WSclient_t * client) {
-    if(client->cWsRXsize == 0) {
-        handleWebsocketCb(client);
-    }
-}
-
-/**
- * wait for
- * @param client
- * @param size
- */
-bool WebSockets::handleWebsocketWaitFor(WSclient_t * client, size_t size) {
-    if(!client->tcp || !client->tcp->connected()) {
-        return false;
-    }
-
-    if(size > WEBSOCKETS_MAX_HEADER_SIZE) {
-        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d too big!\n", client->num, size);
-        return false;
-    }
-
-    if(client->cWsRXsize >= size) {
-        return true;
-    }
-
-    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d cWsRXsize: %d\n", client->num, size, client->cWsRXsize);
-    readCb(client, &client->cWsHeader[client->cWsRXsize], (size - client->cWsRXsize), std::bind([](WebSockets * server, size_t size, WSclient_t * client, bool ok) {
-        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor][readCb] size: %d ok: %d\n", client->num, size, ok);
-        if(ok) {
-            client->cWsRXsize = size;
-            server->handleWebsocketCb(client);
-        } else {
-            DEBUG_WEBSOCKETS("[WS][%d][readCb] failed.\n", client->num);
-            client->cWsRXsize = 0;
-            // timeout or error
-            server->clientDisconnect(client, 1002);
-        }
-    }, this, size, std::placeholders::_1, std::placeholders::_2));
-    return false;
-}
-
-void WebSockets::handleWebsocketCb(WSclient_t * client) {
-
-    if(!client->tcp || !client->tcp->connected()) {
-        return;
-    }
-
-    uint8_t * buffer = client->cWsHeader;
-
-    WSMessageHeader_t * header = &client->cWsHeaderDecode;
-    uint8_t * payload = NULL;
-
-    uint8_t headerLen = 2;
-
-    if(!handleWebsocketWaitFor(client, headerLen)) {
-        return;
-    }
-
-    // split first 2 bytes in the data
-    header->fin = ((*buffer >> 7) & 0x01);
-    header->rsv1 = ((*buffer >> 6) & 0x01);
-    header->rsv2 = ((*buffer >> 5) & 0x01);
-    header->rsv3 = ((*buffer >> 4) & 0x01);
-    header->opCode = (WSopcode_t) (*buffer & 0x0F);
-    buffer++;
-
-    header->mask = ((*buffer >> 7) & 0x01);
-    header->payloadLen = (WSopcode_t) (*buffer & 0x7F);
-    buffer++;
-
-    if(header->payloadLen == 126) {
-        headerLen += 2;
-        if(!handleWebsocketWaitFor(client, headerLen)) {
-            return;
-        }
-        header->payloadLen = buffer[0] << 8 | buffer[1];
-        buffer += 2;
-    } else if(header->payloadLen == 127) {
-        headerLen += 8;
-        // read 64bit integer as length
-        if(!handleWebsocketWaitFor(client, headerLen)) {
-            return;
-        }
-
-        if(buffer[0] != 0 || buffer[1] != 0 || buffer[2] != 0 || buffer[3] != 0) {
-            // really too big!
-            header->payloadLen = 0xFFFFFFFF;
-        } else {
-            header->payloadLen = buffer[4] << 24 | buffer[5] << 16 | buffer[6] << 8 | buffer[7];
-        }
-        buffer += 8;
-    }
-
-    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] ------- read massage frame -------\n", client->num);
-    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] fin: %u rsv1: %u rsv2: %u rsv3 %u  opCode: %u\n", client->num, header->fin, header->rsv1, header->rsv2, header->rsv3, header->opCode);
-    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] mask: %u payloadLen: %u\n", client->num, header->mask, header->payloadLen);
-
-    if(header->payloadLen > WEBSOCKETS_MAX_DATA_SIZE) {
-        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] payload too big! (%u)\n", client->num, header->payloadLen);
-        clientDisconnect(client, 1009);
-        return;
-    }
-
-    if(header->mask) {
-        headerLen += 4;
-        if(!handleWebsocketWaitFor(client, headerLen)) {
-            return;
-        }
-        header->maskKey = buffer;
-        buffer += 4;
-    }
-
-    if(header->payloadLen > 0) {
-        // if text data we need one more
-        payload = (uint8_t *) malloc(header->payloadLen + 1);
-
-        if(!payload) {
-            DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] to less memory to handle payload %d!\n", client->num, header->payloadLen);
-            clientDisconnect(client, 1011);
-            return;
-        }
-        readCb(client, payload, header->payloadLen, std::bind(&WebSockets::handleWebsocketPayloadCb, this, std::placeholders::_1, std::placeholders::_2, payload));
-    } else {
-        handleWebsocketPayloadCb(client, true, NULL);
-    }
-}
-
-void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload) {
-
-    WSMessageHeader_t * header = &client->cWsHeaderDecode;
-    if(ok) {
-        if(header->payloadLen > 0) {
-            payload[header->payloadLen] = 0x00;
-
-            if(header->mask) {
-                //decode XOR
-                for(size_t i = 0; i < header->payloadLen; i++) {
-                    payload[i] = (payload[i] ^ header->maskKey[i % 4]);
-                }
-            }
-        }
-
-        switch(header->opCode) {
-            case WSop_text:
-                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] text: %s\n", client->num, payload);
-                // no break here!
-            case WSop_binary:
-            case WSop_continuation:
-                messageReceived(client, header->opCode, payload, header->payloadLen, header->fin);
-                break;
-            case WSop_ping:
-                // send pong back
-                sendFrame(client, WSop_pong, payload, header->payloadLen, true);
-                break;
-            case WSop_pong:
-                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get pong (%s)\n", client->num, payload ? (const char*)payload : "");
-                break;
-            case WSop_close: {
-                uint16_t reasonCode = 1000;
-                if(header->payloadLen >= 2) {
-                    reasonCode = payload[0] << 8 | payload[1];
-                }
-                (void)reasonCode;
-                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get ask for close. Code: %d", client->num, reasonCode);
-                if(header->payloadLen > 2) {
-                    DEBUG_WEBSOCKETS(" (%s)\n", (payload + 2));
-                } else {
-                    DEBUG_WEBSOCKETS("\n");
-                }
-                clientDisconnect(client, 1000);
-            }
-                break;
-            default:
-                clientDisconnect(client, 1002);
-                break;
-        }
-
-        if(payload) {
-            free(payload);
-        }
-
-        // reset input
-        client->cWsRXsize = 0;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        //register callback for next message
-        handleWebsocketWaitFor(client, 2);
-#endif
-
-    } else {
-        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] missing data!\n", client->num);
-        free(payload);
-        clientDisconnect(client, 1002);
-    }
-}
-
-/**
- * generate the key for Sec-WebSocket-Accept
- * @param clientKey String
- * @return String Accept Key
- */
-String WebSockets::acceptKey(String & clientKey) {
-    uint8_t sha1HashBin[20] = { 0 };
-#ifdef ESP8266
-    sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);
-#elif defined(ESP32)
-    String data = clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-    esp_sha(SHA1, (unsigned char*)data.c_str(), data.length(), &sha1HashBin[0]);
-#else
-    clientKey += "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-    SHA1_CTX ctx;
-    SHA1Init(&ctx);
-    SHA1Update(&ctx, (const unsigned char*)clientKey.c_str(), clientKey.length());
-    SHA1Final(&sha1HashBin[0], &ctx);
-#endif
-
-    String key = base64_encode(sha1HashBin, 20);
-    key.trim();
-
-    return key;
-}
-
-/**
- * base64_encode
- * @param data uint8_t *
- * @param length size_t
- * @return base64 encoded String
- */
-String WebSockets::base64_encode(uint8_t * data, size_t length) {
-    size_t size = ((length * 1.6f) + 1);
-    char * buffer = (char *) malloc(size);
-    if(buffer) {
-        base64_encodestate _state;
-        base64_init_encodestate(&_state);
-        int len = base64_encode_block((const char *) &data[0], length, &buffer[0], &_state);
-        len = base64_encode_blockend((buffer + len), &_state);
-
-        String base64 = String(buffer);
-        free(buffer);
-        return base64;
-    }
-    return String("-FAIL-");
-}
-
-/**
- * read x byte from tcp or get timeout
- * @param client WSclient_t *
- * @param out  uint8_t * data buffer
- * @param n size_t byte count
- * @return true if ok
- */
-bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWaitCb cb) {
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    if(!client->tcp || !client->tcp->connected()) {
-        return false;
-    }
-
-    client->tcp->readBytes(out, n, std::bind([](WSclient_t * client, bool ok, WSreadWaitCb cb) {
-        if(cb) {
-            cb(client, ok);
-        }
-    }, client, std::placeholders::_1, cb));
-
-#else
-    unsigned long t = millis();
-    size_t len;
-    DEBUG_WEBSOCKETS("[readCb] n: %zu t: %lu\n", n, t);
-    while(n > 0) {
-        if(client->tcp == NULL) {
-            DEBUG_WEBSOCKETS("[readCb] tcp is null!\n");
-            if(cb) {
-                cb(client, false);
-            }
-            return false;
-        }
-
-        if(!client->tcp->connected()) {
-            DEBUG_WEBSOCKETS("[readCb] not connected!\n");
-            if(cb) {
-                cb(client, false);
-            }
-            return false;
-        }
-
-        if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
-            DEBUG_WEBSOCKETS("[readCb] receive TIMEOUT! %lu\n", (millis() - t));
-            if(cb) {
-                cb(client, false);
-            }
-            return false;
-        }
-
-        if(!client->tcp->available()) {
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-            delay(0);
-#endif
-            continue;
-        }
-
-        len = client->tcp->read((uint8_t*) out, n);
-        if(len) {
-            t = millis();
-            out += len;
-            n -= len;
-            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
-        } else {
-            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-    if(cb) {
-        cb(client, true);
-    }
-#endif
-    return true;
-}
-
-/**
- * write x byte to tcp or get timeout
- * @param client WSclient_t *
- * @param out  uint8_t * data buffer
- * @param n size_t byte count
- * @return bytes send
- */
-size_t WebSockets::write(WSclient_t * client, uint8_t *out, size_t n) {
-    if(out == NULL) return 0;
-    if(client == NULL) return 0;
-    unsigned long t = millis();
-    size_t len = 0;
-    size_t total = 0;
-    DEBUG_WEBSOCKETS("[write] n: %zu t: %lu\n", n, t);
-    while(n > 0) {
-        if(client->tcp == NULL) {
-            DEBUG_WEBSOCKETS("[write] tcp is null!\n");
-            break;
-        }
-
-        if(!client->tcp->connected()) {
-            DEBUG_WEBSOCKETS("[write] not connected!\n");
-            break;
-        }
-
-        if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
-            DEBUG_WEBSOCKETS("[write] write TIMEOUT! %lu\n", (millis() - t));
-            break;
-        }
-
-        len = client->tcp->write((const uint8_t*)out, n);
-        if(len) {
-            t = millis();
-            out += len;
-            n -= len;
-            total += len;
-            //DEBUG_WEBSOCKETS("write %d left %d!\n", len, n);
-        } else {
-            //DEBUG_WEBSOCKETS("write %d failed left %d!\n", len, n);
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-    return total;
-}
-
-size_t WebSockets::write(WSclient_t * client, const char *out) {
-    if(client == NULL) return 0;
-    if(out == NULL) return 0;
-    return write(client, (uint8_t*)out, strlen(out));
-}
diff --git a/libraries/arduinoWebSockets/src/WebSockets.h b/libraries/arduinoWebSockets/src/WebSockets.h
deleted file mode 100644
index d4bb31106..000000000
--- a/libraries/arduinoWebSockets/src/WebSockets.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- * @file WebSockets.h
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef WEBSOCKETS_H_
-#define WEBSOCKETS_H_
-
-#ifdef STM32_DEVICE
-#include 
-#define bit(b) (1UL << (b)) // Taken directly from Arduino.h
-#else
-#include 
-#include 
-#endif
-
-#ifdef ARDUINO_ARCH_AVR
-#error Version 2.x.x currently does not support Arduino with AVR since there is no support for std namespace of c++.
-#error Use Version 1.x.x. (ATmega branch)
-#else
-#include 
-#endif
-
-#define NODEBUG_WEBSOCKETS
-
-#ifndef NODEBUG_WEBSOCKETS
-#ifdef DEBUG_ESP_PORT
-#define DEBUG_WEBSOCKETS(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
-#else
-//#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
-#endif
-#endif
-
-
-#ifndef DEBUG_WEBSOCKETS
-#define DEBUG_WEBSOCKETS(...)
-#define NODEBUG_WEBSOCKETS
-#endif
-
-#if defined(ESP8266) || defined(ESP32)
-
-#define WEBSOCKETS_MAX_DATA_SIZE  (15*1024)
-#define WEBSOCKETS_USE_BIG_MEM
-#define GET_FREE_HEAP ESP.getFreeHeap()
-// moves all Header strings to Flash (~300 Byte)
-//#define WEBSOCKETS_SAVE_RAM
-
-#elif defined(STM32_DEVICE)
-
-#define WEBSOCKETS_MAX_DATA_SIZE  (15*1024)
-#define WEBSOCKETS_USE_BIG_MEM
-#define GET_FREE_HEAP System.freeMemory()
-
-#else
-
-//atmega328p has only 2KB ram!
-#define WEBSOCKETS_MAX_DATA_SIZE  (1024)
-// moves all Header strings to Flash
-#define WEBSOCKETS_SAVE_RAM
-
-#endif
-
-
-#define WEBSOCKETS_TCP_TIMEOUT    (2000)
-
-#define NETWORK_ESP8266_ASYNC   (0)
-#define NETWORK_ESP8266         (1)
-#define NETWORK_W5100           (2)
-#define NETWORK_ENC28J60        (3)
-#define NETWORK_ESP32           (4)
-
-// max size of the WS Message Header
-#define WEBSOCKETS_MAX_HEADER_SIZE  (14)
-
-#if !defined(WEBSOCKETS_NETWORK_TYPE)
-// select Network type based
-#if defined(ESP8266) || defined(ESP31B)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
-//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
-//#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
-
-#elif defined(ESP32)
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP32
-
-#else
-#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
-
-#endif
-#endif
-
-// Includes and defined based on Network Type
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-
-// Note:
-//   No SSL/WSS support for client in Async mode
-//   TLS lib need a sync interface!
-
-
-#if defined(ESP8266)
-#include 
-#elif defined(ESP32)
-#include 
-#include 
-#elif defined(ESP31B)
-#include 
-#else
-#error "network type ESP8266 ASYNC only possible on the ESP mcu!"
-#endif
-
-#include 
-#include 
-#define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
-#define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer
-
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-
-#if !defined(ESP8266) && !defined(ESP31B)
-#error "network type ESP8266 only possible on the ESP mcu!"
-#endif
-
-#ifdef ESP8266
-#include 
-#else
-#include 
-#endif
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
-
-#ifdef STM32_DEVICE
-#define WEBSOCKETS_NETWORK_CLASS TCPClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS TCPServer
-#else
-#include 
-#include 
-#define WEBSOCKETS_NETWORK_CLASS EthernetClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer
-#endif
-
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
-
-#include 
-#define WEBSOCKETS_NETWORK_CLASS UIPClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer
-
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-
-#include 
-#include 
-#define WEBSOCKETS_NETWORK_CLASS WiFiClient
-#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
-
-#else
-#error "no network type selected!"
-#endif
-
-// moves all Header strings to Flash (~300 Byte)
-#ifdef WEBSOCKETS_SAVE_RAM
-#define WEBSOCKETS_STRING(var)  F(var)
-#else
-#define WEBSOCKETS_STRING(var)  var
-#endif
-
-typedef enum {
-    WSC_NOT_CONNECTED,
-    WSC_HEADER,
-    WSC_CONNECTED
-} WSclientsStatus_t;
-
-typedef enum {
-    WStype_ERROR,
-    WStype_DISCONNECTED,
-    WStype_CONNECTED,
-    WStype_TEXT,
-    WStype_BIN,
-	WStype_FRAGMENT_TEXT_START,
-	WStype_FRAGMENT_BIN_START,
-	WStype_FRAGMENT,
-	WStype_FRAGMENT_FIN,
-} WStype_t;
-
-typedef enum {
-    WSop_continuation = 0x00, ///< %x0 denotes a continuation frame
-    WSop_text = 0x01,         ///< %x1 denotes a text frame
-    WSop_binary = 0x02,       ///< %x2 denotes a binary frame
-                              ///< %x3-7 are reserved for further non-control frames
-    WSop_close = 0x08,        ///< %x8 denotes a connection close
-    WSop_ping = 0x09,         ///< %x9 denotes a ping
-    WSop_pong = 0x0A          ///< %xA denotes a pong
-                              ///< %xB-F are reserved for further control frames
-} WSopcode_t;
-
-typedef struct {
-
-        bool fin;
-        bool rsv1;
-        bool rsv2;
-        bool rsv3;
-
-        WSopcode_t opCode;
-        bool mask;
-
-        size_t payloadLen;
-
-        uint8_t * maskKey;
-} WSMessageHeader_t;
-
-typedef struct {
-        uint8_t num; ///< connection number
-
-        WSclientsStatus_t status;
-
-        WEBSOCKETS_NETWORK_CLASS * tcp;
-
-        bool isSocketIO;    ///< client for socket.io server
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        bool isSSL;             ///< run in ssl mode
-        WiFiClientSecure * ssl;
-#endif
-
-        String cUrl;        ///< http url
-        uint16_t cCode;     ///< http code
-
-        bool cIsUpgrade;    ///< Connection == Upgrade
-        bool cIsWebsocket;  ///< Upgrade == websocket
-
-        String cSessionId;  ///< client Set-Cookie (session id)
-        String cKey;        ///< client Sec-WebSocket-Key
-        String cAccept;     ///< client Sec-WebSocket-Accept
-        String cProtocol;   ///< client Sec-WebSocket-Protocol
-        String cExtensions; ///< client Sec-WebSocket-Extensions
-        uint16_t cVersion;  ///< client Sec-WebSocket-Version
-
-        uint8_t cWsRXsize;  ///< State of the RX
-        uint8_t cWsHeader[WEBSOCKETS_MAX_HEADER_SIZE]; ///< RX WS Message buffer
-        WSMessageHeader_t cWsHeaderDecode;
-
-        String base64Authorization; ///< Base64 encoded Auth request
-        String plainAuthorization; ///< Base64 encoded Auth request
-
-        String extraHeaders;
-
-        bool cHttpHeadersValid; ///< non-websocket http header validity indicator
-        size_t cMandatoryHeadersCount; ///< non-websocket mandatory http headers present count
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        String cHttpLine;   ///< HTTP header lines
-#endif
-
-} WSclient_t;
-
-
-
-class WebSockets {
-    protected:
-#ifdef __AVR__
-        typedef void (*WSreadWaitCb)(WSclient_t * client, bool ok);
-#else
-        typedef std::function WSreadWaitCb;
-#endif
-
-        virtual void clientDisconnect(WSclient_t * client) = 0;
-        virtual bool clientIsConnected(WSclient_t * client) = 0;
-
-        virtual void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin) = 0;
-
-        void clientDisconnect(WSclient_t * client, uint16_t code, char * reason = NULL, size_t reasonLen = 0);
-        bool sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload = NULL, size_t length = 0, bool mask = false, bool fin = true, bool headerToPayload = false);
-
-        void headerDone(WSclient_t * client);
-
-        void handleWebsocket(WSclient_t * client);
-
-        bool handleWebsocketWaitFor(WSclient_t * client, size_t size);
-        void handleWebsocketCb(WSclient_t * client);
-        void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
-
-        String acceptKey(String & clientKey);
-        String base64_encode(uint8_t * data, size_t length);
-
-        bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);
-        virtual size_t write(WSclient_t * client, uint8_t *out, size_t n);
-        size_t write(WSclient_t * client, const char *out);
-
-
-};
-
-#ifndef UNUSED
-#define UNUSED(var) (void)(var)
-#endif
-#endif /* WEBSOCKETS_H_ */
diff --git a/libraries/arduinoWebSockets/src/WebSocketsClient.cpp b/libraries/arduinoWebSockets/src/WebSocketsClient.cpp
deleted file mode 100644
index 60c48b39c..000000000
--- a/libraries/arduinoWebSockets/src/WebSocketsClient.cpp
+++ /dev/null
@@ -1,764 +0,0 @@
-/**
- * @file WebSocketsClient.cpp
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "WebSockets.h"
-#include "WebSocketsClient.h"
-
-WebSocketsClient::WebSocketsClient() {
-    _cbEvent = NULL;
-    _client.num = 0;
-    _client.extraHeaders = WEBSOCKETS_STRING("Origin: file://");
-}
-
-WebSocketsClient::~WebSocketsClient() {
-    disconnect();
-}
-
-/**
- * calles to init the Websockets server
- */
-void WebSocketsClient::begin(const char *host, uint16_t port, const char * url, const char * protocol) {
-    _host = host;
-    _port = port;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    _fingerprint = "";
-#endif
-
-    _client.num = 0;
-    _client.status = WSC_NOT_CONNECTED;
-    _client.tcp = NULL;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    _client.isSSL = false;
-    _client.ssl = NULL;
-#endif
-    _client.cUrl = url;
-    _client.cCode = 0;
-    _client.cIsUpgrade = false;
-    _client.cIsWebsocket = true;
-    _client.cKey = "";
-    _client.cAccept = "";
-    _client.cProtocol = protocol;
-    _client.cExtensions = "";
-    _client.cVersion = 0;
-    _client.base64Authorization = "";
-    _client.plainAuthorization = "";
-    _client.isSocketIO = false;
-
-#ifdef ESP8266
-    randomSeed(RANDOM_REG32);
-#else
-    // todo find better seed
-    randomSeed(millis());
-#endif
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    asyncConnect();
-#endif
-
-    _lastConnectionFail = 0;
-    _reconnectInterval = 500;
-}
-
-void WebSocketsClient::begin(String host, uint16_t port, String url, String protocol) {
-    begin(host.c_str(), port, url.c_str(), protocol.c_str());
-}
-
-void WebSocketsClient::begin(IPAddress host, uint16_t port, const char * url, const char * protocol) {
-    return begin(host.toString().c_str(), port, url, protocol);
-}
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint, const char * protocol) {
-    begin(host, port, url, protocol);
-    _client.isSSL = true;
-    _fingerprint = fingerprint;
-}
-
-void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String protocol) {
-    beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str(), protocol.c_str());
-}
-#endif
-
-void WebSocketsClient::beginSocketIO(const char *host, uint16_t port, const char * url, const char * protocol) {
-    begin(host, port, url, protocol);
-    _client.isSocketIO = true;
-}
-
-void WebSocketsClient::beginSocketIO(String host, uint16_t port, String url, String protocol) {
-    beginSocketIO(host.c_str(), port, url.c_str(), protocol.c_str());
-}
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-void WebSocketsClient::beginSocketIOSSL(const char *host, uint16_t port, const char * url, const char * protocol) {
-    begin(host, port, url, protocol);
-    _client.isSocketIO = true;
-    _client.isSSL = true;
-    _fingerprint = "";
-}
-
-void WebSocketsClient::beginSocketIOSSL(String host, uint16_t port, String url, String protocol) {
-    beginSocketIOSSL(host.c_str(), port, url.c_str(), protocol.c_str());
-}
-#endif
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-/**
- * called in arduino loop
- */
-void WebSocketsClient::loop(void) {
-    if(!clientIsConnected(&_client)) {
-        // do not flood the server
-        if((millis() - _lastConnectionFail) < _reconnectInterval) {
-            return;
-        }
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        if(_client.isSSL) {
-            DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n");
-            if(_client.ssl) {
-                delete _client.ssl;
-                _client.ssl = NULL;
-                _client.tcp = NULL;
-            }
-            _client.ssl = new WiFiClientSecure();
-            _client.tcp = _client.ssl;
-        } else {
-            DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n");
-            if(_client.tcp) {
-                delete _client.tcp;
-                _client.tcp = NULL;
-            }
-            _client.tcp = new WiFiClient();
-        }
-#else
-        _client.tcp = new WEBSOCKETS_NETWORK_CLASS();
-#endif
-
-        if(!_client.tcp) {
-            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
-            return;
-        }
-
-        if(_client.tcp->connect(_host.c_str(), _port)) {
-            connectedCb();
-            _lastConnectionFail = 0;
-        } else {
-            connectFailedCb();
-            _lastConnectionFail = millis();
-
-        }
-    } else {
-        handleClientData();
-    }
-}
-#endif
-
-/**
- * set callback function
- * @param cbEvent WebSocketServerEvent
- */
-void WebSocketsClient::onEvent(WebSocketClientEvent cbEvent) {
-    _cbEvent = cbEvent;
-}
-
-/**
- * send text data to client
- * @param num uint8_t client id
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsClient::sendTXT(uint8_t * payload, size_t length, bool headerToPayload) {
-    if(length == 0) {
-        length = strlen((const char *) payload);
-    }
-    if(clientIsConnected(&_client)) {
-        return sendFrame(&_client, WSop_text, payload, length, true, true, headerToPayload);
-    }
-    return false;
-}
-
-bool WebSocketsClient::sendTXT(const uint8_t * payload, size_t length) {
-    return sendTXT((uint8_t *) payload, length);
-}
-
-bool WebSocketsClient::sendTXT(char * payload, size_t length, bool headerToPayload) {
-    return sendTXT((uint8_t *) payload, length, headerToPayload);
-}
-
-bool WebSocketsClient::sendTXT(const char * payload, size_t length) {
-    return sendTXT((uint8_t *) payload, length);
-}
-
-bool WebSocketsClient::sendTXT(String & payload) {
-    return sendTXT((uint8_t *) payload.c_str(), payload.length());
-}
-
-/**
- * send binary data to client
- * @param num uint8_t client id
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsClient::sendBIN(uint8_t * payload, size_t length, bool headerToPayload) {
-    if(clientIsConnected(&_client)) {
-        return sendFrame(&_client, WSop_binary, payload, length, true, true, headerToPayload);
-    }
-    return false;
-}
-
-bool WebSocketsClient::sendBIN(const uint8_t * payload, size_t length) {
-    return sendBIN((uint8_t *) payload, length);
-}
-
-/**
- * sends a WS ping to Server
- * @param payload uint8_t *
- * @param length size_t
- * @return true if ping is send out
- */
-bool WebSocketsClient::sendPing(uint8_t * payload, size_t length) {
-    if(clientIsConnected(&_client)) {
-        return sendFrame(&_client, WSop_ping, payload, length, true);
-    }
-    return false;
-}
-
-bool WebSocketsClient::sendPing(String & payload) {
-    return sendPing((uint8_t *) payload.c_str(), payload.length());
-}
-
-/**
- * disconnect one client
- * @param num uint8_t client id
- */
-void WebSocketsClient::disconnect(void) {
-    if(clientIsConnected(&_client)) {
-        WebSockets::clientDisconnect(&_client, 1000);
-    }
-}
-
-/**
- * set the Authorizatio for the http request
- * @param user const char *
- * @param password const char *
- */
-void WebSocketsClient::setAuthorization(const char * user, const char * password) {
-    if(user && password) {
-        String auth = user;
-        auth += ":";
-        auth += password;
-        _client.base64Authorization = base64_encode((uint8_t *) auth.c_str(), auth.length());
-    }
-}
-
-/**
- * set the Authorizatio for the http request
- * @param auth const char * base64
- */
-void WebSocketsClient::setAuthorization(const char * auth) {
-    if(auth) {
-        //_client.base64Authorization = auth;
-        _client.plainAuthorization = auth;
-    }
-}
-
-/**
- * set extra headers for the http request;
- * separate headers by "\r\n"
- * @param extraHeaders const char * extraHeaders
- */
-void WebSocketsClient::setExtraHeaders(const char * extraHeaders) {
-    _client.extraHeaders = extraHeaders;
-}
-
-/**
- * set the reconnect Interval
- * how long to wait after a connection initiate failed
- * @param time in ms
- */
-void WebSocketsClient::setReconnectInterval(unsigned long time) {
-    _reconnectInterval = time;
-}
-
-//#################################################################################
-//#################################################################################
-//#################################################################################
-
-/**
- *
- * @param client WSclient_t *  ptr to the client struct
- * @param opcode WSopcode_t
- * @param payload  uint8_t *
- * @param length size_t
- */
-void WebSocketsClient::messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin) {
-    WStype_t type = WStype_ERROR;
-
-    UNUSED(client);
-
-    switch(opcode) {
-        case WSop_text:
-            type = fin ? WStype_TEXT : WStype_FRAGMENT_TEXT_START;
-            break;
-        case WSop_binary:
-            type = fin ? WStype_BIN : WStype_FRAGMENT_BIN_START;
-            break;
-        case WSop_continuation:
-            type = fin ? WStype_FRAGMENT_FIN : WStype_FRAGMENT;
-            break;
-        case WSop_close:
-        case WSop_ping:
-        case WSop_pong:
-        default:
-            break;
-    }
-
-    runCbEvent(type, payload, length);
-
-}
-
-/**
- * Disconnect an client
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSocketsClient::clientDisconnect(WSclient_t * client) {
-
-    bool event = false;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    if(client->isSSL && client->ssl) {
-        if(client->ssl->connected()) {
-            client->ssl->flush();
-            client->ssl->stop();
-        }
-        event = true;
-        delete client->ssl;
-        client->ssl = NULL;
-        client->tcp = NULL;
-    }
-#endif
-
-    if(client->tcp) {
-        if(client->tcp->connected()) {
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-            client->tcp->flush();
-#endif
-            client->tcp->stop();
-        }
-        event = true;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->status = WSC_NOT_CONNECTED;
-#else
-        delete client->tcp;
-#endif
-        client->tcp = NULL;
-    }
-
-    client->cCode = 0;
-    client->cKey = "";
-    client->cAccept = "";
-    client->cVersion = 0;
-    client->cIsUpgrade = false;
-    client->cIsWebsocket = false;
-    client->cSessionId = "";
-
-    client->status = WSC_NOT_CONNECTED;
-
-    DEBUG_WEBSOCKETS("[WS-Client] client disconnected.\n");
-    if(event) {
-        runCbEvent(WStype_DISCONNECTED, NULL, 0);
-    }
-}
-
-/**
- * get client state
- * @param client WSclient_t *  ptr to the client struct
- * @return true = conneted
- */
-bool WebSocketsClient::clientIsConnected(WSclient_t * client) {
-
-    if(!client->tcp) {
-        return false;
-    }
-
-    if(client->tcp->connected()) {
-        if(client->status != WSC_NOT_CONNECTED) {
-            return true;
-        }
-    } else {
-        // client lost
-        if(client->status != WSC_NOT_CONNECTED) {
-            DEBUG_WEBSOCKETS("[WS-Client] connection lost.\n");
-            // do cleanup
-            clientDisconnect(client);
-        }
-    }
-
-    if(client->tcp) {
-        // do cleanup
-        clientDisconnect(client);
-    }
-
-    return false;
-}
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-/**
- * Handel incomming data from Client
- */
-void WebSocketsClient::handleClientData(void) {
-    int len = _client.tcp->available();
-    if(len > 0) {
-        switch(_client.status) {
-            case WSC_HEADER: {
-                String headerLine = _client.tcp->readStringUntil('\n');
-                handleHeader(&_client, &headerLine);
-            }
-                break;
-            case WSC_CONNECTED:
-                WebSockets::handleWebsocket(&_client);
-                break;
-            default:
-                WebSockets::clientDisconnect(&_client, 1002);
-                break;
-        }
-    }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    delay(0);
-#endif
-}
-#endif
-
-/**
- * send the WebSocket header to Server
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSocketsClient::sendHeader(WSclient_t * client) {
-
-    static const char * NEW_LINE = "\r\n";
-
-    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header...\n");
-
-    uint8_t randomKey[16] = { 0 };
-
-    for(uint8_t i = 0; i < sizeof(randomKey); i++) {
-        randomKey[i] = random(0xFF);
-    }
-
-    client->cKey = base64_encode(&randomKey[0], 16);
-
-#ifndef NODEBUG_WEBSOCKETS
-    unsigned long start = micros();
-#endif
-
-    String handshake;
-    bool ws_header = true;
-    String url = client->cUrl;
-
-    if(client->isSocketIO) {
-        if(client->cSessionId.length() == 0) {
-            url += WEBSOCKETS_STRING("&transport=polling");
-            ws_header = false;
-        } else {
-            url += WEBSOCKETS_STRING("&transport=websocket&sid=");
-            url += client->cSessionId;
-        }
-    }
-
-    handshake = WEBSOCKETS_STRING("GET ");
-    handshake += url + WEBSOCKETS_STRING(" HTTP/1.1\r\n"
-            "Host: ");
-    handshake += _host + ":" + _port + NEW_LINE;
-
-    if(ws_header) {
-        handshake += WEBSOCKETS_STRING("Connection: Upgrade\r\n"
-                "Upgrade: websocket\r\n"
-                "Sec-WebSocket-Version: 13\r\n"
-                "Sec-WebSocket-Key: ");
-        handshake += client->cKey + NEW_LINE;
-
-        if(client->cProtocol.length() > 0) {
-            handshake += WEBSOCKETS_STRING("Sec-WebSocket-Protocol: ");
-            handshake += client->cProtocol + NEW_LINE;
-        }
-
-        if(client->cExtensions.length() > 0) {
-            handshake += WEBSOCKETS_STRING("Sec-WebSocket-Extensions: ");
-            handshake += client->cExtensions + NEW_LINE;
-        }
-    } else {
-        handshake += WEBSOCKETS_STRING("Connection: keep-alive\r\n");
-    }
-
-    // add extra headers; by default this includes "Origin: file://"
-    if(client->extraHeaders) {
-        handshake += client->extraHeaders + NEW_LINE;
-    }
-
-    handshake += WEBSOCKETS_STRING("User-Agent: arduino-WebSocket-Client\r\n");
-
-    if(client->base64Authorization.length() > 0) {
-        handshake += WEBSOCKETS_STRING("Authorization: Basic ");
-        handshake += client->base64Authorization + NEW_LINE;
-    }
-
-    if(client->plainAuthorization.length() > 0) {
-        handshake += WEBSOCKETS_STRING("Authorization: ");
-        handshake += client->plainAuthorization + NEW_LINE;
-    }
-
-    handshake += NEW_LINE;
-
-    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] handshake %s", (uint8_t* )handshake.c_str());
-    write(client, (uint8_t*) handshake.c_str(), handshake.length());
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
-#endif
-
-    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%luus).\n", (micros() - start));
-
-}
-
-/**
- * handle the WebSocket header reading
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
-
-    headerLine->trim(); // remove \r
-
-    if(headerLine->length() > 0) {
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] RX: %s\n", headerLine->c_str());
-
-        if(headerLine->startsWith(WEBSOCKETS_STRING("HTTP/1."))) {
-            // "HTTP/1.1 101 Switching Protocols"
-            client->cCode = headerLine->substring(9, headerLine->indexOf(' ', 9)).toInt();
-        } else if(headerLine->indexOf(':')) {
-            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
-            String headerValue = headerLine->substring(headerLine->indexOf(':') + 1);
-
-            // remove space in the beginning  (RFC2616)
-            if(headerValue[0] == ' ') {
-                headerValue.remove(0, 1);
-            }
-
-            if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Connection"))) {
-                if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("upgrade"))) {
-                    client->cIsUpgrade = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Upgrade"))) {
-                if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("websocket"))) {
-                    client->cIsWebsocket = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Accept"))) {
-                client->cAccept = headerValue;
-                client->cAccept.trim(); // see rfc6455
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Protocol"))) {
-                client->cProtocol = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Extensions"))) {
-                client->cExtensions = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
-                client->cVersion = headerValue.toInt();
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Set-Cookie"))) {
-                if(headerValue.indexOf(WEBSOCKETS_STRING("HttpOnly")) > -1) {
-                    client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1, headerValue.indexOf(";"));
-                } else {
-                    client->cSessionId = headerValue.substring(headerValue.indexOf('=') + 1);
-                }
-            }
-        } else {
-            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
-        }
-
-        (*headerLine) = "";
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
-#endif
-
-    } else {
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header read fin.\n");
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Client settings:\n");
-
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cURL: %s\n", client->cUrl.c_str());
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cKey: %s\n", client->cKey.c_str());
-
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Server header:\n");
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cCode: %d\n", client->cCode);
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsUpgrade: %d\n", client->cIsUpgrade);
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsWebsocket: %d\n", client->cIsWebsocket);
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cAccept: %s\n", client->cAccept.c_str());
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cProtocol: %s\n", client->cProtocol.c_str());
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cExtensions: %s\n", client->cExtensions.c_str());
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cVersion: %d\n", client->cVersion);
-        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cSessionId: %s\n", client->cSessionId.c_str());
-
-        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
-
-        if(ok) {
-            switch(client->cCode) {
-                case 101:  ///< Switching Protocols
-
-                    break;
-                case 200:
-                    if(client->isSocketIO) {
-                        break;
-                    }
-                case 403: ///< Forbidden
-                    // todo handle login
-                default:   ///< Server dont unterstand requrst
-                    ok = false;
-                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] serverCode is not 101 (%d)\n", client->cCode);
-                    clientDisconnect(client);
-                    _lastConnectionFail = millis();
-                    break;
-            }
-        }
-
-        if(ok) {
-
-            if(client->cAccept.length() == 0) {
-                ok = false;
-            } else {
-                // generate Sec-WebSocket-Accept key for check
-                String sKey = acceptKey(client->cKey);
-                if(sKey != client->cAccept) {
-                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Sec-WebSocket-Accept is wrong\n");
-                    ok = false;
-                }
-            }
-        }
-
-        if(ok) {
-
-            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Websocket connection init done.\n");
-            headerDone(client);
-
-            runCbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
-
-        } else if(clientIsConnected(client) && client->isSocketIO && client->cSessionId.length() > 0) {
-            sendHeader(client);
-        } else {
-            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");
-            _lastConnectionFail = millis();
-            if(clientIsConnected(client)) {
-                write(client, "This is a webSocket client!");
-            }
-            clientDisconnect(client);
-        }
-    }
-}
-
-void WebSocketsClient::connectedCb() {
-
-    DEBUG_WEBSOCKETS("[WS-Client] connected to %s:%u.\n", _host.c_str(), _port);
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    _client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
-                        DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
-                        client->status = WSC_NOT_CONNECTED;
-                        client->tcp = NULL;
-
-                        // reconnect
-                        c->asyncConnect();
-
-                        return true;
-                    }, this, std::placeholders::_1, &_client));
-#endif
-
-    _client.status = WSC_HEADER;
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-    // set Timeout for readBytesUntil and readStringUntil
-    _client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
-#endif
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-    _client.tcp->setNoDelay(true);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    if(_client.isSSL && _fingerprint.length()) {
-        if(!_client.ssl->verify(_fingerprint.c_str(), _host.c_str())) {
-            DEBUG_WEBSOCKETS("[WS-Client] certificate mismatch\n");
-            WebSockets::clientDisconnect(&_client, 1000);
-            return;
-        }
-    }
-#pragma GCC diagnostic pop
-#endif
-
-    // send Header to Server
-    sendHeader(&_client);
-
-}
-
-void WebSocketsClient::connectFailedCb() {
-    DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Faild\n", _host.c_str(), _port);
-}
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-
-void WebSocketsClient::asyncConnect() {
-
-    DEBUG_WEBSOCKETS("[WS-Client] asyncConnect...\n");
-
-    AsyncClient * tcpclient = new AsyncClient();
-
-    if(!tcpclient) {
-        DEBUG_WEBSOCKETS("[WS-Client] creating AsyncClient class failed!\n");
-        return;
-    }
-
-    tcpclient->onDisconnect([](void *obj, AsyncClient* c) {
-                c->free();
-                delete c;
-            });
-
-    tcpclient->onConnect(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
-                        ws->_client.tcp = new AsyncTCPbuffer(tcp);
-                        if(!ws->_client.tcp) {
-                            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!\n");
-                            ws->connectFailedCb();
-                            return;
-                        }
-                        ws->connectedCb();
-                    }, this, std::placeholders::_2));
-
-    tcpclient->onError(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
-                        ws->connectFailedCb();
-
-                        // reconnect
-                        ws->asyncConnect();
-                    }, this, std::placeholders::_2));
-
-    if(!tcpclient->connect(_host.c_str(), _port)) {
-        connectFailedCb();
-        delete tcpclient;
-    }
-
-}
-
-#endif
diff --git a/libraries/arduinoWebSockets/src/WebSocketsClient.h b/libraries/arduinoWebSockets/src/WebSocketsClient.h
deleted file mode 100644
index 61b8ea2ae..000000000
--- a/libraries/arduinoWebSockets/src/WebSocketsClient.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * @file WebSocketsClient.h
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef WEBSOCKETSCLIENT_H_
-#define WEBSOCKETSCLIENT_H_
-
-#include "WebSockets.h"
-
-class WebSocketsClient: private WebSockets {
-    public:
-#ifdef __AVR__
-        typedef void (*WebSocketClientEvent)(WStype_t type, uint8_t * payload, size_t length);
-#else
-        typedef std::function WebSocketClientEvent;
-#endif
-
-
-        WebSocketsClient(void);
-        virtual ~WebSocketsClient(void);
-
-        void begin(const char *host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
-        void begin(String host, uint16_t port, String url = "/", String protocol = "arduino");
-        void begin(IPAddress host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "", const char * protocol = "arduino");
-        void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "", String protocol = "arduino");
-#endif
-
-        void beginSocketIO(const char *host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
-        void beginSocketIO(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        void beginSocketIOSSL(const char *host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
-        void beginSocketIOSSL(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
-#endif
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-        void loop(void);
-#else
-        // Async interface not need a loop call
-        void loop(void) __attribute__ ((deprecated)) {}
-#endif
-
-        void onEvent(WebSocketClientEvent cbEvent);
-
-        bool sendTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
-        bool sendTXT(const uint8_t * payload, size_t length = 0);
-        bool sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
-        bool sendTXT(const char * payload, size_t length = 0);
-        bool sendTXT(String & payload);
-
-        bool sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
-        bool sendBIN(const uint8_t * payload, size_t length);
-
-        bool sendPing(uint8_t * payload = NULL, size_t length = 0);
-        bool sendPing(String & payload);
-
-        void disconnect(void);
-
-        void setAuthorization(const char * user, const char * password);
-        void setAuthorization(const char * auth);
-	
-        void setExtraHeaders(const char * extraHeaders = NULL);
-
-        void setReconnectInterval(unsigned long time);
-
-    protected:
-        String _host;
-        uint16_t _port;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        String _fingerprint;
-#endif
-        WSclient_t _client;
-
-        WebSocketClientEvent _cbEvent;
-
-        unsigned long _lastConnectionFail;
-        unsigned long _reconnectInterval;
-
-        void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin);
-
-        void clientDisconnect(WSclient_t * client);
-        bool clientIsConnected(WSclient_t * client);
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-        void handleClientData(void);
-#endif
-
-        void sendHeader(WSclient_t * client);
-        void handleHeader(WSclient_t * client, String * headerLine);
-
-        void connectedCb();
-        void connectFailedCb();
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        void asyncConnect();
-#endif
-
-        /**
-         * called for sending a Event to the app
-         * @param type WStype_t
-         * @param payload uint8_t *
-         * @param length size_t
-         */
-        virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) {
-            if(_cbEvent) {
-                _cbEvent(type, payload, length);
-            }
-        }
-
-};
-
-#endif /* WEBSOCKETSCLIENT_H_ */
diff --git a/libraries/arduinoWebSockets/src/WebSocketsServer.cpp b/libraries/arduinoWebSockets/src/WebSocketsServer.cpp
deleted file mode 100644
index 12f26f93d..000000000
--- a/libraries/arduinoWebSockets/src/WebSocketsServer.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-/**
- * @file WebSocketsServer.cpp
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "WebSockets.h"
-#include "WebSocketsServer.h"
-
-WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol) {
-    _port = port;
-    _origin = origin;
-    _protocol = protocol;
-    _runnning = false;
-
-    _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    _server->onClient([](void *s, AsyncClient* c){
-        ((WebSocketsServer*)s)->newClient(new AsyncTCPbuffer(c));
-    }, this);
-#endif
-
-    _cbEvent = NULL;
-
-    _httpHeaderValidationFunc = NULL;
-    _mandatoryHttpHeaders = NULL;
-    _mandatoryHttpHeaderCount = 0;
-
-    memset(&_clients[0], 0x00, (sizeof(WSclient_t) * WEBSOCKETS_SERVER_CLIENT_MAX));
-}
-
-
-WebSocketsServer::~WebSocketsServer() {
-    // disconnect all clients
-    close();
-
-    if (_mandatoryHttpHeaders)
-        delete[] _mandatoryHttpHeaders;
-
-    _mandatoryHttpHeaderCount = 0;
-}
-
-/**
- * called to initialize the Websocket server
- */
-void WebSocketsServer::begin(void) {
-    WSclient_t * client;
-
-    // init client storage
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-
-        client->num = i;
-        client->status = WSC_NOT_CONNECTED;
-        client->tcp = NULL;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        client->isSSL = false;
-        client->ssl = NULL;
-#endif
-        client->cUrl = "";
-        client->cCode = 0;
-        client->cKey = "";
-        client->cProtocol = "";
-        client->cVersion = 0;
-        client->cIsUpgrade = false;
-        client->cIsWebsocket = false;
-
-        client->base64Authorization = "";
-
-        client->cWsRXsize = 0;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->cHttpLine = "";
-#endif
-    }
-
-#ifdef ESP8266
-    randomSeed(RANDOM_REG32);
-#elif defined(ESP32)
-    #define DR_REG_RNG_BASE 0x3ff75144
-    randomSeed(READ_PERI_REG(DR_REG_RNG_BASE));
-#else
-    // TODO find better seed
-    randomSeed(millis());
-#endif
-
-    _runnning = true;
-    _server->begin();
-
-    DEBUG_WEBSOCKETS("[WS-Server] Server Started.\n");
-}
-
-void WebSocketsServer::close(void) {
-    _runnning = false;
-     disconnect();
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-    _server->close();
-#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    _server->end();
-#else
-    // TODO how to close server?
-#endif
-
-}
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-/**
- * called in arduino loop
- */
-void WebSocketsServer::loop(void) {
-    if(_runnning) {
-        handleNewClients();
-        handleClientData();
-    }
-}
-#endif
-
-/**
- * set callback function
- * @param cbEvent WebSocketServerEvent
- */
-void WebSocketsServer::onEvent(WebSocketServerEvent cbEvent) {
-    _cbEvent = cbEvent;
-}
-
-/*
- * Sets the custom http header validator function
- * @param httpHeaderValidationFunc WebSocketServerHttpHeaderValFunc ///< pointer to the custom http header validation function
- * @param mandatoryHttpHeaders[] const char* ///< the array of named http headers considered to be mandatory / must be present in order for websocket upgrade to succeed
- * @param mandatoryHttpHeaderCount size_t ///< the number of items in the mandatoryHttpHeaders array
- */
-void WebSocketsServer::onValidateHttpHeader(
-    WebSocketServerHttpHeaderValFunc validationFunc,
-    const char* mandatoryHttpHeaders[],
-    size_t mandatoryHttpHeaderCount)
-{
-    _httpHeaderValidationFunc = validationFunc;
-
-    if (_mandatoryHttpHeaders)
-        delete[] _mandatoryHttpHeaders;
-
-    _mandatoryHttpHeaderCount = mandatoryHttpHeaderCount;
-    _mandatoryHttpHeaders = new String[_mandatoryHttpHeaderCount];
-
-    for (size_t i = 0; i < _mandatoryHttpHeaderCount; i++) {
-        _mandatoryHttpHeaders[i] = mandatoryHttpHeaders[i];
-    }
-}
-
-/*
- * send text data to client
- * @param num uint8_t client id
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsServer::sendTXT(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
-    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
-        return false;
-    }
-    if(length == 0) {
-        length = strlen((const char *) payload);
-    }
-    WSclient_t * client = &_clients[num];
-    if(clientIsConnected(client)) {
-        return sendFrame(client, WSop_text, payload, length, false, true, headerToPayload);
-    }
-    return false;
-}
-
-bool WebSocketsServer::sendTXT(uint8_t num, const uint8_t * payload, size_t length) {
-    return sendTXT(num, (uint8_t *) payload, length);
-}
-
-bool WebSocketsServer::sendTXT(uint8_t num, char * payload, size_t length, bool headerToPayload) {
-    return sendTXT(num, (uint8_t *) payload, length, headerToPayload);
-}
-
-bool WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length) {
-    return sendTXT(num, (uint8_t *) payload, length);
-}
-
-bool WebSocketsServer::sendTXT(uint8_t num, String & payload) {
-    return sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
-}
-
-/**
- * send text data to client all
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsServer::broadcastTXT(uint8_t * payload, size_t length, bool headerToPayload) {
-    WSclient_t * client;
-    bool ret = true;
-    if(length == 0) {
-        length = strlen((const char *) payload);
-    }
-
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(clientIsConnected(client)) {
-            if(!sendFrame(client, WSop_text, payload, length, false, true, headerToPayload)) {
-                ret = false;
-            }
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-    return ret;
-}
-
-bool WebSocketsServer::broadcastTXT(const uint8_t * payload, size_t length) {
-    return broadcastTXT((uint8_t *) payload, length);
-}
-
-bool WebSocketsServer::broadcastTXT(char * payload, size_t length, bool headerToPayload) {
-    return broadcastTXT((uint8_t *) payload, length, headerToPayload);
-}
-
-bool WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
-    return broadcastTXT((uint8_t *) payload, length);
-}
-
-bool WebSocketsServer::broadcastTXT(String & payload) {
-    return broadcastTXT((uint8_t *) payload.c_str(), payload.length());
-}
-
-/**
- * send binary data to client
- * @param num uint8_t client id
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsServer::sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
-    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
-        return false;
-    }
-    WSclient_t * client = &_clients[num];
-    if(clientIsConnected(client)) {
-        return sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload);
-    }
-    return false;
-}
-
-bool WebSocketsServer::sendBIN(uint8_t num, const uint8_t * payload, size_t length) {
-    return sendBIN(num, (uint8_t *) payload, length);
-}
-
-/**
- * send binary data to client all
- * @param payload uint8_t *
- * @param length size_t
- * @param headerToPayload bool  (see sendFrame for more details)
- * @return true if ok
- */
-bool WebSocketsServer::broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload) {
-    WSclient_t * client;
-    bool ret = true;
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(clientIsConnected(client)) {
-            if(!sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload)) {
-                ret = false;
-            }
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-    return ret;
-}
-
-bool WebSocketsServer::broadcastBIN(const uint8_t * payload, size_t length) {
-    return broadcastBIN((uint8_t *) payload, length);
-}
-
-
-/**
- * sends a WS ping to Client
- * @param num uint8_t client id
- * @param payload uint8_t *
- * @param length size_t
- * @return true if ping is send out
- */
-bool WebSocketsServer::sendPing(uint8_t num, uint8_t * payload, size_t length) {
-    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
-        return false;
-    }
-    WSclient_t * client = &_clients[num];
-    if(clientIsConnected(client)) {
-        return sendFrame(client, WSop_ping, payload, length);
-    }
-    return false;
-}
-
-bool WebSocketsServer::sendPing(uint8_t num, String & payload) {
-    return sendPing(num, (uint8_t *) payload.c_str(), payload.length());
-}
-
-/**
- *  sends a WS ping to all Client
- * @param payload uint8_t *
- * @param length size_t
- * @return true if ping is send out
- */
-bool WebSocketsServer::broadcastPing(uint8_t * payload, size_t length) {
-    WSclient_t * client;
-    bool ret = true;
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(clientIsConnected(client)) {
-            if(!sendFrame(client, WSop_ping, payload, length)) {
-                ret = false;
-            }
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-    return ret;
-}
-
-bool WebSocketsServer::broadcastPing(String & payload) {
-    return broadcastPing((uint8_t *) payload.c_str(), payload.length());
-}
-
-
-/**
- * disconnect all clients
- */
-void WebSocketsServer::disconnect(void) {
-    WSclient_t * client;
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(clientIsConnected(client)) {
-            WebSockets::clientDisconnect(client, 1000);
-        }
-    }
-}
-
-/**
- * disconnect one client
- * @param num uint8_t client id
- */
-void WebSocketsServer::disconnect(uint8_t num) {
-    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
-        return;
-    }
-    WSclient_t * client = &_clients[num];
-    if(clientIsConnected(client)) {
-        WebSockets::clientDisconnect(client, 1000);
-    }
-}
-
-
-/*
- * set the Authorization for the http request
- * @param user const char *
- * @param password const char *
- */
-void WebSocketsServer::setAuthorization(const char * user, const char * password) {
-    if(user && password) {
-        String auth = user;
-        auth += ":";
-        auth += password;
-        _base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
-    }
-}
-
-/**
- * set the Authorizatio for the http request
- * @param auth const char * base64
- */
-void WebSocketsServer::setAuthorization(const char * auth) {
-    if(auth) {
-        _base64Authorization = auth;
-    }
-}
-
-/**
- * count the connected clients (optional ping them)
- * @param ping bool ping the connected clients
- */
-int WebSocketsServer::connectedClients(bool ping) {
-    WSclient_t * client;
-    int count = 0;
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(client->status == WSC_CONNECTED) {
-            if(ping != true || sendPing(i)) {
-                count++;
-            }
-        }
-    }
-    return count;
-}
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-/**
- * get an IP for a client
- * @param num uint8_t client id
- * @return IPAddress
- */
-IPAddress WebSocketsServer::remoteIP(uint8_t num) {
-    if(num < WEBSOCKETS_SERVER_CLIENT_MAX) {
-        WSclient_t * client = &_clients[num];
-        if(clientIsConnected(client)) {
-            return client->tcp->remoteIP();
-        }
-    }
-
-    return IPAddress();
-}
-#endif
-
-//#################################################################################
-//#################################################################################
-//#################################################################################
-
-/**
- * handle new client connection
- * @param client
- */
-bool WebSocketsServer::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient) {
-    WSclient_t * client;
-    // search free list entry for client
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-
-        // state is not connected or tcp connection is lost
-        if(!clientIsConnected(client)) {
-
-            client->tcp = TCPclient;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-            client->isSSL = false;
-            client->tcp->setNoDelay(true);
-#endif
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-            // set Timeout for readBytesUntil and readStringUntil
-            client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
-#endif
-            client->status = WSC_HEADER;
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-            IPAddress ip = client->tcp->remoteIP();
-            (void)ip;
-            DEBUG_WEBSOCKETS("[WS-Server][%d] new client from %d.%d.%d.%d\n", client->num, ip[0], ip[1], ip[2], ip[3]);
-#else
-            DEBUG_WEBSOCKETS("[WS-Server][%d] new client\n", client->num);
-#endif
-
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-            client->tcp->onDisconnect(std::bind([](WebSocketsServer * server, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
-                DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
-
-                AsyncTCPbuffer ** sl = &server->_clients[client->num].tcp;
-                if(*sl == obj) {
-                    client->status = WSC_NOT_CONNECTED;
-                    *sl = NULL;
-                }
-                return true;
-            },  this, std::placeholders::_1, client));
-
-
-            client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
-#endif
-
-            return true;
-            break;
-        }
-    }
-    return false;
-}
-
-/**
- *
- * @param client WSclient_t *  ptr to the client struct
- * @param opcode WSopcode_t
- * @param payload  uint8_t *
- * @param length size_t
- */
-void WebSocketsServer::messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin) {
-    WStype_t type = WStype_ERROR;
-
-    switch(opcode) {
-        case WSop_text:
-            type = fin ? WStype_TEXT : WStype_FRAGMENT_TEXT_START;
-            break;
-        case WSop_binary:
-            type = fin ? WStype_BIN : WStype_FRAGMENT_BIN_START;
-            break;
-        case WSop_continuation:
-            type = fin ? WStype_FRAGMENT_FIN : WStype_FRAGMENT;
-            break;
-        case WSop_close:
-        case WSop_ping:
-        case WSop_pong:
-        default:
-            break;
-    }
-
-    runCbEvent(client->num, type, payload, length);
-
-}
-
-/**
- * Disconnect an client
- * @param client WSclient_t *  ptr to the client struct
- */
-void WebSocketsServer::clientDisconnect(WSclient_t * client) {
-
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    if(client->isSSL && client->ssl) {
-        if(client->ssl->connected()) {
-            client->ssl->flush();
-            client->ssl->stop();
-        }
-        delete client->ssl;
-        client->ssl = NULL;
-        client->tcp = NULL;
-    }
-#endif
-
-    if(client->tcp) {
-        if(client->tcp->connected()) {
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-            client->tcp->flush();
-#endif
-            client->tcp->stop();
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->status = WSC_NOT_CONNECTED;
-#else
-        delete client->tcp;
-#endif
-        client->tcp = NULL;
-    }
-
-    client->cUrl = "";
-    client->cKey = "";
-    client->cProtocol = "";
-    client->cVersion = 0;
-    client->cIsUpgrade = false;
-    client->cIsWebsocket = false;
-
-    client->cWsRXsize = 0;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-    client->cHttpLine = "";
-#endif
-
-    client->status = WSC_NOT_CONNECTED;
-
-    DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
-
-    runCbEvent(client->num, WStype_DISCONNECTED, NULL, 0);
-
-}
-
-/**
- * get client state
- * @param client WSclient_t *  ptr to the client struct
- * @return true = connected
- */
-bool WebSocketsServer::clientIsConnected(WSclient_t * client) {
-
-    if(!client->tcp) {
-        return false;
-    }
-
-    if(client->tcp->connected()) {
-        if(client->status != WSC_NOT_CONNECTED) {
-            return true;
-        }
-    } else {
-        // client lost
-        if(client->status != WSC_NOT_CONNECTED) {
-            DEBUG_WEBSOCKETS("[WS-Server][%d] client connection lost.\n", client->num);
-            // do cleanup
-            clientDisconnect(client);
-        }
-    }
-
-    if(client->tcp) {
-        // do cleanup
-        DEBUG_WEBSOCKETS("[WS-Server][%d] client list cleanup.\n", client->num);
-        clientDisconnect(client);
-    }
-
-    return false;
-}
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-/**
- * Handle incoming Connection Request
- */
-void WebSocketsServer::handleNewClients(void) {
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-    while(_server->hasClient()) {
-#endif
-        bool ok = false;
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        // store new connection
-        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
-#else
-        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
-#endif
-
-        if(!tcpClient) {
-            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
-            return;
-        }
-
-        ok = newClient(tcpClient);
-
-        if(!ok) {
-            // no free space to handle client
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-            IPAddress ip = tcpClient->remoteIP();
-            (void)ip;
-            DEBUG_WEBSOCKETS("[WS-Server] no free space new client from %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
-#else
-            DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
-#endif
-            tcpClient->stop();
-        }
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        delay(0);
-    }
-#endif
-
-}
-
-
-/**
- * Handel incomming data from Client
- */
-void WebSocketsServer::handleClientData(void) {
-
-    WSclient_t * client;
-    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
-        client = &_clients[i];
-        if(clientIsConnected(client)) {
-            int len = client->tcp->available();
-            if(len > 0) {
-                //DEBUG_WEBSOCKETS("[WS-Server][%d][handleClientData] len: %d\n", client->num, len);
-                switch(client->status) {
-                    case WSC_HEADER:
-                    {
-                        String headerLine = client->tcp->readStringUntil('\n');
-                        handleHeader(client, &headerLine);
-                    }
-                        break;
-                    case WSC_CONNECTED:
-                        WebSockets::handleWebsocket(client);
-                        break;
-                    default:
-                        WebSockets::clientDisconnect(client, 1002);
-                        break;
-                }
-            }
-        }
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        delay(0);
-#endif
-    }
-}
-#endif
-
-/*
- * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
- * @param headerName String ///< the name of the header being checked
- */
-bool WebSocketsServer::hasMandatoryHeader(String headerName) {
-    for (size_t i = 0; i < _mandatoryHttpHeaderCount; i++) {
-        if (_mandatoryHttpHeaders[i].equalsIgnoreCase(headerName))
-            return true;
-    }
-    return false;
-}
-
-
-/**
- * handles http header reading for WebSocket upgrade
- * @param client WSclient_t * ///< pointer to the client struct
- * @param headerLine String ///< the header being read / processed
- */
-void WebSocketsServer::handleHeader(WSclient_t * client, String * headerLine) {
-
-    static const char * NEW_LINE = "\r\n";
-
-    headerLine->trim(); // remove \r
-
-    if(headerLine->length() > 0) {
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] RX: %s\n", client->num, headerLine->c_str());
-
-        // websocket requests always start with GET see rfc6455
-        if(headerLine->startsWith("GET ")) {
-
-            // cut URL out
-            client->cUrl = headerLine->substring(4, headerLine->indexOf(' ', 4));
-
-            //reset non-websocket http header validation state for this client
-            client->cHttpHeadersValid = true;
-            client->cMandatoryHeadersCount = 0;
-
-        } else if(headerLine->indexOf(':')) {
-            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
-            String headerValue = headerLine->substring(headerLine->indexOf(':') + 1);
-
-            // remove space in the beginning (RFC2616)
-            if(headerValue[0] == ' ') {
-                headerValue.remove(0, 1);
-            }
-
-            if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Connection"))) {
-                headerValue.toLowerCase();
-                if(headerValue.indexOf(WEBSOCKETS_STRING("upgrade")) >= 0) {
-                    client->cIsUpgrade = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Upgrade"))) {
-                if(headerValue.equalsIgnoreCase(WEBSOCKETS_STRING("websocket"))) {
-                    client->cIsWebsocket = true;
-                }
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Version"))) {
-                client->cVersion = headerValue.toInt();
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Key"))) {
-                client->cKey = headerValue;
-                client->cKey.trim(); // see rfc6455
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Protocol"))) {
-                client->cProtocol = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Sec-WebSocket-Extensions"))) {
-                client->cExtensions = headerValue;
-            } else if(headerName.equalsIgnoreCase(WEBSOCKETS_STRING("Authorization"))) {
-                client->base64Authorization = headerValue;
-            } else {
-                client->cHttpHeadersValid &= execHttpHeaderValidation(headerName, headerValue);
-                if(_mandatoryHttpHeaderCount > 0 && hasMandatoryHeader(headerName)) {
-                    client->cMandatoryHeadersCount++;
-                }
-            }
-
-        } else {
-            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
-        }
-
-        (*headerLine) = "";
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
-        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
-#endif
-    } else {
-
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Header read fin.\n", client->num);
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cURL: %s\n", client->num, client->cUrl.c_str());
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsUpgrade: %d\n", client->num, client->cIsUpgrade);
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsWebsocket: %d\n", client->num, client->cIsWebsocket);
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cKey: %s\n", client->num, client->cKey.c_str());
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cProtocol: %s\n", client->num, client->cProtocol.c_str());
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cExtensions: %s\n", client->num, client->cExtensions.c_str());
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cVersion: %d\n", client->num, client->cVersion);
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - base64Authorization: %s\n", client->num, client->base64Authorization.c_str());
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cHttpHeadersValid: %d\n", client->num, client->cHttpHeadersValid);
-        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cMandatoryHeadersCount: %d\n", client->num, client->cMandatoryHeadersCount);
-
-        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
-
-        if(ok) {
-            if(client->cUrl.length() == 0) {
-                ok = false;
-            }
-            if(client->cKey.length() == 0) {
-                ok = false;
-            }
-            if(client->cVersion != 13) {
-                ok = false;
-            }
-            if(!client->cHttpHeadersValid) {
-                ok = false;
-            }
-            if (client->cMandatoryHeadersCount != _mandatoryHttpHeaderCount) {
-                ok = false;
-            }
-        }
-
-        if(_base64Authorization.length() > 0) {
-            String auth = WEBSOCKETS_STRING("Basic ");
-            auth += _base64Authorization;
-            if(auth != client->base64Authorization) {
-                DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] HTTP Authorization failed!\n", client->num);
-                handleAuthorizationFailed(client);
-                return;
-            }
-        }
-
-        if(ok) {
-
-            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incoming.\n", client->num);
-
-            // generate Sec-WebSocket-Accept key
-            String sKey = acceptKey(client->cKey);
-
-            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - sKey: %s\n", client->num, sKey.c_str());
-
-            client->status = WSC_CONNECTED;
-
-            String handshake = WEBSOCKETS_STRING("HTTP/1.1 101 Switching Protocols\r\n"
-                    "Server: arduino-WebSocketsServer\r\n"
-                    "Upgrade: websocket\r\n"
-                    "Connection: Upgrade\r\n"
-                    "Sec-WebSocket-Version: 13\r\n"
-                    "Sec-WebSocket-Accept: ");
-            handshake += sKey + NEW_LINE;
-
-            if(_origin.length() > 0) {
-                handshake += WEBSOCKETS_STRING("Access-Control-Allow-Origin: ");
-                handshake +=_origin + NEW_LINE;
-            }
-
-            if(client->cProtocol.length() > 0) {
-                handshake += WEBSOCKETS_STRING("Sec-WebSocket-Protocol: ");
-                handshake +=_protocol + NEW_LINE;
-            }
-
-            // header end
-            handshake += NEW_LINE;
-
-            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] handshake %s",  client->num, (uint8_t*)handshake.c_str());
-
-            write(client, (uint8_t*)handshake.c_str(), handshake.length());
-
-            headerDone(client);
-
-            // send ping
-            WebSockets::sendFrame(client, WSop_ping);
-
-            runCbEvent(client->num, WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
-
-        } else {
-            handleNonWebsocketConnection(client);
-        }
-    }
-}
-
-
-
diff --git a/libraries/arduinoWebSockets/src/WebSocketsServer.h b/libraries/arduinoWebSockets/src/WebSocketsServer.h
deleted file mode 100644
index db945a6ff..000000000
--- a/libraries/arduinoWebSockets/src/WebSocketsServer.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * @file WebSocketsServer.h
- * @date 20.05.2015
- * @author Markus Sattler
- *
- * Copyright (c) 2015 Markus Sattler. All rights reserved.
- * This file is part of the WebSockets for Arduino.
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef WEBSOCKETSSERVER_H_
-#define WEBSOCKETSSERVER_H_
-
-#include "WebSockets.h"
-
-#ifndef WEBSOCKETS_SERVER_CLIENT_MAX
-#define WEBSOCKETS_SERVER_CLIENT_MAX  (5)
-#endif
-
-
-
-
-class WebSocketsServer: protected WebSockets {
-public:
-
-#ifdef __AVR__
-        typedef void (*WebSocketServerEvent)(uint8_t num, WStype_t type, uint8_t * payload, size_t length);
-        typedef bool (*WebSocketServerHttpHeaderValFunc)(String headerName, String headerValue);
-#else
-        typedef std::function WebSocketServerEvent;
-        typedef std::function WebSocketServerHttpHeaderValFunc;
-#endif
-
-        WebSocketsServer(uint16_t port, String origin = "", String protocol = "arduino");
-        virtual ~WebSocketsServer(void);
-
-        void begin(void);
-        void close(void);
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-        void loop(void);
-#else
-        // Async interface not need a loop call
-        void loop(void) __attribute__ ((deprecated)) {}
-#endif
-
-        void onEvent(WebSocketServerEvent cbEvent);
-        void onValidateHttpHeader(
-			WebSocketServerHttpHeaderValFunc validationFunc,
-			const char* mandatoryHttpHeaders[],
-			size_t mandatoryHttpHeaderCount);
-
-
-        bool sendTXT(uint8_t num, uint8_t * payload, size_t length = 0, bool headerToPayload = false);
-        bool sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
-        bool sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
-        bool sendTXT(uint8_t num, const char * payload, size_t length = 0);
-        bool sendTXT(uint8_t num, String & payload);
-
-        bool broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
-        bool broadcastTXT(const uint8_t * payload, size_t length = 0);
-        bool broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
-        bool broadcastTXT(const char * payload, size_t length = 0);
-        bool broadcastTXT(String & payload);
-
-        bool sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
-        bool sendBIN(uint8_t num, const uint8_t * payload, size_t length);
-
-        bool broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
-        bool broadcastBIN(const uint8_t * payload, size_t length);
-
-        bool sendPing(uint8_t num, uint8_t * payload = NULL, size_t length = 0);
-        bool sendPing(uint8_t num, String & payload);
-
-        bool broadcastPing(uint8_t * payload = NULL, size_t length = 0);
-        bool broadcastPing(String & payload);
-
-        void disconnect(void);
-        void disconnect(uint8_t num);
-
-        void setAuthorization(const char * user, const char * password);
-        void setAuthorization(const char * auth);
-
-        int connectedClients(bool ping = false);
-
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
-        IPAddress remoteIP(uint8_t num);
-#endif
-
-protected:
-        uint16_t _port;
-        String _origin;
-        String _protocol;
-        String _base64Authorization; ///< Base64 encoded Auth request
-        String * _mandatoryHttpHeaders;
-        size_t _mandatoryHttpHeaderCount;
-
-        WEBSOCKETS_NETWORK_SERVER_CLASS * _server;
-
-        WSclient_t _clients[WEBSOCKETS_SERVER_CLIENT_MAX];
-
-        WebSocketServerEvent _cbEvent;
-        WebSocketServerHttpHeaderValFunc _httpHeaderValidationFunc;
-
-        bool _runnning;
-
-        bool newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient);
-
-        void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin);
-
-        void clientDisconnect(WSclient_t * client);
-        bool clientIsConnected(WSclient_t * client);
-
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-        void handleNewClients(void);
-        void handleClientData(void);
-#endif
-
-        void handleHeader(WSclient_t * client, String * headerLine);
-
-        /**
-         * called if a non Websocket connection is coming in.
-         * Note: can be override
-         * @param client WSclient_t *  ptr to the client struct
-         */
-        virtual void handleNonWebsocketConnection(WSclient_t * client) {
-            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] no Websocket connection close.\n", client->num);
-            client->tcp->write("HTTP/1.1 400 Bad Request\r\n"
-                    "Server: arduino-WebSocket-Server\r\n"
-                    "Content-Type: text/plain\r\n"
-                    "Content-Length: 32\r\n"
-                    "Connection: close\r\n"
-                    "Sec-WebSocket-Version: 13\r\n"
-                    "\r\n"
-                    "This is a Websocket server only!");
-            clientDisconnect(client);
-        }
-
-        /**
-         * called if a non Authorization connection is coming in.
-         * Note: can be override
-         * @param client WSclient_t *  ptr to the client struct
-         */
-        virtual void handleAuthorizationFailed(WSclient_t *client) {
-        	 client->tcp->write("HTTP/1.1 401 Unauthorized\r\n"
-                    "Server: arduino-WebSocket-Server\r\n"
-                    "Content-Type: text/plain\r\n"
-                    "Content-Length: 45\r\n"
-                    "Connection: close\r\n"
-                    "Sec-WebSocket-Version: 13\r\n"
-                    "WWW-Authenticate: Basic realm=\"WebSocket Server\""
-                    "\r\n"
-                    "This Websocket server requires Authorization!");
-            clientDisconnect(client);
-        }
-
-        /**
-         * called for sending a Event to the app
-         * @param num uint8_t
-         * @param type WStype_t
-         * @param payload uint8_t *
-         * @param length size_t
-         */
-        virtual void runCbEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
-            if(_cbEvent) {
-                _cbEvent(num, type, payload, length);
-            }
-        }
-
-        /*
-         * Called at client socket connect handshake negotiation time for each http header that is not
-         * a websocket specific http header (not Connection, Upgrade, Sec-WebSocket-*)
-         * If the custom httpHeaderValidationFunc returns false for any headerName / headerValue passed, the
-         * socket negotiation is considered invalid and the upgrade to websockets request is denied / rejected
-         * This mechanism can be used to enable custom authentication schemes e.g. test the value
-         * of a session cookie to determine if a user is logged on / authenticated
-         */
-        virtual bool execHttpHeaderValidation(String headerName, String headerValue) {
-        	if(_httpHeaderValidationFunc) {
-        		//return the value of the custom http header validation function
-        		return _httpHeaderValidationFunc(headerName, headerValue);
-        	}
-        	//no custom http header validation so just assume all is good
-        	return true;
-        }
-
-private:
-        /*
-         * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
-         * @param headerName String ///< the name of the header being checked
-         */
-        bool hasMandatoryHeader(String headerName);
-
-};
-
-
-
-#endif /* WEBSOCKETSSERVER_H_ */
diff --git a/libraries/arduinoWebSockets/src/libb64/AUTHORS b/libraries/arduinoWebSockets/src/libb64/AUTHORS
deleted file mode 100644
index af6873756..000000000
--- a/libraries/arduinoWebSockets/src/libb64/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-libb64: Base64 Encoding/Decoding Routines
-======================================
-
-Authors:
--------
-
-Chris Venter	chris.venter@gmail.com	http://rocketpod.blogspot.com
diff --git a/libraries/arduinoWebSockets/src/libb64/LICENSE b/libraries/arduinoWebSockets/src/libb64/LICENSE
deleted file mode 100644
index a6b56069e..000000000
--- a/libraries/arduinoWebSockets/src/libb64/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright-Only Dedication (based on United States law) 
-or Public Domain Certification
-
-The person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
-his knowledge, the work of authorship identified is in the public domain of the
-country from which the work is published, or (b) hereby dedicates whatever
-copyright the dedicators holds in the work of authorship identified below (the
-"Work") to the public domain. A certifier, moreover, dedicates any copyright
-interest he may have in the associated work, and for these purposes, is
-described as a "dedicator" below.
-
-A certifier has taken reasonable steps to verify the copyright status of this
-work. Certifier recognizes that his good faith efforts may not shield him from
-liability if in fact the work certified is not in the public domain.
-
-Dedicator makes this dedication for the benefit of the public at large and to
-the detriment of the Dedicator's heirs and successors. Dedicator intends this
-dedication to be an overt act of relinquishment in perpetuity of all present
-and future rights under copyright law, whether vested or contingent, in the
-Work. Dedicator understands that such relinquishment of all rights includes
-the relinquishment of all rights to enforce (by lawsuit or otherwise) those
-copyrights in the Work.
-
-Dedicator recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built upon, or
-otherwise exploited by anyone for any purpose, commercial or non-commercial,
-and in any way, including by methods that have not yet been invented or
-conceived.
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/src/libb64/cdecode.c b/libraries/arduinoWebSockets/src/libb64/cdecode.c
deleted file mode 100644
index e135da249..000000000
--- a/libraries/arduinoWebSockets/src/libb64/cdecode.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-cdecoder.c - c source to a base64 decoding algorithm implementation
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#ifdef ESP8266
-#include 
-#endif
-
-#if defined(ESP32)
-#define CORE_HAS_LIBB64
-#endif
-
-#ifndef CORE_HAS_LIBB64
-#include "cdecode_inc.h"
-
-int base64_decode_value(char value_in)
-{
-	static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
-	static const char decoding_size = sizeof(decoding);
-	value_in -= 43;
-	if (value_in < 0 || value_in > decoding_size) return -1;
-	return decoding[(int)value_in];
-}
-
-void base64_init_decodestate(base64_decodestate* state_in)
-{
-	state_in->step = step_a;
-	state_in->plainchar = 0;
-}
-
-int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in)
-{
-	const char* codechar = code_in;
-	char* plainchar = plaintext_out;
-	char fragment;
-
-	*plainchar = state_in->plainchar;
-
-	switch (state_in->step)
-	{
-		while (1)
-		{
-	case step_a:
-			do {
-				if (codechar == code_in+length_in)
-				{
-					state_in->step = step_a;
-					state_in->plainchar = *plainchar;
-					return plainchar - plaintext_out;
-				}
-				fragment = (char)base64_decode_value(*codechar++);
-			} while (fragment < 0);
-			*plainchar    = (fragment & 0x03f) << 2;
-	case step_b:
-			do {
-				if (codechar == code_in+length_in)
-				{
-					state_in->step = step_b;
-					state_in->plainchar = *plainchar;
-					return plainchar - plaintext_out;
-				}
-				fragment = (char)base64_decode_value(*codechar++);
-			} while (fragment < 0);
-			*plainchar++ |= (fragment & 0x030) >> 4;
-			*plainchar    = (fragment & 0x00f) << 4;
-	case step_c:
-			do {
-				if (codechar == code_in+length_in)
-				{
-					state_in->step = step_c;
-					state_in->plainchar = *plainchar;
-					return plainchar - plaintext_out;
-				}
-				fragment = (char)base64_decode_value(*codechar++);
-			} while (fragment < 0);
-			*plainchar++ |= (fragment & 0x03c) >> 2;
-			*plainchar    = (fragment & 0x003) << 6;
-	case step_d:
-			do {
-				if (codechar == code_in+length_in)
-				{
-					state_in->step = step_d;
-					state_in->plainchar = *plainchar;
-					return plainchar - plaintext_out;
-				}
-				fragment = (char)base64_decode_value(*codechar++);
-			} while (fragment < 0);
-			*plainchar++   |= (fragment & 0x03f);
-		}
-	}
-	/* control should not reach here */
-	return plainchar - plaintext_out;
-}
-
-#endif
diff --git a/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h b/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h
deleted file mode 100644
index d0d7f489d..000000000
--- a/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-cdecode.h - c header for a base64 decoding algorithm
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#ifndef BASE64_CDECODE_H
-#define BASE64_CDECODE_H
-
-typedef enum
-{
-	step_a, step_b, step_c, step_d
-} base64_decodestep;
-
-typedef struct
-{
-	base64_decodestep step;
-	char plainchar;
-} base64_decodestate;
-
-void base64_init_decodestate(base64_decodestate* state_in);
-
-int base64_decode_value(char value_in);
-
-int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in);
-
-#endif /* BASE64_CDECODE_H */
diff --git a/libraries/arduinoWebSockets/src/libb64/cencode.c b/libraries/arduinoWebSockets/src/libb64/cencode.c
deleted file mode 100644
index afe1463c6..000000000
--- a/libraries/arduinoWebSockets/src/libb64/cencode.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-cencoder.c - c source to a base64 encoding algorithm implementation
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#ifdef ESP8266
-#include 
-#endif
-
-#if defined(ESP32)
-#define CORE_HAS_LIBB64
-#endif
-
-#ifndef CORE_HAS_LIBB64
-#include "cencode_inc.h"
-
-const int CHARS_PER_LINE = 72;
-
-void base64_init_encodestate(base64_encodestate* state_in)
-{
-	state_in->step = step_A;
-	state_in->result = 0;
-	state_in->stepcount = 0;
-}
-
-char base64_encode_value(char value_in)
-{
-	static const char* encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	if (value_in > 63) return '=';
-	return encoding[(int)value_in];
-}
-
-int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in)
-{
-	const char* plainchar = plaintext_in;
-	const char* const plaintextend = plaintext_in + length_in;
-	char* codechar = code_out;
-	char result;
-	char fragment;
-
-	result = state_in->result;
-
-	switch (state_in->step)
-	{
-		while (1)
-		{
-	case step_A:
-			if (plainchar == plaintextend)
-			{
-				state_in->result = result;
-				state_in->step = step_A;
-				return codechar - code_out;
-			}
-			fragment = *plainchar++;
-			result = (fragment & 0x0fc) >> 2;
-			*codechar++ = base64_encode_value(result);
-			result = (fragment & 0x003) << 4;
-	case step_B:
-			if (plainchar == plaintextend)
-			{
-				state_in->result = result;
-				state_in->step = step_B;
-				return codechar - code_out;
-			}
-			fragment = *plainchar++;
-			result |= (fragment & 0x0f0) >> 4;
-			*codechar++ = base64_encode_value(result);
-			result = (fragment & 0x00f) << 2;
-	case step_C:
-			if (plainchar == plaintextend)
-			{
-				state_in->result = result;
-				state_in->step = step_C;
-				return codechar - code_out;
-			}
-			fragment = *plainchar++;
-			result |= (fragment & 0x0c0) >> 6;
-			*codechar++ = base64_encode_value(result);
-			result  = (fragment & 0x03f) >> 0;
-			*codechar++ = base64_encode_value(result);
-
-			++(state_in->stepcount);
-			if (state_in->stepcount == CHARS_PER_LINE/4)
-			{
-				*codechar++ = '\n';
-				state_in->stepcount = 0;
-			}
-		}
-	}
-	/* control should not reach here */
-	return codechar - code_out;
-}
-
-int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
-{
-	char* codechar = code_out;
-
-	switch (state_in->step)
-	{
-	case step_B:
-		*codechar++ = base64_encode_value(state_in->result);
-		*codechar++ = '=';
-		*codechar++ = '=';
-		break;
-	case step_C:
-		*codechar++ = base64_encode_value(state_in->result);
-		*codechar++ = '=';
-		break;
-	case step_A:
-		break;
-	}
-	*codechar++ = 0x00;
-
-	return codechar - code_out;
-}
-
-#endif
diff --git a/libraries/arduinoWebSockets/src/libb64/cencode_inc.h b/libraries/arduinoWebSockets/src/libb64/cencode_inc.h
deleted file mode 100644
index c1e3464af..000000000
--- a/libraries/arduinoWebSockets/src/libb64/cencode_inc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-cencode.h - c header for a base64 encoding algorithm
-
-This is part of the libb64 project, and has been placed in the public domain.
-For details, see http://sourceforge.net/projects/libb64
-*/
-
-#ifndef BASE64_CENCODE_H
-#define BASE64_CENCODE_H
-
-typedef enum
-{
-	step_A, step_B, step_C
-} base64_encodestep;
-
-typedef struct
-{
-	base64_encodestep step;
-	char result;
-	int stepcount;
-} base64_encodestate;
-
-void base64_init_encodestate(base64_encodestate* state_in);
-
-char base64_encode_value(char value_in);
-
-int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in);
-
-int base64_encode_blockend(char* code_out, base64_encodestate* state_in);
-
-#endif /* BASE64_CENCODE_H */
diff --git a/libraries/arduinoWebSockets/src/libsha1/libsha1.c b/libraries/arduinoWebSockets/src/libsha1/libsha1.c
deleted file mode 100644
index 48f4df5a3..000000000
--- a/libraries/arduinoWebSockets/src/libsha1/libsha1.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* from valgrind tests */
-
-/* ================ sha1.c ================ */
-/*
-SHA-1 in C
-By Steve Reid 
-100% Public Domain
-
-Test Vectors (from FIPS PUB 180-1)
-"abc"
-  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
-  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
-/* #define SHA1HANDSOFF * Copies data before messing with it. */
-
-#if !defined(ESP8266) && !defined(ESP32)
-
-#define SHA1HANDSOFF
-
-#include 
-#include 
-#include 
-
-#include "libsha1.h"
-
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
-#elif BYTE_ORDER == BIG_ENDIAN
-#define blk0(i) block->l[i]
-#else
-#error "Endianness not defined!"
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-
-void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
-{
-    uint32_t a, b, c, d, e;
-    typedef union {
-        unsigned char c[64];
-        uint32_t l[16];
-    } CHAR64LONG16;
-#ifdef SHA1HANDSOFF
-    CHAR64LONG16 block[1];  /* use array to appear as a pointer */
-    memcpy(block, buffer, 64);
-#else
-    /* The following had better never be used because it causes the
-     * pointer-to-const buffer to be cast into a pointer to non-const.
-     * And the result is written through.  I threw a "const" in, hoping
-     * this will cause a diagnostic.
-     */
-    CHAR64LONG16* block = (const CHAR64LONG16*)buffer;
-#endif
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-    /* Wipe variables */
-    a = b = c = d = e = 0;
-#ifdef SHA1HANDSOFF
-    memset(block, '\0', sizeof(block));
-#endif
-}
-
-
-/* SHA1Init - Initialize new context */
-
-void SHA1Init(SHA1_CTX* context)
-{
-    /* SHA1 initialization constants */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xEFCDAB89;
-    context->state[2] = 0x98BADCFE;
-    context->state[3] = 0x10325476;
-    context->state[4] = 0xC3D2E1F0;
-    context->count[0] = context->count[1] = 0;
-}
-
-
-/* Run your data through this. */
-
-void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
-{
-    uint32_t i, j;
-
-    j = context->count[0];
-    if ((context->count[0] += len << 3) < j)
-        context->count[1]++;
-    context->count[1] += (len>>29);
-    j = (j >> 3) & 63;
-    if ((j + len) > 63) {
-        memcpy(&context->buffer[j], data, (i = 64-j));
-        SHA1Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) {
-            SHA1Transform(context->state, &data[i]);
-        }
-        j = 0;
-    }
-    else i = 0;
-    memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-
-/* Add padding and return the message digest. */
-
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
-{
-    unsigned i;
-    unsigned char finalcount[8];
-    unsigned char c;
-
-#if 0	/* untested "improvement" by DHR */
-    /* Convert context->count to a sequence of bytes
-     * in finalcount.  Second element first, but
-     * big-endian order within element.
-     * But we do it all backwards.
-     */
-    unsigned char *fcp = &finalcount[8];
-
-    for (i = 0; i < 2; i++)
-       {
-        uint32_t t = context->count[i];
-        int j;
-
-        for (j = 0; j < 4; t >>= 8, j++)
-	          *--fcp = (unsigned char) t;
-    }
-#else
-    for (i = 0; i < 8; i++) {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-    }
-#endif
-    c = 0200;
-    SHA1Update(context, &c, 1);
-    while ((context->count[0] & 504) != 448) {
-	c = 0000;
-        SHA1Update(context, &c, 1);
-    }
-    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
-    for (i = 0; i < 20; i++) {
-        digest[i] = (unsigned char)
-         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-    }
-    /* Wipe variables */
-    memset(context, '\0', sizeof(*context));
-    memset(&finalcount, '\0', sizeof(finalcount));
-}
-/* ================ end of sha1.c ================ */
-
-
-#endif
diff --git a/libraries/arduinoWebSockets/src/libsha1/libsha1.h b/libraries/arduinoWebSockets/src/libsha1/libsha1.h
deleted file mode 100644
index ee3718e1a..000000000
--- a/libraries/arduinoWebSockets/src/libsha1/libsha1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ================ sha1.h ================ */
-/*
-SHA-1 in C
-By Steve Reid 
-100% Public Domain
-*/
-
-#if !defined(ESP8266) && !defined(ESP32)
-
-typedef struct {
-    uint32_t state[5];
-    uint32_t count[2];
-    unsigned char buffer[64];
-} SHA1_CTX;
-
-void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
-
-#endif
diff --git a/libraries/arduinoWebSockets/tests/webSocket.html b/libraries/arduinoWebSockets/tests/webSocket.html
deleted file mode 100644
index 66a270890..000000000
--- a/libraries/arduinoWebSockets/tests/webSocket.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-LED Control:

-

-R: 

-G: 

-B: 

-
-
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/tests/webSocketServer/index.js b/libraries/arduinoWebSockets/tests/webSocketServer/index.js
deleted file mode 100644
index 389e19307..000000000
--- a/libraries/arduinoWebSockets/tests/webSocketServer/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-var WebSocketServer = require('websocket').server;
-var http = require('http');
- 
-var server = http.createServer(function(request, response) {
-    console.log((new Date()) + ' Received request for ' + request.url);
-    response.writeHead(404);
-    response.end();
-});
-server.listen(8011, function() {
-    console.log((new Date()) + ' Server is listening on port 8011');
-});
- 
-wsServer = new WebSocketServer({
-    httpServer: server,
-    // You should not use autoAcceptConnections for production 
-    // applications, as it defeats all standard cross-origin protection 
-    // facilities built into the protocol and the browser.  You should 
-    // *always* verify the connection's origin and decide whether or not 
-    // to accept it. 
-    autoAcceptConnections: false
-});
- 
-function originIsAllowed(origin) {
-  // put logic here to detect whether the specified origin is allowed. 
-  return true;
-}
- 
-wsServer.on('request', function(request) {
-	
-    if (!originIsAllowed(request.origin)) {
-      // Make sure we only accept requests from an allowed origin 
-      request.reject();
-      console.log((new Date()) + ' Connection from origin ' + request.origin + ' rejected.');
-      return;
-    }
-    
-    var connection = request.accept('arduino', request.origin);
-    console.log((new Date()) + ' Connection accepted.');
-    
-	connection.on('message', function(message) {
-        if (message.type === 'utf8') {
-            console.log('Received Message: ' + message.utf8Data);
-           // connection.sendUTF(message.utf8Data);
-        }
-        else if (message.type === 'binary') {
-            console.log('Received Binary Message of ' + message.binaryData.length + ' bytes');
-           //connection.sendBytes(message.binaryData);
-        }
-    });
-    
-	connection.on('close', function(reasonCode, description) {
-        console.log((new Date()) + ' Peer ' + connection.remoteAddress + ' disconnected.');
-    });
-	
-	connection.sendUTF("Hallo Client!");
-});
diff --git a/libraries/arduinoWebSockets/tests/webSocketServer/package.json b/libraries/arduinoWebSockets/tests/webSocketServer/package.json
deleted file mode 100644
index 9538323e4..000000000
--- a/libraries/arduinoWebSockets/tests/webSocketServer/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "webSocketServer",
-  "version": "1.0.0",
-  "description": "WebSocketServer for testing",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Links2004/arduinoWebSockets"
-  },
-  "keywords": [
-    "esp8266",
-    "websocket",
-    "arduino"
-  ],
-  "author": "Markus Sattler",
-  "license": "LGPLv2",
-  "bugs": {
-    "url": "https://github.com/Links2004/arduinoWebSockets/issues"
-  },
-  "homepage": "https://github.com/Links2004/arduinoWebSockets",
-  "dependencies": {
-    "websocket": "^1.0.18"
-  }
-}
diff --git a/libraries/arduinoWebSockets/travis/common.sh b/libraries/arduinoWebSockets/travis/common.sh
deleted file mode 100644
index be959faf7..000000000
--- a/libraries/arduinoWebSockets/travis/common.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-function build_sketches()
-{
-    local arduino=$1
-    local srcpath=$2
-    local platform=$3
-    local sketches=$(find $srcpath -name *.ino)
-    for sketch in $sketches; do
-        local sketchdir=$(dirname $sketch)
-        if [[ -f "$sketchdir/.$platform.skip" ]]; then
-            echo -e "\n\n ------------ Skipping $sketch ------------ \n\n";
-            continue
-        fi
-        echo -e "\n\n ------------ Building $sketch ------------ \n\n";
-        $arduino --verify $sketch;
-        local result=$?
-        if [ $result -ne 0 ]; then
-            echo "Build failed ($sketch) build verbose..."
-            $arduino --verify --verbose --preserve-temp-files $sketch
-            result=$?
-        fi
-        if [ $result -ne 0 ]; then
-            echo "Build failed ($1) $sketch"
-            return $result
-        fi
-    done
-}
-
-
-function get_core()
-{
-    echo Setup core for $1
-
-    cd $HOME/arduino_ide/hardware
-
-    if [ "$1" = "esp8266" ] ; then
-        mkdir esp8266com
-        cd esp8266com
-        git clone https://github.com/esp8266/Arduino.git esp8266
-        cd esp8266/tools
-        python get.py
-    fi
-
-    if [ "$1" = "esp32" ] ; then
-        mkdir espressif
-        cd espressif
-        git clone https://github.com/espressif/arduino-esp32.git esp32
-        cd esp32/tools
-        python get.py
-    fi
-
-}
diff --git a/libraries/oled-ssd1306/.travis.yml b/libraries/oled-ssd1306/.travis.yml
deleted file mode 100644
index 88a1e72ba..000000000
--- a/libraries/oled-ssd1306/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: python
-python:
-    - "2.7"
-
-# Cache PlatformIO packages using Travis CI container-based infrastructure
-sudo: false
-cache:
-    directories:
-        - "~/.platformio"
-
-env:
-    - PLATFORMIO_CI_SRC=examples/SSD1306UiDemo
-    - PLATFORMIO_CI_SRC=examples/SSD1306SimpleDemo
-    - PLATFORMIO_CI_SRC=examples/SSD1306DrawingDemo
-    - PLATFORMIO_CI_SRC=examples/SSD1306OTADemo
-    - PLATFORMIO_CI_SRC=examples/SSD1306ClockDemo
-
-
-install:
-    - pip install -U platformio
-    - platformio lib install 44
-
-script:
-    - platformio ci --lib="." --board=nodemcuv2
diff --git a/libraries/oled-ssd1306/OLEDDisplay.cpp b/libraries/oled-ssd1306/OLEDDisplay.cpp
deleted file mode 100644
index a82ecbcc5..000000000
--- a/libraries/oled-ssd1306/OLEDDisplay.cpp
+++ /dev/null
@@ -1,811 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#include "OLEDDisplay.h"
-
-bool OLEDDisplay::init() {
-  if (!this->connect()) {
-    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Can't establish connection to display\n");
-    return false;
-  }
-  this->buffer = (uint8_t*) malloc(sizeof(uint8_t) * DISPLAY_BUFFER_SIZE);
-  if(!this->buffer) {
-    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create display\n");
-    return false;
-  }
-
-  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-  this->buffer_back = (uint8_t*) malloc(sizeof(uint8_t) * DISPLAY_BUFFER_SIZE);
-  if(!this->buffer_back) {
-    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create back buffer\n");
-    free(this->buffer);
-    return false;
-  }
-  #endif
-
-  sendInitCommands();
-  resetDisplay();
-
-  return true;
-}
-
-void OLEDDisplay::end() {
-  if (this->buffer) free(this->buffer);
-  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-  if (this->buffer_back) free(this->buffer_back);
-  #endif
-}
-
-void OLEDDisplay::resetDisplay(void) {
-  clear();
-  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-  memset(buffer_back, 1, DISPLAY_BUFFER_SIZE);
-  #endif
-  display();
-}
-
-void OLEDDisplay::setColor(OLEDDISPLAY_COLOR color) {
-  this->color = color;
-}
-
-void OLEDDisplay::setPixel(int16_t x, int16_t y) {
-  if (x >= 0 && x < 128 && y >= 0 && y < 64) {
-    switch (color) {
-      case WHITE:   buffer[x + (y / 8) * DISPLAY_WIDTH] |=  (1 << (y & 7)); break;
-      case BLACK:   buffer[x + (y / 8) * DISPLAY_WIDTH] &= ~(1 << (y & 7)); break;
-      case INVERSE: buffer[x + (y / 8) * DISPLAY_WIDTH] ^=  (1 << (y & 7)); break;
-    }
-  }
-}
-
-// Bresenham's algorithm - thx wikipedia and Adafruit_GFX
-void OLEDDisplay::drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1) {
-  int16_t steep = abs(y1 - y0) > abs(x1 - x0);
-  if (steep) {
-    _swap_int16_t(x0, y0);
-    _swap_int16_t(x1, y1);
-  }
-
-  if (x0 > x1) {
-    _swap_int16_t(x0, x1);
-    _swap_int16_t(y0, y1);
-  }
-
-  int16_t dx, dy;
-  dx = x1 - x0;
-  dy = abs(y1 - y0);
-
-  int16_t err = dx / 2;
-  int16_t ystep;
-
-  if (y0 < y1) {
-    ystep = 1;
-  } else {
-    ystep = -1;
-  }
-
-  for (; x0<=x1; x0++) {
-    if (steep) {
-      setPixel(y0, x0);
-    } else {
-      setPixel(x0, y0);
-    }
-    err -= dy;
-    if (err < 0) {
-      y0 += ystep;
-      err += dx;
-    }
-  }
-}
-
-void OLEDDisplay::drawRect(int16_t x, int16_t y, int16_t width, int16_t height) {
-  drawHorizontalLine(x, y, width);
-  drawVerticalLine(x, y, height);
-  drawVerticalLine(x + width - 1, y, height);
-  drawHorizontalLine(x, y + height - 1, width);
-}
-
-void OLEDDisplay::fillRect(int16_t xMove, int16_t yMove, int16_t width, int16_t height) {
-  for (int16_t x = xMove; x < xMove + width; x++) {
-    drawVerticalLine(x, yMove, height);
-  }
-}
-
-void OLEDDisplay::drawCircle(int16_t x0, int16_t y0, int16_t radius) {
-  int16_t x = 0, y = radius;
-	int16_t dp = 1 - radius;
-	do {
-		if (dp < 0)
-			dp = dp + 2 * (++x) + 3;
-		else
-			dp = dp + 2 * (++x) - 2 * (--y) + 5;
-
-		setPixel(x0 + x, y0 + y);     //For the 8 octants
-		setPixel(x0 - x, y0 + y);
-		setPixel(x0 + x, y0 - y);
-		setPixel(x0 - x, y0 - y);
-		setPixel(x0 + y, y0 + x);
-		setPixel(x0 - y, y0 + x);
-		setPixel(x0 + y, y0 - x);
-		setPixel(x0 - y, y0 - x);
-
-	} while (x < y);
-
-  setPixel(x0 + radius, y0);
-  setPixel(x0, y0 + radius);
-  setPixel(x0 - radius, y0);
-  setPixel(x0, y0 - radius);
-}
-
-void OLEDDisplay::drawCircleQuads(int16_t x0, int16_t y0, int16_t radius, uint8_t quads) {
-  int16_t x = 0, y = radius;
-  int16_t dp = 1 - radius;
-  while (x < y) {
-    if (dp < 0)
-      dp = dp + 2 * (++x) + 3;
-    else
-      dp = dp + 2 * (++x) - 2 * (--y) + 5;
-    if (quads & 0x1) {
-      setPixel(x0 + x, y0 - y);
-      setPixel(x0 + y, y0 - x);
-    }
-    if (quads & 0x2) {
-      setPixel(x0 - y, y0 - x);
-      setPixel(x0 - x, y0 - y);
-    }
-    if (quads & 0x4) {
-      setPixel(x0 - y, y0 + x);
-      setPixel(x0 - x, y0 + y);
-    }
-    if (quads & 0x8) {
-      setPixel(x0 + x, y0 + y);
-      setPixel(x0 + y, y0 + x);
-    }
-  }
-  if (quads & 0x1 && quads & 0x8) {
-    setPixel(x0 + radius, y0);
-  }
-  if (quads & 0x4 && quads & 0x8) {
-    setPixel(x0, y0 + radius);
-  }
-  if (quads & 0x2 && quads & 0x4) {
-    setPixel(x0 - radius, y0);
-  }
-  if (quads & 0x1 && quads & 0x2) {
-    setPixel(x0, y0 - radius);
-  }
-}
-
-
-void OLEDDisplay::fillCircle(int16_t x0, int16_t y0, int16_t radius) {
-  int16_t x = 0, y = radius;
-	int16_t dp = 1 - radius;
-	do {
-		if (dp < 0)
-			dp = dp + 2 * (++x) + 3;
-		else
-			dp = dp + 2 * (++x) - 2 * (--y) + 5;
-
-    drawHorizontalLine(x0 - x, y0 - y, 2*x);
-    drawHorizontalLine(x0 - x, y0 + y, 2*x);
-    drawHorizontalLine(x0 - y, y0 - x, 2*y);
-    drawHorizontalLine(x0 - y, y0 + x, 2*y);
-
-
-	} while (x < y);
-  drawHorizontalLine(x0 - radius, y0, 2 * radius);
-
-}
-
-void OLEDDisplay::drawHorizontalLine(int16_t x, int16_t y, int16_t length) {
-  if (y < 0 || y >= DISPLAY_HEIGHT) { return; }
-
-  if (x < 0) {
-    length += x;
-    x = 0;
-  }
-
-  if ( (x + length) > DISPLAY_WIDTH) {
-    length = (DISPLAY_WIDTH - x);
-  }
-
-  if (length <= 0) { return; }
-
-  uint8_t * bufferPtr = buffer;
-  bufferPtr += (y >> 3) * DISPLAY_WIDTH;
-  bufferPtr += x;
-
-  uint8_t drawBit = 1 << (y & 7);
-
-  switch (color) {
-    case WHITE:   while (length--) {
-        *bufferPtr++ |= drawBit;
-      }; break;
-    case BLACK:   drawBit = ~drawBit;   while (length--) {
-        *bufferPtr++ &= drawBit;
-      }; break;
-    case INVERSE: while (length--) {
-        *bufferPtr++ ^= drawBit;
-      }; break;
-  }
-}
-
-void OLEDDisplay::drawVerticalLine(int16_t x, int16_t y, int16_t length) {
-  if (x < 0 || x >= DISPLAY_WIDTH) return;
-
-  if (y < 0) {
-    length += y;
-    y = 0;
-  }
-
-  if ( (y + length) > DISPLAY_HEIGHT) {
-    length = (DISPLAY_HEIGHT - y);
-  }
-
-  if (length <= 0) return;
-
-
-  uint8_t yOffset = y & 7;
-  uint8_t drawBit;
-  uint8_t *bufferPtr = buffer;
-
-  bufferPtr += (y >> 3) * DISPLAY_WIDTH;
-  bufferPtr += x;
-
-  if (yOffset) {
-    yOffset = 8 - yOffset;
-    drawBit = ~(0xFF >> (yOffset));
-
-    if (length < yOffset) {
-      drawBit &= (0xFF >> (yOffset - length));
-    }
-
-    switch (color) {
-      case WHITE:   *bufferPtr |=  drawBit; break;
-      case BLACK:   *bufferPtr &= ~drawBit; break;
-      case INVERSE: *bufferPtr ^=  drawBit; break;
-    }
-
-    if (length < yOffset) return;
-
-    length -= yOffset;
-    bufferPtr += DISPLAY_WIDTH;
-  }
-
-  if (length >= 8) {
-    switch (color) {
-      case WHITE:
-      case BLACK:
-        drawBit = (color == WHITE) ? 0xFF : 0x00;
-        do {
-          *bufferPtr = drawBit;
-          bufferPtr += DISPLAY_WIDTH;
-          length -= 8;
-        } while (length >= 8);
-        break;
-      case INVERSE:
-        do {
-          *bufferPtr = ~(*bufferPtr);
-          bufferPtr += DISPLAY_WIDTH;
-          length -= 8;
-        } while (length >= 8);
-        break;
-    }
-  }
-
-  if (length > 0) {
-    drawBit = (1 << (length & 7)) - 1;
-    switch (color) {
-      case WHITE:   *bufferPtr |=  drawBit; break;
-      case BLACK:   *bufferPtr &= ~drawBit; break;
-      case INVERSE: *bufferPtr ^=  drawBit; break;
-    }
-  }
-}
-
-void OLEDDisplay::drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress) {
-  uint16_t radius = height / 2;
-  uint16_t xRadius = x + radius;
-  uint16_t yRadius = y + radius;
-  uint16_t doubleRadius = 2 * radius;
-  uint16_t innerRadius = radius - 2;
-
-  setColor(WHITE);
-  drawCircleQuads(xRadius, yRadius, radius, 0b00000110);
-  drawHorizontalLine(xRadius, y, width - doubleRadius + 1);
-  drawHorizontalLine(xRadius, y + height, width - doubleRadius + 1);
-  drawCircleQuads(x + width - radius, yRadius, radius, 0b00001001);
-
-  uint16_t maxProgressWidth = (width - doubleRadius - 1) * progress / 100;
-
-  fillCircle(xRadius, yRadius, innerRadius);
-  fillRect(xRadius + 1, y + 2, maxProgressWidth, height - 3);
-  fillCircle(xRadius + maxProgressWidth, yRadius, innerRadius);
-}
-
-void OLEDDisplay::drawFastImage(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *image) {
-  drawInternal(xMove, yMove, width, height, image, 0, 0);
-}
-
-void OLEDDisplay::drawXbm(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *xbm) {
-  int16_t widthInXbm = (width + 7) / 8;
-  uint8_t data = 0;
-
-  for(int16_t y = 0; y < height; y++) {
-    for(int16_t x = 0; x < width; x++ ) {
-      if (x & 7) {
-        data >>= 1; // Move a bit
-      } else {  // Read new data every 8 bit
-        data = pgm_read_byte(xbm + (x / 8) + y * widthInXbm);
-      }
-      // if there is a bit draw it
-      if (data & 0x01) {
-        setPixel(xMove + x, yMove + y);
-      }
-    }
-  }
-}
-
-void OLEDDisplay::drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth) {
-  uint8_t textHeight       = pgm_read_byte(fontData + HEIGHT_POS);
-  uint8_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
-  uint16_t sizeOfJumpTable = pgm_read_byte(fontData + CHAR_NUM_POS)  * JUMPTABLE_BYTES;
-
-  uint8_t cursorX         = 0;
-  uint8_t cursorY         = 0;
-
-  switch (textAlignment) {
-    case TEXT_ALIGN_CENTER_BOTH:
-      yMove -= textHeight >> 1;
-    // Fallthrough
-    case TEXT_ALIGN_CENTER:
-      xMove -= textWidth >> 1; // divide by 2
-      break;
-    case TEXT_ALIGN_RIGHT:
-      xMove -= textWidth;
-      break;
-    default:
-        break;
-  }
-
-  // Don't draw anything if it is not on the screen.
-  if (xMove + textWidth  < 0 || xMove > DISPLAY_WIDTH ) {return;}
-  if (yMove + textHeight < 0 || yMove > DISPLAY_HEIGHT) {return;}
-
-  for (uint16_t j = 0; j < textLength; j++) {
-    int16_t xPos = xMove + cursorX;
-    int16_t yPos = yMove + cursorY;
-
-    byte code = text[j];
-    if (code >= firstChar) {
-      byte charCode = code - firstChar;
-
-      // 4 Bytes per char code
-      byte msbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES );                  // MSB  \ JumpAddress
-      byte lsbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_LSB);   // LSB /
-      byte charByteSize     = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_SIZE);  // Size
-      byte currentCharWidth = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_WIDTH); // Width
-
-      // Test if the char is drawable
-      if (!(msbJumpToChar == 255 && lsbJumpToChar == 255)) {
-        // Get the position of the char data
-        uint16_t charDataPosition = JUMPTABLE_START + sizeOfJumpTable + ((msbJumpToChar << 8) + lsbJumpToChar);
-        drawInternal(xPos, yPos, currentCharWidth, textHeight, fontData, charDataPosition, charByteSize);
-      }
-
-      cursorX += currentCharWidth;
-    }
-  }
-}
-
-
-void OLEDDisplay::drawString(int16_t xMove, int16_t yMove, String strUser) {
-  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
-
-  // char* text must be freed!
-  char* text = utf8ascii(strUser);
-
-  uint16_t yOffset = 0;
-  // If the string should be centered vertically too
-  // we need to now how heigh the string is.
-  if (textAlignment == TEXT_ALIGN_CENTER_BOTH) {
-    uint16_t lb = 0;
-    // Find number of linebreaks in text
-    for (uint16_t i=0;text[i] != 0; i++) {
-      lb += (text[i] == 10);
-    }
-    // Calculate center
-    yOffset = (lb * lineHeight) / 2;
-  }
-
-  uint16_t line = 0;
-  char* textPart = strtok(text,"\n");
-  while (textPart != NULL) {
-    uint16_t length = strlen(textPart);
-    drawStringInternal(xMove, yMove - yOffset + (line++) * lineHeight, textPart, length, getStringWidth(textPart, length));
-    textPart = strtok(NULL, "\n");
-  }
-  free(text);
-}
-
-void OLEDDisplay::drawStringMaxWidth(int16_t xMove, int16_t yMove, uint16_t maxLineWidth, String strUser) {
-  uint16_t firstChar  = pgm_read_byte(fontData + FIRST_CHAR_POS);
-  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
-
-  char* text = utf8ascii(strUser);
-
-  uint16_t length = strlen(text);
-  uint16_t lastDrawnPos = 0;
-  uint16_t lineNumber = 0;
-  uint16_t strWidth = 0;
-
-  uint16_t preferredBreakpoint = 0;
-  uint16_t widthAtBreakpoint = 0;
-
-  for (uint16_t i = 0; i < length; i++) {
-    strWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[i] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
-
-    // Always try to break on a space or dash
-    if (text[i] == ' ' || text[i]== '-') {
-      preferredBreakpoint = i;
-      widthAtBreakpoint = strWidth;
-    }
-
-    if (strWidth >= maxLineWidth) {
-      if (preferredBreakpoint == 0) {
-        preferredBreakpoint = i;
-        widthAtBreakpoint = strWidth;
-      }
-      drawStringInternal(xMove, yMove + (lineNumber++) * lineHeight , &text[lastDrawnPos], preferredBreakpoint - lastDrawnPos, widthAtBreakpoint);
-      lastDrawnPos = preferredBreakpoint + 1;
-      // It is possible that we did not draw all letters to i so we need
-      // to account for the width of the chars from `i - preferredBreakpoint`
-      // by calculating the width we did not draw yet.
-      strWidth = strWidth - widthAtBreakpoint;
-      preferredBreakpoint = 0;
-    }
-  }
-
-  // Draw last part if needed
-  if (lastDrawnPos < length) {
-    drawStringInternal(xMove, yMove + lineNumber * lineHeight , &text[lastDrawnPos], length - lastDrawnPos, getStringWidth(&text[lastDrawnPos], length - lastDrawnPos));
-  }
-
-  free(text);
-}
-
-uint16_t OLEDDisplay::getStringWidth(const char* text, uint16_t length) {
-  uint16_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
-
-  uint16_t stringWidth = 0;
-  uint16_t maxWidth = 0;
-
-  while (length--) {
-    stringWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[length] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
-    if (text[length] == 10) {
-      maxWidth = max(maxWidth, stringWidth);
-      stringWidth = 0;
-    }
-  }
-
-  return max(maxWidth, stringWidth);
-}
-
-uint16_t OLEDDisplay::getStringWidth(String strUser) {
-  char* text = utf8ascii(strUser);
-  uint16_t length = strlen(text);
-  uint16_t width = getStringWidth(text, length);
-  free(text);
-  return width;
-}
-
-void OLEDDisplay::setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment) {
-  this->textAlignment = textAlignment;
-}
-
-void OLEDDisplay::setFont(const char *fontData) {
-  this->fontData = fontData;
-}
-
-void OLEDDisplay::displayOn(void) {
-  sendCommand(DISPLAYON);
-}
-
-void OLEDDisplay::displayOff(void) {
-  sendCommand(DISPLAYOFF);
-}
-
-void OLEDDisplay::invertDisplay(void) {
-  sendCommand(INVERTDISPLAY);
-}
-
-void OLEDDisplay::normalDisplay(void) {
-  sendCommand(NORMALDISPLAY);
-}
-
-void OLEDDisplay::setContrast(char contrast) {
-  sendCommand(SETCONTRAST);
-  sendCommand(contrast);
-}
-
-void OLEDDisplay::flipScreenVertically() {
-  sendCommand(SEGREMAP | 0x01);
-  sendCommand(COMSCANDEC);           //Rotate screen 180 Deg
-}
-
-void OLEDDisplay::clear(void) {
-  memset(buffer, 0, DISPLAY_BUFFER_SIZE);
-}
-
-void OLEDDisplay::drawLogBuffer(uint16_t xMove, uint16_t yMove) {
-  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
-  // Always align left
-  setTextAlignment(TEXT_ALIGN_LEFT);
-
-  // State values
-  uint16_t length   = 0;
-  uint16_t line     = 0;
-  uint16_t lastPos  = 0;
-
-  for (uint16_t i=0;ilogBufferFilled;i++){
-    // Everytime we have a \n print
-    if (this->logBuffer[i] == 10) {
-      length++;
-      // Draw string on line `line` from lastPos to length
-      // Passing 0 as the lenght because we are in TEXT_ALIGN_LEFT
-      drawStringInternal(xMove, yMove + (line++) * lineHeight, &this->logBuffer[lastPos], length, 0);
-      // Remember last pos
-      lastPos = i;
-      // Reset length
-      length = 0;
-    } else {
-      // Count chars until next linebreak
-      length++;
-    }
-  }
-  // Draw the remaining string
-  if (length > 0) {
-    drawStringInternal(xMove, yMove + line * lineHeight, &this->logBuffer[lastPos], length, 0);
-  }
-}
-
-bool OLEDDisplay::setLogBuffer(uint16_t lines, uint16_t chars){
-  if (logBuffer != NULL) free(logBuffer);
-  uint16_t size = lines * chars;
-  if (size > 0) {
-    this->logBufferLine     = 0;      // Lines printed
-    this->logBufferMaxLines = lines;  // Lines max printable
-    this->logBufferSize     = size;   // Total number of characters the buffer can hold
-    this->logBuffer         = (char *) malloc(size * sizeof(uint8_t));
-    if(!this->logBuffer) {
-      DEBUG_OLEDDISPLAY("[OLEDDISPLAY][setLogBuffer] Not enough memory to create log buffer\n");
-      return false;
-    }
-  }
-  return true;
-}
-
-size_t OLEDDisplay::write(uint8_t c) {
-  if (this->logBufferSize > 0) {
-    // Don't waste space on \r\n line endings, dropping \r
-    if (c == 13) return 1;
-
-    bool maxLineNotReached = this->logBufferLine < this->logBufferMaxLines;
-    bool bufferNotFull = this->logBufferFilled < this->logBufferSize;
-
-    // Can we write to the buffer?
-    if (bufferNotFull && maxLineNotReached) {
-      this->logBuffer[logBufferFilled] = utf8ascii(c);
-      this->logBufferFilled++;
-      // Keep track of lines written
-      if (c == 10) this->logBufferLine++;
-    } else {
-      // Max line number is reached
-      if (!maxLineNotReached) this->logBufferLine--;
-
-      // Find the end of the first line
-      uint16_t firstLineEnd = 0;
-      for (uint16_t i=0;ilogBufferFilled;i++) {
-        if (this->logBuffer[i] == 10){
-          // Include last char too
-          firstLineEnd = i + 1;
-          break;
-        }
-      }
-      // If there was a line ending
-      if (firstLineEnd > 0) {
-        // Calculate the new logBufferFilled value
-        this->logBufferFilled = logBufferFilled - firstLineEnd;
-        // Now we move the lines infront of the buffer
-        memcpy(this->logBuffer, &this->logBuffer[firstLineEnd], logBufferFilled);
-      } else {
-        // Let's reuse the buffer if it was full
-        if (!bufferNotFull) {
-          this->logBufferFilled = 0;
-        }// else {
-        //  Nothing to do here
-        //}
-      }
-      write(c);
-    }
-  }
-  // We are always writing all uint8_t to the buffer
-  return 1;
-}
-
-size_t OLEDDisplay::write(const char* str) {
-  if (str == NULL) return 0;
-  size_t length = strlen(str);
-  for (size_t i = 0; i < length; i++) {
-    write(str[i]);
-  }
-  return length;
-}
-
-// Private functions
-void OLEDDisplay::sendInitCommands(void) {
-  sendCommand(DISPLAYOFF);
-  sendCommand(SETDISPLAYCLOCKDIV);
-  sendCommand(0xF0); // Increase speed of the display max ~96Hz
-  sendCommand(SETMULTIPLEX);
-  sendCommand(0x3F);
-  sendCommand(SETDISPLAYOFFSET);
-  sendCommand(0x00);
-  sendCommand(SETSTARTLINE);
-  sendCommand(CHARGEPUMP);
-  sendCommand(0x14);
-  sendCommand(MEMORYMODE);
-  sendCommand(0x00);
-  sendCommand(SEGREMAP);
-  sendCommand(COMSCANINC);
-  sendCommand(SETCOMPINS);
-  sendCommand(0x12);
-  sendCommand(SETCONTRAST);
-  sendCommand(0xCF);
-  sendCommand(SETPRECHARGE);
-  sendCommand(0xF1);
-  sendCommand(DISPLAYALLON_RESUME);
-  sendCommand(NORMALDISPLAY);
-  sendCommand(0x2e);            // stop scroll
-  sendCommand(DISPLAYON);
-}
-
-void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *data, uint16_t offset, uint16_t bytesInData) {
-  if (width < 0 || height < 0) return;
-  if (yMove + height < 0 || yMove > DISPLAY_HEIGHT)  return;
-  if (xMove + width  < 0 || xMove > DISPLAY_WIDTH)   return;
-
-  uint8_t  rasterHeight = 1 + ((height - 1) >> 3); // fast ceil(height / 8.0)
-  int8_t   yOffset      = yMove & 7;
-
-  bytesInData = bytesInData == 0 ? width * rasterHeight : bytesInData;
-
-  int16_t initYMove   = yMove;
-  int8_t  initYOffset = yOffset;
-
-
-  for (uint16_t i = 0; i < bytesInData; i++) {
-
-    // Reset if next horizontal drawing phase is started.
-    if ( i % rasterHeight == 0) {
-      yMove   = initYMove;
-      yOffset = initYOffset;
-    }
-
-    byte currentByte = pgm_read_byte(data + offset + i);
-
-    int16_t xPos = xMove + (i / rasterHeight);
-    int16_t yPos = ((yMove >> 3) + (i % rasterHeight)) * DISPLAY_WIDTH;
-
-    //int16_t yScreenPos = yMove + yOffset;
-    int16_t dataPos    = xPos  + yPos;
-
-    if (dataPos >=  0  && dataPos < DISPLAY_BUFFER_SIZE &&
-        xPos    >=  0  && xPos    < DISPLAY_WIDTH ) {
-
-      if (yOffset >= 0) {
-        switch (this->color) {
-          case WHITE:   buffer[dataPos] |= currentByte << yOffset; break;
-          case BLACK:   buffer[dataPos] &= ~(currentByte << yOffset); break;
-          case INVERSE: buffer[dataPos] ^= currentByte << yOffset; break;
-        }
-        if (dataPos < (DISPLAY_BUFFER_SIZE - DISPLAY_WIDTH)) {
-          switch (this->color) {
-            case WHITE:   buffer[dataPos + DISPLAY_WIDTH] |= currentByte >> (8 - yOffset); break;
-            case BLACK:   buffer[dataPos + DISPLAY_WIDTH] &= ~(currentByte >> (8 - yOffset)); break;
-            case INVERSE: buffer[dataPos + DISPLAY_WIDTH] ^= currentByte >> (8 - yOffset); break;
-          }
-        }
-      } else {
-        // Make new offset position
-        yOffset = -yOffset;
-
-        switch (this->color) {
-          case WHITE:   buffer[dataPos] |= currentByte >> yOffset; break;
-          case BLACK:   buffer[dataPos] &= ~(currentByte >> yOffset); break;
-          case INVERSE: buffer[dataPos] ^= currentByte >> yOffset; break;
-        }
-
-        // Prepare for next iteration by moving one block up
-        yMove -= 8;
-
-        // and setting the new yOffset
-        yOffset = 8 - yOffset;
-      }
-      optimistic_yield(10000);
-    }
-  }
-}
-
-// Code form http://playground.arduino.cc/Main/Utf8ascii
-uint8_t OLEDDisplay::utf8ascii(byte ascii) {
-  static uint8_t LASTCHAR;
-
-  if ( ascii < 128 ) { // Standard ASCII-set 0..0x7F handling
-    LASTCHAR = 0;
-    return ascii;
-  }
-
-  uint8_t last = LASTCHAR;   // get last char
-  LASTCHAR = ascii;
-
-  switch (last) {    // conversion depnding on first UTF8-character
-    case 0xC2: return  (ascii);  break;
-    case 0xC3: return  (ascii | 0xC0);  break;
-    case 0x82: if (ascii == 0xAC) return (0x80);    // special case Euro-symbol
-  }
-
-  return  0; // otherwise: return zero, if character has to be ignored
-}
-
-// You need to free the char!
-char* OLEDDisplay::utf8ascii(String str) {
-  uint16_t k = 0;
-  uint16_t length = str.length() + 1;
-
-  // Copy the string into a char array
-  char* s = (char*) malloc(length * sizeof(char));
-  if(!s) {
-    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][utf8ascii] Can't allocate another char array. Drop support for UTF-8.\n");
-    return (char*) str.c_str();
-  }
-  str.toCharArray(s, length);
-
-  length--;
-
-  for (uint16_t i=0; i < length; i++) {
-    char c = utf8ascii(s[i]);
-    if (c!=0) {
-      s[k++]=c;
-    }
-  }
-
-  s[k]=0;
-
-  // This will leak 's' be sure to free it in the calling function.
-  return s;
-}
diff --git a/libraries/oled-ssd1306/OLEDDisplay.h b/libraries/oled-ssd1306/OLEDDisplay.h
deleted file mode 100644
index d16128fed..000000000
--- a/libraries/oled-ssd1306/OLEDDisplay.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef OLEDDISPLAY_h
-#define OLEDDISPLAY_h
-
-#include 
-#include "OLEDDisplayFonts.h"
-
-//#define DEBUG_OLEDDISPLAY(...) Serial.printf( __VA_ARGS__ )
-
-#ifndef DEBUG_OLEDDISPLAY
-#define DEBUG_OLEDDISPLAY(...)
-#endif
-
-// Use DOUBLE BUFFERING by default
-#ifndef OLEDDISPLAY_REDUCE_MEMORY
-#define OLEDDISPLAY_DOUBLE_BUFFER
-#endif
-
-
-// Display settings
-#define DISPLAY_WIDTH 128
-#define DISPLAY_HEIGHT 64
-#define DISPLAY_BUFFER_SIZE 1024
-
-// Header Values
-#define JUMPTABLE_BYTES 4
-
-#define JUMPTABLE_LSB   1
-#define JUMPTABLE_SIZE  2
-#define JUMPTABLE_WIDTH 3
-#define JUMPTABLE_START 4
-
-#define WIDTH_POS 0
-#define HEIGHT_POS 1
-#define FIRST_CHAR_POS 2
-#define CHAR_NUM_POS 3
-
-
-// Display commands
-#define CHARGEPUMP 0x8D
-#define COLUMNADDR 0x21
-#define COMSCANDEC 0xC8
-#define COMSCANINC 0xC0
-#define DISPLAYALLON 0xA5
-#define DISPLAYALLON_RESUME 0xA4
-#define DISPLAYOFF 0xAE
-#define DISPLAYON 0xAF
-#define EXTERNALVCC 0x1
-#define INVERTDISPLAY 0xA7
-#define MEMORYMODE 0x20
-#define NORMALDISPLAY 0xA6
-#define PAGEADDR 0x22
-#define SEGREMAP 0xA0
-#define SETCOMPINS 0xDA
-#define SETCONTRAST 0x81
-#define SETDISPLAYCLOCKDIV 0xD5
-#define SETDISPLAYOFFSET 0xD3
-#define SETHIGHCOLUMN 0x10
-#define SETLOWCOLUMN 0x00
-#define SETMULTIPLEX 0xA8
-#define SETPRECHARGE 0xD9
-#define SETSEGMENTREMAP 0xA1
-#define SETSTARTLINE 0x40
-#define SETVCOMDETECT 0xDB
-#define SWITCHCAPVCC 0x2
-
-#ifndef _swap_int16_t
-#define _swap_int16_t(a, b) { int16_t t = a; a = b; b = t; }
-#endif
-
-enum OLEDDISPLAY_COLOR {
-  BLACK = 0,
-  WHITE = 1,
-  INVERSE = 2
-};
-
-enum OLEDDISPLAY_TEXT_ALIGNMENT {
-  TEXT_ALIGN_LEFT = 0,
-  TEXT_ALIGN_RIGHT = 1,
-  TEXT_ALIGN_CENTER = 2,
-  TEXT_ALIGN_CENTER_BOTH = 3
-};
-
-
-class OLEDDisplay : public Print {
-  public:
-    // Initialize the display
-    bool init();
-
-    // Free the memory used by the display
-    void end();
-
-    // Cycle through the initialization
-    void resetDisplay(void);
-
-    /* Drawing functions */
-    // Sets the color of all pixel operations
-    void setColor(OLEDDISPLAY_COLOR color);
-
-    // Draw a pixel at given position
-    void setPixel(int16_t x, int16_t y);
-
-    // Draw a line from position 0 to position 1
-    void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
-
-    // Draw the border of a rectangle at the given location
-    void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
-
-    // Fill the rectangle
-    void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
-
-    // Draw the border of a circle
-    void drawCircle(int16_t x, int16_t y, int16_t radius);
-
-    // Draw all Quadrants specified in the quads bit mask
-    void drawCircleQuads(int16_t x0, int16_t y0, int16_t radius, uint8_t quads);
-
-    // Fill circle
-    void fillCircle(int16_t x, int16_t y, int16_t radius);
-
-    // Draw a line horizontally
-    void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
-
-    // Draw a lin vertically
-    void drawVerticalLine(int16_t x, int16_t y, int16_t length);
-
-    // Draws a rounded progress bar with the outer dimensions given by width and height. Progress is 
-    // a unsigned byte value between 0 and 100
-    void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
-
-    // Draw a bitmap in the internal image format
-    void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const char *image);
-
-    // Draw a XBM
-    void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char *xbm);
-
-    /* Text functions */
-
-    // Draws a string at the given location
-    void drawString(int16_t x, int16_t y, String text);
-
-    // Draws a String with a maximum width at the given location.
-    // If the given String is wider than the specified width
-    // The text will be wrapped to the next line at a space or dash
-    void drawStringMaxWidth(int16_t x, int16_t y, uint16_t maxLineWidth, String text);
-
-    // Returns the width of the const char* with the current
-    // font settings
-    uint16_t getStringWidth(const char* text, uint16_t length);
-
-    // Convencience method for the const char version
-    uint16_t getStringWidth(String text);
-
-    // Specifies relative to which anchor point
-    // the text is rendered. Available constants:
-    // TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
-    void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
-
-    // Sets the current font. Available default fonts
-    // ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
-    void setFont(const char *fontData);
-
-    /* Display functions */
-
-    // Turn the display on
-    void displayOn(void);
-
-    // Turn the display offs
-    void displayOff(void);
-
-    // Inverted display mode
-    void invertDisplay(void);
-
-    // Normal display mode
-    void normalDisplay(void);
-
-    // Set display contrast
-    void setContrast(char contrast);
-
-    // Turn the display upside down
-    void flipScreenVertically();
-
-    // Write the buffer to the display memory
-    virtual void display(void) = 0;
-
-    // Clear the local pixel buffer
-    void clear(void);
-
-    // Log buffer implementation
-
-    // This will define the lines and characters you can
-    // print to the screen. When you exeed the buffer size (lines * chars)
-    // the output may be truncated due to the size constraint.
-    bool setLogBuffer(uint16_t lines, uint16_t chars);
-
-    // Draw the log buffer at position (x, y)
-    void drawLogBuffer(uint16_t x, uint16_t y);
-
-    // Implementent needed function to be compatible with Print class
-    size_t write(uint8_t c);
-    size_t write(const char* s);
-
-    uint8_t            *buffer;
-
-    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-    uint8_t            *buffer_back;
-    #endif
-
-  protected:
-
-    OLEDDISPLAY_TEXT_ALIGNMENT   textAlignment = TEXT_ALIGN_LEFT;
-    OLEDDISPLAY_COLOR            color         = WHITE;
-
-    const char          *fontData              = ArialMT_Plain_10;
-
-    // State values for logBuffer
-    uint16_t   logBufferSize                   = 0;
-    uint16_t   logBufferFilled                 = 0;
-    uint16_t   logBufferLine                   = 0;
-    uint16_t   logBufferMaxLines               = 0;
-    char      *logBuffer                       = NULL;
-
-    // Send a command to the display (low level function)
-    virtual void sendCommand(uint8_t com) {};
-
-    // Connect to the display
-    virtual bool connect() {return false;};
-
-    // Send all the init commands
-    void sendInitCommands();
-
-    // converts utf8 characters to extended ascii
-    static char* utf8ascii(String s);
-    static byte utf8ascii(byte ascii);
-
-    void inline drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *data, uint16_t offset, uint16_t bytesInData) __attribute__((always_inline));
-
-    void drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth);
-
-};
-
-#endif
diff --git a/libraries/oled-ssd1306/OLEDDisplayFonts.h b/libraries/oled-ssd1306/OLEDDisplayFonts.h
deleted file mode 100644
index 6dd21ef60..000000000
--- a/libraries/oled-ssd1306/OLEDDisplayFonts.h
+++ /dev/null
@@ -1,1274 +0,0 @@
-#ifndef OLEDDISPLAYFONTS_h
-#define OLEDDISPLAYFONTS_h
-
-const char ArialMT_Plain_10[] PROGMEM = {
-  0x0A, // Width: 10
-  0x0D, // Height: 13
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table:
-  0xFF, 0xFF, 0x00, 0x03,  // 32:65535
-  0x00, 0x00, 0x04, 0x03,  // 33:0
-  0x00, 0x04, 0x05, 0x04,  // 34:4
-  0x00, 0x09, 0x09, 0x06,  // 35:9
-  0x00, 0x12, 0x0A, 0x06,  // 36:18
-  0x00, 0x1C, 0x10, 0x09,  // 37:28
-  0x00, 0x2C, 0x0E, 0x07,  // 38:44
-  0x00, 0x3A, 0x01, 0x02,  // 39:58
-  0x00, 0x3B, 0x06, 0x03,  // 40:59
-  0x00, 0x41, 0x06, 0x03,  // 41:65
-  0x00, 0x47, 0x05, 0x04,  // 42:71
-  0x00, 0x4C, 0x09, 0x06,  // 43:76
-  0x00, 0x55, 0x04, 0x03,  // 44:85
-  0x00, 0x59, 0x03, 0x03,  // 45:89
-  0x00, 0x5C, 0x04, 0x03,  // 46:92
-  0x00, 0x60, 0x05, 0x03,  // 47:96
-  0x00, 0x65, 0x0A, 0x06,  // 48:101
-  0x00, 0x6F, 0x08, 0x06,  // 49:111
-  0x00, 0x77, 0x0A, 0x06,  // 50:119
-  0x00, 0x81, 0x0A, 0x06,  // 51:129
-  0x00, 0x8B, 0x0B, 0x06,  // 52:139
-  0x00, 0x96, 0x0A, 0x06,  // 53:150
-  0x00, 0xA0, 0x0A, 0x06,  // 54:160
-  0x00, 0xAA, 0x09, 0x06,  // 55:170
-  0x00, 0xB3, 0x0A, 0x06,  // 56:179
-  0x00, 0xBD, 0x0A, 0x06,  // 57:189
-  0x00, 0xC7, 0x04, 0x03,  // 58:199
-  0x00, 0xCB, 0x04, 0x03,  // 59:203
-  0x00, 0xCF, 0x0A, 0x06,  // 60:207
-  0x00, 0xD9, 0x09, 0x06,  // 61:217
-  0x00, 0xE2, 0x09, 0x06,  // 62:226
-  0x00, 0xEB, 0x0B, 0x06,  // 63:235
-  0x00, 0xF6, 0x14, 0x0A,  // 64:246
-  0x01, 0x0A, 0x0E, 0x07,  // 65:266
-  0x01, 0x18, 0x0C, 0x07,  // 66:280
-  0x01, 0x24, 0x0C, 0x07,  // 67:292
-  0x01, 0x30, 0x0B, 0x07,  // 68:304
-  0x01, 0x3B, 0x0C, 0x07,  // 69:315
-  0x01, 0x47, 0x09, 0x06,  // 70:327
-  0x01, 0x50, 0x0D, 0x08,  // 71:336
-  0x01, 0x5D, 0x0C, 0x07,  // 72:349
-  0x01, 0x69, 0x04, 0x03,  // 73:361
-  0x01, 0x6D, 0x08, 0x05,  // 74:365
-  0x01, 0x75, 0x0E, 0x07,  // 75:373
-  0x01, 0x83, 0x0C, 0x06,  // 76:387
-  0x01, 0x8F, 0x10, 0x08,  // 77:399
-  0x01, 0x9F, 0x0C, 0x07,  // 78:415
-  0x01, 0xAB, 0x0E, 0x08,  // 79:427
-  0x01, 0xB9, 0x0B, 0x07,  // 80:441
-  0x01, 0xC4, 0x0E, 0x08,  // 81:452
-  0x01, 0xD2, 0x0C, 0x07,  // 82:466
-  0x01, 0xDE, 0x0C, 0x07,  // 83:478
-  0x01, 0xEA, 0x0B, 0x06,  // 84:490
-  0x01, 0xF5, 0x0C, 0x07,  // 85:501
-  0x02, 0x01, 0x0D, 0x07,  // 86:513
-  0x02, 0x0E, 0x11, 0x09,  // 87:526
-  0x02, 0x1F, 0x0E, 0x07,  // 88:543
-  0x02, 0x2D, 0x0D, 0x07,  // 89:557
-  0x02, 0x3A, 0x0C, 0x06,  // 90:570
-  0x02, 0x46, 0x06, 0x03,  // 91:582
-  0x02, 0x4C, 0x06, 0x03,  // 92:588
-  0x02, 0x52, 0x04, 0x03,  // 93:594
-  0x02, 0x56, 0x09, 0x05,  // 94:598
-  0x02, 0x5F, 0x0C, 0x06,  // 95:607
-  0x02, 0x6B, 0x03, 0x03,  // 96:619
-  0x02, 0x6E, 0x0A, 0x06,  // 97:622
-  0x02, 0x78, 0x0A, 0x06,  // 98:632
-  0x02, 0x82, 0x0A, 0x05,  // 99:642
-  0x02, 0x8C, 0x0A, 0x06,  // 100:652
-  0x02, 0x96, 0x0A, 0x06,  // 101:662
-  0x02, 0xA0, 0x05, 0x03,  // 102:672
-  0x02, 0xA5, 0x0A, 0x06,  // 103:677
-  0x02, 0xAF, 0x0A, 0x06,  // 104:687
-  0x02, 0xB9, 0x04, 0x02,  // 105:697
-  0x02, 0xBD, 0x04, 0x02,  // 106:701
-  0x02, 0xC1, 0x08, 0x05,  // 107:705
-  0x02, 0xC9, 0x04, 0x02,  // 108:713
-  0x02, 0xCD, 0x10, 0x08,  // 109:717
-  0x02, 0xDD, 0x0A, 0x06,  // 110:733
-  0x02, 0xE7, 0x0A, 0x06,  // 111:743
-  0x02, 0xF1, 0x0A, 0x06,  // 112:753
-  0x02, 0xFB, 0x0A, 0x06,  // 113:763
-  0x03, 0x05, 0x05, 0x03,  // 114:773
-  0x03, 0x0A, 0x08, 0x05,  // 115:778
-  0x03, 0x12, 0x06, 0x03,  // 116:786
-  0x03, 0x18, 0x0A, 0x06,  // 117:792
-  0x03, 0x22, 0x09, 0x05,  // 118:802
-  0x03, 0x2B, 0x0E, 0x07,  // 119:811
-  0x03, 0x39, 0x0A, 0x05,  // 120:825
-  0x03, 0x43, 0x09, 0x05,  // 121:835
-  0x03, 0x4C, 0x0A, 0x05,  // 122:844
-  0x03, 0x56, 0x06, 0x03,  // 123:854
-  0x03, 0x5C, 0x04, 0x03,  // 124:860
-  0x03, 0x60, 0x05, 0x03,  // 125:864
-  0x03, 0x65, 0x09, 0x06,  // 126:869
-  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 128:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 129:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 130:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 131:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 132:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 133:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 134:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 135:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 136:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 137:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 138:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 139:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 140:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 141:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 142:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 143:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 144:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 145:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 146:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 147:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 148:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 149:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 150:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 151:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 152:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 153:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 154:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 155:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 156:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 157:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 158:65535
-  0xFF, 0xFF, 0x00, 0x0A,  // 159:65535
-  0xFF, 0xFF, 0x00, 0x03,  // 160:65535
-  0x03, 0x6E, 0x04, 0x03,  // 161:878
-  0x03, 0x72, 0x0A, 0x06,  // 162:882
-  0x03, 0x7C, 0x0C, 0x06,  // 163:892
-  0x03, 0x88, 0x0A, 0x06,  // 164:904
-  0x03, 0x92, 0x0A, 0x06,  // 165:914
-  0x03, 0x9C, 0x04, 0x03,  // 166:924
-  0x03, 0xA0, 0x0A, 0x06,  // 167:928
-  0x03, 0xAA, 0x05, 0x03,  // 168:938
-  0x03, 0xAF, 0x0D, 0x07,  // 169:943
-  0x03, 0xBC, 0x07, 0x04,  // 170:956
-  0x03, 0xC3, 0x0A, 0x06,  // 171:963
-  0x03, 0xCD, 0x09, 0x06,  // 172:973
-  0x03, 0xD6, 0x03, 0x03,  // 173:982
-  0x03, 0xD9, 0x0D, 0x07,  // 174:985
-  0x03, 0xE6, 0x0B, 0x06,  // 175:998
-  0x03, 0xF1, 0x07, 0x04,  // 176:1009
-  0x03, 0xF8, 0x0A, 0x05,  // 177:1016
-  0x04, 0x02, 0x05, 0x03,  // 178:1026
-  0x04, 0x07, 0x05, 0x03,  // 179:1031
-  0x04, 0x0C, 0x05, 0x03,  // 180:1036
-  0x04, 0x11, 0x0A, 0x06,  // 181:1041
-  0x04, 0x1B, 0x09, 0x05,  // 182:1051
-  0x04, 0x24, 0x03, 0x03,  // 183:1060
-  0x04, 0x27, 0x06, 0x03,  // 184:1063
-  0x04, 0x2D, 0x05, 0x03,  // 185:1069
-  0x04, 0x32, 0x07, 0x04,  // 186:1074
-  0x04, 0x39, 0x0A, 0x06,  // 187:1081
-  0x04, 0x43, 0x10, 0x08,  // 188:1091
-  0x04, 0x53, 0x10, 0x08,  // 189:1107
-  0x04, 0x63, 0x10, 0x08,  // 190:1123
-  0x04, 0x73, 0x0A, 0x06,  // 191:1139
-  0x04, 0x7D, 0x0E, 0x07,  // 192:1149
-  0x04, 0x8B, 0x0E, 0x07,  // 193:1163
-  0x04, 0x99, 0x0E, 0x07,  // 194:1177
-  0x04, 0xA7, 0x0E, 0x07,  // 195:1191
-  0x04, 0xB5, 0x0E, 0x07,  // 196:1205
-  0x04, 0xC3, 0x0E, 0x07,  // 197:1219
-  0x04, 0xD1, 0x12, 0x0A,  // 198:1233
-  0x04, 0xE3, 0x0C, 0x07,  // 199:1251
-  0x04, 0xEF, 0x0C, 0x07,  // 200:1263
-  0x04, 0xFB, 0x0C, 0x07,  // 201:1275
-  0x05, 0x07, 0x0C, 0x07,  // 202:1287
-  0x05, 0x13, 0x0C, 0x07,  // 203:1299
-  0x05, 0x1F, 0x05, 0x03,  // 204:1311
-  0x05, 0x24, 0x04, 0x03,  // 205:1316
-  0x05, 0x28, 0x04, 0x03,  // 206:1320
-  0x05, 0x2C, 0x05, 0x03,  // 207:1324
-  0x05, 0x31, 0x0B, 0x07,  // 208:1329
-  0x05, 0x3C, 0x0C, 0x07,  // 209:1340
-  0x05, 0x48, 0x0E, 0x08,  // 210:1352
-  0x05, 0x56, 0x0E, 0x08,  // 211:1366
-  0x05, 0x64, 0x0E, 0x08,  // 212:1380
-  0x05, 0x72, 0x0E, 0x08,  // 213:1394
-  0x05, 0x80, 0x0E, 0x08,  // 214:1408
-  0x05, 0x8E, 0x0A, 0x06,  // 215:1422
-  0x05, 0x98, 0x0D, 0x08,  // 216:1432
-  0x05, 0xA5, 0x0C, 0x07,  // 217:1445
-  0x05, 0xB1, 0x0C, 0x07,  // 218:1457
-  0x05, 0xBD, 0x0C, 0x07,  // 219:1469
-  0x05, 0xC9, 0x0C, 0x07,  // 220:1481
-  0x05, 0xD5, 0x0D, 0x07,  // 221:1493
-  0x05, 0xE2, 0x0B, 0x07,  // 222:1506
-  0x05, 0xED, 0x0C, 0x06,  // 223:1517
-  0x05, 0xF9, 0x0A, 0x06,  // 224:1529
-  0x06, 0x03, 0x0A, 0x06,  // 225:1539
-  0x06, 0x0D, 0x0A, 0x06,  // 226:1549
-  0x06, 0x17, 0x0A, 0x06,  // 227:1559
-  0x06, 0x21, 0x0A, 0x06,  // 228:1569
-  0x06, 0x2B, 0x0A, 0x06,  // 229:1579
-  0x06, 0x35, 0x10, 0x09,  // 230:1589
-  0x06, 0x45, 0x0A, 0x05,  // 231:1605
-  0x06, 0x4F, 0x0A, 0x06,  // 232:1615
-  0x06, 0x59, 0x0A, 0x06,  // 233:1625
-  0x06, 0x63, 0x0A, 0x06,  // 234:1635
-  0x06, 0x6D, 0x0A, 0x06,  // 235:1645
-  0x06, 0x77, 0x05, 0x03,  // 236:1655
-  0x06, 0x7C, 0x04, 0x03,  // 237:1660
-  0x06, 0x80, 0x05, 0x03,  // 238:1664
-  0x06, 0x85, 0x05, 0x03,  // 239:1669
-  0x06, 0x8A, 0x0A, 0x06,  // 240:1674
-  0x06, 0x94, 0x0A, 0x06,  // 241:1684
-  0x06, 0x9E, 0x0A, 0x06,  // 242:1694
-  0x06, 0xA8, 0x0A, 0x06,  // 243:1704
-  0x06, 0xB2, 0x0A, 0x06,  // 244:1714
-  0x06, 0xBC, 0x0A, 0x06,  // 245:1724
-  0x06, 0xC6, 0x0A, 0x06,  // 246:1734
-  0x06, 0xD0, 0x09, 0x05,  // 247:1744
-  0x06, 0xD9, 0x0A, 0x06,  // 248:1753
-  0x06, 0xE3, 0x0A, 0x06,  // 249:1763
-  0x06, 0xED, 0x0A, 0x06,  // 250:1773
-  0x06, 0xF7, 0x0A, 0x06,  // 251:1783
-  0x07, 0x01, 0x0A, 0x06,  // 252:1793
-  0x07, 0x0B, 0x09, 0x05,  // 253:1803
-  0x07, 0x14, 0x0A, 0x06,  // 254:1812
-  0x07, 0x1E, 0x09, 0x05,  // 255:1822
-
-  // Font Data:
-  0x00,0x00,0xF8,0x02,  // 33
-  0x38,0x00,0x00,0x00,0x38, // 34
-  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
-  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01,  // 36
-  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01,  // 37
-  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02,  // 38
-  0x38, // 39
-  0xE0,0x03,0x10,0x04,0x08,0x08,  // 40
-  0x08,0x08,0x10,0x04,0xE0,0x03,  // 41
-  0x28,0x00,0x18,0x00,0x28, // 42
-  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
-  0x00,0x00,0x00,0x06,  // 44
-  0x80,0x00,0x80, // 45
-  0x00,0x00,0x00,0x02,  // 46
-  0x00,0x03,0xE0,0x00,0x18, // 47
-  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 48
-  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03,  // 49
-  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02,  // 50
-  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 51
-  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
-  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01,  // 53
-  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01,  // 54
-  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
-  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 56
-  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01,  // 57
-  0x00,0x00,0x20,0x02,  // 58
-  0x00,0x00,0x20,0x06,  // 59
-  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01,  // 60
-  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
-  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
-  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
-  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04,  // 64
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02,  // 65
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01,  // 66
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01,  // 67
-  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02,  // 69
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
-  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
-  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03,  // 72
-  0x00,0x00,0xF8,0x03,  // 73
-  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01,  // 74
-  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 75
-  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,  // 76
-  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03,  // 77
-  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03,  // 78
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 79
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02,  // 81
-  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03,  // 82
-  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01,  // 83
-  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
-  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01,  // 85
-  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
-  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
-  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 88
-  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
-  0x08,0x03,0x88,0x02,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02,  // 90
-  0x00,0x00,0xF8,0x0F,0x08,0x08,  // 91
-  0x18,0x00,0xE0,0x00,0x00,0x03,  // 92
-  0x08,0x08,0xF8,0x0F,  // 93
-  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
-  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,  // 95
-  0x08,0x00,0x10, // 96
-  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03,  // 97
-  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01,  // 98
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01,  // 99
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03,  // 100
-  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 101
-  0x20,0x00,0xF0,0x03,0x28, // 102
-  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07,  // 103
-  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 104
-  0x00,0x00,0xE8,0x03,  // 105
-  0x00,0x08,0xE8,0x07,  // 106
-  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02,  // 107
-  0x00,0x00,0xF8,0x03,  // 108
-  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 109
-  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 110
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01,  // 111
-  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 112
-  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F,  // 113
-  0x00,0x00,0xE0,0x03,0x20, // 114
-  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01,  // 115
-  0x20,0x00,0xF8,0x03,0x20,0x02,  // 116
-  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03,  // 117
-  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
-  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01,  // 119
-  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02,  // 120
-  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
-  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02,  // 122
-  0x80,0x00,0x78,0x0F,0x08,0x08,  // 123
-  0x00,0x00,0xF8,0x0F,  // 124
-  0x08,0x08,0x78,0x0F,0x80, // 125
-  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
-  0x00,0x00,0xA0,0x0F,  // 161
-  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01,  // 162
-  0x40,0x02,0x70,0x03,0xC8,0x02,0x48,0x02,0x08,0x02,0x10,0x02,  // 163
-  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01,  // 164
-  0x48,0x01,0x70,0x01,0xC0,0x03,0x70,0x01,0x48,0x01,  // 165
-  0x00,0x00,0x38,0x0F,  // 166
-  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05,  // 167
-  0x08,0x00,0x00,0x00,0x08, // 168
-  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
-  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
-  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02,  // 171
-  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
-  0x80,0x00,0x80, // 173
-  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
-  0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 175
-  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
-  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02,  // 177
-  0x48,0x00,0x68,0x00,0x58, // 178
-  0x48,0x00,0x58,0x00,0x68, // 179
-  0x00,0x00,0x10,0x00,0x08, // 180
-  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03,  // 181
-  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
-  0x00,0x00,0x40, // 183
-  0x00,0x00,0x00,0x14,0x00,0x18,  // 184
-  0x00,0x00,0x10,0x00,0x78, // 185
-  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
-  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01,  // 187
-  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 188
-  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02,  // 189
-  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 190
-  0x00,0x00,0x00,0x06,0x00,0x09,0xA0,0x09,0x00,0x04,  // 191
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 192
-  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 193
-  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 194
-  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 195
-  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 196
-  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02,  // 197
-  0x00,0x03,0xC0,0x00,0xE0,0x00,0x98,0x00,0x88,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,  // 198
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01,  // 199
-  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 200
-  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02,  // 201
-  0x00,0x00,0xFA,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 202
-  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02,  // 203
-  0x00,0x00,0xF9,0x03,0x02, // 204
-  0x02,0x00,0xF9,0x03,  // 205
-  0x01,0x00,0xFA,0x03,  // 206
-  0x02,0x00,0xF8,0x03,0x02, // 207
-  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
-  0x00,0x00,0xFA,0x03,0x31,0x00,0x42,0x00,0x81,0x01,0xF8,0x03,  // 209
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 210
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01,  // 211
-  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01,  // 212
-  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01,  // 213
-  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 214
-  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01,  // 215
-  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
-  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01,  // 217
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01,  // 218
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01,  // 219
-  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01,  // 220
-  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
-  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
-  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01,  // 223
-  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03,  // 224
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03,  // 225
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03,  // 226
-  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03,  // 227
-  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03,  // 228
-  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03,  // 229
-  0x00,0x00,0x40,0x03,0xA0,0x02,0xA0,0x02,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 230
-  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01,  // 231
-  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02,  // 232
-  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02,  // 233
-  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC8,0x02,  // 234
-  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02,  // 235
-  0x00,0x00,0xE4,0x03,0x08, // 236
-  0x08,0x00,0xE4,0x03,  // 237
-  0x08,0x00,0xE4,0x03,0x08, // 238
-  0x08,0x00,0xE0,0x03,0x08, // 239
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01,  // 240
-  0x00,0x00,0xE8,0x03,0x24,0x00,0x28,0x00,0xC4,0x03,  // 241
-  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01,  // 242
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01,  // 243
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01,  // 244
-  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01,  // 245
-  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01,  // 246
-  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
-  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01,  // 248
-  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 249
-  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03,  // 250
-  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 251
-  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03,  // 252
-  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
-  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 254
-  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20  // 255
-};
-
-const char ArialMT_Plain_16[] PROGMEM = {
-  0x10, // Width: 16
-  0x13, // Height: 19
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table:
-  0xFF, 0xFF, 0x00, 0x04,  // 32:65535
-  0x00, 0x00, 0x08, 0x04,  // 33:0
-  0x00, 0x08, 0x0D, 0x06,  // 34:8
-  0x00, 0x15, 0x1A, 0x09,  // 35:21
-  0x00, 0x2F, 0x17, 0x09,  // 36:47
-  0x00, 0x46, 0x26, 0x0E,  // 37:70
-  0x00, 0x6C, 0x1D, 0x0B,  // 38:108
-  0x00, 0x89, 0x04, 0x03,  // 39:137
-  0x00, 0x8D, 0x0C, 0x05,  // 40:141
-  0x00, 0x99, 0x0B, 0x05,  // 41:153
-  0x00, 0xA4, 0x0D, 0x06,  // 42:164
-  0x00, 0xB1, 0x17, 0x09,  // 43:177
-  0x00, 0xC8, 0x09, 0x04,  // 44:200
-  0x00, 0xD1, 0x0B, 0x05,  // 45:209
-  0x00, 0xDC, 0x08, 0x04,  // 46:220
-  0x00, 0xE4, 0x0A, 0x04,  // 47:228
-  0x00, 0xEE, 0x17, 0x09,  // 48:238
-  0x01, 0x05, 0x11, 0x09,  // 49:261
-  0x01, 0x16, 0x17, 0x09,  // 50:278
-  0x01, 0x2D, 0x17, 0x09,  // 51:301
-  0x01, 0x44, 0x17, 0x09,  // 52:324
-  0x01, 0x5B, 0x17, 0x09,  // 53:347
-  0x01, 0x72, 0x17, 0x09,  // 54:370
-  0x01, 0x89, 0x16, 0x09,  // 55:393
-  0x01, 0x9F, 0x17, 0x09,  // 56:415
-  0x01, 0xB6, 0x17, 0x09,  // 57:438
-  0x01, 0xCD, 0x05, 0x04,  // 58:461
-  0x01, 0xD2, 0x06, 0x04,  // 59:466
-  0x01, 0xD8, 0x17, 0x09,  // 60:472
-  0x01, 0xEF, 0x17, 0x09,  // 61:495
-  0x02, 0x06, 0x17, 0x09,  // 62:518
-  0x02, 0x1D, 0x16, 0x09,  // 63:541
-  0x02, 0x33, 0x2F, 0x10,  // 64:563
-  0x02, 0x62, 0x1D, 0x0B,  // 65:610
-  0x02, 0x7F, 0x1D, 0x0B,  // 66:639
-  0x02, 0x9C, 0x20, 0x0C,  // 67:668
-  0x02, 0xBC, 0x20, 0x0C,  // 68:700
-  0x02, 0xDC, 0x1D, 0x0B,  // 69:732
-  0x02, 0xF9, 0x19, 0x0A,  // 70:761
-  0x03, 0x12, 0x20, 0x0C,  // 71:786
-  0x03, 0x32, 0x1D, 0x0C,  // 72:818
-  0x03, 0x4F, 0x05, 0x04,  // 73:847
-  0x03, 0x54, 0x14, 0x08,  // 74:852
-  0x03, 0x68, 0x1D, 0x0B,  // 75:872
-  0x03, 0x85, 0x17, 0x09,  // 76:901
-  0x03, 0x9C, 0x23, 0x0D,  // 77:924
-  0x03, 0xBF, 0x1D, 0x0C,  // 78:959
-  0x03, 0xDC, 0x20, 0x0C,  // 79:988
-  0x03, 0xFC, 0x1C, 0x0B,  // 80:1020
-  0x04, 0x18, 0x20, 0x0C,  // 81:1048
-  0x04, 0x38, 0x1D, 0x0C,  // 82:1080
-  0x04, 0x55, 0x1D, 0x0B,  // 83:1109
-  0x04, 0x72, 0x19, 0x0A,  // 84:1138
-  0x04, 0x8B, 0x1D, 0x0C,  // 85:1163
-  0x04, 0xA8, 0x1C, 0x0B,  // 86:1192
-  0x04, 0xC4, 0x2B, 0x0F,  // 87:1220
-  0x04, 0xEF, 0x20, 0x0B,  // 88:1263
-  0x05, 0x0F, 0x19, 0x0B,  // 89:1295
-  0x05, 0x28, 0x1A, 0x0A,  // 90:1320
-  0x05, 0x42, 0x0C, 0x04,  // 91:1346
-  0x05, 0x4E, 0x0B, 0x04,  // 92:1358
-  0x05, 0x59, 0x09, 0x04,  // 93:1369
-  0x05, 0x62, 0x14, 0x08,  // 94:1378
-  0x05, 0x76, 0x1B, 0x09,  // 95:1398
-  0x05, 0x91, 0x07, 0x05,  // 96:1425
-  0x05, 0x98, 0x17, 0x09,  // 97:1432
-  0x05, 0xAF, 0x17, 0x09,  // 98:1455
-  0x05, 0xC6, 0x14, 0x08,  // 99:1478
-  0x05, 0xDA, 0x17, 0x09,  // 100:1498
-  0x05, 0xF1, 0x17, 0x09,  // 101:1521
-  0x06, 0x08, 0x0A, 0x04,  // 102:1544
-  0x06, 0x12, 0x17, 0x09,  // 103:1554
-  0x06, 0x29, 0x14, 0x09,  // 104:1577
-  0x06, 0x3D, 0x05, 0x04,  // 105:1597
-  0x06, 0x42, 0x06, 0x04,  // 106:1602
-  0x06, 0x48, 0x17, 0x08,  // 107:1608
-  0x06, 0x5F, 0x05, 0x04,  // 108:1631
-  0x06, 0x64, 0x23, 0x0D,  // 109:1636
-  0x06, 0x87, 0x14, 0x09,  // 110:1671
-  0x06, 0x9B, 0x17, 0x09,  // 111:1691
-  0x06, 0xB2, 0x17, 0x09,  // 112:1714
-  0x06, 0xC9, 0x18, 0x09,  // 113:1737
-  0x06, 0xE1, 0x0D, 0x05,  // 114:1761
-  0x06, 0xEE, 0x14, 0x08,  // 115:1774
-  0x07, 0x02, 0x0B, 0x04,  // 116:1794
-  0x07, 0x0D, 0x14, 0x09,  // 117:1805
-  0x07, 0x21, 0x13, 0x08,  // 118:1825
-  0x07, 0x34, 0x1F, 0x0C,  // 119:1844
-  0x07, 0x53, 0x14, 0x08,  // 120:1875
-  0x07, 0x67, 0x13, 0x08,  // 121:1895
-  0x07, 0x7A, 0x14, 0x08,  // 122:1914
-  0x07, 0x8E, 0x0F, 0x05,  // 123:1934
-  0x07, 0x9D, 0x06, 0x04,  // 124:1949
-  0x07, 0xA3, 0x0E, 0x05,  // 125:1955
-  0x07, 0xB1, 0x17, 0x09,  // 126:1969
-  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 128:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 129:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 130:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 131:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 132:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 133:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 134:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 135:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 136:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 137:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 138:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 139:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 140:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 141:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 142:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 143:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 144:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 145:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 146:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 147:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 148:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 149:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 150:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 151:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 152:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 153:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 154:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 155:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 156:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 157:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 158:65535
-  0xFF, 0xFF, 0x00, 0x10,  // 159:65535
-  0xFF, 0xFF, 0x00, 0x04,  // 160:65535
-  0x07, 0xC8, 0x09, 0x05,  // 161:1992
-  0x07, 0xD1, 0x17, 0x09,  // 162:2001
-  0x07, 0xE8, 0x17, 0x09,  // 163:2024
-  0x07, 0xFF, 0x14, 0x09,  // 164:2047
-  0x08, 0x13, 0x1A, 0x09,  // 165:2067
-  0x08, 0x2D, 0x06, 0x04,  // 166:2093
-  0x08, 0x33, 0x17, 0x09,  // 167:2099
-  0x08, 0x4A, 0x07, 0x05,  // 168:2122
-  0x08, 0x51, 0x23, 0x0C,  // 169:2129
-  0x08, 0x74, 0x0E, 0x06,  // 170:2164
-  0x08, 0x82, 0x14, 0x09,  // 171:2178
-  0x08, 0x96, 0x17, 0x09,  // 172:2198
-  0x08, 0xAD, 0x0B, 0x05,  // 173:2221
-  0x08, 0xB8, 0x23, 0x0C,  // 174:2232
-  0x08, 0xDB, 0x19, 0x09,  // 175:2267
-  0x08, 0xF4, 0x0D, 0x06,  // 176:2292
-  0x09, 0x01, 0x17, 0x09,  // 177:2305
-  0x09, 0x18, 0x0E, 0x05,  // 178:2328
-  0x09, 0x26, 0x0D, 0x05,  // 179:2342
-  0x09, 0x33, 0x0A, 0x05,  // 180:2355
-  0x09, 0x3D, 0x17, 0x09,  // 181:2365
-  0x09, 0x54, 0x19, 0x09,  // 182:2388
-  0x09, 0x6D, 0x08, 0x05,  // 183:2413
-  0x09, 0x75, 0x0C, 0x05,  // 184:2421
-  0x09, 0x81, 0x0B, 0x05,  // 185:2433
-  0x09, 0x8C, 0x0D, 0x06,  // 186:2444
-  0x09, 0x99, 0x17, 0x09,  // 187:2457
-  0x09, 0xB0, 0x26, 0x0D,  // 188:2480
-  0x09, 0xD6, 0x26, 0x0D,  // 189:2518
-  0x09, 0xFC, 0x26, 0x0D,  // 190:2556
-  0x0A, 0x22, 0x1A, 0x0A,  // 191:2594
-  0x0A, 0x3C, 0x1D, 0x0B,  // 192:2620
-  0x0A, 0x59, 0x1D, 0x0B,  // 193:2649
-  0x0A, 0x76, 0x1D, 0x0B,  // 194:2678
-  0x0A, 0x93, 0x1D, 0x0B,  // 195:2707
-  0x0A, 0xB0, 0x1D, 0x0B,  // 196:2736
-  0x0A, 0xCD, 0x1D, 0x0B,  // 197:2765
-  0x0A, 0xEA, 0x2C, 0x10,  // 198:2794
-  0x0B, 0x16, 0x20, 0x0C,  // 199:2838
-  0x0B, 0x36, 0x1D, 0x0B,  // 200:2870
-  0x0B, 0x53, 0x1D, 0x0B,  // 201:2899
-  0x0B, 0x70, 0x1D, 0x0B,  // 202:2928
-  0x0B, 0x8D, 0x1D, 0x0B,  // 203:2957
-  0x0B, 0xAA, 0x05, 0x04,  // 204:2986
-  0x0B, 0xAF, 0x07, 0x04,  // 205:2991
-  0x0B, 0xB6, 0x0A, 0x04,  // 206:2998
-  0x0B, 0xC0, 0x07, 0x04,  // 207:3008
-  0x0B, 0xC7, 0x20, 0x0C,  // 208:3015
-  0x0B, 0xE7, 0x1D, 0x0C,  // 209:3047
-  0x0C, 0x04, 0x20, 0x0C,  // 210:3076
-  0x0C, 0x24, 0x20, 0x0C,  // 211:3108
-  0x0C, 0x44, 0x20, 0x0C,  // 212:3140
-  0x0C, 0x64, 0x20, 0x0C,  // 213:3172
-  0x0C, 0x84, 0x20, 0x0C,  // 214:3204
-  0x0C, 0xA4, 0x17, 0x09,  // 215:3236
-  0x0C, 0xBB, 0x20, 0x0C,  // 216:3259
-  0x0C, 0xDB, 0x1D, 0x0C,  // 217:3291
-  0x0C, 0xF8, 0x1D, 0x0C,  // 218:3320
-  0x0D, 0x15, 0x1D, 0x0C,  // 219:3349
-  0x0D, 0x32, 0x1D, 0x0C,  // 220:3378
-  0x0D, 0x4F, 0x19, 0x0B,  // 221:3407
-  0x0D, 0x68, 0x1D, 0x0B,  // 222:3432
-  0x0D, 0x85, 0x17, 0x0A,  // 223:3461
-  0x0D, 0x9C, 0x17, 0x09,  // 224:3484
-  0x0D, 0xB3, 0x17, 0x09,  // 225:3507
-  0x0D, 0xCA, 0x17, 0x09,  // 226:3530
-  0x0D, 0xE1, 0x17, 0x09,  // 227:3553
-  0x0D, 0xF8, 0x17, 0x09,  // 228:3576
-  0x0E, 0x0F, 0x17, 0x09,  // 229:3599
-  0x0E, 0x26, 0x29, 0x0E,  // 230:3622
-  0x0E, 0x4F, 0x14, 0x08,  // 231:3663
-  0x0E, 0x63, 0x17, 0x09,  // 232:3683
-  0x0E, 0x7A, 0x17, 0x09,  // 233:3706
-  0x0E, 0x91, 0x17, 0x09,  // 234:3729
-  0x0E, 0xA8, 0x17, 0x09,  // 235:3752
-  0x0E, 0xBF, 0x05, 0x04,  // 236:3775
-  0x0E, 0xC4, 0x07, 0x04,  // 237:3780
-  0x0E, 0xCB, 0x0A, 0x04,  // 238:3787
-  0x0E, 0xD5, 0x07, 0x04,  // 239:3797
-  0x0E, 0xDC, 0x17, 0x09,  // 240:3804
-  0x0E, 0xF3, 0x14, 0x09,  // 241:3827
-  0x0F, 0x07, 0x17, 0x09,  // 242:3847
-  0x0F, 0x1E, 0x17, 0x09,  // 243:3870
-  0x0F, 0x35, 0x17, 0x09,  // 244:3893
-  0x0F, 0x4C, 0x17, 0x09,  // 245:3916
-  0x0F, 0x63, 0x17, 0x09,  // 246:3939
-  0x0F, 0x7A, 0x17, 0x09,  // 247:3962
-  0x0F, 0x91, 0x17, 0x0A,  // 248:3985
-  0x0F, 0xA8, 0x14, 0x09,  // 249:4008
-  0x0F, 0xBC, 0x14, 0x09,  // 250:4028
-  0x0F, 0xD0, 0x14, 0x09,  // 251:4048
-  0x0F, 0xE4, 0x14, 0x09,  // 252:4068
-  0x0F, 0xF8, 0x13, 0x08,  // 253:4088
-  0x10, 0x0B, 0x17, 0x09,  // 254:4107
-  0x10, 0x22, 0x13, 0x08,  // 255:4130
-
-  // Font Data:
-  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F,  // 33
-  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
-  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,  // 35
-  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
-  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C,  // 37
-  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
-  0x00,0x00,0x00,0x78,  // 39
-  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02,  // 40
-  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
-  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
-  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,  // 46
-  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18,  // 47
-  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
-  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
-  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
-  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
-  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
-  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
-  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
-  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18,  // 55
-  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
-  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
-  0x00,0x00,0x00,0x40,0x40, // 58
-  0x00,0x00,0x00,0x40,0xC0,0x01,  // 59
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
-  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
-  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
-  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 63
-  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 67
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 68
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E,  // 71
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
-  0x00,0x00,0x00,0xF8,0x7F, // 73
-  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F,  // 74
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 79
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 80
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F,  // 81
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
-  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
-  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
-  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18,  // 86
-  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
-  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40,  // 88
-  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
-  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40,  // 90
-  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02,  // 91
-  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
-  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
-  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01,  // 94
-  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
-  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,  // 99
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
-  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48,  // 102
-  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 104
-  0x00,0x00,0x00,0xC8,0x7F, // 105
-  0x00,0x00,0x02,0xC8,0xFF,0x01,  // 106
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
-  0x00,0x00,0x00,0xF8,0x7F, // 108
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 110
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
-  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03,  // 113
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
-  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38,  // 115
-  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 117
-  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
-  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
-  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40,  // 120
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
-  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40,  // 122
-  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
-  0x00,0x00,0x00,0xF8,0xFF,0x03,  // 124
-  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04,  // 125
-  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
-  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
-  0x00,0x41,0x00,0xE0,0x31,0x00,0x10,0x2F,0x00,0x08,0x21,0x00,0x08,0x21,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x20,0x20, // 163
-  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B,  // 164
-  0x08,0x0A,0x00,0x10,0x0A,0x00,0x60,0x0A,0x00,0x80,0x0B,0x00,0x00,0x7E,0x00,0x80,0x0B,0x00,0x60,0x0A,0x00,0x10,0x0A,0x00,0x08,0x0A,  // 165
-  0x00,0x00,0x00,0xF8,0xF1,0x03,  // 166
-  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
-  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
-  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
-  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01,  // 170
-  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,  // 171
-  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
-  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
-  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
-  0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04, // 175
-  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
-  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
-  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01,  // 178
-  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x28,0x01,0x00,0xD8, // 179
-  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08,  // 180
-  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
-  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,  // 183
-  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03,  // 184
-  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0xF8,0x01, // 185
-  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
-  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
-  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 188
-  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C,  // 189
-  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 190
-  0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x10,0x01,0x00,0x08,0x02,0x40,0x07,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0xC0,  // 191
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
-  0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x06,0x00,0x80,0x05,0x00,0x60,0x04,0x00,0x18,0x04,0x00,0x08,0x04,0x00,0x08,0x04,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,  // 198
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 199
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 202
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
-  0x01,0x00,0x00,0xFA,0x7F, // 204
-  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
-  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02,  // 206
-  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
-  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 208
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x82,0x00,0x00,0x01,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 210
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 211
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 212
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 213
-  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 214
-  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
-  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F,  // 216
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
-  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
-  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
-  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
-  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
-  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x3F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 230
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20,  // 231
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x44,0x00,0x90,0x24,0x00,0x00,0x17, // 234
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
-  0x08,0x00,0x00,0xD0,0x7F, // 236
-  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
-  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10,  // 238
-  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
-  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
-  0x00,0x00,0x00,0xC0,0x7F,0x00,0x90,0x00,0x00,0x48,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F,  // 241
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
-  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
-  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 249
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F,  // 250
-  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F,  // 251
-  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 252
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
-  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
-  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0  // 255
-};
-const char ArialMT_Plain_24[] PROGMEM = {
-  0x18, // Width: 24
-  0x1C, // Height: 28
-  0x20, // First Char: 32
-  0xE0, // Numbers of Chars: 224
-
-  // Jump Table:
-  0xFF, 0xFF, 0x00, 0x07,  // 32:65535
-  0x00, 0x00, 0x13, 0x07,  // 33:0
-  0x00, 0x13, 0x1A, 0x09,  // 34:19
-  0x00, 0x2D, 0x33, 0x0D,  // 35:45
-  0x00, 0x60, 0x2F, 0x0D,  // 36:96
-  0x00, 0x8F, 0x4F, 0x15,  // 37:143
-  0x00, 0xDE, 0x3B, 0x10,  // 38:222
-  0x01, 0x19, 0x0A, 0x05,  // 39:281
-  0x01, 0x23, 0x1C, 0x08,  // 40:291
-  0x01, 0x3F, 0x1B, 0x08,  // 41:319
-  0x01, 0x5A, 0x21, 0x09,  // 42:346
-  0x01, 0x7B, 0x32, 0x0E,  // 43:379
-  0x01, 0xAD, 0x10, 0x07,  // 44:429
-  0x01, 0xBD, 0x1B, 0x08,  // 45:445
-  0x01, 0xD8, 0x0F, 0x07,  // 46:472
-  0x01, 0xE7, 0x19, 0x07,  // 47:487
-  0x02, 0x00, 0x2F, 0x0D,  // 48:512
-  0x02, 0x2F, 0x23, 0x0D,  // 49:559
-  0x02, 0x52, 0x2F, 0x0D,  // 50:594
-  0x02, 0x81, 0x2F, 0x0D,  // 51:641
-  0x02, 0xB0, 0x2F, 0x0D,  // 52:688
-  0x02, 0xDF, 0x2F, 0x0D,  // 53:735
-  0x03, 0x0E, 0x2F, 0x0D,  // 54:782
-  0x03, 0x3D, 0x2D, 0x0D,  // 55:829
-  0x03, 0x6A, 0x2F, 0x0D,  // 56:874
-  0x03, 0x99, 0x2F, 0x0D,  // 57:921
-  0x03, 0xC8, 0x0F, 0x07,  // 58:968
-  0x03, 0xD7, 0x10, 0x07,  // 59:983
-  0x03, 0xE7, 0x2F, 0x0E,  // 60:999
-  0x04, 0x16, 0x2F, 0x0E,  // 61:1046
-  0x04, 0x45, 0x2E, 0x0E,  // 62:1093
-  0x04, 0x73, 0x2E, 0x0D,  // 63:1139
-  0x04, 0xA1, 0x5B, 0x18,  // 64:1185
-  0x04, 0xFC, 0x3B, 0x10,  // 65:1276
-  0x05, 0x37, 0x3B, 0x10,  // 66:1335
-  0x05, 0x72, 0x3F, 0x11,  // 67:1394
-  0x05, 0xB1, 0x3F, 0x11,  // 68:1457
-  0x05, 0xF0, 0x3B, 0x10,  // 69:1520
-  0x06, 0x2B, 0x35, 0x0F,  // 70:1579
-  0x06, 0x60, 0x43, 0x13,  // 71:1632
-  0x06, 0xA3, 0x3B, 0x11,  // 72:1699
-  0x06, 0xDE, 0x0F, 0x07,  // 73:1758
-  0x06, 0xED, 0x27, 0x0C,  // 74:1773
-  0x07, 0x14, 0x3F, 0x10,  // 75:1812
-  0x07, 0x53, 0x2F, 0x0D,  // 76:1875
-  0x07, 0x82, 0x43, 0x14,  // 77:1922
-  0x07, 0xC5, 0x3B, 0x11,  // 78:1989
-  0x08, 0x00, 0x47, 0x13,  // 79:2048
-  0x08, 0x47, 0x3A, 0x10,  // 80:2119
-  0x08, 0x81, 0x47, 0x13,  // 81:2177
-  0x08, 0xC8, 0x3F, 0x11,  // 82:2248
-  0x09, 0x07, 0x3B, 0x10,  // 83:2311
-  0x09, 0x42, 0x35, 0x0F,  // 84:2370
-  0x09, 0x77, 0x3B, 0x11,  // 85:2423
-  0x09, 0xB2, 0x39, 0x10,  // 86:2482
-  0x09, 0xEB, 0x59, 0x17,  // 87:2539
-  0x0A, 0x44, 0x3B, 0x10,  // 88:2628
-  0x0A, 0x7F, 0x3D, 0x10,  // 89:2687
-  0x0A, 0xBC, 0x37, 0x0F,  // 90:2748
-  0x0A, 0xF3, 0x14, 0x07,  // 91:2803
-  0x0B, 0x07, 0x1B, 0x07,  // 92:2823
-  0x0B, 0x22, 0x18, 0x07,  // 93:2850
-  0x0B, 0x3A, 0x2A, 0x0B,  // 94:2874
-  0x0B, 0x64, 0x34, 0x0D,  // 95:2916
-  0x0B, 0x98, 0x11, 0x08,  // 96:2968
-  0x0B, 0xA9, 0x2F, 0x0D,  // 97:2985
-  0x0B, 0xD8, 0x33, 0x0D,  // 98:3032
-  0x0C, 0x0B, 0x2B, 0x0C,  // 99:3083
-  0x0C, 0x36, 0x2F, 0x0D,  // 100:3126
-  0x0C, 0x65, 0x2F, 0x0D,  // 101:3173
-  0x0C, 0x94, 0x1A, 0x07,  // 102:3220
-  0x0C, 0xAE, 0x2F, 0x0D,  // 103:3246
-  0x0C, 0xDD, 0x2F, 0x0D,  // 104:3293
-  0x0D, 0x0C, 0x0F, 0x05,  // 105:3340
-  0x0D, 0x1B, 0x10, 0x05,  // 106:3355
-  0x0D, 0x2B, 0x2F, 0x0C,  // 107:3371
-  0x0D, 0x5A, 0x0F, 0x05,  // 108:3418
-  0x0D, 0x69, 0x47, 0x14,  // 109:3433
-  0x0D, 0xB0, 0x2F, 0x0D,  // 110:3504
-  0x0D, 0xDF, 0x2F, 0x0D,  // 111:3551
-  0x0E, 0x0E, 0x33, 0x0D,  // 112:3598
-  0x0E, 0x41, 0x30, 0x0D,  // 113:3649
-  0x0E, 0x71, 0x1E, 0x08,  // 114:3697
-  0x0E, 0x8F, 0x2B, 0x0C,  // 115:3727
-  0x0E, 0xBA, 0x1B, 0x07,  // 116:3770
-  0x0E, 0xD5, 0x2F, 0x0D,  // 117:3797
-  0x0F, 0x04, 0x2A, 0x0C,  // 118:3844
-  0x0F, 0x2E, 0x42, 0x11,  // 119:3886
-  0x0F, 0x70, 0x2B, 0x0C,  // 120:3952
-  0x0F, 0x9B, 0x2A, 0x0C,  // 121:3995
-  0x0F, 0xC5, 0x2B, 0x0C,  // 122:4037
-  0x0F, 0xF0, 0x1C, 0x08,  // 123:4080
-  0x10, 0x0C, 0x10, 0x06,  // 124:4108
-  0x10, 0x1C, 0x1B, 0x08,  // 125:4124
-  0x10, 0x37, 0x32, 0x0E,  // 126:4151
-  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 128:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 129:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 130:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 131:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 132:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 133:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 134:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 135:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 136:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 137:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 138:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 139:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 140:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 141:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 142:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 143:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 144:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 145:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 146:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 147:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 148:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 149:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 150:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 151:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 152:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 153:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 154:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 155:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 156:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 157:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 158:65535
-  0xFF, 0xFF, 0x00, 0x18,  // 159:65535
-  0xFF, 0xFF, 0x00, 0x07,  // 160:65535
-  0x10, 0x69, 0x14, 0x08,  // 161:4201
-  0x10, 0x7D, 0x2B, 0x0D,  // 162:4221
-  0x10, 0xA8, 0x2F, 0x0D,  // 163:4264
-  0x10, 0xD7, 0x33, 0x0D,  // 164:4311
-  0x11, 0x0A, 0x31, 0x0D,  // 165:4362
-  0x11, 0x3B, 0x10, 0x06,  // 166:4411
-  0x11, 0x4B, 0x2F, 0x0D,  // 167:4427
-  0x11, 0x7A, 0x19, 0x08,  // 168:4474
-  0x11, 0x93, 0x46, 0x12,  // 169:4499
-  0x11, 0xD9, 0x1A, 0x09,  // 170:4569
-  0x11, 0xF3, 0x27, 0x0D,  // 171:4595
-  0x12, 0x1A, 0x2F, 0x0E,  // 172:4634
-  0x12, 0x49, 0x1B, 0x08,  // 173:4681
-  0x12, 0x64, 0x46, 0x12,  // 174:4708
-  0x12, 0xAA, 0x31, 0x0D,  // 175:4778
-  0x12, 0xDB, 0x1E, 0x0A,  // 176:4827
-  0x12, 0xF9, 0x33, 0x0D,  // 177:4857
-  0x13, 0x2C, 0x1A, 0x08,  // 178:4908
-  0x13, 0x46, 0x1A, 0x08,  // 179:4934
-  0x13, 0x60, 0x19, 0x08,  // 180:4960
-  0x13, 0x79, 0x2F, 0x0E,  // 181:4985
-  0x13, 0xA8, 0x31, 0x0D,  // 182:5032
-  0x13, 0xD9, 0x12, 0x08,  // 183:5081
-  0x13, 0xEB, 0x18, 0x08,  // 184:5099
-  0x14, 0x03, 0x16, 0x08,  // 185:5123
-  0x14, 0x19, 0x1E, 0x09,  // 186:5145
-  0x14, 0x37, 0x2E, 0x0D,  // 187:5175
-  0x14, 0x65, 0x4F, 0x14,  // 188:5221
-  0x14, 0xB4, 0x4B, 0x14,  // 189:5300
-  0x14, 0xFF, 0x4B, 0x14,  // 190:5375
-  0x15, 0x4A, 0x33, 0x0F,  // 191:5450
-  0x15, 0x7D, 0x3B, 0x10,  // 192:5501
-  0x15, 0xB8, 0x3B, 0x10,  // 193:5560
-  0x15, 0xF3, 0x3B, 0x10,  // 194:5619
-  0x16, 0x2E, 0x3B, 0x10,  // 195:5678
-  0x16, 0x69, 0x3B, 0x10,  // 196:5737
-  0x16, 0xA4, 0x3B, 0x10,  // 197:5796
-  0x16, 0xDF, 0x5B, 0x18,  // 198:5855
-  0x17, 0x3A, 0x3F, 0x11,  // 199:5946
-  0x17, 0x79, 0x3B, 0x10,  // 200:6009
-  0x17, 0xB4, 0x3B, 0x10,  // 201:6068
-  0x17, 0xEF, 0x3B, 0x10,  // 202:6127
-  0x18, 0x2A, 0x3B, 0x10,  // 203:6186
-  0x18, 0x65, 0x11, 0x07,  // 204:6245
-  0x18, 0x76, 0x11, 0x07,  // 205:6262
-  0x18, 0x87, 0x15, 0x07,  // 206:6279
-  0x18, 0x9C, 0x15, 0x07,  // 207:6300
-  0x18, 0xB1, 0x3F, 0x11,  // 208:6321
-  0x18, 0xF0, 0x3B, 0x11,  // 209:6384
-  0x19, 0x2B, 0x47, 0x13,  // 210:6443
-  0x19, 0x72, 0x47, 0x13,  // 211:6514
-  0x19, 0xB9, 0x47, 0x13,  // 212:6585
-  0x1A, 0x00, 0x47, 0x13,  // 213:6656
-  0x1A, 0x47, 0x47, 0x13,  // 214:6727
-  0x1A, 0x8E, 0x2B, 0x0E,  // 215:6798
-  0x1A, 0xB9, 0x47, 0x13,  // 216:6841
-  0x1B, 0x00, 0x3B, 0x11,  // 217:6912
-  0x1B, 0x3B, 0x3B, 0x11,  // 218:6971
-  0x1B, 0x76, 0x3B, 0x11,  // 219:7030
-  0x1B, 0xB1, 0x3B, 0x11,  // 220:7089
-  0x1B, 0xEC, 0x3D, 0x10,  // 221:7148
-  0x1C, 0x29, 0x3A, 0x10,  // 222:7209
-  0x1C, 0x63, 0x37, 0x0F,  // 223:7267
-  0x1C, 0x9A, 0x2F, 0x0D,  // 224:7322
-  0x1C, 0xC9, 0x2F, 0x0D,  // 225:7369
-  0x1C, 0xF8, 0x2F, 0x0D,  // 226:7416
-  0x1D, 0x27, 0x2F, 0x0D,  // 227:7463
-  0x1D, 0x56, 0x2F, 0x0D,  // 228:7510
-  0x1D, 0x85, 0x2F, 0x0D,  // 229:7557
-  0x1D, 0xB4, 0x53, 0x15,  // 230:7604
-  0x1E, 0x07, 0x2B, 0x0C,  // 231:7687
-  0x1E, 0x32, 0x2F, 0x0D,  // 232:7730
-  0x1E, 0x61, 0x2F, 0x0D,  // 233:7777
-  0x1E, 0x90, 0x2F, 0x0D,  // 234:7824
-  0x1E, 0xBF, 0x2F, 0x0D,  // 235:7871
-  0x1E, 0xEE, 0x11, 0x07,  // 236:7918
-  0x1E, 0xFF, 0x11, 0x07,  // 237:7935
-  0x1F, 0x10, 0x15, 0x07,  // 238:7952
-  0x1F, 0x25, 0x15, 0x07,  // 239:7973
-  0x1F, 0x3A, 0x2F, 0x0D,  // 240:7994
-  0x1F, 0x69, 0x2F, 0x0D,  // 241:8041
-  0x1F, 0x98, 0x2F, 0x0D,  // 242:8088
-  0x1F, 0xC7, 0x2F, 0x0D,  // 243:8135
-  0x1F, 0xF6, 0x2F, 0x0D,  // 244:8182
-  0x20, 0x25, 0x2F, 0x0D,  // 245:8229
-  0x20, 0x54, 0x2F, 0x0D,  // 246:8276
-  0x20, 0x83, 0x32, 0x0D,  // 247:8323
-  0x20, 0xB5, 0x33, 0x0F,  // 248:8373
-  0x20, 0xE8, 0x2F, 0x0D,  // 249:8424
-  0x21, 0x17, 0x2F, 0x0D,  // 250:8471
-  0x21, 0x46, 0x2F, 0x0D,  // 251:8518
-  0x21, 0x75, 0x2F, 0x0D,  // 252:8565
-  0x21, 0xA4, 0x2A, 0x0C,  // 253:8612
-  0x21, 0xCE, 0x2F, 0x0D,  // 254:8654
-  0x21, 0xFD, 0x2A, 0x0C,  // 255:8701
-
-  // Font Data:
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
-  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 34
-  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
-  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
-  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
-  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
-  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 39
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04,  // 40
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
-  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
-  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 43
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01,  // 44
-  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
-  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
-  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
-  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
-  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
-  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
-  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
-  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01,  // 59
-  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
-  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
-  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20,  // 62
-  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07,  // 63
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
-  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F,  // 80
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
-  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
-  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
-  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
-  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
-  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
-  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
-  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
-  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 91
-  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,  // 93
-  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20,  // 94
-  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 95
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
-  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06,  // 102
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
-  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03,  // 106
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,  // 113
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 114
-  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
-  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
-  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 118
-  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E,  // 119
-  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 121
-  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
-  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 123
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F,  // 124
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
-  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,  // 126
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07,  // 161
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
-  0x00,0x60,0x10,0x00,0x00,0x60,0x38,0x00,0x00,0x7F,0x1C,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xE0,0x19,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x30,0x00,0xE0,0x00,0x30,0x00,0xC0,0x01,0x30,0x00,0x80,0x01,0x38,0x00,0x00,0x00,0x10, // 163
-  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
-  0xE0,0x60,0x06,0x00,0xC0,0x61,0x06,0x00,0x80,0x67,0x06,0x00,0x00,0x7E,0x06,0x00,0x00,0x7C,0x06,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x7C,0x06,0x00,0x00,0x7E,0x06,0x00,0x80,0x67,0x06,0x00,0xC0,0x61,0x06,0x00,0xE0,0x60,0x06,0x00,0x20, // 165
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F,  // 166
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
-  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
-  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 169
-  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F,  // 170
-  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
-  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
-  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
-  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 174
-  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C, // 175
-  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03,  // 176
-  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
-  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21,  // 178
-  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x00,0x00,0x20,0x22,0x00,0x00,0xE0,0x3D,0x00,0x00,0xC0,0x1D,  // 179
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
-  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 183
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,  // 184
-  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,  // 185
-  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F,  // 186
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,  // 187
-  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
-  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
-  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0xF8,0x03,0x00,0x00,0x1E,0x03,0x00,0x00,0x07,0x07,0x00,0xE6,0x03,0x06,0x00,0xE6,0x01,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xC0, // 191
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
-  0x00,0x00,0x30,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x01,0x00,0x00,0xBC,0x01,0x00,0x00,0x8F,0x01,0x00,0xC0,0x83,0x01,0x00,0xE0,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 198
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
-  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
-  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
-  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
-  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
-  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x8C,0x03,0x00,0x00,0x0E,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x70,0x00,0x00,0x0C,0xE0,0x01,0x00,0x0C,0x80,0x03,0x00,0x0E,0x00,0x0F,0x00,0x06,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
-  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
-  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8,  // 222
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
-  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
-  0x00,0x00,0x00,0x00,0x00,0x10,0x0F,0x00,0x00,0x9C,0x1F,0x00,0x00,0xCC,0x39,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0x66,0x18,0x00,0x00,0x6E,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xFC,0x1F,0x00,0x00,0xCC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xE0,0x04, // 230
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x80,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0x80,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 234
-  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
-  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
-  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
-  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
-  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0xC0,0xFE,0x3F,0x00,0xE0,0x18,0x00,0x00,0x60,0x0C,0x00,0x00,0x60,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xE0,0x0E,0x00,0x00,0x60,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
-  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
-  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,  // 247
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 253
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
-  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
-};
-#endif 
diff --git a/libraries/oled-ssd1306/OLEDDisplayUi.cpp b/libraries/oled-ssd1306/OLEDDisplayUi.cpp
deleted file mode 100644
index 6e553b787..000000000
--- a/libraries/oled-ssd1306/OLEDDisplayUi.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include "OLEDDisplayUi.h"
-
-OLEDDisplayUi::OLEDDisplayUi(OLEDDisplay *display) {
-  this->display = display;
-}
-
-void OLEDDisplayUi::init() {
-  this->display->init();
-}
-
-void OLEDDisplayUi::setTargetFPS(uint8_t fps){
-  float oldInterval = this->updateInterval;
-  this->updateInterval = ((float) 1.0 / (float) fps) * 1000;
-
-  // Calculate new ticksPerFrame
-  float changeRatio = oldInterval / (float) this->updateInterval;
-  this->ticksPerFrame *= changeRatio;
-  this->ticksPerTransition *= changeRatio;
-}
-
-// -/------ Automatic controll ------\-
-
-void OLEDDisplayUi::enableAutoTransition(){
-  this->autoTransition = true;
-}
-void OLEDDisplayUi::disableAutoTransition(){
-  this->autoTransition = false;
-}
-void OLEDDisplayUi::setAutoTransitionForwards(){
-  this->state.frameTransitionDirection = 1;
-  this->lastTransitionDirection = 1;
-}
-void OLEDDisplayUi::setAutoTransitionBackwards(){
-  this->state.frameTransitionDirection = -1;
-  this->lastTransitionDirection = -1;
-}
-void OLEDDisplayUi::setTimePerFrame(uint16_t time){
-  this->ticksPerFrame = (int) ( (float) time / (float) updateInterval);
-}
-void OLEDDisplayUi::setTimePerTransition(uint16_t time){
-  this->ticksPerTransition = (int) ( (float) time / (float) updateInterval);
-}
-
-// -/------ Customize indicator position and style -------\-
-void OLEDDisplayUi::enableIndicator(){
-  this->state.isIndicatorDrawen = true;
-}
-
-void OLEDDisplayUi::disableIndicator(){
-  this->state.isIndicatorDrawen = false;
-}
-
-void OLEDDisplayUi::enableAllIndicators(){
-  this->shouldDrawIndicators = true;
-}
-
-void OLEDDisplayUi::disableAllIndicators(){
-  this->shouldDrawIndicators = false;
-}
-
-void OLEDDisplayUi::setIndicatorPosition(IndicatorPosition pos) {
-  this->indicatorPosition = pos;
-}
-void OLEDDisplayUi::setIndicatorDirection(IndicatorDirection dir) {
-  this->indicatorDirection = dir;
-}
-void OLEDDisplayUi::setActiveSymbol(const char* symbol) {
-  this->activeSymbol = symbol;
-}
-void OLEDDisplayUi::setInactiveSymbol(const char* symbol) {
-  this->inactiveSymbol = symbol;
-}
-
-
-// -/----- Frame settings -----\-
-void OLEDDisplayUi::setFrameAnimation(AnimationDirection dir) {
-  this->frameAnimationDirection = dir;
-}
-void OLEDDisplayUi::setFrames(FrameCallback* frameFunctions, uint8_t frameCount) {
-  this->frameFunctions = frameFunctions;
-  this->frameCount     = frameCount;
-  this->resetState();
-}
-
-// -/----- Overlays ------\-
-void OLEDDisplayUi::setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount){
-  this->overlayFunctions = overlayFunctions;
-  this->overlayCount     = overlayCount;
-}
-
-// -/----- Loading Process -----\-
-
-void OLEDDisplayUi::setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction) {
-  this->loadingDrawFunction = loadingDrawFunction;
-}
-
-void OLEDDisplayUi::runLoadingProcess(LoadingStage* stages, uint8_t stagesCount) {
-  uint8_t progress = 0;
-  uint8_t increment = 100 / stagesCount;
-
-  for (uint8_t i = 0; i < stagesCount; i++) {
-    display->clear();
-    this->loadingDrawFunction(this->display, &stages[i], progress);
-    display->display();
-
-    stages[i].callback();
-
-    progress += increment;
-    optimistic_yield(10000);
-  }
-
-  display->clear();
-  this->loadingDrawFunction(this->display, &stages[stagesCount-1], progress);
-  display->display();
-
-  delay(150);
-}
-
-// -/----- Manuel control -----\-
-void OLEDDisplayUi::nextFrame() {
-  if (this->state.frameState != IN_TRANSITION) {
-    this->state.manuelControll = true;
-    this->state.frameState = IN_TRANSITION;
-    this->state.ticksSinceLastStateSwitch = 0;
-    this->lastTransitionDirection = this->state.frameTransitionDirection;
-    this->state.frameTransitionDirection = 1;
-  }
-}
-void OLEDDisplayUi::previousFrame() {
-  if (this->state.frameState != IN_TRANSITION) {
-    this->state.manuelControll = true;
-    this->state.frameState = IN_TRANSITION;
-    this->state.ticksSinceLastStateSwitch = 0;
-    this->lastTransitionDirection = this->state.frameTransitionDirection;
-    this->state.frameTransitionDirection = -1;
-  }
-}
-
-void OLEDDisplayUi::switchToFrame(uint8_t frame) {
-  if (frame >= this->frameCount) return;
-  this->state.ticksSinceLastStateSwitch = 0;
-  if (frame == this->state.currentFrame) return;
-  this->state.frameState = FIXED;
-  this->state.currentFrame = frame;
-  this->state.isIndicatorDrawen = true;
-}
-
-void OLEDDisplayUi::transitionToFrame(uint8_t frame) {
-  if (frame >= this->frameCount) return;
-  this->state.ticksSinceLastStateSwitch = 0;
-  if (frame == this->state.currentFrame) return;
-  this->nextFrameNumber = frame;
-  this->lastTransitionDirection = this->state.frameTransitionDirection;
-  this->state.manuelControll = true;
-  this->state.frameState = IN_TRANSITION;
-  this->state.frameTransitionDirection = frame < this->state.currentFrame ? -1 : 1;
-}
-
-
-// -/----- State information -----\-
-OLEDDisplayUiState* OLEDDisplayUi::getUiState(){
-  return &this->state;
-}
-
-
-int8_t OLEDDisplayUi::update(){
-  long frameStart = millis();
-  int8_t timeBudget = this->updateInterval - (frameStart - this->state.lastUpdate);
-  if ( timeBudget <= 0) {
-    // Implement frame skipping to ensure time budget is keept
-    if (this->autoTransition && this->state.lastUpdate != 0) this->state.ticksSinceLastStateSwitch += ceil(-timeBudget / this->updateInterval);
-
-    this->state.lastUpdate = frameStart;
-    this->tick();
-  }
-  return this->updateInterval - (millis() - frameStart);
-}
-
-
-void OLEDDisplayUi::tick() {
-  this->state.ticksSinceLastStateSwitch++;
-
-  switch (this->state.frameState) {
-    case IN_TRANSITION:
-        if (this->state.ticksSinceLastStateSwitch >= this->ticksPerTransition){
-          this->state.frameState = FIXED;
-          this->state.currentFrame = getNextFrameNumber();
-          this->state.ticksSinceLastStateSwitch = 0;
-          this->nextFrameNumber = -1;
-        }
-      break;
-    case FIXED:
-      // Revert manuelControll
-      if (this->state.manuelControll) {
-        this->state.frameTransitionDirection = this->lastTransitionDirection;
-        this->state.manuelControll = false;
-      }
-      if (this->state.ticksSinceLastStateSwitch >= this->ticksPerFrame){
-          if (this->autoTransition){
-            this->state.frameState = IN_TRANSITION;
-          }
-          this->state.ticksSinceLastStateSwitch = 0;
-      }
-      break;
-  }
-
-  this->display->clear();
-  this->drawFrame();
-  if (shouldDrawIndicators) {
-    this->drawIndicator();
-  }
-  this->drawOverlays();
-  this->display->display();
-}
-
-void OLEDDisplayUi::resetState() {
-  this->state.lastUpdate = 0;
-  this->state.ticksSinceLastStateSwitch = 0;
-  this->state.frameState = FIXED;
-  this->state.currentFrame = 0;
-  this->state.isIndicatorDrawen = true;
-}
-
-void OLEDDisplayUi::drawFrame(){
-  switch (this->state.frameState){
-     case IN_TRANSITION: {
-       float progress = (float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition;
-       int16_t x = 0;
-       int16_t y = 0;
-       int16_t x1 = 0;
-       int16_t y1 = 0;
-       switch(this->frameAnimationDirection){
-        case SLIDE_LEFT:
-          x = -128 * progress;
-          y = 0;
-          x1 = x + 128;
-          y1 = 0;
-          break;
-        case SLIDE_RIGHT:
-          x = 128 * progress;
-          y = 0;
-          x1 = x - 128;
-          y1 = 0;
-          break;
-        case SLIDE_UP:
-          x = 0;
-          y = -64 * progress;
-          x1 = 0;
-          y1 = y + 64;
-          break;
-        case SLIDE_DOWN:
-          x = 0;
-          y = 64 * progress;
-          x1 = 0;
-          y1 = y - 64;
-          break;
-       }
-
-       // Invert animation if direction is reversed.
-       int8_t dir = this->state.frameTransitionDirection >= 0 ? 1 : -1;
-       x *= dir; y *= dir; x1 *= dir; y1 *= dir;
-
-       bool drawenCurrentFrame;
-
-
-       // Prope each frameFunction for the indicator Drawen state
-       this->enableIndicator();
-       (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, x, y);
-       drawenCurrentFrame = this->state.isIndicatorDrawen;
-
-       this->enableIndicator();
-       (this->frameFunctions[this->getNextFrameNumber()])(this->display, &this->state, x1, y1);
-
-       // Build up the indicatorDrawState
-       if (drawenCurrentFrame && !this->state.isIndicatorDrawen) {
-         // Drawen now but not next
-         this->indicatorDrawState = 2;
-       } else if (!drawenCurrentFrame && this->state.isIndicatorDrawen) {
-         // Not drawen now but next
-         this->indicatorDrawState = 1;
-       } else if (!drawenCurrentFrame && !this->state.isIndicatorDrawen) {
-         // Not drawen in both frames
-         this->indicatorDrawState = 3;
-       }
-
-       // If the indicator isn't draw in the current frame
-       // reflect it in state.isIndicatorDrawen
-       if (!drawenCurrentFrame) this->state.isIndicatorDrawen = false;
-
-       break;
-     }
-     case FIXED:
-      // Always assume that the indicator is drawn!
-      // And set indicatorDrawState to "not known yet"
-      this->indicatorDrawState = 0;
-      this->enableIndicator();
-      (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, 0, 0);
-      break;
-  }
-}
-
-void OLEDDisplayUi::drawIndicator() {
-
-    // Only draw if the indicator is invisible
-    // for both frames or
-    // the indiactor is shown and we are IN_TRANSITION
-    if (this->indicatorDrawState == 3 || (!this->state.isIndicatorDrawen && this->state.frameState != IN_TRANSITION)) {
-      return;
-    }
-
-    uint8_t posOfHighlightFrame = 0;
-    float indicatorFadeProgress = 0;
-
-    // if the indicator needs to be slided in we want to
-    // highlight the next frame in the transition
-    uint8_t frameToHighlight = this->indicatorDrawState == 1 ? this->getNextFrameNumber() : this->state.currentFrame;
-
-    // Calculate the frame that needs to be highlighted
-    // based on the Direction the indiactor is drawn
-    switch (this->indicatorDirection){
-      case LEFT_RIGHT:
-        posOfHighlightFrame = frameToHighlight;
-        break;
-      case RIGHT_LEFT:
-        posOfHighlightFrame = this->frameCount - frameToHighlight;
-        break;
-    }
-
-    switch (this->indicatorDrawState) {
-      case 1: // Indicator was not drawn in this frame but will be in next
-        // Slide IN
-        indicatorFadeProgress = 1 - ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
-        break;
-      case 2: // Indicator was drawn in this frame but not in next
-        // Slide OUT
-        indicatorFadeProgress = ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
-        break;
-    }
-
-    uint16_t frameStartPos = (12 * frameCount / 2);
-    const char *image;
-    uint16_t x = 0;
-    uint16_t y = 0;
-    for (byte i = 0; i < this->frameCount; i++) {
-
-      switch (this->indicatorPosition){
-        case TOP:
-          y = 0 - (8 * indicatorFadeProgress);
-          x = 64 - frameStartPos + 12 * i;
-          break;
-        case BOTTOM:
-          y = 56 + (8 * indicatorFadeProgress);
-          x = 64 - frameStartPos + 12 * i;
-          break;
-        case RIGHT:
-          x = 120 + (8 * indicatorFadeProgress);
-          y = 32 - frameStartPos + 2 + 12 * i;
-          break;
-        case LEFT:
-          x = 0 - (8 * indicatorFadeProgress);
-          y = 32 - frameStartPos + 2 + 12 * i;
-          break;
-      }
-
-      if (posOfHighlightFrame == i) {
-         image = this->activeSymbol;
-      } else {
-         image = this->inactiveSymbol;
-      }
-
-      this->display->drawFastImage(x, y, 8, 8, image);
-    }
-}
-
-void OLEDDisplayUi::drawOverlays() {
- for (uint8_t i=0;ioverlayCount;i++){
-    (this->overlayFunctions[i])(this->display, &this->state);
- }
-}
-
-uint8_t OLEDDisplayUi::getNextFrameNumber(){
-  if (this->nextFrameNumber != -1) return this->nextFrameNumber;
-  return (this->state.currentFrame + this->frameCount + this->state.frameTransitionDirection) % this->frameCount;
-}
diff --git a/libraries/oled-ssd1306/OLEDDisplayUi.h b/libraries/oled-ssd1306/OLEDDisplayUi.h
deleted file mode 100644
index 35a1e99bc..000000000
--- a/libraries/oled-ssd1306/OLEDDisplayUi.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef OLEDDISPLAYUI_h
-#define OLEDDISPLAYUI_h
-
-#include 
-#include "OLEDDisplay.h"
-
-//#define DEBUG_OLEDDISPLAYUI(...) Serial.printf( __VA_ARGS__ )
-
-#ifndef DEBUG_OLEDDISPLAYUI
-#define DEBUG_OLEDDISPLAYUI(...)
-#endif
-
-enum AnimationDirection {
-  SLIDE_UP,
-  SLIDE_DOWN,
-  SLIDE_LEFT,
-  SLIDE_RIGHT
-};
-
-enum IndicatorPosition {
-  TOP,
-  RIGHT,
-  BOTTOM,
-  LEFT
-};
-
-enum IndicatorDirection {
-  LEFT_RIGHT,
-  RIGHT_LEFT
-};
-
-enum FrameState {
-  IN_TRANSITION,
-  FIXED
-};
-
-
-const char ANIMATION_activeSymbol[] PROGMEM = {
-  0x00, 0x18, 0x3c, 0x7e, 0x7e, 0x3c, 0x18, 0x00
-};
-
-const char ANIMATION_inactiveSymbol[] PROGMEM = {
-  0x00, 0x0, 0x0, 0x18, 0x18, 0x0, 0x0, 0x00
-};
-
-
-// Structure of the UiState
-struct OLEDDisplayUiState {
-  uint64_t     lastUpdate                = 0;
-  uint16_t      ticksSinceLastStateSwitch = 0;
-
-  FrameState    frameState                = FIXED;
-  uint8_t       currentFrame              = 0;
-
-  bool          isIndicatorDrawen         = true;
-
-  // Normal = 1, Inverse = -1;
-  int8_t        frameTransitionDirection  = 1;
-
-  bool          manuelControll            = false;
-
-  // Custom data that can be used by the user
-  void*         userData                  = NULL;
-};
-
-struct LoadingStage {
-  const char* process;
-  void (*callback)();
-};
-
-typedef void (*FrameCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
-typedef void (*OverlayCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state);
-typedef void (*LoadingDrawFunction)(OLEDDisplay *display, LoadingStage* stage, uint8_t progress);
-
-class OLEDDisplayUi {
-  private:
-    OLEDDisplay             *display;
-
-    // Symbols for the Indicator
-    IndicatorPosition   indicatorPosition         = BOTTOM;
-    IndicatorDirection  indicatorDirection        = LEFT_RIGHT;
-
-    const char*         activeSymbol              = ANIMATION_activeSymbol;
-    const char*         inactiveSymbol            = ANIMATION_inactiveSymbol;
-
-    bool                shouldDrawIndicators      = true;
-
-    // Values for the Frames
-    AnimationDirection  frameAnimationDirection   = SLIDE_RIGHT;
-
-    int8_t              lastTransitionDirection   = 1;
-
-    uint16_t            ticksPerFrame             = 151; // ~ 5000ms at 30 FPS
-    uint16_t            ticksPerTransition        = 15;  // ~  500ms at 30 FPS
-
-    bool                autoTransition            = true;
-
-    FrameCallback*      frameFunctions;
-    uint8_t             frameCount                = 0;
-
-    // Internally used to transition to a specific frame
-    int8_t              nextFrameNumber           = -1;
-
-    // Values for Overlays
-    OverlayCallback*    overlayFunctions;
-    uint8_t             overlayCount              = 0;
-
-    // Will the Indicator be drawen
-    // 3 Not drawn in both frames
-    // 2 Drawn this frame but not next
-    // 1 Not drown this frame but next
-    // 0 Not known yet
-    uint8_t                indicatorDrawState        = 1;
-
-    // Loading screen
-    LoadingDrawFunction loadingDrawFunction       = [](OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
-      display->setTextAlignment(TEXT_ALIGN_CENTER);
-      display->setFont(ArialMT_Plain_10);
-      display->drawString(64, 18, stage->process);
-      display->drawProgressBar(4, 32, 120, 8, progress);
-    };
-
-    // UI State
-    OLEDDisplayUiState      state;
-
-    // Bookeeping for update
-    uint8_t             updateInterval            = 33;
-
-    uint8_t             getNextFrameNumber();
-    void                drawIndicator();
-    void                drawFrame();
-    void                drawOverlays();
-    void                tick();
-    void                resetState();
-
-  public:
-
-    OLEDDisplayUi(OLEDDisplay *display);
-
-    /**
-     * Initialise the display
-     */
-    void init();
-
-    /**
-     * Configure the internal used target FPS
-     */
-    void setTargetFPS(uint8_t fps);
-
-    // Automatic Controll
-    /**
-     * Enable automatic transition to next frame after the some time can be configured with `setTimePerFrame` and `setTimePerTransition`.
-     */
-    void enableAutoTransition();
-
-    /**
-     * Disable automatic transition to next frame.
-     */
-    void disableAutoTransition();
-
-    /**
-     * Set the direction if the automatic transitioning
-     */
-    void setAutoTransitionForwards();
-    void setAutoTransitionBackwards();
-
-    /**
-     *  Set the approx. time a frame is displayed
-     */
-    void setTimePerFrame(uint16_t time);
-
-    /**
-     * Set the approx. time a transition will take
-     */
-    void setTimePerTransition(uint16_t time);
-
-    // Customize indicator position and style
-
-    /**
-     * Draw the indicator.
-     * This is the defaut state for all frames if
-     * the indicator was hidden on the previous frame
-     * it will be slided in.
-     */
-    void enableIndicator();
-
-    /**
-     * Don't draw the indicator.
-     * This will slide out the indicator
-     * when transitioning to the next frame.
-     */
-    void disableIndicator();
-
-    /**
-     * Enable drawing of indicators
-     */
-    void enableAllIndicators();
-
-    /**
-     * Disable draw of indicators.
-     */
-    void disableAllIndicators();
-
-    /**
-     * Set the position of the indicator bar.
-     */
-    void setIndicatorPosition(IndicatorPosition pos);
-
-    /**
-     * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
-     */
-    void setIndicatorDirection(IndicatorDirection dir);
-
-    /**
-     * Set the symbol to indicate an active frame in the indicator bar.
-     */
-    void setActiveSymbol(const char* symbol);
-
-    /**
-     * Set the symbol to indicate an inactive frame in the indicator bar.
-     */
-    void setInactiveSymbol(const char* symbol);
-
-
-    // Frame settings
-
-    /**
-     * Configure what animation is used to transition from one frame to another
-     */
-    void setFrameAnimation(AnimationDirection dir);
-
-    /**
-     * Add frame drawing functions
-     */
-    void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
-
-    // Overlay
-
-    /**
-     * Add overlays drawing functions that are draw independent of the Frames
-     */
-    void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
-
-
-    // Loading animation
-    /**
-     * Set the function that will draw each step
-     * in the loading animation
-     */
-    void setLoadingDrawFunction(LoadingDrawFunction loadingFunction);
-
-
-    /**
-     * Run the loading process
-     */
-    void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
-
-
-    // Manual Control
-    void nextFrame();
-    void previousFrame();
-
-    /**
-     * Switch without transition to frame `frame`.
-     */
-    void switchToFrame(uint8_t frame);
-
-    /**
-     * Transition to frame `frame`, when the `frame` number is bigger than the current
-     * frame the forward animation will be used, otherwise the backwards animation is used.
-     */
-    void transitionToFrame(uint8_t frame);
-
-    // State Info
-    OLEDDisplayUiState* getUiState();
-
-    int8_t update();
-};
-#endif
diff --git a/libraries/oled-ssd1306/README.md b/libraries/oled-ssd1306/README.md
deleted file mode 100644
index 01c134c35..000000000
--- a/libraries/oled-ssd1306/README.md
+++ /dev/null
@@ -1,393 +0,0 @@
-esp8266-oled-ssd1306 [![Build Status](https://travis-ci.org/squix78/esp8266-oled-ssd1306.svg?branch=dev-branch-3.0.0)](https://travis-ci.org/squix78/esp8266-oled-ssd1306)
-============
-
-> We just released version 3.0.0. Please have a look at our [upgrade guide](UPGRADE-3.0.md)
-
-This is a driver for the SSD1306 based 128x64 pixel OLED display running on the Arduino/ESP8266 platform.
-Can be used with either the I2C or SPI version of the display
-
-You can either download this library as a zip file and unpack it to your Arduino/libraries folder or (once it has been added) choose it from the Arduino library manager.
-
-It is also available as a platformio library. Just execute the following command:
-```
-platformio lib install 562
-```
-
-## Credits
-This library has initially been written by Daniel Eichhorn (@squix78). Many thanks go to Fabrice Weinberg (@FWeinb) for optimizing and refactoring many aspects of the library. Also many thanks to the many committers who helped to add new features and who fixed many bugs.
-The init sequence for the SSD1306 was inspired by Adafruit's library for the same display.
-
-## Usage
-
-Check out the examples folder for a few comprehensive demonstrations how to use the library. Also check out the ESP8266 Weather Station library (https://github.com/squix78/esp8266-weather-station) which uses the OLED library to display beautiful weather information.
-
-## Upgrade
-
-The API changed a lot with the 3.0 release. If you were using this library with older versions please have a look at the [Upgrade Guide](UPGRADE-3.0.md).
-
-## Features
-
-* Draw pixels at given coordinates
-* Draw lines from given coordinates to given coordinates
-* Draw or fill a rectangle with given dimensions
-* Draw Text at given coordinates:
- * Define Alignment: Left, Right and Center
- * Set the Fontface you want to use (see section Fonts below)
- * Limit the width of the text by an amount of pixels. Before this widths will be reached, the renderer will wrap the text to a new line if possible
-* Display content in automatically side scrolling carousel
- * Define transition cycles
- * Define how long one frame will be displayed
- * Draw the different frames in callback methods
- * One indicator per frame will be automatically displayed. The active frame will be displayed from inactive once
-
-## Fonts
-
-Fonts are defined in a proprietary but open format. You can create new font files by choosing from a given list
-of open sourced Fonts from this web app: http://oleddisplay.squix.ch
-Choose the font family, style and size, check the preview image and if you like what you see click the "Create" button. This will create the font array in a text area form where you can copy and paste it into a new or existing header file.
-
-
-![FontTool](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/FontTool.png)
-
-## Hardware Abstraction
-
-The library supports different protocols to access the OLED display. Currently there is support for I2C using the built in Wire.h library, I2C by using the much faster BRZO I2C library [https://github.com/pasko-zh/brzo_i2c] written in assembler and it also supports displays which come with the SPI interface.
-
-### I2C with Wire.h
-
-```C++
-#include   
-#include "SSD1306.h"
-
-SSD1306  display(ADDRESS, SDA, SDC);
-```
-or for a SH1106:
-```C++
-#include   
-#include "SH1106.h"
-
-SH1106  display(ADDRESS, SDA, SDC);
-```
-
-### I2C with brzo_i2c
-
-```C++
-#include 
-#include "SSD1306Brzo.h"
-
-SSD1306Brzo display(ADDRESS, SDA, SDC);
-```
-or for the SH1106:
-```C++
-#include 
-#include "SH1106Brzo.h"
-
-SH1106Brzo display(ADDRESS, SDA, SDC);
-```
-
-### SPI
-
-```C++
-#include 
-#include "SSD1306Spi.h"
-
-SSD1306Spi display(RES, DC, CS);
-```
-or for the SH1106:
-```C++
-#include 
-#include "SH1106Spi.h"
-
-SH1106Spi display(RES, DC, CS);
-```
-
-## API
-
-### Display Control
-
-```C++
-// Initialize the display
-void init();
-
-// Free the memory used by the display
-void end();
-
-// Cycle through the initialization
-void resetDisplay(void);
-
-// Connect again to the display through I2C
-void reconnect(void);
-
-// Turn the display on
-void displayOn(void);
-
-// Turn the display offs
-void displayOff(void);
-
-// Clear the local pixel buffer
-void clear(void);
-
-// Write the buffer to the display memory
-void display(void);
-
-// Inverted display mode
-void invertDisplay(void);
-
-// Normal display mode
-void normalDisplay(void);
-
-// Set display contrast
-void setContrast(char contrast);
-
-// Turn the display upside down
-void flipScreenVertically();
-```
-
-## Pixel drawing
-
-```C++
-
-/* Drawing functions */
-// Sets the color of all pixel operations
-void setColor(OLEDDISPLAY_COLOR color);
-
-// Draw a pixel at given position
-void setPixel(int16_t x, int16_t y);
-
-// Draw a line from position 0 to position 1
-void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
-
-// Draw the border of a rectangle at the given location
-void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
-
-// Fill the rectangle
-void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
-
-// Draw the border of a circle
-void drawCircle(int16_t x, int16_t y, int16_t radius);
-
-// Fill circle
-void fillCircle(int16_t x, int16_t y, int16_t radius);
-
-// Draw a line horizontally
-void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
-
-// Draw a lin vertically
-void drawVerticalLine(int16_t x, int16_t y, int16_t length);
-
-// Draws a rounded progress bar with the outer dimensions given by width and height. Progress is
-// a unsigned byte value between 0 and 100
-void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
-
-// Draw a bitmap in the internal image format
-void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const char *image);
-
-// Draw a XBM
-void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char* xbm);
-```
-
-## Text operations
-
-``` C++
-void drawString(int16_t x, int16_t y, String text);
-
-// Draws a String with a maximum width at the given location.
-// If the given String is wider than the specified width
-// The text will be wrapped to the next line at a space or dash
-void drawStringMaxWidth(int16_t x, int16_t y, int16_t maxLineWidth, String text);
-
-// Returns the width of the const char* with the current
-// font settings
-uint16_t getStringWidth(const char* text, uint16_t length);
-
-// Convencience method for the const char version
-uint16_t getStringWidth(String text);
-
-// Specifies relative to which anchor point
-// the text is rendered. Available constants:
-// TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
-void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
-
-// Sets the current font. Available default fonts
-// ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
-// Or create one with the font tool at http://oleddisplay.squix.ch
-void setFont(const char* fontData);
-```
-
-## Ui Library (OLEDDisplayUi)
-
-The Ui Library is used to provide a basic set of Ui elements called, `Frames` and `Overlays`. A `Frame` is used to provide
-information the default behaviour is to display a `Frame` for a defined time and than move to the next. The library also provides an `Indicator` that will be updated accordingly. An `Overlay` on the other hand is a pieces of information (e.g. a clock) that is displayed always at the same position.
-
-
-```C++
-/**
- * Initialise the display
- */
-void init();
-
-/**
- * Configure the internal used target FPS
- */
-void setTargetFPS(uint8_t fps);
-
-/**
- * Enable automatic transition to next frame after the some time can be configured with
- * `setTimePerFrame` and `setTimePerTransition`.
- */
-void enableAutoTransition();
-
-/**
- * Disable automatic transition to next frame.
- */
-void disableAutoTransition();
-
-/**
- * Set the direction if the automatic transitioning
- */
-void setAutoTransitionForwards();
-void setAutoTransitionBackwards();
-
-/**
- *  Set the approx. time a frame is displayed
- */
-void setTimePerFrame(uint16_t time);
-
-/**
- * Set the approx. time a transition will take
- */
-void setTimePerTransition(uint16_t time);
-
-/**
- * Draw the indicator.
- * This is the default state for all frames if
- * the indicator was hidden on the previous frame
- * it will be slided in.
- */
-void enableIndicator();
-
-/**
- * Don't draw the indicator.
- * This will slide out the indicator
- * when transitioning to the next frame.
- */
-void disableIndicator();
-
-/**
- * Enable drawing of all indicators.
- */
-void enableAllIndicators();
-
-/**
- * Disable drawing of all indicators.
- */
-void disableAllIndicators();
-
-/**
- * Set the position of the indicator bar.
- */
-void setIndicatorPosition(IndicatorPosition pos);
-
-/**
- * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
- */
-void setIndicatorDirection(IndicatorDirection dir);
-
-/**
- * Set the symbol to indicate an active frame in the indicator bar.
- */
-void setActiveSymbol(const char* symbol);
-
-/**
- * Set the symbol to indicate an inactive frame in the indicator bar.
- */
-void setInactiveSymbol(const char* symbol);
-
-/**
- * Configure what animation is used to transition from one frame to another
- */
-void setFrameAnimation(AnimationDirection dir);
-
-/**
- * Add frame drawing functions
- */
-void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
-
-/**
- * Add overlays drawing functions that are draw independent of the Frames
- */
-void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
-
-/**
- * Set the function that will draw each step
- * in the loading animation
- */
-void setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction);
-
-/**
- * Run the loading process
- */
-void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
-
-// Manuell Controll
-void nextFrame();
-void previousFrame();
-
-/**
- * Switch without transition to frame `frame`.
- */
-void switchToFrame(uint8_t frame);
-
-/**
- * Transition to frame `frame`, when the `frame` number is bigger than the current
- * frame the forward animation will be used, otherwise the backwards animation is used.
- */
-void transitionToFrame(uint8_t frame);
-
-// State Info
-OLEDDisplayUiState* getUiState();
-
-// This needs to be called in the main loop
-// the returned value is the remaining time (in ms)
-// you have to draw after drawing to keep the frame budget.
-int8_t update();
-```
-
-## Example: SSD1306Demo
-
-### Frame 1
-![DemoFrame1](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame1.jpg)
-
-This frame shows three things:
- * How to draw an xbm image
- * How to draw a static text which is not moved by the frame transition
- * The active/inactive frame indicators
-
-### Frame 2
-![DemoFrame2](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame2.jpg)
-
-Currently there are one fontface with three sizes included in the library: Arial 10, 16 and 24. Once the converter is published you will be able to convert any ttf font into the used format.
-
-### Frame 3
-
-![DemoFrame3](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame3.jpg)
-
-This frame demonstrates the text alignment. The coordinates in the frame show relative to which position the texts have been rendered.
-
-### Frame 4
-
-![DemoFrame4](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame4.jpg)
-
-This shows how to use define a maximum width after which the driver automatically wraps a word to the next line. This comes in very handy if you have longer texts to display.
-
-### SPI version
-
-![SPIVersion](https://github.com/neptune2/esp8266-oled-ssd1306/raw/master/resources/SPI_version.jpg)
-
-This shows the code working on the SPI version of the display. See demo code for ESP8266 pins used.
-
-## Project using this library
-
- * [QRCode ESP8266](https://github.com/anunpanya/ESP8266_QRcode) (by @anunpanya)
- * [Scan I2C](https://github.com/hallard/Scan-I2C-WiFi) (by @hallard)
- * [Weather Station](https://github.com/squix78/esp8266-weather-station) (by @squix)
diff --git a/libraries/oled-ssd1306/SH1106.h b/libraries/oled-ssd1306/SH1106.h
deleted file mode 100644
index 55dd4090e..000000000
--- a/libraries/oled-ssd1306/SH1106.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef SH1106_h
-#define SH1106_h
-#include "SH1106Wire.h"
-
-// For make SH1106 an alias for SH1106Wire
-typedef SH1106Wire SH1106;
-
-
-#endif
diff --git a/libraries/oled-ssd1306/SH1106Brzo.h b/libraries/oled-ssd1306/SH1106Brzo.h
deleted file mode 100644
index 4270066df..000000000
--- a/libraries/oled-ssd1306/SH1106Brzo.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef SH1106Brzo_h
-#define SH1106Brzo_h
-
-#include "OLEDDisplay.h"
-#include 
-
-#if F_CPU == 160000000L
-  #define BRZO_I2C_SPEED 1000
-#else
-  #define BRZO_I2C_SPEED 800
-#endif
-
-class SH1106Brzo : public OLEDDisplay {
-  private:
-      uint8_t             _address;
-      uint8_t             _sda;
-      uint8_t             _scl;
-
-  public:
-    SH1106Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->_address = _address;
-      this->_sda = _sda;
-      this->_scl = _scl;
-    }
-
-    bool connect(){
-      brzo_i2c_setup(_sda, _scl, 0);
-      return true;
-    }
-
-    void display(void) {
-    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-       uint8_t minBoundY = ~0;
-       uint8_t maxBoundY = 0;
-
-       uint8_t minBoundX = ~0;
-       uint8_t maxBoundX = 0;
-       uint8_t x, y;
-
-       // Calculate the Y bounding box of changes
-       // and copy buffer[pos] to buffer_back[pos];
-       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-         for (x = 0; x < DISPLAY_WIDTH; x++) {
-          uint16_t pos = x + y * DISPLAY_WIDTH;
-          if (buffer[pos] != buffer_back[pos]) {
-            minBoundY = _min(minBoundY, y);
-            maxBoundY = _max(maxBoundY, y);
-            minBoundX = _min(minBoundX, x);
-            maxBoundX = _max(maxBoundX, x);
-          }
-          buffer_back[pos] = buffer[pos];
-        }
-        optimistic_yield(10000);
-       }
-
-       // If the minBoundY wasn't updated
-       // we can savely assume that buffer_back[pos] == buffer[pos]
-       // holdes true for all values of pos
-       if (minBoundY == ~0) return;
-
-       byte k = 0;
-       uint8_t sendBuffer[17];
-       sendBuffer[0] = 0x40;
-
-       // Calculate the colum offset 
-       uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
-       uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
-
-       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
-
-       for (y = minBoundY; y <= maxBoundY; y++) {
-         sendCommand(0xB0 + y);
-         sendCommand(minBoundXp2H);
-         sendCommand(minBoundXp2L);
-         for (x = minBoundX; x <= maxBoundX; x++) {
-             k++;
-             sendBuffer[k] = buffer[x + y * DISPLAY_WIDTH];
-             if (k == 16)  {
-               brzo_i2c_write(sendBuffer, 17, true);
-               k = 0;
-             }
-         }
-         if (k != 0) {
-           brzo_i2c_write(sendBuffer, k + 1, true);
-           k = 0;
-         }
-         optimistic_yield(10000);
-       }
-       if (k != 0) {
-         brzo_i2c_write(sendBuffer, k + 1, true);
-       }
-       brzo_i2c_end_transaction();
-     #else
-     #endif
-    }
-
-  private:
-    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
-      uint8_t command[2] = {0x80 /* command mode */, com};
-      brzo_i2c_start_transaction(_address, BRZO_I2C_SPEED);
-      brzo_i2c_write(command, 2, true);
-      brzo_i2c_end_transaction();
-    }
-};
-
-#endif
diff --git a/libraries/oled-ssd1306/SH1106Spi.h b/libraries/oled-ssd1306/SH1106Spi.h
deleted file mode 100644
index 48d2cfbae..000000000
--- a/libraries/oled-ssd1306/SH1106Spi.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef SH1106Spi_h
-#define SH1106Spi_h
-
-#include "OLEDDisplay.h"
-#include 
-
-class SH1106Spi : public OLEDDisplay {
-  private:
-      uint8_t             _rst;
-      uint8_t             _dc;
-
-  public:
-
-    SH1106Spi(uint8_t _rst, uint8_t _dc) {
-      this->_rst = _rst;
-      this->_dc  = _dc;
-    }
-
-    bool connect(){
-      pinMode(_dc, OUTPUT);
-      pinMode(_rst, OUTPUT);
-
-      SPI.begin ();
-      SPI.setClockDivider (SPI_CLOCK_DIV2);
-
-      // Pulse Reset low for 10ms
-      digitalWrite(_rst, HIGH);
-      delay(1);
-      digitalWrite(_rst, LOW);
-      delay(10);
-      digitalWrite(_rst, HIGH);
-      return true;
-    }
-
-    void display(void) {
-    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-       uint8_t minBoundY = ~0;
-       uint8_t maxBoundY = 0;
-
-       uint8_t minBoundX = ~0;
-       uint8_t maxBoundX = 0;
-
-       uint8_t x, y;
-
-       // Calculate the Y bounding box of changes
-       // and copy buffer[pos] to buffer_back[pos];
-       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-         for (x = 0; x < DISPLAY_WIDTH; x++) {
-          uint16_t pos = x + y * DISPLAY_WIDTH;
-          if (buffer[pos] != buffer_back[pos]) {
-            minBoundY = _min(minBoundY, y);
-            maxBoundY = _max(maxBoundY, y);
-            minBoundX = _min(minBoundX, x);
-            maxBoundX = _max(maxBoundX, x);
-          }
-          buffer_back[pos] = buffer[pos];
-        }
-        optimistic_yield(10000);
-       }
-
-       // If the minBoundY wasn't updated
-       // we can savely assume that buffer_back[pos] == buffer[pos]
-       // holdes true for all values of pos
-       if (minBoundY == ~0) return;
-
-       // Calculate the colum offset
-       uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
-       uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
-
-       for (y = minBoundY; y <= maxBoundY; y++) {
-         sendCommand(0xB0 + y);
-         sendCommand(minBoundXp2H);
-         sendCommand(minBoundXp2L);
-         digitalWrite(_dc, HIGH);   // data mode
-         for (x = minBoundX; x <= maxBoundX; x++) {
-           SPI.transfer(buffer[x + y * DISPLAY_WIDTH]);
-         }
-        optimistic_yield(10000);
-       }
-     #else
-      for (uint8_t y=0; y
-
-#define SH1106_SET_PUMP_VOLTAGE 0X30
-#define SH1106_SET_PUMP_MODE 0XAD
-#define SH1106_PUMP_ON 0X8B
-#define SH1106_PUMP_OFF 0X8A
-//--------------------------------------
-
-class SH1106Wire : public OLEDDisplay {
-  private:
-      uint8_t             _address;
-      uint8_t             _sda;
-      uint8_t             _scl;
-
-  public:
-    SH1106Wire(uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->_address = _address;
-      this->_sda = _sda;
-      this->_scl = _scl;
-    }
-
-    bool connect() {
-      Wire.begin(this->_sda, this->_scl);
-      // Let's use ~700khz if ESP8266 is in 160Mhz mode
-      // this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
-      Wire.setClock(700000);
-      return true;
-    }
-
-    void display(void) {
-      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-        uint8_t minBoundY = ~0;
-        uint8_t maxBoundY = 0;
-
-        uint8_t minBoundX = ~0;
-        uint8_t maxBoundX = 0;
-
-        uint8_t x, y;
-
-        // Calculate the Y bounding box of changes
-        // and copy buffer[pos] to buffer_back[pos];
-        for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-          for (x = 0; x < DISPLAY_WIDTH; x++) {
-           uint16_t pos = x + y * DISPLAY_WIDTH;
-           if (buffer[pos] != buffer_back[pos]) {
-             minBoundY = _min(minBoundY, y);
-             maxBoundY = _max(maxBoundY, y);
-             minBoundX = _min(minBoundX, x);
-             maxBoundX = _max(maxBoundX, x);
-           }
-           buffer_back[pos] = buffer[pos];
-         }
-         optimistic_yield(10000);
-        }
-
-        // If the minBoundY wasn't updated
-        // we can savely assume that buffer_back[pos] == buffer[pos]
-        // holdes true for all values of pos
-        if (minBoundY == ~0) return;
-
-        // Calculate the colum offset
-        uint8_t minBoundXp2H = (minBoundX + 2) & 0x0F;
-        uint8_t minBoundXp2L = 0x10 | ((minBoundX + 2) >> 4 );
-
-        byte k = 0;
-        for (y = minBoundY; y <= maxBoundY; y++) {
-          sendCommand(0xB0 + y);
-          sendCommand(minBoundXp2H);
-          sendCommand(minBoundXp2L);
-          for (x = minBoundX; x <= maxBoundX; x++) {
-            if (k == 0) {
-              Wire.beginTransmission(_address);
-              Wire.write(0x40);
-            }
-            Wire.write(buffer[x + y * DISPLAY_WIDTH]);
-            k++;
-            if (k == 16)  {
-              Wire.endTransmission();
-              k = 0;
-            }
-          }
-          if (k != 0)  {
-            Wire.endTransmission();
-            k = 0;
-          }
-          optimistic_yield(10000);
-        }
-
-        if (k != 0) {
-          Wire.endTransmission();
-        }
-      #else
-        uint8_t * p = &buffer[0];
-        for (uint8_t y=0; y<8; y++) {
-          sendCommand(0xB0+y);
-          sendCommand(0x02);
-          sendCommand(0x10);
-          for( uint8_t x=0; x<8; x++) {
-            Wire.beginTransmission(_address);
-            Wire.write(0x40);
-            for (uint8_t k = 0; k < 16; k++) {
-              Wire.write(*p++);
-            }
-            Wire.endTransmission();
-          }
-        }
-      #endif
-    }
-
-  private:
-    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
-      Wire.beginTransmission(_address);
-      Wire.write(0x80);
-      Wire.write(command);
-      Wire.endTransmission();
-    }
-
-
-};
-
-#endif
diff --git a/libraries/oled-ssd1306/SSD1306.h b/libraries/oled-ssd1306/SSD1306.h
deleted file mode 100644
index f3b790949..000000000
--- a/libraries/oled-ssd1306/SSD1306.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef SSD1306_h
-#define SSD1306_h
-#include "SSD1306Wire.h"
-
-// For legacy support make SSD1306 an alias for SSD1306
-typedef SSD1306Wire SSD1306;
-
-
-#endif
diff --git a/libraries/oled-ssd1306/SSD1306Brzo.h b/libraries/oled-ssd1306/SSD1306Brzo.h
deleted file mode 100644
index 1cccd5da5..000000000
--- a/libraries/oled-ssd1306/SSD1306Brzo.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
- */
-
-#ifndef SSD1306Brzo_h
-#define SSD1306Brzo_h
-
-#include "OLEDDisplay.h"
-#include 
-
-#if F_CPU == 160000000L
-  #define BRZO_I2C_SPEED 1000
-#else
-  #define BRZO_I2C_SPEED 800
-#endif
-
-class SSD1306Brzo : public OLEDDisplay {
-  private:
-      uint8_t             _address;
-      uint8_t             _sda;
-      uint8_t             _scl;
-
-  public:
-    SSD1306Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->_address = _address;
-      this->_sda = _sda;
-      this->_scl = _scl;
-    }
-
-    bool connect(){
-      brzo_i2c_setup(_sda, _scl, 0);
-      return true;
-    }
-
-    void display(void) {
-    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-       uint8_t minBoundY = ~0;
-       uint8_t maxBoundY = 0;
-
-       uint8_t minBoundX = ~0;
-       uint8_t maxBoundX = 0;
-
-       uint8_t x, y;
-
-       // Calculate the Y bounding box of changes
-       // and copy buffer[pos] to buffer_back[pos];
-       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-         for (x = 0; x < DISPLAY_WIDTH; x++) {
-          uint16_t pos = x + y * DISPLAY_WIDTH;
-          if (buffer[pos] != buffer_back[pos]) {
-            minBoundY = _min(minBoundY, y);
-            maxBoundY = _max(maxBoundY, y);
-            minBoundX = _min(minBoundX, x);
-            maxBoundX = _max(maxBoundX, x);
-          }
-          buffer_back[pos] = buffer[pos];
-        }
-        optimistic_yield(10000);
-       }
-
-       // If the minBoundY wasn't updated
-       // we can savely assume that buffer_back[pos] == buffer[pos]
-       // holdes true for all values of pos
-       if (minBoundY == ~0) return;
-
-       sendCommand(COLUMNADDR);
-       sendCommand(minBoundX);
-       sendCommand(maxBoundX);
-
-       sendCommand(PAGEADDR);
-       sendCommand(minBoundY);
-       sendCommand(maxBoundY);
-
-       byte k = 0;
-       uint8_t sendBuffer[17];
-       sendBuffer[0] = 0x40;
-       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
-       for (y = minBoundY; y <= maxBoundY; y++) {
-           for (x = minBoundX; x <= maxBoundX; x++) {
-               k++;
-               sendBuffer[k] = buffer[x + y * DISPLAY_WIDTH];
-               if (k == 16)  {
-                 brzo_i2c_write(sendBuffer, 17, true);
-                 k = 0;
-               }
-           }
-           optimistic_yield(10000);
-       }
-       brzo_i2c_write(sendBuffer, k + 1, true);
-       brzo_i2c_end_transaction();
-     #else
-       // No double buffering
-       sendCommand(COLUMNADDR);
-       sendCommand(0x0);
-       sendCommand(0x7F);
-
-       sendCommand(PAGEADDR);
-       sendCommand(0x0);
-       sendCommand(0x7);
-
-       uint8_t sendBuffer[17];
-       sendBuffer[0] = 0x40;
-       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
-       for (uint16_t i=0; i
-
-#if F_CPU == 160000000L
-  #define BRZO_I2C_SPEED 1000
-#else
-  #define BRZO_I2C_SPEED 800
-#endif
-
-class SSD1306Spi : public OLEDDisplay {
-  private:
-      uint8_t             _rst;
-      uint8_t             _dc;
-      uint8_t             _cs;
-
-  public:
-    SSD1306Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs) {
-      this->_rst = _rst;
-      this->_dc  = _dc;
-      this->_cs  = _cs;
-    }
-
-    bool connect(){
-      pinMode(_dc, OUTPUT);
-      pinMode(_cs, OUTPUT);
-      pinMode(_rst, OUTPUT);
-
-      SPI.begin ();
-      SPI.setClockDivider (SPI_CLOCK_DIV2);
-
-      // Pulse Reset low for 10ms
-      digitalWrite(_rst, HIGH);
-      delay(1);
-      digitalWrite(_rst, LOW);
-      delay(10);
-      digitalWrite(_rst, HIGH);
-      return true;
-    }
-
-    void display(void) {
-    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-       uint8_t minBoundY = ~0;
-       uint8_t maxBoundY = 0;
-
-       uint8_t minBoundX = ~0;
-       uint8_t maxBoundX = 0;
-
-       uint8_t x, y;
-
-       // Calculate the Y bounding box of changes
-       // and copy buffer[pos] to buffer_back[pos];
-       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-         for (x = 0; x < DISPLAY_WIDTH; x++) {
-          uint16_t pos = x + y * DISPLAY_WIDTH;
-          if (buffer[pos] != buffer_back[pos]) {
-            minBoundY = _min(minBoundY, y);
-            maxBoundY = _max(maxBoundY, y);
-            minBoundX = _min(minBoundX, x);
-            maxBoundX = _max(maxBoundX, x);
-          }
-          buffer_back[pos] = buffer[pos];
-        }
-        optimistic_yield(10000);
-       }
-
-       // If the minBoundY wasn't updated
-       // we can savely assume that buffer_back[pos] == buffer[pos]
-       // holdes true for all values of pos
-       if (minBoundY == ~0) return;
-
-       sendCommand(COLUMNADDR);
-       sendCommand(minBoundX);
-       sendCommand(maxBoundX);
-
-       sendCommand(PAGEADDR);
-       sendCommand(minBoundY);
-       sendCommand(maxBoundY);
-
-       digitalWrite(_cs, HIGH);
-       digitalWrite(_dc, HIGH);   // data mode
-       digitalWrite(_cs, LOW);
-       for (y = minBoundY; y <= maxBoundY; y++) {
-         for (x = minBoundX; x <= maxBoundX; x++) {
-           SPI.transfer(buffer[x + y * DISPLAY_WIDTH]);
-         }
-         optimistic_yield(10000);
-       }
-       digitalWrite(_cs, HIGH);
-     #else
-       // No double buffering
-       sendCommand(COLUMNADDR);
-       sendCommand(0x0);
-       sendCommand(0x7F);
-
-       sendCommand(PAGEADDR);
-       sendCommand(0x0);
-       sendCommand(0x7);
-
-        digitalWrite(_cs, HIGH);
-        digitalWrite(_dc, HIGH);   // data mode
-        digitalWrite(_cs, LOW);
-        for (uint16_t i=0; i
-
-class SSD1306Wire : public OLEDDisplay {
-  private:
-      uint8_t             _address;
-      uint8_t             _sda;
-      uint8_t             _scl;
-
-  public:
-    SSD1306Wire(uint8_t _address, uint8_t _sda, uint8_t _scl) {
-      this->_address = _address;
-      this->_sda = _sda;
-      this->_scl = _scl;
-    }
-
-    bool connect() {
-      Wire.begin(this->_sda, this->_scl);
-      // Let's use ~700khz if ESP8266 is in 160Mhz mode
-      // this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
-      Wire.setClock(700000);
-      return true;
-    }
-
-    void display(void) {
-      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
-        uint8_t minBoundY = ~0;
-        uint8_t maxBoundY = 0;
-
-        uint8_t minBoundX = ~0;
-        uint8_t maxBoundX = 0;
-        uint8_t x, y;
-
-        // Calculate the Y bounding box of changes
-        // and copy buffer[pos] to buffer_back[pos];
-        for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
-          for (x = 0; x < DISPLAY_WIDTH; x++) {
-           uint16_t pos = x + y * DISPLAY_WIDTH;
-           if (buffer[pos] != buffer_back[pos]) {
-             minBoundY = _min(minBoundY, y);
-             maxBoundY = _max(maxBoundY, y);
-             minBoundX = _min(minBoundX, x);
-             maxBoundX = _max(maxBoundX, x);
-           }
-           buffer_back[pos] = buffer[pos];
-         }
-         optimistic_yield(10000);
-        }
-
-        // If the minBoundY wasn't updated
-        // we can savely assume that buffer_back[pos] == buffer[pos]
-        // holdes true for all values of pos
-        if (minBoundY == ~0) return;
-
-        sendCommand(COLUMNADDR);
-        sendCommand(minBoundX);
-        sendCommand(maxBoundX);
-
-        sendCommand(PAGEADDR);
-        sendCommand(minBoundY);
-        sendCommand(maxBoundY);
-
-        byte k = 0;
-        for (y = minBoundY; y <= maxBoundY; y++) {
-          for (x = minBoundX; x <= maxBoundX; x++) {
-            if (k == 0) {
-              Wire.beginTransmission(_address);
-              Wire.write(0x40);
-            }
-            Wire.write(buffer[x + y * DISPLAY_WIDTH]);
-            k++;
-            if (k == 16)  {
-              Wire.endTransmission();
-              k = 0;
-            }
-          }
-          optimistic_yield(10000);
-        }
-
-        if (k != 0) {
-          Wire.endTransmission();
-        }
-      #else
-
-        sendCommand(COLUMNADDR);
-        sendCommand(0x0);
-        sendCommand(0x7F);
-
-        sendCommand(PAGEADDR);
-        sendCommand(0x0);
-        sendCommand(0x7);
-
-        for (uint16_t i=0; i < DISPLAY_BUFFER_SIZE; i++) {
-          Wire.beginTransmission(this->_address);
-          Wire.write(0x40);
-          for (uint8_t x = 0; x < 16; x++) {
-            Wire.write(buffer[i]);
-            i++;
-          }
-          i--;
-          Wire.endTransmission();
-        }
-      #endif
-    }
-
-  private:
-    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
-      Wire.beginTransmission(_address);
-      Wire.write(0x80);
-      Wire.write(command);
-      Wire.endTransmission();
-    }
-
-
-};
-
-#endif
diff --git a/libraries/oled-ssd1306/UPGRADE-3.0.md b/libraries/oled-ssd1306/UPGRADE-3.0.md
deleted file mode 100644
index e7a315bc6..000000000
--- a/libraries/oled-ssd1306/UPGRADE-3.0.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# Upgrade from 2.0 to 3.0
-
-While developing version 3.0 we made some breaking changes to the public
-API of this library. This document will help you update your code to work with
-version 3.0
-
-## Font Definitions
-
-To get better performance and a smaller font definition format, we change the memory
-layout of the font definition format. If you are using custom fonts not included in
-this library we updated the font generator [here](http://oleddisplay.squix.ch/#/home).
-Please update your fonts to be working with 3.0 by selecting the respective version in the dropdown.
-
-
-## Architectural Changes
-
-To become a more versatile library for the SSD1306 chipset we abstracted the
-hardware connection into subclasses of the base display class now called `OLEDDisplay`.
-This library is currently shipping with three implementations:
-
-  * `SSD1306Wire` implementing the I2C protocol using the Wire Library.    
-  * `SSD1306Brzo` implementing the I2C protocol using the faster [`brzo_i2c`](https://github.com/pasko-zh/brzo_i2c) library.
-  * `SSD1306Spi` implementing the SPI protocol.
-
-To keep backwards compatiblity with the old API `SSD1306` is an alias of `SSD1306Wire`.
-If you are not using the UI components you don't have to change anything to keep your code working.
-
-## Name Changes
-
-[Naming things is hard](http://martinfowler.com/bliki/TwoHardThings.html), to better reflect our intention with this library
-we changed the name of the base class to `OLEDDisplay` and the UI library accordingly to `OLEDDisplayUi`.
-As a consequence the type definitions of all frame and overlay related functions changed.
-This means that you have to update all your frame drawing callbacks from:
-
-```c
-bool frame1(SSD1306 *display,  SSD1306UiState* state, int x, int y);
-```
-
-too
-
-```c
-void frame1(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
-```
-
-And your overlay drawing functions from:
-
-```c
-bool overlay1(SSD1306 *display,  SSD1306UiState* state);
-```
-
-too
-
-```c
-void overlay1(OLEDDisplay *display,  OLEDDisplayUiState* state);
-```
-
-## New Features
-
-### Loading Animation
-
-While using this library ourself we noticed a pattern emerging. We want to drawing
-a loading progress while connecting to WiFi and updating weather data etc.
-
-The simplest thing was to add the function `drawProgressBar(x, y, width,  height, progress)`
-,where `progress` is between `0` and `100`, right to the `OLEDDisplay` class.
-
-But we didn't stop there. We added a new feature to the `OLEDDisplayUi` called `LoadingStages`.
-You can define your loading process like this:
-
-```c++
-LoadingStage loadingStages[] = {
-  {
-    .process = "Connect to WiFi",
-    .callback = []() {
-      // Connect to WiFi
-    }
-  },
-  {
-    .process = "Get time from NTP",
-    .callback = []() {
-      // Get current time via NTP
-    }
-  }
-  // more steps
-};
-
-int LOADING_STAGES_COUNT = sizeof(loadingStages) / sizeof(LoadingStage);
-```
-
-After defining your array of `LoadingStages` you can then run the loading process by using
-`ui.runLoadingProcess(loadingStages, LOADING_STAGES_COUNT)`. This will give you a
-nice little loading animation you can see in the beginning of [this](https://vimeo.com/168362918)
-video.
-
-To further customize this you are free to define your own `LoadingDrawFunction` like this:
-
-```c
-void myLoadingDraw(OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
-  display->setTextAlignment(TEXT_ALIGN_CENTER);
-  display->setFont(ArialMT_Plain_10);
-  // stage->process contains the text of the current progress e.q. "Connect to WiFi"
-  display->drawString(64, 18, stage->process);
-  // you could just print the current process without the progress bar
-  display->drawString(64, 28, progress);
-}
-```
-
-After defining a function like that, you can pass it to the Ui library by use
-`ui.setLoadingDrawFunction(myLoadingDraw)`.
-
-
-### Text Logging
-
-It is always useful to display some text on the display without worrying to much
-where it goes and managing it. In 3.0 we made the `OLEDDisplay` class implement
-[`Print`](https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/Print.h)
-so you can use it like you would use `Serial`. We calls this feature `LogBuffer`
-and the only thing you have to do is to define how many lines you want to display
-and how many characters there are on average on each. This is done by calling
-`setLogBuffer(lines, chars);`. If there is not enough memory the function will
-return false.
-
-After that you can draw the `LogBuffer` anywhere you want by calling `drawLogBuffer(x, y)`.
-(Note: You have to call `display()` to update the screen)
-We made a [video](https://www.youtube.com/watch?v=8Fiss77A3TE) showing this feature in action.
diff --git a/libraries/oled-ssd1306/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino b/libraries/oled-ssd1306/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
deleted file mode 100644
index e9db7d645..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include 
-
-// Include the correct display library
-// For a connection via I2C using Wire include
-#include   // Only needed for Arduino 1.6.5 and earlier
-#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
-// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
-// For a connection via I2C using brzo_i2c (must be installed) include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Brzo.h"
-// #include "SH1106Brzo.h"
-// For a connection via SPI include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Spi.h"
-// #include "SH1106SPi.h"
-
-// Include the UI lib
-#include "OLEDDisplayUi.h"
-
-// Include custom images
-#include "images.h"
-
-// Use the corresponding display class:
-
-// Initialize the OLED display using SPI
-// D5 -> CLK
-// D7 -> MOSI (DOUT)
-// D0 -> RES
-// D2 -> DC
-// D8 -> CS
-// SSD1306Spi        display(D0, D2, D8);
-// or
-// SH1106Spi         display(D0, D2);
-
-// Initialize the OLED display using brzo_i2c
-// D3 -> SDA
-// D5 -> SCL
-// SSD1306Brzo display(0x3c, D3, D5);
-// or
-// SH1106Brzo  display(0x3c, D3, D5);
-
-// Initialize the OLED display using Wire library
-SSD1306  display(0x3c, D3, D5);
-// SH1106 display(0x3c, D3, D5);
-
-OLEDDisplayUi ui ( &display );
-
-int screenW = 128;
-int screenH = 64;
-int clockCenterX = screenW/2;
-int clockCenterY = ((screenH-16)/2)+16;   // top yellow part is 16 px height
-int clockRadius = 23;
-
-// utility function for digital clock display: prints leading 0
-String twoDigits(int digits){
-  if(digits < 10) {
-    String i = '0'+String(digits);
-    return i;
-  }
-  else {
-    return String(digits);
-  }
-}
-
-void clockOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
-
-}
-
-void analogClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-//  ui.disableIndicator();
-
-  // Draw the clock face
-//  display->drawCircle(clockCenterX + x, clockCenterY + y, clockRadius);
-  display->drawCircle(clockCenterX + x, clockCenterY + y, 2);
-  //
-  //hour ticks
-  for( int z=0; z < 360;z= z + 30 ){
-  //Begin at 0° and stop at 360°
-    float angle = z ;
-    angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
-    int x2 = ( clockCenterX + ( sin(angle) * clockRadius ) );
-    int y2 = ( clockCenterY - ( cos(angle) * clockRadius ) );
-    int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
-    int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
-    display->drawLine( x2 + x , y2 + y , x3 + x , y3 + y);
-  }
-
-  // display second hand
-  float angle = second() * 6 ;
-  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
-  int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
-  int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
-  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
-  //
-  // display minute hand
-  angle = minute() * 6 ;
-  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
-  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
-  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
-  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
-  //
-  // display hour hand
-  angle = hour() * 30 + int( ( minute() / 12 ) * 6 )   ;
-  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
-  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
-  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
-  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
-}
-
-void digitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  String timenow = String(hour())+":"+twoDigits(minute())+":"+twoDigits(second());
-  display->setTextAlignment(TEXT_ALIGN_CENTER);
-  display->setFont(ArialMT_Plain_24);
-  display->drawString(clockCenterX + x , clockCenterY + y, timenow );
-}
-
-// This array keeps function pointers to all frames
-// frames are the single views that slide in
-FrameCallback frames[] = { analogClockFrame, digitalClockFrame };
-
-// how many frames are there?
-int frameCount = 2;
-
-// Overlays are statically drawn on top of a frame eg. a clock
-OverlayCallback overlays[] = { clockOverlay };
-int overlaysCount = 1;
-
-void setup() {
-  Serial.begin(9600);
-  Serial.println();
-
-	// The ESP is capable of rendering 60fps in 80Mhz mode
-	// but that won't give you much time for anything else
-	// run it in 160Mhz mode or just set it to 30 fps
-  ui.setTargetFPS(60);
-
-	// Customize the active and inactive symbol
-  ui.setActiveSymbol(activeSymbol);
-  ui.setInactiveSymbol(inactiveSymbol);
-
-  // You can change this to
-  // TOP, LEFT, BOTTOM, RIGHT
-  ui.setIndicatorPosition(TOP);
-
-  // Defines where the first frame is located in the bar.
-  ui.setIndicatorDirection(LEFT_RIGHT);
-
-  // You can change the transition that is used
-  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
-  ui.setFrameAnimation(SLIDE_LEFT);
-
-  // Add frames
-  ui.setFrames(frames, frameCount);
-
-  // Add overlays
-  ui.setOverlays(overlays, overlaysCount);
-
-  // Initialising the UI will init the display too.
-  ui.init();
-
-  display.flipScreenVertically();
-
-  unsigned long secsSinceStart = millis();
-  // Unix time starts on Jan 1 1970. In seconds, that's 2208988800:
-  const unsigned long seventyYears = 2208988800UL;
-  // subtract seventy years:
-  unsigned long epoch = secsSinceStart - seventyYears * SECS_PER_HOUR;
-  setTime(epoch);
-
-}
-
-
-void loop() {
-  int remainingTimeBudget = ui.update();
-
-  if (remainingTimeBudget > 0) {
-    // You can do some work here
-    // Don't do stuff if you are below your
-    // time budget.
-    delay(remainingTimeBudget);
-
-  }
-
-
-}
diff --git a/libraries/oled-ssd1306/examples/SSD1306ClockDemo/images.h b/libraries/oled-ssd1306/examples/SSD1306ClockDemo/images.h
deleted file mode 100644
index a220a27c2..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306ClockDemo/images.h
+++ /dev/null
@@ -1,21 +0,0 @@
-const char activeSymbol[] PROGMEM = {
-    B00000000,
-    B00000000,
-    B00011000,
-    B00100100,
-    B01000010,
-    B01000010,
-    B00100100,
-    B00011000
-};
-
-const char inactiveSymbol[] PROGMEM = {
-    B00000000,
-    B00000000,
-    B00000000,
-    B00000000,
-    B00011000,
-    B00011000,
-    B00000000,
-    B00000000
-};
diff --git a/libraries/oled-ssd1306/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino b/libraries/oled-ssd1306/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
deleted file mode 100644
index cf37fb041..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306DrawingDemo/SSD1306DrawingDemo.ino
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
- // Include the correct display library
- // For a connection via I2C using Wire include
- #include   // Only needed for Arduino 1.6.5 and earlier
- #include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
- // or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
- // For a connection via I2C using brzo_i2c (must be installed) include
- // #include  // Only needed for Arduino 1.6.5 and earlier
- // #include "SSD1306Brzo.h"
- // #include "SH1106Brzo.h"
- // For a connection via SPI include
- // #include  // Only needed for Arduino 1.6.5 and earlier
- // #include "SSD1306Spi.h"
- // #include "SH1106SPi.h"
-
- // Use the corresponding display class:
-
- // Initialize the OLED display using SPI
- // D5 -> CLK
- // D7 -> MOSI (DOUT)
- // D0 -> RES
- // D2 -> DC
- // D8 -> CS
- // SSD1306Spi        display(D0, D2, D8);
- // or
- // SH1106Spi         display(D0, D2);
-
- // Initialize the OLED display using brzo_i2c
- // D3 -> SDA
- // D5 -> SCL
- // SSD1306Brzo display(0x3c, D3, D5);
- // or
- // SH1106Brzo  display(0x3c, D3, D5);
-
- // Initialize the OLED display using Wire library
- SSD1306  display(0x3c, D3, D5);
- // SH1106 display(0x3c, D3, D5);
-
-// Adapted from Adafruit_SSD1306
-void drawLines() {
-  for (int16_t i=0; i=0; i-=4) {
-    display.drawLine(0, DISPLAY_HEIGHT-1, DISPLAY_WIDTH-1, i);
-    display.display();
-    delay(10);
-  }
-  delay(250);
-
-  display.clear();
-  for (int16_t i=DISPLAY_WIDTH-1; i>=0; i-=4) {
-    display.drawLine(DISPLAY_WIDTH-1, DISPLAY_HEIGHT-1, i, 0);
-    display.display();
-    delay(10);
-  }
-  for (int16_t i=DISPLAY_HEIGHT-1; i>=0; i-=4) {
-    display.drawLine(DISPLAY_WIDTH-1, DISPLAY_HEIGHT-1, 0, i);
-    display.display();
-    delay(10);
-  }
-  delay(250);
-  display.clear();
-  for (int16_t i=0; i
-
- // OTA Includes
- #include 
- #include 
-
- const char *ssid         = "[Your SSID]";
- const char *password     = "[Your Password]";
-
-
-// Include the correct display library
-// For a connection via I2C using Wire include
-#include   // Only needed for Arduino 1.6.5 and earlier
-#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
-// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
-// For a connection via I2C using brzo_i2c (must be installed) include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Brzo.h"
-// #include "SH1106Brzo.h"
-// For a connection via SPI include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Spi.h"
-// #include "SH1106SPi.h"
-
-// Use the corresponding display class:
-
-// Initialize the OLED display using SPI
-// D5 -> CLK
-// D7 -> MOSI (DOUT)
-// D0 -> RES
-// D2 -> DC
-// D8 -> CS
-// SSD1306Spi        display(D0, D2, D8);
-// or
-// SH1106Spi         display(D0, D2);
-
-// Initialize the OLED display using brzo_i2c
-// D3 -> SDA
-// D5 -> SCL
-// SSD1306Brzo display(0x3c, D3, D5);
-// or
-// SH1106Brzo  display(0x3c, D3, D5);
-
-// Initialize the OLED display using Wire library
-SSD1306  display(0x3c, D3, D5);
-// SH1106 display(0x3c, D3, D5);
-
-
-void setup() {
-  WiFi.begin ( ssid, password );
-
-  // Wait for connection
-  while ( WiFi.status() != WL_CONNECTED ) {
-    delay ( 10 );
-  }
-
-  display.init();
-  display.flipScreenVertically();
-  display.setContrast(255);
-
-  ArduinoOTA.begin();
-  ArduinoOTA.onStart([]() {
-    display.clear();
-    display.setFont(ArialMT_Plain_10);
-    display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
-    display.drawString(DISPLAY_WIDTH/2, DISPLAY_HEIGHT/2 - 10, "OTA Update");
-    display.display();
-  });
-
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
-    display.drawProgressBar(4, 32, 120, 8, progress / (total / 100) );
-    display.display();
-  });
-
-  ArduinoOTA.onEnd([]() {
-    display.clear();
-    display.setFont(ArialMT_Plain_10);
-    display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
-    display.drawString(DISPLAY_WIDTH/2, DISPLAY_HEIGHT/2, "Restart");
-    display.display();
-  });
-
-  // Align text vertical/horizontal center
-  display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
-  display.setFont(ArialMT_Plain_10);
-  display.drawString(DISPLAY_WIDTH/2, DISPLAY_HEIGHT/2, "Ready for OTA:\n" + WiFi.localIP().toString());
-  display.display();
-}
-
-void loop() {
-  ArduinoOTA.handle();
-}
diff --git a/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino b/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
deleted file mode 100644
index 6d3854a5f..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-// Include the correct display library
-// For a connection via I2C using Wire include
-#include   // Only needed for Arduino 1.6.5 and earlier
-#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
-// or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
-// For a connection via I2C using brzo_i2c (must be installed) include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Brzo.h"
-// #include "SH1106Brzo.h"
-// For a connection via SPI include
-// #include  // Only needed for Arduino 1.6.5 and earlier
-// #include "SSD1306Spi.h"
-// #include "SH1106SPi.h"
-
-// Include custom images
-#include "images.h"
-
-// Initialize the OLED display using SPI
-// D5 -> CLK
-// D7 -> MOSI (DOUT)
-// D0 -> RES
-// D2 -> DC
-// D8 -> CS
-// SSD1306Spi        display(D0, D2, D8);
-// or
-// SH1106Spi         display(D0, D2);
-
-// Initialize the OLED display using brzo_i2c
-// D3 -> SDA
-// D5 -> SCL
-// SSD1306Brzo display(0x3c, D3, D5);
-// or
-// SH1106Brzo  display(0x3c, D3, D5);
-
-// Initialize the OLED display using Wire library
-SSD1306  display(0x3c, 4, 15);
-// SH1106 display(0x3c, D3, D5);
-
-
-#define DEMO_DURATION 3000
-typedef void (*Demo)(void);
-
-int demoMode = 0;
-int counter = 1;
-
-void setup() {
-  Serial.begin(115200);
-  Serial.println();
-  Serial.println();
-
-
-  // Initialising the UI will init the display too.
-  display.init();
-
-  display.flipScreenVertically();
-  display.setFont(ArialMT_Plain_10);
-
-}
-
-void drawFontFaceDemo() {
-    // Font Demo1
-    // create more fonts at http://oleddisplay.squix.ch/
-    display.setTextAlignment(TEXT_ALIGN_LEFT);
-    display.setFont(ArialMT_Plain_10);
-    display.drawString(0, 0, "Hello world");
-    display.setFont(ArialMT_Plain_16);
-    display.drawString(0, 10, "Hello world");
-    display.setFont(ArialMT_Plain_24);
-    display.drawString(0, 26, "Hello world");
-}
-
-void drawTextFlowDemo() {
-    display.setFont(ArialMT_Plain_10);
-    display.setTextAlignment(TEXT_ALIGN_LEFT);
-    display.drawStringMaxWidth(0, 0, 128,
-      "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore." );
-}
-
-void drawTextAlignmentDemo() {
-    // Text alignment demo
-  display.setFont(ArialMT_Plain_10);
-
-  // The coordinates define the left starting point of the text
-  display.setTextAlignment(TEXT_ALIGN_LEFT);
-  display.drawString(0, 10, "Left aligned (0,10)");
-
-  // The coordinates define the center of the text
-  display.setTextAlignment(TEXT_ALIGN_CENTER);
-  display.drawString(64, 22, "Center aligned (64,22)");
-
-  // The coordinates define the right end of the text
-  display.setTextAlignment(TEXT_ALIGN_RIGHT);
-  display.drawString(128, 33, "Right aligned (128,33)");
-}
-
-void drawRectDemo() {
-      // Draw a pixel at given position
-    for (int i = 0; i < 10; i++) {
-      display.setPixel(i, i);
-      display.setPixel(10 - i, i);
-    }
-    display.drawRect(12, 12, 20, 20);
-
-    // Fill the rectangle
-    display.fillRect(14, 14, 17, 17);
-
-    // Draw a line horizontally
-    display.drawHorizontalLine(0, 40, 20);
-
-    // Draw a line horizontally
-    display.drawVerticalLine(40, 0, 20);
-}
-
-void drawCircleDemo() {
-  for (int i=1; i < 8; i++) {
-    display.setColor(WHITE);
-    display.drawCircle(32, 32, i*3);
-    if (i % 2 == 0) {
-      display.setColor(BLACK);
-    }
-    display.fillCircle(96, 32, 32 - i* 3);
-  }
-}
-
-void drawProgressBarDemo() {
-  int progress = (counter / 5) % 100;
-  // draw the progress bar
-  display.drawProgressBar(0, 32, 120, 10, progress);
-
-  // draw the percentage as String
-  display.setTextAlignment(TEXT_ALIGN_CENTER);
-  display.drawString(64, 15, String(progress) + "%");
-}
-
-void drawImageDemo() {
-    // see http://blog.squix.org/2015/05/esp8266-nodemcu-how-to-create-xbm.html
-    // on how to create xbm files
-    display.drawXbm(34, 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
-}
-
-Demo demos[] = {drawFontFaceDemo, drawTextFlowDemo, drawTextAlignmentDemo, drawRectDemo, drawCircleDemo, drawProgressBarDemo, drawImageDemo};
-int demoLength = (sizeof(demos) / sizeof(Demo));
-long timeSinceLastModeSwitch = 0;
-
-void loop() {
-  // clear the display
-  display.clear();
-  // draw the current demo method
-  demos[demoMode]();
-
-  display.setTextAlignment(TEXT_ALIGN_RIGHT);
-  display.drawString(10, 128, String(millis()));
-  // write the buffer to the display
-  display.display();
-
-  if (millis() - timeSinceLastModeSwitch > DEMO_DURATION) {
-    demoMode = (demoMode + 1)  % demoLength;
-    timeSinceLastModeSwitch = millis();
-  }
-  counter++;
-  delay(10);
-}
diff --git a/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/images.h b/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/images.h
deleted file mode 100644
index 9daf8c1a2..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306SimpleDemo/images.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#define WiFi_Logo_width 60
-#define WiFi_Logo_height 36
-const char WiFi_Logo_bits[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
-  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
-  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
-  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
-  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
-  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
-  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
-  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
-  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
-  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
-  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
-  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  };
diff --git a/libraries/oled-ssd1306/examples/SSD1306UiDemo/SSD1306UiDemo.ino b/libraries/oled-ssd1306/examples/SSD1306UiDemo/SSD1306UiDemo.ino
deleted file mode 100644
index ada991ad9..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306UiDemo/SSD1306UiDemo.ino
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 by Daniel Eichhorn
- * Copyright (c) 2016 by Fabrice Weinberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
- // Include the correct display library
- // For a connection via I2C using Wire include
- #include   // Only needed for Arduino 1.6.5 and earlier
- #include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
- // or #include "SH1106.h" alis for `#include "SH1106Wire.h"`
- // For a connection via I2C using brzo_i2c (must be installed) include
- // #include  // Only needed for Arduino 1.6.5 and earlier
- // #include "SSD1306Brzo.h"
- // #include "SH1106Brzo.h"
- // For a connection via SPI include
- // #include  // Only needed for Arduino 1.6.5 and earlier
- // #include "SSD1306Spi.h"
- // #include "SH1106SPi.h"
-
-// Include the UI lib
-#include "OLEDDisplayUi.h"
-
-// Include custom images
-#include "images.h"
-
-// Use the corresponding display class:
-
-// Initialize the OLED display using SPI
-// D5 -> CLK
-// D7 -> MOSI (DOUT)
-// D0 -> RES
-// D2 -> DC
-// D8 -> CS
-// SSD1306Spi        display(D0, D2, D8);
-// or
-// SH1106Spi         display(D0, D2);
-
-// Initialize the OLED display using brzo_i2c
-// D3 -> SDA
-// D5 -> SCL
-// SSD1306Brzo display(0x3c, D3, D5);
-// or
-// SH1106Brzo  display(0x3c, D3, D5);
-
-// Initialize the OLED display using Wire library
-SSD1306  display(0x3c, 4, 15);
-// SH1106 display(0x3c, D3, D5);
-
-OLEDDisplayUi ui     ( &display );
-
-void msOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
-  display->setTextAlignment(TEXT_ALIGN_RIGHT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawString(128, 0, String(millis()));
-}
-
-void drawFrame1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  // draw an xbm image.
-  // Please note that everything that should be transitioned
-  // needs to be drawn relative to x and y
-
-  display->drawXbm(x + 34, y + 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
-}
-
-void drawFrame2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  // Demonstrates the 3 included default sizes. The fonts come from SSD1306Fonts.h file
-  // Besides the default fonts there will be a program to convert TrueType fonts into this format
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawString(0 + x, 10 + y, "Arial 10");
-
-  display->setFont(ArialMT_Plain_16);
-  display->drawString(0 + x, 20 + y, "Arial 16");
-
-  display->setFont(ArialMT_Plain_24);
-  display->drawString(0 + x, 34 + y, "Arial 24");
-}
-
-void drawFrame3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  // Text alignment demo
-  display->setFont(ArialMT_Plain_10);
-
-  // The coordinates define the left starting point of the text
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->drawString(0 + x, 11 + y, "Left aligned (0,10)");
-
-  // The coordinates define the center of the text
-  display->setTextAlignment(TEXT_ALIGN_CENTER);
-  display->drawString(64 + x, 22 + y, "Center aligned (64,22)");
-
-  // The coordinates define the right end of the text
-  display->setTextAlignment(TEXT_ALIGN_RIGHT);
-  display->drawString(128 + x, 33 + y, "Right aligned (128,33)");
-}
-
-void drawFrame4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-  // Demo for drawStringMaxWidth:
-  // with the third parameter you can define the width after which words will be wrapped.
-  // Currently only spaces and "-" are allowed for wrapping
-  display->setTextAlignment(TEXT_ALIGN_LEFT);
-  display->setFont(ArialMT_Plain_10);
-  display->drawStringMaxWidth(0 + x, 10 + y, 128, "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore.");
-}
-
-void drawFrame5(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
-
-}
-
-// This array keeps function pointers to all frames
-// frames are the single views that slide in
-FrameCallback frames[] = { drawFrame1, drawFrame2, drawFrame3, drawFrame4, drawFrame5 };
-
-// how many frames are there?
-int frameCount = 5;
-
-// Overlays are statically drawn on top of a frame eg. a clock
-OverlayCallback overlays[] = { msOverlay };
-int overlaysCount = 1;
-
-void setup() {
-    //For Embeded OLED on Wifi kit 32
-   pinMode(16,OUTPUT);
-   digitalWrite(16, LOW);   // turn the LED on (HIGH is the voltage level)
-   delay(100);                       // wait for a second
-   digitalWrite(16, HIGH);    // turn the LED off by making the voltage LOW
-  Serial.begin(115200);
-  Serial.println();
-  Serial.println();
-
-	// The ESP is capable of rendering 60fps in 80Mhz mode
-	// but that won't give you much time for anything else
-	// run it in 160Mhz mode or just set it to 30 fps
-  ui.setTargetFPS(60);
-
-	// Customize the active and inactive symbol
-  ui.setActiveSymbol(activeSymbol);
-  ui.setInactiveSymbol(inactiveSymbol);
-
-  // You can change this to
-  // TOP, LEFT, BOTTOM, RIGHT
-  ui.setIndicatorPosition(BOTTOM);
-
-  // Defines where the first frame is located in the bar.
-  ui.setIndicatorDirection(LEFT_RIGHT);
-
-  // You can change the transition that is used
-  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
-  ui.setFrameAnimation(SLIDE_LEFT);
-
-  // Add frames
-  ui.setFrames(frames, frameCount);
-
-  // Add overlays
-  ui.setOverlays(overlays, overlaysCount);
-
-  // Initialising the UI will init the display too.
-  ui.init();
-
-  display.flipScreenVertically();
-
-}
-
-
-void loop() {
-  int remainingTimeBudget = ui.update();
-
-  if (remainingTimeBudget > 0) {
-    // You can do some work here
-    // Don't do stuff if you are below your
-    // time budget.
-    delay(remainingTimeBudget);
-  }
-}
diff --git a/libraries/oled-ssd1306/examples/SSD1306UiDemo/images.h b/libraries/oled-ssd1306/examples/SSD1306UiDemo/images.h
deleted file mode 100644
index 8b876a369..000000000
--- a/libraries/oled-ssd1306/examples/SSD1306UiDemo/images.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#define WiFi_Logo_width 60
-#define WiFi_Logo_height 36
-const char WiFi_Logo_bits[] PROGMEM = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
-  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
-  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
-  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
-  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
-  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
-  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
-  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
-  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
-  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
-  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
-  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
-  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
-  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
-  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  };
-
-const char activeSymbol[] PROGMEM = {
-    B00000000,
-    B00000000,
-    B00011000,
-    B00100100,
-    B01000010,
-    B01000010,
-    B00100100,
-    B00011000
-};
-
-const char inactiveSymbol[] PROGMEM = {
-    B00000000,
-    B00000000,
-    B00000000,
-    B00000000,
-    B00011000,
-    B00011000,
-    B00000000,
-    B00000000
-};
diff --git a/libraries/oled-ssd1306/library.json b/libraries/oled-ssd1306/library.json
deleted file mode 100644
index 862d17167..000000000
--- a/libraries/oled-ssd1306/library.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "ESP8266_SSD1306",
-  "version": "3.2.7",
-  "keywords": "ssd1306, oled, display, i2c",
-  "description": "A I2C display driver for SSD1306 oled displays connected to an ESP8266 or ESP32",
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/squix78/esp8266-oled-ssd1306.git"
-  },
-  "authors":
-  [
-    {
-        "name": "Daniel Eichhorn",
-        "email": "squix78@gmail.com",
-        "url": "http://blog.squix.ch"
-    },
-    {
-        "name": "Fabrice Weinberg",
-        "email": "fabrice@weinberg.me"
-    }
-  ],
-  "frameworks": "arduino",
-  "platforms": [
-    "espressif8266",
-    "espressif32"
-  ]
-}
diff --git a/libraries/oled-ssd1306/library.properties b/libraries/oled-ssd1306/library.properties
deleted file mode 100644
index 4f8de4cf3..000000000
--- a/libraries/oled-ssd1306/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=ESP8266 and ESP32 Oled Driver for SSD1306 display
-version=3.2.7
-author=Daniel Eichhorn, Fabrice Weinberg
-maintainer=Daniel Eichhorn 
-sentence=A I2C display driver for SSD1306 oled displays connected to an ESP8266 or ESP32
-paragraph=A I2C display driver for SSD1306 oled displays connected to an ESP8266 or ESP32
-category=Display
-url=https://github.com/squix78/esp8266-oled-ssd1306
-architectures=esp8266,esp32
diff --git a/libraries/oled-ssd1306/license b/libraries/oled-ssd1306/license
deleted file mode 100644
index 706c10fed..000000000
--- a/libraries/oled-ssd1306/license
+++ /dev/null
@@ -1,24 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 by Daniel Eichhorn
-Copyright (c) 2016 by Fabrice Weinberg
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-See more at http://blog.squix.ch
diff --git a/libraries/oled-ssd1306/resources/DemoFrame1.jpg b/libraries/oled-ssd1306/resources/DemoFrame1.jpg
deleted file mode 100644
index 536b570db09931ec634b38777033432276bafed8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16026
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

diff --git a/libraries/oled-ssd1306/resources/DemoFrame2.jpg b/libraries/oled-ssd1306/resources/DemoFrame2.jpg
deleted file mode 100644
index 8dccbcd0210b5c1dd7bad824982c1ecbf5c1edc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19502
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
C1xwrj

diff --git a/libraries/oled-ssd1306/resources/DemoFrame4.jpg b/libraries/oled-ssd1306/resources/DemoFrame4.jpg
deleted file mode 100644
index 99cbe1bc41ce7fe01700f5cd00bf04da68f9602a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25325
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
EUrx=8H~;_u

diff --git a/libraries/oled-ssd1306/resources/SPI_version.jpg b/libraries/oled-ssd1306/resources/SPI_version.jpg
deleted file mode 100644
index 115c9f3bccef1177204c88ef8b8cb8f22daa9e7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26912
zcmeFXXH*nj^Do*1NDw6FETBl193&Y?A|N0+j3i;mISGt{pk&EP6af(hM#&k;nUO4U
zfFTG7%z(fM1KjpW@Bf~4KHT?yxNF^Yp54>a)wOGfs@~yO)qVc$d=a3&tFEOEKp+r6
z6Fh+PC8lh(K-ePy(9r<|0RSKcC;=|u0!Tr?n|25lKmgLjAl(n4{(~k1>8}u4fbb6)
zFb5+3kIW22;t!f0lvyO8`%4C_={XD_`m4^LFRuJeGhQo{_@gZ_kLg~a7~cKy+O~Li{D+-<><|WZTbZ!#lPZBAqzuE#dNhbS?2BA*!#eZZ*lj;B9gP4hSCOPDHTZHN$
zy_}r%M;{2qL7kJ6|3km|yU*g+ufKu(RVRp`-Vpqa!zjMIA^e*rd-;~>FBwqxfo6qg`AKZ4){Xe*k+&kE%2`e{H3oL_zsiAcFag@tnZ>ZZPL>ncqn6
zZ@LMLi2Y4Bg3^D}5HJ>X5iASF#t210?q7Te9T-*nTL$dWKlJaI7+~w^3iI*3eqE1-
z0MG^Q0k;5szyL4@OaTzZg559%x`1!M6mSF#0y^NK0XzWnT>)<(1n>cz!7_$GFMtAY
z01~9k0TVzOFai<*UqA`C21o(Y057Q2Hn0KA0v3Qh@DPvzB!C>CAC$TWo@Kx|kOt;n
zfE)uIkTF0WETsZ;0z+UKE`SpV1P*~*@WcS8z!N|jatERc2mmX<87RXIN(ce3foSmV
z2s|hu;eZIh1h4>a05re{I08jrJ{Ry9xCEhv5JM6m7LZ6V_ZnFHEZDC~@Lv$%0D=KB
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
Vmt>cr&zI7iF#5{vw(shH|JlZ6us8q!

diff --git a/libraries/oled-ssd1306/resources/xbmPreview.png b/libraries/oled-ssd1306/resources/xbmPreview.png
deleted file mode 100644
index 70ea3a53a843f220f18d2ef7cc0698516a990ba6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41692
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

diff --git a/platformio.ini b/platformio.ini
index ab9852874..adab704d9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,12 +9,22 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-src_dir     = esp3d
-build_dir   = .pioenvs
-lib_dir     = libraries
-libdeps_dir = .piolibdeps
+boards_dir = boards
+src_dir = esp3d
 data_dir = esp3d/data
-default_envs = esp8266
+default_envs = esp8266_mod
+
+
+[common]
+lib_deps               =
+  links2004/WebSockets@2.1.0
+  me-no-dev/AsyncTCP@1.0.3
+  DHT sensor library for ESPx=https://github.com/beegee-tokyo/DHTesp/archive/refs/tags/1.0.6.zip
+  me-no-dev/ESPAsyncTCP@1.1.2
+  me-no-dev/ESP Async WebServer@1.2.0
+  ESP8266 and ESP32 OLED driver for SSD1306 displays=https://github.com/ThingPulse/esp8266-oled-ssd1306/archive/refs/tags/3.2.7.zip
+  ESP32SSPD=https://github.com/luc-github/ESP32SSDP/archive/refs/tags/1.1.0.zip
+
 
 [env:esp32dev]
 platform = espressif32@3.0.0
@@ -39,7 +49,7 @@ lib_ignore =
 [env:esp8266]
 ;esp8266 core 2.5.2
 platform = espressif8266@2.2.0
-platform_packages      = toolchain-xtensa@2.40802.200502
+platform_packages = toolchain-xtensa@2.40802.200502
 board = esp12e
 framework = arduino
 monitor_speed = 115200
@@ -63,6 +73,37 @@ lib_ignore =
     ESP32NetBIOS
     ESP32SSDP
 
+[env:esp8266_mod]
+; ESP-01 unit with MOD: Flash W25Q64 (8M)
+platform  = platformio/espressif8266@2.6.2
+;platform_packages =
+;  platformio/toolchain-xtensa@2.40802.200502
+;  platformio/framework-arduinoespressif8266@3.20704.0
+board = sl1esp8266_w25q64
+framework = arduino
+monitor_speed  = 115200
+monitor_echo  = yes
+monitor_filters  = send_on_enter, colorize, esp8266_exception_decoder
+; set frequency to 160MHz
+board_build.f_cpu = 160000000L
+board_build.f_flash = 40000000L
+board_build.flash_mode = dout
+board_build.ldscript = eagle.flash.8m6m.ld
+board_upload.maximum_size = 8388608
+upload_resetmethod = ck
+build_flags =
+  -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+  -DNONOSDK221=1
+  -DNDEBUG
+  -DVTABLES_IN_FLASH
+upload_speed = 115200
+lib_deps = ${common.lib_deps}
+lib_ignore =
+  AsyncTCP
+  ESP32NetBIOS
+  ESP32SSPD
+  ESP8266 and ESP32 OLED driver for SSD1306 displays
+
 ;https://github.com/platformio/platform-espressif8266/releases
 [env:esp01s_160mhz_2_7_4]
 platform = espressif8266@2.6.2
@@ -82,6 +123,7 @@ build_flags =
     -DNDEBUG
     -DVTABLES_IN_FLASH
 upload_speed = 115200
+lib_deps = ${common.lib_deps}
 lib_ignore =
     AsyncTCP
     ESP32NetBIOS
@@ -106,6 +148,7 @@ build_flags =
     -DNDEBUG
     -DVTABLES_IN_FLASH
 upload_speed = 115200
+lib_deps = ${common.lib_deps}
 lib_ignore =
     AsyncTCP
     ESP32NetBIOS