Merge pull request #14 from tomekmalek/master

Change client id naming

examples/1_send_data/1_send_data.ino

@@ -17,7 +17,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects for Arduino MKR boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
   lo.setSecurity(TLS);
   lo.begin(MQTT, TEXT, true);
   lo.connect(); // connects to the network + Live Objects

examples/1_send_data/README.md

@@ -7,7 +7,8 @@ This example shows how to send some sample data (device uptime) to Live Objects
 First of all, be sure that you installed the required libraries and generated an API key mentioned in the main README file, then:
 1. Open "1_send_data.ino" sketch using Arduino IDE
 2. Replace ```const char SECRET_LIVEOBJECTS_API_KEY[]="...";``` in arduino_secrets.h with API key you generated
-3. Upload *1_send_data.ino* sketch to your Arduino MKR NB 1500 board
+3. In ```lo.setSecurity()``` select security mode using ```TLS``` or ```NONE``` according to board abilities shown in **Compatibility** point in main **README.md**
+4. Upload *1_send_data.ino* sketch to your Arduino MKR NB 1500 board
 
 
 ## Verify

examples/2_simple_parameters/2_simple_parameters.ino

@@ -22,7 +22,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects on Arduino MKR NB boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
 
   // Declaring a simple parameter stored in the variable 'messageRate'.
   // This parameter will become available for modification over the air from Live Objects

examples/2_simple_parameters/README.md

@@ -8,7 +8,8 @@ Parameters give you ability to configure your device over the air from Live Obje
 First of all, be sure that you installed the required libraries and generated an API key mentioned in the main README file, then:
 1. Open "2_simple_parameters.ino" sketch using Arduino IDE
 2. Replace ```const char SECRET_LIVEOBJECTS_API_KEY[]="...";``` in arduino_secrets.h with API key you generated
-3. Upload *2_simple_parameters.ino* sketch to your Arduino MKR NB 1500 board
+3. In ```lo.setSecurity()``` select security mode using ```TLS``` or ```NONE``` according to board abilities shown in **Compatibility** point in main **README.md**
+4. Upload *2_simple_parameters.ino* sketch to your Arduino MKR NB 1500 board
 
 
 ## Verify

examples/3_Parameter_with_callback/3_Parameter_with_callback.ino

@@ -30,7 +30,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects on Arduino MKR boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
 
   // Declaring a parameter with a callback function 'processMsgRate'.
   // This function will be called after the update of the variable 'messageRate'.

examples/3_Parameter_with_callback/README.md

@@ -16,7 +16,8 @@ This is how callback function will look like:<br>
 First of all, be sure that you installed the required libraries and generated an API key mentioned in the main README file, then:
 1. Open "3_parameter_with_callback.ino" sketch using Arduino IDE
 2. Replace ```const char SECRET_LIVEOBJECTS_API_KEY[]="...";``` in arduino_secrets.h with API key you generated
-3. Upload *3_parameter_with_callback.ino* sketch to your Arduino MKR NB 1500 board
+3. In ```lo.setSecurity()``` select security mode using ```TLS``` or ```NONE``` according to board abilities shown in **Compatibility** point in main **README.md**
+4. Upload *3_parameter_with_callback.ino* sketch to your Arduino MKR NB 1500 board
 
 
 ## Verify

examples/4_Simple_command/4_Simple_command.ino

@@ -21,10 +21,10 @@ unsigned long lastMessageTime = 0;   // stores the time when last data message w
 void blinkLED5times(const String arguments, String &response) {
   pinMode(LED_BUILTIN, OUTPUT);
   for (byte i = 0; i < 5; i++) {
-    digitalWrite(LED_BUILTIN, HIGH);
-    delay(250);
     digitalWrite(LED_BUILTIN, LOW);
     delay(250);
+    digitalWrite(LED_BUILTIN, HIGH);
+    delay(250);
   }
   response = "{\"blinked\":\"5 times\"}";
 }
@@ -34,7 +34,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects on Arduino MKR boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
 
   // Declaring a simple commands hadled by the function 'blinkLED5times'.
   lo.addCommand("blink", blinkLED5times);

examples/4_Simple_command/README.md

@@ -11,7 +11,8 @@ In this example we will use command to make Arduino onboard LED blink.
 First of all, be sure that you installed the required libraries and generated an API key mentioned in the main README file, then:
 1. Open "4_simple_command.ino" sketch using Arduino IDE
 2. Replace ```const char SECRET_LIVEOBJECTS_API_KEY[]="...";``` in arduino_secrets.h with API key you generated
-3. Upload *4_simple_command.ino* sketch to your Arduino MKR NB 1500 board
+3. In ```lo.setSecurity()``` select security mode using ```TLS``` or ```NONE``` according to board abilities shown in **Compatibility** point in main **README.md**
+4. Upload *4_simple_command.ino* sketch to your Arduino MKR NB 1500 board
 
 ## Verify
 **Is device online:**<br>

examples/5_Command_with_arguments/5_Command_with_arguments.ino

@@ -31,20 +31,20 @@ void blinkLED(const String arguments, String &response) {
   int timeOn = incomingArguments["time ON"];  // arguments are now accessible using their name
   int timeOff = incomingArguments["time OFF"];
   int reps = incomingArguments["repetitions"];
-  unsigned long elaspedTime = millis();   // will keep track of time in order to compute the animation duration
+  unsigned long elapsedTime = millis();   // will keep track of time in order to compute the animation duration
 
   pinMode(LED_BUILTIN, OUTPUT);
   for (byte i = 0; i < reps; i++) {
-    digitalWrite(LED_BUILTIN, HIGH);
-    delay(timeOn);
     digitalWrite(LED_BUILTIN, LOW);
+    delay(timeOn);
+    digitalWrite(LED_BUILTIN, HIGH);
     delay(timeOff);
   }
 
-  elaspedTime = millis() - elaspedTime;
+  elapsedTime = millis() - elapsedTime;
 
   StaticJsonDocument<128> outgoingResponse;  // creation of a JSON document that will hold the response
-  outgoingResponse["animation duration (milliseconds)"] = elaspedTime;  // adding reponse item (you can add several by repeating the line):
+  outgoingResponse["animation duration (milliseconds)"] = elapsedTime;  // adding reponse item (you can add several by repeating the line):
   serializeJson(outgoingResponse, response);  // exporting JSON in 'reponse' String
   // example of 'response' content: "{\"animation duration (milliseconds)\":5000}"
 }
@@ -54,7 +54,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects on Arduino MKR boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
 
   // Declaring a simple commands hadled by the function 'blinkLED'.
   lo.addCommand("blink", blinkLED);

examples/5_Command_with_arguments/README.md

@@ -11,7 +11,8 @@ In this example we will use command to make Arduino onboard LED blink. Unlike in
 First of all, be sure that you installed the required libraries and generated an API key mentioned in the main README file, then:
 1. Open "5_simple_command.ino" sketch using Arduino IDE
 2. Replace ```const char SECRET_LIVEOBJECTS_API_KEY[]="...";``` in arduino_secrets.h with API key you generated
-3. Upload *5_simple_command.ino* sketch to your Arduino MKR NB 1500 board
+3. In ```lo.setSecurity()``` select security mode using ```TLS``` or ```NONE``` according to board abilities shown in **Compatibility** point in main **README.md**
+4. Upload *5_simple_command.ino* sketch to your Arduino MKR NB 1500 board
 
 ## Verify
 **Is device online:**<br>

examples/6_sms_send_data/6_sms_send_data.ino

@@ -17,7 +17,7 @@ void setup() {
   Serial.begin(115200);
   Serial.print("\n*** Live Objects for Arduino MKR boards, revision ");
   Serial.print(SW_REVISION);
-  Serial.println("***");
+  Serial.println(" ***");
   lo.begin(SMS, TEXT, true);
   lo.connect(); // connects to the network + Live Objects
 }

src/LiveObjectsBase.h

@@ -12,7 +12,7 @@
  ******************************************************************************/
 #define PAYLOAD_DATA_SIZE 1024
 #define KEEP_ALIVE_NETWORK 1000
-#define SW_REVISION "2.0.2"
+#define SW_REVISION "2.0.3"
 
 
 /******************************************************************************
@@ -24,6 +24,7 @@
 #else
 #define MQTT_BROKER "liveobjects.orange-business.com"
 #endif
+#define SDK_PREFIX "Arduino:"
 #define MQTT_USER "json+device"
 #define MQTT_PUBDATA "dev/data"
 #define MQTT_PUBDATA_BINARY "dev/v1/data/binary"
@@ -265,7 +266,7 @@ class LiveObjectsBase
 private:
     unsigned long lastKeepAliveNetwork;
 protected:
-    String m_sMqttid;
+    String m_sMqttid = SDK_PREFIX;
     String m_sPayload;
     String m_sTopic;
     String m_sDecoder;

src/LiveObjectsCellular.cpp

@@ -102,17 +102,14 @@ void LiveObjectsCellular::connectNetwork()
     #endif
     if(modem.begin())
     {
-      if(m_sMqttid.length()==0)
+      String imei="";
+      for(int i=1;i<=3;i++)
       {
-        String imei="";
-        for(int i=1;i<=3;i++)
-        {
-          imei=modem.getIMEI();
-          if(imei.length()!=0) break;
-          delay(100*i);
-        }
-        m_sMqttid = imei;
+        imei=modem.getIMEI();
+        if(imei.length()!=0) break;
+        delay(100*i);
       }
+      m_sMqttid += imei;
     }
     else
     {

src/LiveObjectsESP.cpp

@@ -94,7 +94,7 @@ void LiveObjectsESP::connectNetwork()
   //   outputDebug(INFO, m_sIP," ",  m_sMqttid, " ",  m_sMac);
   //   delay(500);
   // }
-  m_sModel = m_sMac;
+  m_sModel = m_sMqttid;
 }
 
 void LiveObjectsESP::checkNetwork()