Initial Alexa support

Author: emelianov

WiFiSwitch.ino

@@ -9,7 +9,7 @@
 
 ADC_MODE(ADC_VCC);
 
-const char* VERSION = "0.7.12";
+const char* VERSION = "0.8.0";
 
 // Pin to activete WiFiManager configuration routine
 #define RESET_PIN D8
@@ -73,6 +73,7 @@ uint32_t wifiStart();
 #include "discovery.h"
 #include "update.h"
 #include "ping.h"
+#include "alexa.h"
 
 uint8_t waitWF;
 uint32_t wifiStart() {
@@ -201,6 +202,7 @@ void setup() {
   taskAddWithSemaphore(initWeb, &event.wifiConnected);  // Run initWeb() on Wi-Fi connection
   taskAddWithSemaphore(discovery, &event.wifiConnected);
   taskAddWithSemaphore(initUpdate, &event.wifiConnected);
+  taskAddWithSemaphore(initAlexa, &event.wifiConnected);
   //taskAdd(printTime);     //For debug
   taskAdd(checkKey);      // Key query
   taskAddWithSemaphore(keyPressed, &event.keyPressed);  // Run keyPressed() on keyPressed event

alexa.h

@@ -1,83 +1,58 @@
 #pragma once
-#include <fauxmoESP.h>
-
-fauxmoESP fauxmo;
-
-#define ID_CHAN_1           "channel one lamp"
-#define ID_CHAN_2           "channel two lamp"
-#define ID_CHAN_3           "channel three lamp"
-#define ID_CHAN_4           "channel four lamp"
-#define ID_CHAN_5           "channel five lamp"
-#define ID_CHAN_6           "channel six lamp"
-#define ID_CHAN_7           "channel seven lamp"
-#define ID_CHAN_8           "channel eight lamp"
-
-
-uint32_t alexaInit() {
-    // By default, fauxmoESP creates it's own webserver on the defined port
-    // The TCP port must be 80 for gen3 devices (default is 1901)
-    // This has to be done before the call to enable()
-    fauxmo.createServer(true); // not needed, this is the default value
-    fauxmo.setPort(80); // This is required for gen3 devices
-
-    // You have to call enable(true) once you have a WiFi connection
-    // You can enable or disable the library at any moment
-    // Disabling it will prevent the devices from being discovered and switched
-    fauxmo.enable(true);
-
-    // You can use different ways to invoke alexa to modify the devices state:
-    // "Alexa, turn yellow lamp on"
-    // "Alexa, turn on yellow lamp
-    // "Alexa, set yellow lamp to fifty" (50 means 50% of brightness, note, this example does not use this functionality)
+#include <Espalexa.h>
+
+#define ID_CHAN_1           "channel one"
+#define ID_CHAN_2           "channel two"
+#define ID_CHAN_3           "channel three"
+#define ID_CHAN_4           "channel four"
+#define ID_CHAN_5           "channel five"
+#define ID_CHAN_6           "channel six"
+#define ID_CHAN_7           "channel seven"
+#define ID_CHAN_8           "channel eight"
+
+Espalexa espalexa;
+
+template <int I>
+void chChanged(uint8_t brightness) {
+    if (brightness == 255) {  // ON
+      WDEBUG("Alexa: ON CH%d\n", I);
+      socket[I]->manual = SON;
+    }
+    else if (brightness == 0) { // OFF
+      WDEBUG("Alexa: OFF CH%d\n", I);
+      socket[I]->manual = SOFF;
+    }
+    else {  // Value
+      WDEBUG("Alexa: DIM %d CH%d\n", brightness, I);
+    }
+}
 
-    // Add virtual devices
-    fauxmo.addDevice(ID_CHAN_1);
-    fauxmo.addDevice(ID_CHAN_2);
-    fauxmo.addDevice(ID_CHAN_3);
-    fauxmo.addDevice(ID_CHAN_4);
-    fauxmo.addDevice(ID_CHAN_5);
-    fauxmo.addDevice(ID_CHAN_6);
-    fauxmo.addDevice(ID_CHAN_7);
-    fauxmo.addDevice(ID_CHAN_8);
+uint32_t alexaLoop() {
+  espalexa.loop();
+  return 100;
+}
 
-    fauxmo.onSetState([](unsigned char device_id, const char * device_name, bool state, unsigned char value) {
-        
-        // Callback when a command from Alexa is received. 
-        // You can use device_id or device_name to choose the element to perform an action onto (relay, LED,...)
-        // State is a boolean (ON/OFF) and value a number from 0 to 255 (if you say "set kitchen light to 50%" you will receive a 128 here).
-        // Just remember not to delay too much here, this is a callback, exit as soon as possible.
-        // If you have to do something more involved here set a flag and process it in your main loop.
-        
-        Serial.printf("[MAIN] Device #%d (%s) state: %s value: %d\n", device_id, device_name, state ? "ON" : "OFF", value);
-/*
-        // Checking for device_id is simpler if you are certain about the order they are loaded and it does not change.
-        // Otherwise comparing the device_name is safer.
+void anyFile(); //From web.h
 
-        if (strcmp(device_name, ID_YELLOW)==0) {
-            digitalWrite(LED_YELLOW, state ? HIGH : LOW);
-        } else if (strcmp(device_name, ID_GREEN)==0) {
-            digitalWrite(LED_GREEN, state ? HIGH : LOW);
-        } else if (strcmp(device_name, ID_BLUE)==0) {
-            digitalWrite(LED_BLUE, state ? HIGH : LOW);
-        } else if (strcmp(device_name, ID_PINK)==0) {
-            digitalWrite(LED_PINK, state ? HIGH : LOW);
-        } else if (strcmp(device_name, ID_WHITE)==0) {
-            digitalWrite(LED_WHITE, state ? HIGH : LOW);
-        }
-*/
+uint32_t initAlexa() {
+    server.onNotFound([](){
+      if (!espalexa.handleAlexaApiCall(server.uri(),server.arg(0))) {
+        //server.send(404, "text/plain", "Not found");
+        anyFile();
+      }
     });
+  // Add devices
+  espalexa.addDevice(ID_CHAN_1, chChanged<0>);
+  espalexa.addDevice(ID_CHAN_2, chChanged<1>);
+  espalexa.addDevice(ID_CHAN_3, chChanged<2>);
+  espalexa.addDevice(ID_CHAN_4, chChanged<3>);
+  espalexa.addDevice(ID_CHAN_5, chChanged<4>);
+  espalexa.addDevice(ID_CHAN_6, chChanged<5>);
+  espalexa.addDevice(ID_CHAN_7, chChanged<6>);
+  espalexa.addDevice(ID_CHAN_8, chChanged<7>);
+
+  espalexa.begin(&server);
+  
   taskAdd(alexaLoop);
   return RUN_DELETE;
 }
-
-uint32_t alexaLoop()() {
-  // fauxmoESP uses an async TCP server but a sync UDP server
-  // Therefore, we have to manually poll for UDP packets
-  fauxmo.handle();
-
-  // If your device state is changed by any other means (MQTT, physical button,...)
-  // you can instruct the library to report the new state to Alexa on next request:
-  // fauxmo.setState(ID_YELLOW, true, 255);
-  return 100;
-}
-

settings.h

@@ -11,7 +11,7 @@
 #ifdef ARDUINO_ESP8266_NODEMCU
  #define WFS_DEBUG
 //Debug settings
- #define WDEBUG(format, ...) Serial.printf_P(PSTR(format), ##__VA_ARGS__);
+ #define WDEBUG(format, ...) Serial.printf_P((format), ##__VA_ARGS__);
 
  #define SDA 4
  #define SCL 5

web.h

@@ -922,7 +922,7 @@ uint32_t initWeb() {
     server.on("/list", HTTP_GET, listFile);                   // List/Upload/Delete page
     server.on("/delete", HTTP_GET, handleDelete);             // Delete File
     server.on("/edit", HTTP_POST, handleFile, handleFileUpload);    // Upload file
-    server.onNotFound(anyFile);                               // call function anyFile() on any other requests
+    //server.onNotFound(anyFile);                               // call function anyFile() on any other requests => moved to alexa.h
     //server.on("/socket", HTTP_GET, handleOverride);
     server.on("/net", HTTP_POST, handleNetwork);
     server.on("/reboot", HTTP_GET, handleReboot);