Arduino MKR1000 SSL with SSL connection now supported.

alvarolb · alvarolb · commit 666916735a35 · 2016-09-05T23:04:05.000+02:00
Updated License.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Please, refer to the following page for a full documentation of the Arduino Clie
 
 The class is licensed under the [MIT License](http://opensource.org/licenses/MIT):
 
-Copyright &copy; 2015 [THINGER LTD](http://thinger.io)
+Copyright &copy; 2016 [THINK BIG LABS SL](http://thinger.io)
 
 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:
 
diff --git a/examples/ArduinoMKR1000/ArduinoMKR1000.ino b/examples/ArduinoMKR1000/ArduinoMKR1000.ino
@@ -1,5 +1,5 @@
 #include <WiFi101.h>
-#include <ThingerWifi.h>
+#include <ThingerWifi101.h>
 
 #define USERNAME "your_user_name"
 #define DEVICE_ID "your_device_id"
@@ -9,7 +9,7 @@
 #define SSID_PASSWORD "your_wifi_ssid_password"
 #define LED_PIN 6
 
-ThingerWifi thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
+ThingerWifi101 thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
 
 void setup() {
   // configure wifi network
diff --git a/library.properties b/library.properties
@@ -1,8 +1,8 @@
 name=thinger.io
-version=2.4.0
+version=2.4.1
 author=Alvaro Luis Bustamante <alvarolb@gmail.com>
 maintainer=Thinger.io <admin@thinger.io>
-sentence=Arduino library for the thinger.io IoT platform.
+sentence=Arduino library for the Thinger.io Internet of Things Platform.
 paragraph=Thinger.io is an open source platform for the Internet of Things. It will allow connecting your things or devices for remote sensing and actuating. Working with several devices like ESP8266, Arduino Ethernet, Arduino Wifi, Arduino MKR1000, Arduino Yun, Adafruit CC3000, Texas Instruments CC3200, ENC28J60, LinkIt ONE.
 category=Communication
 url=https://github.com/thinger-io/Arduino-Library
diff --git a/src/ThingerCC3000.h b/src/ThingerCC3000.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerClient.h b/src/ThingerClient.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -34,6 +34,7 @@ memory_allocator& protoson::pool = alloc;
 
 #define THINGER_SERVER "iot.thinger.io"
 #define THINGER_PORT 25200
+#define THINGER_SSL_PORT 25202
 #define RECONNECTION_TIMEOUT 5000 // milliseconds
 
 #ifdef _DEBUG_
@@ -127,6 +128,10 @@ class ThingerClient : public thinger::thinger {
         return true;
     }
 
+    virtual bool connect_socket(){
+        return client_.connect(THINGER_SERVER, THINGER_PORT);
+    }
+
     enum THINGER_STATE{
         NETWORK_CONNECTING,
         NETWORK_CONNECTED,
@@ -216,7 +221,7 @@ class ThingerClient : public thinger::thinger {
         bool connected = false;
         client_.stop(); // cleanup previous socket
         thinger_state_listener(SOCKET_CONNECTING);
-        if (client_.connect(THINGER_SERVER, THINGER_PORT)) {
+        if (connect_socket()) {
             thinger_state_listener(SOCKET_CONNECTED);
             thinger_state_listener(THINGER_AUTHENTICATING);
             connected = thinger::thinger::connect(username_, device_id_, device_password_);
diff --git a/src/ThingerENC28J60.h b/src/ThingerENC28J60.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerEthernet.h b/src/ThingerEthernet.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerGSM.h b/src/ThingerGSM.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerLinkItOneGPRS.h b/src/ThingerLinkItOneGPRS.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerLinkItOneWifi.h b/src/ThingerLinkItOneWifi.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerSmartConfig.h b/src/ThingerSmartConfig.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerWebConfig.h b/src/ThingerWebConfig.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/ThingerWifi.h b/src/ThingerWifi.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -62,7 +62,7 @@ class ThingerWifi : public ThingerClient {
             yield();
             #endif
         }
-        THINGER_DEBUG_VALUE("NETWORK", "Got IP Address: ", wifi_ssid_);
+        THINGER_DEBUG_VALUE("NETWORK", "Got IP Address: ", WiFi.localIP());
         return true;
     }
 
@@ -74,7 +74,7 @@ class ThingerWifi : public ThingerClient {
         wifi_password_ = password;
     }
 
-private:
+protected:
 
     WiFiClient client_;
     const char* wifi_ssid_;
diff --git a/src/ThingerWifi101.h b/src/ThingerWifi101.h
@@ -0,0 +1,54 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2016 THINK BIG LABS SL
+// Author: alvarolb@gmail.com (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_WIFI101_H
+#define THINGER_WIFI101_H
+
+#include "ThingerWifi.h"
+
+class ThingerWifi101 : public ThingerWifi {
+
+public:
+    ThingerWifi101(const char* user, const char* device, const char* device_credential, bool ssl = true) :
+            ThingerWifi(user, device, device_credential), ssl_(ssl)
+    {}
+
+    ~ThingerWifi101(){
+
+    }
+
+protected:
+
+    virtual bool connect_socket(){
+        if(ssl_){
+            return client_.connectSSL(THINGER_SERVER, THINGER_SSL_PORT);
+        }else{
+            return client_.connect(THINGER_SERVER, THINGER_PORT);
+        }
+    }
+
+private:
+    bool ssl_;
+};
+
+#endif
diff --git a/src/ThingerYun.h b/src/ThingerYun.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/pson.h b/src/thinger/pson.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger.h b/src/thinger/thinger.h
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_decoder.hpp b/src/thinger/thinger_decoder.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_encoder.hpp b/src/thinger/thinger_encoder.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_io.hpp b/src/thinger/thinger_io.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_map.hpp b/src/thinger/thinger_map.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_message.hpp b/src/thinger/thinger_message.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/thinger/thinger_resource.hpp b/src/thinger/thinger_resource.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016 THINGER LTD
+// Copyright (c) 2016 THINK BIG LABS SL
 // Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
