add mqtt example

Author: tve

espduino/examples/mqtt/Makefile

@@ -0,0 +1,9 @@
+HOST ?= esp-link
+LIBRARYPATH = $(ARDUINODIR)/libraries ../../..
+LIBRARIES = espduino
+CPPFLAGS = 
+SERIALDEV = net:$(HOST):2323
+include ../arduino.mk
+
+run: upload size
+	nc $(HOST) 23

espduino/examples/mqtt/mqtt.ino

@@ -4,12 +4,12 @@
  * \author
  *       Tuan PM <[email protected]>
  */
-#include <SoftwareSerial.h>
+//#include <SoftwareSerial.h>
 #include <espduino.h>
 #include <mqtt.h>
 
-SoftwareSerial debugPort(2, 3); // RX, TX
-ESP esp(&Serial, &debugPort, 4);
+//SoftwareSerial debugPort(2, 3); // RX, TX
+ESP esp(&Serial, &Serial, 4);
 MQTT mqtt(&esp);
 boolean wifiConnected = false;
 
@@ -21,7 +21,7 @@ void wifiCb(void* response)
   if(res.getArgc() == 1) {
     res.popArgs((uint8_t*)&status, 4);
     if(status == STATION_GOT_IP) {
-      debugPort.println("WIFI CONNECTED");
+      Serial.println("Wifi connected");
       mqtt.connect("yourserver.com", 1883, false);
       wifiConnected = true;
       //or mqtt.connect("host", 1883); /*without security ssl*/
@@ -35,7 +35,7 @@ void wifiCb(void* response)
 
 void mqttConnected(void* response)
 {
-  debugPort.println("Connected");
+  Serial.println("MQTT connected");
   mqtt.subscribe("/topic/0"); //or mqtt.subscribe("topic"); /*with qos = 0*/
   mqtt.subscribe("/topic/1");
   mqtt.subscribe("/topic/2");
@@ -50,36 +50,35 @@ void mqttData(void* response)
 {
   RESPONSE res(response);
 
-  debugPort.print("Received: topic=");
+  Serial.print("Received: topic=");
   String topic = res.popString();
-  debugPort.println(topic);
+  Serial.println(topic);
 
-  debugPort.print("data=");
+  Serial.print("data=");
   String data = res.popString();
-  debugPort.println(data);
+  Serial.println(data);
 
 }
 void mqttPublished(void* response)
 {
 
 }
 void setup() {
-  Serial.begin(19200);
-  debugPort.begin(19200);
+  Serial.begin(115200);
   esp.enable();
   delay(500);
   esp.reset();
   delay(500);
   while(!esp.ready());
 
-  debugPort.println("ARDUINO: setup mqtt client");
+  Serial.println("ARDUINO: setup mqtt client");
   if(!mqtt.begin("DVES_duino", "admin", "Isb_C4OGD4c3", 120, 1)) {
-    debugPort.println("ARDUINO: fail to setup mqtt");
+    Serial.println("ARDUINO: fail to setup mqtt");
     while(1);
   }
 
 
-  debugPort.println("ARDUINO: setup mqtt lwt");
+  Serial.println("ARDUINO: setup mqtt lwt");
   mqtt.lwt("/lwt", "offline", 0, 0); //or mqtt.lwt("/lwt", "offline");
 
 /*setup mqtt events */
@@ -89,18 +88,18 @@ void setup() {
   mqtt.dataCb.attach(&mqttData);
 
   /*setup wifi*/
-  debugPort.println("ARDUINO: setup wifi");
+  Serial.println("ARDUINO: setup wifi");
   esp.wifiCb.attach(&wifiCb);
 
   esp.wifiConnect("DVES_HOME","wifipassword");
 
 
-  debugPort.println("ARDUINO: system started");
+  Serial.println("ARDUINO: system started");
 }
 
 void loop() {
   esp.process();
   if(wifiConnected) {
 
   }
-}
+}

espduino/mqtt.h

@@ -23,7 +23,7 @@ class MQTT {
   FP<void, void*> publishedCb;
   FP<void, void*> dataCb;
 
-  
+
   MQTT(ESP *esp);
   boolean begin(const char* client_id, const char* user, const char* pass, uint16_t keep_alive, boolean clean_seasion);
   boolean lwt(const char* topic, const char* message, uint8_t qos, uint8_t retain);
@@ -38,4 +38,4 @@ class MQTT {
   void publish(const char* topic, char* data);
 
 };
-#endif
+#endif

espduino/rest.cpp

@@ -23,7 +23,7 @@ boolean REST::begin(const char* host, uint16_t port, boolean security)
   if(security)
     sec = 1;
   restCb.attach(this, &REST::restCallback);
-  
+
   uint16_t crc = esp->request(CMD_REST_SETUP, (uint32_t)&restCb, 1, 3);
   crc = esp->request(crc,(uint8_t*)host, strlen(host));
   crc = esp->request(crc,(uint8_t*)&port, 2);
@@ -45,6 +45,8 @@ void REST::request(const char* path, const char* method, const char* data, int l
 {
   if(remote_instance == 0)
     return;
+  //Serial.print("REST ri=");
+  //Serial.println(remote_instance, 16);
   uint16_t crc;
   if(len > 0)
     crc = esp->request(CMD_REST_REQUEST, 0, 0, 5);
@@ -57,7 +59,7 @@ void REST::request(const char* path, const char* method, const char* data, int l
     crc = esp->request(crc,(uint8_t*)&len, 2);
     crc = esp->request(crc,(uint8_t*)data, len);
   }
-    
+
   esp->request(crc);
 }
 void REST::request(const char* path, const char* method, const char* data)
@@ -131,7 +133,7 @@ uint16_t REST::getResponse(char* data, uint16_t maxLen)
     data[len < maxLen ? len : maxLen-1] = 0;
     return esp->return_value;
   }
-    
-  
+
+
   return 0;
 }