Merge pull request #12 from bcmi-labs/improvements

[CM-177] Change library name and bearSSL includes

Author: mattiabertorello

examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino

@@ -1,5 +1,5 @@
 #include <WiFi101.h> // change to WiFiNINA.h if you are using the MKR WiFi 1010 or MKR Vidor 4000
-#include <ArduinoCloudV2.h>
+#include <ArduinoIoTCloud.h>
 #include "arduino_secrets.h"
 
 #define TIMEOUT 7000

examples/utility/Provisioning/Provisioning.ino

@@ -1,8 +1,8 @@
-#include <ArduinoCloudV2.h>
+#include <ArduinoIoTCloud.h>
 #include <utility/ECCX08Cert.h>
 #include <utility/ECCX08TLSConfig.h>
 
-#include <ArduinoBearSSL.h>
+#include <ArduinoIoTCloudBearSSL.h>
 #include <ArduinoECCX08.h>
 
 const bool DEBUG = true;

library.properties

@@ -1,10 +1,10 @@
-name=ArduinoCloudV2
+name=ArduinoIoTCloud
 version=0.0.0
 author=Arduino
 maintainer=Arduino <[email protected]>
-sentence=Arduino Cloud V2
+sentence=Arduino IoT Cloud
 paragraph=
 category=Communication
 url=
 architectures=samd
-includes=ArduinoCloudV2.h
+includes=ArduinoIoTCloud.h

src/ArduinoCloud.cpp renamed to src/ArduinoIoTCloud.cpp

@@ -3,7 +3,7 @@
 #include "utility/ECCX08Cert.h"
 #include "CloudSerial.h"
 
-#include "ArduinoCloudV2.h"
+#include "ArduinoIoTCloud.h"
 
 const static char server[] = "mqtts-sa.iot.oniudra.cc";
 
@@ -12,21 +12,21 @@ const static int compressedCertSlot                        = 10;
 const static int serialNumberAndAuthorityKeyIdentifierSlot = 11;
 const static int thingIdSlot                               = 12;
 
-ArduinoCloudClass::ArduinoCloudClass() :
+ArduinoIoTCloudClass::ArduinoIoTCloudClass() :
   _bearSslClient(NULL),
   // Size of the receive buffer
   _mqttClient(MQTT_BUFFER_SIZE)
 {
 }
 
-ArduinoCloudClass::~ArduinoCloudClass()
+ArduinoIoTCloudClass::~ArduinoIoTCloudClass()
 {
   if (_bearSslClient) {
     delete _bearSslClient;
   }
 }
 
-int ArduinoCloudClass::begin(Client& net)
+int ArduinoIoTCloudClass::begin(Client& net)
 {
   byte thingIdBytes[72];
 
@@ -68,7 +68,7 @@ int ArduinoCloudClass::begin(Client& net)
 }
 
 // private class method used to initialize mqttClient class member. (called in the begin class method)
-void ArduinoCloudClass::mqttClientBegin(Client& net)
+void ArduinoIoTCloudClass::mqttClientBegin(Client& net)
 {
   // MQTT topics definition
   _stdoutTopic = "/a/d/" + _id + "/s/o";
@@ -77,14 +77,14 @@ void ArduinoCloudClass::mqttClientBegin(Client& net)
   _dataTopicOut = "/a/d/" + _id + "/e/o";
 
   // use onMessage as callback for received mqtt messages
-  _mqttClient.onMessageAdvanced(ArduinoCloudClass::onMessage);
+  _mqttClient.onMessageAdvanced(ArduinoIoTCloudClass::onMessage);
   _mqttClient.begin(server, 8883, net);
 
   // Set MQTT connection options
   _mqttClient.setOptions(mqttOpt.keepAlive, mqttOpt.cleanSession, mqttOpt.timeout);
 }
 
-int ArduinoCloudClass::connect()
+int ArduinoIoTCloudClass::connect()
 {
   // Username: device id
   // Password: empty
@@ -97,18 +97,18 @@ int ArduinoCloudClass::connect()
   return 1;
 }
 
-bool ArduinoCloudClass::disconnect()
+bool ArduinoIoTCloudClass::disconnect()
 {
     return _mqttClient.disconnect();
 }
 
-void ArduinoCloudClass::poll()
+void ArduinoIoTCloudClass::poll()
 {
   // If user call poll() without parameters use the default ones
   poll(MAX_RETRIES, RECONNECTION_TIMEOUT);
 }
 
-bool ArduinoCloudClass::mqttReconnect(int maxRetries, int timeout)
+bool ArduinoIoTCloudClass::mqttReconnect(int maxRetries, int timeout)
 {
   // Counter for reconnection retries
   int retries = 0;
@@ -132,7 +132,7 @@ bool ArduinoCloudClass::mqttReconnect(int maxRetries, int timeout)
   return true;
 }
 
-void ArduinoCloudClass::poll(int reconnectionMaxRetries, int reconnectionTimeoutMs)
+void ArduinoIoTCloudClass::poll(int reconnectionMaxRetries, int reconnectionTimeoutMs)
 {
   // Method's argument controls
   int maxRetries = (reconnectionMaxRetries > 0) ? reconnectionMaxRetries : MAX_RETRIES;
@@ -152,39 +152,39 @@ void ArduinoCloudClass::poll(int reconnectionMaxRetries, int reconnectionTimeout
   }
 }
 
-void ArduinoCloudClass::reconnect(Client& net)
+void ArduinoIoTCloudClass::reconnect(Client& net)
 {
   // Initialize again the MQTTClient, otherwise it would not be able to receive messages through its callback
   mqttClientBegin(net);
   connect();
 }
 
-void ArduinoCloudClass::onGetTime(unsigned long(*callback)(void))
+void ArduinoIoTCloudClass::onGetTime(unsigned long(*callback)(void))
 {
   ArduinoBearSSL.onGetTime(callback);
 }
 
-int ArduinoCloudClass::connected()
+int ArduinoIoTCloudClass::connected()
 {
   return _mqttClient.connected();
 }
 
-int ArduinoCloudClass::writeProperties(const byte data[], int length)
+int ArduinoIoTCloudClass::writeProperties(const byte data[], int length)
 {
   return _mqttClient.publish(_dataTopicOut.c_str(), (const char*)data, length);
 }
 
-int ArduinoCloudClass::writeStdout(const byte data[], int length)
+int ArduinoIoTCloudClass::writeStdout(const byte data[], int length)
 {
   return _mqttClient.publish(_stdoutTopic.c_str(), (const char*)data, length);
 }
 
-void ArduinoCloudClass::onMessage(MQTTClient* /*client*/, char topic[], char bytes[], int length)
+void ArduinoIoTCloudClass::onMessage(MQTTClient* /*client*/, char topic[], char bytes[], int length)
 {
   ArduinoCloud.handleMessage(topic, bytes, length);
 }
 
-void ArduinoCloudClass::handleMessage(char topic[], char bytes[], int length)
+void ArduinoIoTCloudClass::handleMessage(char topic[], char bytes[], int length)
 {
   if (_stdinTopic == topic) {
     CloudSerial.appendStdin((uint8_t*)bytes, length);
@@ -194,4 +194,4 @@ void ArduinoCloudClass::handleMessage(char topic[], char bytes[], int length)
   }
 }
 
-ArduinoCloudClass ArduinoCloud;
+ArduinoIoTCloudClass ArduinoCloud;

src/ArduinoCloudV2.h renamed to src/ArduinoIoTCloud.h

@@ -1,8 +1,8 @@
-#ifndef ARDUINO_CLOUD_V2_H
-#define ARDUINO_CLOUD_V2_H
+#ifndef ARDUINO_IOT_CLOUD_H
+#define ARDUINO_IOT_CLOUD_H
 
 #include <MQTTClient.h>
-#include <ArduinoBearSSL.h>
+#include <ArduinoIoTCloudBearSSL.h>
 #include <ArduinoCloudThing.h>
 
 #include "CloudSerial.h"
@@ -14,11 +14,11 @@ typedef struct mqtt_opt{
   int timeout;
 } mqttConnectionOptions;
 
-class ArduinoCloudClass {
+class ArduinoIoTCloudClass {
 
 public:
-  ArduinoCloudClass();
-  ~ArduinoCloudClass();
+  ArduinoIoTCloudClass();
+  ~ArduinoIoTCloudClass();
 
   int begin(Client& net);
 
@@ -74,6 +74,6 @@ class ArduinoCloudClass {
   String _otaTopic;
 };
 
-extern ArduinoCloudClass ArduinoCloud;
+extern ArduinoIoTCloudClass ArduinoCloud;
 
 #endif

src/CloudSerial.cpp

@@ -1,5 +1,4 @@
-#include "ArduinoCloudV2.h"
-
+#include "ArduinoIoTCloud.h"
 #include "CloudSerial.h"
 
 CloudSerialClass::CloudSerialClass()

src/CloudSerial.h

@@ -2,13 +2,12 @@
 #define CLOUD_SERIAL_H
 
 #include <Arduino.h>
-
 #include <RingBuffer.h>
 
 #define CLOUD_SERIAL_TX_BUFFER_SIZE 64
 #define CLOUD_SERIAL_RX_BUFFER_SIZE 512
 
-class ArduinoCloudClass;
+class ArduinoIoTCloudClass;
 
 class CloudSerialClass : public Stream
 {
@@ -29,7 +28,7 @@ class CloudSerialClass : public Stream
   operator bool();
 
 protected:
-  friend class ArduinoCloudClass;
+  friend class ArduinoIoTCloudClass;
 
   void appendStdin(const uint8_t *buffer, size_t size);
 

src/utility/ECCX08Cert.cpp

@@ -1,4 +1,4 @@
-#include <ArduinoBearSSL.h>
+#include <ArduinoIoTCloudBearSSL.h>
 #include <bearssl/bearssl_hash.h>
 #include <ArduinoECCX08.h>