add shortcuts from AntoHTTP and AntoMQTT to AntoIO

AntoIOT · Apr 14, 2017 · 2d2dcbb · 2d2dcbb
1 parent 8bd02e5
commit 2d2dcbb
Show file tree

Hide file tree

Showing 12 changed files with 286 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.7.2 (2017-04-15)
+* add shortcuts from AntoHTTP and AntoMQTT to AntoIO
 ## 0.7.1 (2017-04-10)
 * add reconnect procedure inside `AntoMQTT::loop()`
 ## 0.7.0 (2017-04-10)

diff --git a/README.md b/README.md
@@ -7,3 +7,4 @@
 - Upload this library to Arduino repository
 - Request via HTTPS
 - Increase speed of keep-alive message
+- Timer interrupt and remove `AntoMQTT::loop()`
diff --git a/examples/AntoSimple/AntoSimple.ino b/examples/AntoSimple/AntoSimple.ino
@@ -0,0 +1,39 @@
+/*
+ * This example is meant to be used for beginner
+ *
+ * 2017/04/14
+ * by Anto.io team
+ *
+ */
+
+#include <AntoIO.h>
+
+const char *ssid = "your access point SSID";
+const char *pass = "access point password";
+const char *user = "your username";
+const char *token = "your token";
+const char *thing = "your thing";
+
+AntoIO anto(user, token, thing);
+
+void setup() {
+  Serial.begin(9600);
+  anto.begin(ssid, pass, messageReceived);
+  anto.sub("channel");
+}
+
+void loop() {
+  anto.loop();
+  anto.pub("other channel", 1);
+
+  delay(3000);
+}
+
+void messageReceived(String thing, String channel, String payload) {
+  Serial.print("Recieved: ");
+  Serial.print(thing);
+  Serial.print("/");
+  Serial.print(channel);
+  Serial.print("-> ");
+  Serial.println(payload);
+}
diff --git a/examples/BasicMQTT/BasicMQTT.ino b/examples/BasicMQTT/BasicMQTT.ino
@@ -15,9 +15,8 @@ const char *user = "your username";
 const char *token = "your token";
 const char *thing = "your thing";
 
-// initialize AntoIO instance
 AntoIO anto(user, token, thing);
-// for counting how many loop has passed
+
 uint8_t loopCount = 0;
 
 void setup() {
@@ -50,30 +49,20 @@ void setup() {
 
 void loop() {
   anto.mqtt.loop();
-  // this delay(10) is for proper functionality
-  delay(10);
 
   ++loopCount;
 
-  // if this NodeMCU is connected to Anto broker
-  // then publish 'value' to 'other_channel'
-  if (anto.mqtt.isConnected()) {
-    // if 'loopCount' is even number, update 'other_channel' channel to 'other_value'
-    // otherwise, update it to 'value'
-    anto.mqtt.pub("other_channel", (loopCount % 2 ? "value" : "other_value"));
-  } else {
-    Serial.println("Disconnected");
-  }
+  anto.mqtt.pub("other_channel", (loopCount % 2 ? "value" : "other_value"));
 
   delay(3000);
 }
 
 // a callback function for arriving data.
-void messageReceived(String topic, String payload, char * bytes, unsigned int length)
-{
-  Serial.print("incoming: ");
-  Serial.print(topic);
-  Serial.print(" - ");
-  Serial.print(payload);
-  Serial.println();
+void messageReceived(String thing, String channel, String payload) {
+  Serial.print("Recieved: ");
+  Serial.print(thing);
+  Serial.print("/");
+  Serial.print(channel);
+  Serial.print("-> ");
+  Serial.println(payload);
 }
diff --git a/examples/Quick_start_anto/Quick_start_anto.ino b/examples/Quick_start_anto/Quick_start_anto.ino
@@ -39,7 +39,7 @@ void setup() {
   while (!anto.wifi.begin(ssid, pass));
   Serial.println("\nConnected, trying to connect to broker...");
 
-  while (!anto.mqtt.connect(user, token, true));
+  while (!anto.mqtt.connect());
   Serial.println("\nConnected");
 
   //port output
@@ -55,55 +55,46 @@ void setup() {
 
 void loop() {
   anto.mqtt.loop();
-  // this delay(10) is for proper functionality
-  delay(10);
-
-  if (!anto.mqtt.isConnected())
-    Serial.println("Disconnected");
 }
 
 
 // a callback function for arriving data.
-void messageReceived(String topic, String payload, char * bytes, unsigned int length)
-{
-    uint8_t index = topic.indexOf('/');
-
-    index = topic.indexOf('/', index + 1);
-    index = topic.indexOf('/', index + 1);
-
-    topic.remove(0, index + 1);
+void messageReceived(String thing, String channel, String payload) {
 
-    Serial.print(topic);
-    Serial.print(": ");
+    Serial.print("Recieved: ");
+    Serial.print(thing);
+    Serial.print("/");
+    Serial.print(channel);
+    Serial.print("-> ");
     Serial.println(payload);
 
-    if(topic.equals("LED1")){
-      value = payload.toInt();
-      if(value == 1){
-        digitalWrite(D1,HIGH);
-      }
-      else{
-        digitalWrite(D1,LOW);
-      }
+    if(channel.equals("LED1")){
+        value = payload.toInt();
+        if(value == 1){
+            digitalWrite(D1,HIGH);
+        }
+        else{
+            digitalWrite(D1,LOW);
+        }
 
     }
-    else if(topic.equals("LED2")){
-     value = payload.toInt();
-     if(value == 1){
-        digitalWrite(D2,HIGH);
-      }
-      else{
-        digitalWrite(D2,LOW);
-      }
+    else if(channel.equals("LED2")){
+        value = payload.toInt();
+        if(value == 1){
+            digitalWrite(D2,HIGH);
+        }
+        else{
+            digitalWrite(D2,LOW);
+        }
     }
-    else if(topic.equals("LED3")){
-      value = payload.toInt();
-      if(value == 1){
-        digitalWrite(D3,HIGH);
-      }
-      else{
-        digitalWrite(D3,LOW);
-      }
+    else if(channel.equals("LED3")){
+        value = payload.toInt();
+        if(value == 1){
+            digitalWrite(D3,HIGH);
+        }
+        else{
+            digitalWrite(D3,LOW);
+        }
     }
 }
 
diff --git a/examples/Quick_start_anto_dht11/Quick_start_anto_dht11.ino b/examples/Quick_start_anto_dht11/Quick_start_anto_dht11.ino
@@ -41,7 +41,7 @@ void setup() {
   Serial.println();
   Serial.println("WiFi connected, trying to connect to broker...");
 
-  while (!anto.mqtt.connect(user, token, true));
+  while (!anto.mqtt.connect());
   Serial.println("\nConnected");
 
   //dht start
@@ -51,8 +51,6 @@ void setup() {
 
 void loop() {
   anto.mqtt.loop();
-  // this delay(10) is for proper functionality
-  delay(10);
 
   if (!anto.mqtt.isConnected())
     Serial.println("Disconnected");
@@ -78,18 +76,12 @@ void loop() {
 }
 
 // a callback function for arriving data.
-void messageReceived(String topic, String payload, char * bytes, unsigned int length)
-{
-    uint8_t index = topic.indexOf('/');
-
-    index = topic.indexOf('/', index + 1);
-    index = topic.indexOf('/', index + 1);
-
-    topic.remove(0, index + 1);
-
-    Serial.print(topic);
-    Serial.print(": ");
-    Serial.println(payload);
-
+void messageReceived(String thing, String channel, String payload) {
+  Serial.print("Recieved: ");
+  Serial.print(thing);
+  Serial.print("/");
+  Serial.print(channel);
+  Serial.print("-> ");
+  Serial.println(payload);
 }
 
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=anto-esp8266-arduino
-version=0.7.1
+version=0.7.2
 author=Anto.io developers <support@anto.io>
 maintainer=Anto.io developers <support@anto.io>
 sentence=Enables ESP8266 to connect to Anto.io IoT platform.

diff --git a/src/AntoCommon.h b/src/AntoCommon.h
@@ -1,6 +1,6 @@
 #ifndef ANTO_COMMON_H
 #define ANTO_COMMON_H
 
-#define ANTO_VER    "v0.7.1"
+#define ANTO_VER    "v0.7.2"
 
 #endif /* ifndef ANTO_COMMON_H */
diff --git a/src/AntoHTTP.h b/src/AntoHTTP.h
@@ -8,7 +8,7 @@ class AntoHTTP
     public:
         AntoHTTP(const char *token, const char *thing):
             _token(token), _thing(thing)
-    { 
+    {
         _host = (char *) malloc(sizeof("api.anto.io"));
         strcpy(_host, "api.anto.io");
     }

diff --git a/src/AntoIO.cpp b/src/AntoIO.cpp
@@ -33,5 +33,10 @@ void AntoIO::begin(
     Serial.println("Broker Connected");
 
     printArtWork();
+
+    Serial.print("Anto library version: ");
+    Serial.println(this->getVersion());
+    Serial.println();
+
     this->mqtt.onData(onData);
 }