Release 2.0.0

DatavenueLiveObjects · Nov 25, 2020 · f33a1ab · f33a1ab
1 parent 0cee386
commit f33a1ab
Show file tree

Hide file tree

Showing 24 changed files with 136 additions and 172 deletions.
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
@@ -15,13 +15,13 @@ jobs:
          "arduino:samd:mkrwifi1010",
          "arduino:samd:nano_33_iot",
          "arduino:samd:mkrvidor4000",
-         '"esp8266:esp8266:huzzah" "http://arduino.esp8266.com/stable/package_esp8266com_index.json"'
+         '"esp8266:esp8266:huzzah" "http://arduino.esp8266.com/stable/package_esp8266com_index.json"',
+         '"adafruit:samd:adafruit_feather_m0:usbstack=arduino,debug=off" "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"'
+         #'"adafruit:avr:feather32u4" "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json" ',
          #'"esp32:esp32:esp32doit-devkit-v1:FlashFreq=80,UploadSpeed=921600,DebugLevel=none" "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"'
        ]
 
    steps:
-     #- run: pip install pyserial
-     #- run: pip3 install pyserial
      - uses: actions/checkout@v1
        with:
          fetch-depth: 1

diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
@@ -0,0 +1,13 @@
+COMPONENT                               | VERSION          | LICENCE                    | URL
+-------------------------------------------------------------------------------------------------------------------------------------------------
+MKRNB                                   | Latest           | GNU LGPL 2.1               | https://github.com/arduino-libraries/MKRNB
+MKRGSM                                  | Latest           | GNU LGPL 2.1               | https://github.com/arduino-libraries/MKRGSM
+WiFiNINA                                | Latest           | GNU LGPL 2.1               | https://github.com/arduino-libraries/WiFiNINA
+WiFi101                                 | Latest           | GNU LGPL 2.1               | https://github.com/arduino-libraries/WiFi101
+ArduinoMQTTClient                       | 0.1.5 moddified  | GNU LGPL 2.1               | https://github.com/arduino-libraries/ArduinoMqttClient
+PubSubClient                            | Latest           | MIT License                | https://github.com/knolleary/pubsubclient/blob/master/LICENSE.txt
+ArduinoJSON                             | Latest           | MIT License                | https://github.com/bblanchon/ArduinoJson/blob/6.x/LICENSE.md
+Adafruit FONA                           | Latest           | BSD License                | https://github.com/adafruit/Adafruit_FONA
+Adafruit MQTT                           | 2.0.0 modiffied  | MIT License                | https://github.com/adafruit/Adafruit_MQTT_Library/blob/master/LICENSE
+ESP8266 boards components               | Latest           | GNU LGPL 2.1               | https://github.com/esp8266/Arduino/blob/master/LICENSE
+ESP32 boards components                 | Latest           | GNU LGPL 2.1               | https://github.com/espressif/arduino-esp32/blob/master/LICENSE.md
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=LiveObjectsSDK
-version=1.0.0
+version=2.0.0
 author=Orange
 maintainer=Marc Delain <marc.delain@orange.com>, Krzysztof Krzeslak <krzysztof.krzeslak@orange.com>
 sentence=A library that makes connection with Orange LiveObjects platform a breeze.

diff --git a/src/Adafruit_MQTT.cpp b/src/Adafruit_MQTT.cpp
@@ -19,6 +19,10 @@
 // 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.
+//
+// Modiffications:
+// setClientID()
+//
 #include "Adafruit_MQTT.h"
 
 #if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000) ||             \

diff --git a/src/Adafruit_MQTT_Client.cpp b/src/Adafruit_MQTT_Client.cpp
diff --git a/src/Adafruit_MQTT_Client.h b/src/Adafruit_MQTT_Client.h
diff --git a/src/LiveObjects.cpp b/src/LiveObjects.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjects.h"
 LiveObjects& lo = LiveObjects::get();
 

diff --git a/src/LiveObjects.h b/src/LiveObjects.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #pragma once
 
  /******************************************************************************

diff --git a/src/LiveObjectsBase.cpp b/src/LiveObjectsBase.cpp
@@ -1,4 +1,10 @@
 
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsBase.h"
 LiveObjectsBase::LiveObjectsBase()
     :
@@ -341,6 +347,11 @@ void LiveObjectsBase::publishMessage(const String& topic, String& payload) {
  ******************************************************************************/
 void LiveObjectsBase::begin(Protocol p, Encoding e, bool d)
 {
+  if(e != TEXT && e != BINARY)
+  {
+    outputDebug(ERR,"Wrong encoding type! Check your code. begin(MQTT/SMS , TEXT/BINARY, false/true)");
+    while(true);
+  }
   m_Protocol = p;
   m_Encoding = e;
   m_bDebug = d;

diff --git a/src/LiveObjectsBase.h b/src/LiveObjectsBase.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #pragma once
 
 

diff --git a/src/LiveObjectsCellular.cpp b/src/LiveObjectsCellular.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsCellular.h"
 
 #if defined NBD || defined GSMD

diff --git a/src/LiveObjectsCellular.h b/src/LiveObjectsCellular.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsMKR.h"
 #if defined ARDUINO_SAMD_MKRNB1500
 #define NBD

diff --git a/src/LiveObjectsCert.h b/src/LiveObjectsCert.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #ifndef _LIVEOBJECTS_CERT_H_INCLUDED
 #define _LIVEOBJECTS_CERT_H_INCLUDED
 

diff --git a/src/LiveObjectsESP.cpp b/src/LiveObjectsESP.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsESP.h"
 
 #if defined ESP8266D || defined ESP32D

diff --git a/src/LiveObjectsESP.h b/src/LiveObjectsESP.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #pragma once
 #if defined ESP8266 || defined ESP32
 #include "LiveObjectsBase.h"

diff --git a/src/LiveObjectsFona.cpp b/src/LiveObjectsFona.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsFona.h"
 #ifdef FONAD
 LiveObjectsFona::LiveObjectsFona() 
@@ -6,6 +12,7 @@ LiveObjectsFona::LiveObjectsFona()
    ,m_FonaSerial(FONA_TX,FONA_RX)
    ,m_FonaMQTT(&m_Fona,MQTT_BROKER, 1883,"Fona", MQTT_USER, SECRET_LIVEOBJECTS_API_KEY)
    ,m_sClientID()
+   ,m_sModel("Orange")
    ,m_nPort(1883)
    ,m_Security(NONE)
 {
@@ -14,9 +21,10 @@ LiveObjectsFona::LiveObjectsFona()
 
 void LiveObjectsFona::begin(Protocol p, Encoding e, bool d) 
 {
-  if(m_Encoding == BINARY)
+  if(m_Encoding != TEXT)
   {
-    //Serial.println("[ERROR] This board support only Text mode");
+    Serial.println("[ERROR] This board support only Text mode");
+    while(true);
   }
   m_Protocol=p;
   m_Encoding=e;

diff --git a/src/LiveObjectsFona.h b/src/LiveObjectsFona.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #pragma once
 
 #ifdef ARDUINO_ARCH_AVR

diff --git a/src/LiveObjectsMKR.cpp b/src/LiveObjectsMKR.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsMKR.h"
 LiveObjectsMKR::LiveObjectsMKR()
   :

diff --git a/src/LiveObjectsMKR.h b/src/LiveObjectsMKR.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #pragma once
 /******************************************************************************
    MKR BOARDS BASE CLASS

diff --git a/src/LiveObjectsWiFi.cpp b/src/LiveObjectsWiFi.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) Orange
+ *
+ * This software is distributed under the terms and conditions of the 'MIT'
+ * license which can be found in the file 'LICENSE.md' in this package distribution
+ */
 #include "LiveObjectsWiFi.h"
 #ifdef WIFID
 LiveObjectsWiFi::LiveObjectsWiFi()