Make ESPAlexa work again

TheNitek · May 18, 2020 · b849cff · b849cff
1 parent 51a5c64
commit b849cff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/RfidShelf/ShelfHtml.cpp b/RfidShelf/ShelfHtml.cpp
@@ -2,7 +2,7 @@
 #include "ShelfHtml.h"
 
 const char ShelfHtml::INDEX[] PROGMEM = {
-	0x1f, 0x8b, 0x08, 0x00, 0x56, 0x92, 0x94, 0x5e, 0x02, 0xff, 0xc5, 0x3c,
+	0x1f, 0x8b, 0x08, 0x00, 0x6f, 0x89, 0xc2, 0x5e, 0x02, 0xff, 0xc5, 0x3c,
 	0x69, 0x77, 0xdb, 0xb6, 0x96, 0xdf, 0xe7, 0x9c, 0xf9, 0x0f, 0x08, 0xdb,
 	0x3e, 0xc9, 0xcf, 0x12, 0x25, 0x79, 0x4b, 0x2c, 0xcb, 0xea, 0xd8, 0x8e,
 	0x9d, 0xa5, 0xf1, 0x12, 0xcb, 0x71, 0xdb, 0xd7, 0x76, 0x7a, 0x28, 0x12,

diff --git a/RfidShelf/ShelfWeb.cpp b/RfidShelf/ShelfWeb.cpp
@@ -9,7 +9,8 @@ void ShelfWeb::begin() {
     std::bind(&ShelfWeb::_handleFileUpload, this)
   );
   _server.onNotFound(defaultCallback);
-  _server.begin();
+  // Done by espalexa
+  //_server.begin();
 
   DeviceCallbackFunction deviceCallback = std::bind(&ShelfWeb::_deviceCallback, this, std::placeholders::_1);
   _alexaDevice = new EspalexaDevice(ShelfConfig::config.hostname, deviceCallback, EspalexaDeviceType::dimmable, 50);
@@ -357,7 +358,7 @@ void ShelfWeb::_handleFileUpload() {
 void ShelfWeb::_handleDefault() {
   String path = _server.urlDecode(_server.uri());
   Sprintf("Request to: %s\n", path.c_str());
-  if (espalexa.handleAlexaApiCall(_server.uri(), _server.arg(0))) {
+  if (espalexa.handleAlexaApiCall(_server.uri(), _server.arg("plain"))) {
     return;
   }
   if (_server.method() == HTTP_GET) {

diff --git a/RfidShelf/build/latest.bin b/RfidShelf/build/latest.bin
diff --git a/RfidShelf/platformio.ini b/RfidShelf/platformio.ini
@@ -12,7 +12,7 @@
 src_dir = .
 
 [env:nodemcuv2]
-platform = espressif8266@2.3.2
+platform = espressif8266
 board = nodemcuv2
 framework = arduino
 ; using my fork of Adafruit_VS1053 to allow long file names
@@ -29,9 +29,10 @@ lib_deps =
   MFRC522@1.4.6
   SPI
   WifiManager@0.15.0
-  TheNitek/Espalexa
+  Espalexa
 extra_scripts = platformio_script.py
 monitor_speed = 115200
 upload_speed = 921600
-build_flags = -Os -Wall -Wl,-Teagle.flash.4m1m.ld
+build_flags = -Os -Wall
+board_build.ldscript = eagle.flash.4m1m.ld
 board_build.f_cpu = 160000000L