on/off callbacks added

igorantolic · Nov 24, 2016 · 42e5931 · 42e5931
1 parent cb7d9dc
commit 42e5931
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 8 deletions.
diff --git a/wemos/CallbackFunction.h b/wemos/CallbackFunction.h
@@ -0,0 +1,8 @@
+#ifndef CALLBACKFUNCTION_H
+#define CALLBACKFUNCTION_H
+
+#include <Arduino.h>
+
+typedef void (*CallbackFunction) ();
+
+#endif
diff --git a/wemos/Switch.cpp b/wemos/Switch.cpp
@@ -1,11 +1,12 @@
 #include "Switch.h"
-
+#include "CallbackFunction.h"
 
 //<<constructor>>
 Switch::Switch(){
 
 }
-Switch::Switch(String alexaInvokeName,unsigned int port){
+//Switch::Switch(String alexaInvokeName,unsigned int port){
+Switch::Switch(String alexaInvokeName, unsigned int port, CallbackFunction oncb, CallbackFunction offcb){
     uint32_t chipId = ESP.getChipId();
     char uuid[64];
     sprintf_P(uuid, PSTR("38323636-4558-4dda-9188-cda0e6%02x%02x%02x"),
@@ -17,7 +18,9 @@ Switch::Switch(String alexaInvokeName,unsigned int port){
     persistent_uuid = "Socket-1_0-" + serial +"-"+ String(localPort);
     device_name = alexaInvokeName;
     localPort = port;
-
+    onCallback = oncb;
+    offCallback = offcb;
+
     startWebServer();
 }
 
@@ -94,10 +97,12 @@ void Switch::handleUpnpControl(){
 
   if(request.indexOf("<BinaryState>1</BinaryState>") > 0) {
       Serial.println("Got Turn on request");
+      onCallback();
   }
 
   if(request.indexOf("<BinaryState>0</BinaryState>") > 0) {
       Serial.println("Got Turn off request");
+      offCallback();
   }
 
   server->send(200, "text/plain", "");

diff --git a/wemos/Switch.h b/wemos/Switch.h
@@ -5,13 +5,17 @@
 #include <ESP8266WiFi.h>
 #include <ESP8266WebServer.h>
 #include <WiFiUDP.h>
+#include "CallbackFunction.h"
+
 
 class Switch {
 private:
         String serial;
         String persistent_uuid;
         String device_name;
         unsigned int localPort;
+        CallbackFunction onCallback;
+        CallbackFunction offCallback;
         ESP8266WebServer *server = NULL;
         WiFiUDP UDP;                
         void startWebServer();
@@ -21,7 +25,7 @@ class Switch {
         void handleSetupXml();
 public:
         Switch();
-        Switch(String alexaInvokeName, unsigned int port);
+        Switch(String alexaInvokeName, unsigned int port, CallbackFunction onCallback, CallbackFunction offCallback);
         ~Switch();
         void respondToSearch(IPAddress& senderIP, unsigned int senderPort);
 };

diff --git a/wemos/wemos.ino b/wemos/wemos.ino
@@ -4,8 +4,14 @@
 #include <functional>
 #include "switch.h"
 #include "UpnpBroadcastResponder.h"
+#include "CallbackFunction.h"
 
+// prototypes
 boolean connectWifi();
+void s1On();
+void s1Off();
+void s2On();
+void s2Off();
 
 const char* ssid = "Aruna";
 const char* password = "********";
@@ -15,13 +21,13 @@ boolean wifiConnected = false;
 UpnpBroadcastResponder upnpBroadcastResponder;
 
 // Define all switches here. Max 14
-// Format: Alexa invocation name, local port no.
-Switch s1("office lights", 1501);
-Switch s2("kitchen lights", 1502);
+// Format: Alexa invocation name, local port no, on callback, off callback
+Switch s1("office lights", 1501, s1On, s1Off);
+Switch s2("kitchen lights", 1502, s2On, s2Off);
 
 void setup()
 {
-   Serial.begin(115200);
+  Serial.begin(115200);
 
   // Initialise wifi connection
   wifiConnected = connectWifi();
@@ -42,6 +48,22 @@ void loop()
 	 }
 }
 
+void s1On() {
+    // Switch 1 turn on
+}
+
+void s1Off() {
+  // Switch 1 turn off
+}
+
+
+void s2On() {
+    // Switch 2 turn on
+}
+
+void s2Off() {
+  // Switch 2 turn off
+}
 
 // connect to wifi – returns true if successful or false if not
 boolean connectWifi(){