Add support for LinkItOneGRPS.

Improved syntactic sugar for inputValue. Now it is not required to pass a callback if it is not necessary.

Author: alvarolb

examples/LinkItOneGPRS/LinkItOneGPRS.ino

@@ -0,0 +1,30 @@
+#include <LGPRS.h>
+#include <LGPRSClient.h>
+#include <ThingerLinkItOneGPRS.h>
+
+#define USERNAME "your_user_name"
+#define DEVICE_ID "your_device_id"
+#define DEVICE_CREDENTIAL "your_device_credential"
+
+ThingerLinkItOneGPRS thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
+
+void setup() {
+  // SIM unlock using a PIN is not supported by LinkItOne. Remove PIN from SIM before use.
+
+  // Set your GPRS APN if it is not provided automatically by your SIM
+  //thing.set_apn("orangeworld", "orange", "orange");
+
+  pinMode(2, OUTPUT);
+
+  // pin control example (i.e. turning on/off a light, a relay, etc)
+  thing["led"] << digitalPin(2);
+
+  // resource output example (i.e. reading a sensor value, a variable, etc)
+  thing["millis"] >> outputValue(millis());
+
+  // more details at http://docs.thinger.io/arduino/
+}
+
+void loop() {
+  thing.handle();
+}

examples/LinkItOne/LinkItOne.ino renamed to examples/LinkItOneWifi/LinkItOneWifi.ino

@@ -1,9 +1,9 @@
 #include <LTask.h>
 #include <LWiFi.h>
 #include <LWiFiClient.h>
-#include <ThingerLinkItOne.h>
+#include <ThingerLinkItOneWifi.h>
 
-ThingerLinkItOne thing("user_id", "device_id", "device_credential");
+ThingerLinkItOneWifi thing("user_id", "device_id", "device_credential");
 
 void setup() {
   thing.add_wifi("SSID", "SSID_Password");

library.properties

@@ -1,5 +1,5 @@
 name=thinger.io
-version=2.2.0
+version=2.3.0
 author=Alvaro Luis Bustamante <[email protected]>
 maintainer=Thinger.io <[email protected]>
 sentence=Arduino library for the thinger.io IoT platform.

src/ThingerClient.h

@@ -282,8 +282,13 @@ void analog_pin(protoson::pson& in, int pin){
 #define digitalPin(PIN) [](pson& in){ digital_pin(in, PIN);}
 #define invertedDigitalPin(PIN) [](pson& in){ inverted_digital_pin(in, PIN);}
 #define analogPin(PIN) [](pson& in){ analog_pin(in, PIN);}
-#define inputValue(value, callback) [](pson& in){ if(in.is_empty()){ in = value; } else{ value = in; callback; } }
 #define outputValue(value) [](pson& out){ out = value; }
 #define servo(servo) [](pson& in){ if(in.is_empty()) in = (int)servo.read(); else servo.write((int)in); }
-
+#define inputValue_1(value) [](pson& in){ if(in.is_empty()){ in = value; } else{ value = in; } }
+#define inputValue_2(value, callback) [](pson& in){ if(in.is_empty()){ in = value; } else{ value = in; callback; } }
+#define inputValue_X(x, value, callback, FUNC, ...)  FUNC
+#define inputValue(...) inputValue_X(,##__VA_ARGS__,\
+                                          inputValue_2(__VA_ARGS__),\
+                                          inputValue_1(__VA_ARGS__)\
+                                    )
 #endif

src/ThingerLinkItOneGPRS.h

@@ -0,0 +1,88 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2016 THINGER LTD
+// Author: [email protected] (Alvaro Luis Bustamante)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef THINGER_LINKITONE_H
+#define THINGER_LINKITONE_H
+
+#include "ThingerClient.h"
+
+class ThingerLinkItOneGPRS : public ThingerClient {
+
+public:
+    ThingerLinkItOneGPRS(const char* user, const char* device, const char* device_credential) :
+            ThingerClient(client_, user, device, device_credential), connected_(false),
+            apn_(NULL), user_(NULL), password_(NULL), pin_(NULL)
+    {}
+
+    ~ThingerLinkItOneGPRS(){
+    }
+
+protected:
+
+    virtual bool network_connected(){
+        return connected_;
+    }
+
+    virtual bool connect_network(){
+        long gprs_timeout = millis();
+        THINGER_DEBUG("NETWORK", "Connecting to GPRS...");
+        while(!attachGPRS())
+        {
+            if (millis() - gprs_timeout > 30000) return false;
+            delay(500);
+        }
+        connected_ = true;
+        THINGER_DEBUG("NETWORK", "Connected to GPRS!");
+        return connected_;
+    }
+
+public:
+    void set_apn(const char* apn, const char* user=NULL, const char* password=NULL){
+        apn_ = apn;
+        user_ = user;
+        password_ = password;
+    }
+
+    void set_pin(const char* pin){
+        pin_ = pin;
+    }
+
+private:
+    bool connected_;
+    LGPRSClient client_;
+    const char* apn_;
+    const char* user_;
+    const char* password_;
+    const char* pin_;
+
+    bool attachGPRS(){
+        if(apn_!=NULL){
+            return LGPRS.attachGPRS(apn_, user_, password_) == 1;
+        }
+        else{
+            return LGPRS.attachGPRS() == 1;
+        }
+    }
+};
+
+#endif

src/ThingerLinkItOne.h renamed to src/ThingerLinkItOneWifi.h

@@ -26,10 +26,10 @@
 
 #include "ThingerClient.h"
 
-class ThingerLinkItOne : public ThingerClient {
+class ThingerLinkItOneWifi : public ThingerClient {
 
 public:
-    ThingerLinkItOne(const char* user, const char* device, const char* device_credential) :
+    ThingerLinkItOneWifi(const char* user, const char* device, const char* device_credential) :
             ThingerClient(client_, user, device, device_credential)
     {}