Adjusting MQTT ClientId

Setting ClientId based on <sw model>:<type of id>:<id>
like LO_SDK_Arduino:mac:<mac address> for WiFi boards
or LO_SDK_Arduino:imei:<imei> for cellular boards

Author: DatavenueLiveObjects

src/LiveObjectsBase.h

@@ -13,7 +13,7 @@
 #define PAYLOAD_DATA_SIZE 1024
 #define KEEP_ALIVE_NETWORK 1000
 #define SW_MODEL "LO_SDK_Arduino"
-#define SW_REVISION "2.1.2"
+#define SW_REVISION "2.1.1"
 
 /******************************************************************************
    LiveObjects MQTT constants
@@ -24,7 +24,7 @@
 #else
 #define MQTT_BROKER "liveobjects.orange-business.com"
 #endif
-#define SDK_PREFIX "urn:lo:nsid:Arduino:"
+#define SDK_PREFIX SW_MODEL ":"
 #define MQTT_USER "json+device"
 #define MQTT_PUBDATA "dev/data"
 #define MQTT_PUBDATA_BINARY "dev/v1/data/binary"

src/LiveObjectsCellular.cpp

@@ -109,7 +109,7 @@ void LiveObjectsCellular::connectNetwork()
         if(imei.length()!=0) break;
         delay(100*i);
       }
-      m_sMqttid += imei;
+      m_sMqttid += "imei:" imei;
     }
     else
     {

src/LiveObjectsWiFi.cpp

@@ -53,7 +53,7 @@ void LiveObjectsWiFi::begin(Protocol p, Encoding s, bool bDebug)
 void LiveObjectsWiFi::connectNetwork()
 {
   #ifdef ADAFRUIT_FEATHER_M0
-    WiFi.setPins(8,7,4,2);
+  WiFi.setPins(8,7,4,2);
   #endif
   if(!m_bInitialized)
   {
@@ -81,15 +81,17 @@ void LiveObjectsWiFi::connectNetwork()
     outputDebug(TXT,".");
     delay(1000);
   }
-   outputDebug();
+  outputDebug();
   IPAddress ip = WiFi.localIP();
   for(int i=0;i<4;++i)
   {
     m_sIP+=ip[i];
     if(i!=3) m_sIP+='.';
   }
 
-   uint8_t mac[6];
+  m_sMqttid+= "mac:";
+
+  uint8_t mac[6];
   char buff[10];
   WiFi.macAddress(mac);
 
@@ -107,37 +109,35 @@ void LiveObjectsWiFi::connectNetwork()
       m_sMac += (char)toupper(buff[j]);
       m_sMqttid += (char)toupper(buff[j]);
     }
-  if(i!=0) m_sMac += ':';
+    if(i!=0) m_sMac += ':';
   }
-  m_sModel = m_sMqttid;
 }
+
 void LiveObjectsWiFi::checkNetwork()
 {
   if(WiFi.status()== WL_DISCONNECTED)
     connectNetwork();
 }
+
 void LiveObjectsWiFi::disconnectNetwork()
 {
   outputDebug(INFO,"Disconnecting WiFi");
   WiFi.disconnect();
 }
+
 void LiveObjectsWiFi::messageCallback(int msg)
 {
   LiveObjects::get().onMQTTmessage(msg);
 }
 
-
-
-
-
-
-
 void LiveObjectsWiFi::addNetworkInfo()
 {
   String tmp;
   tmp = String(WiFi.RSSI());
   tmp += " dbm";
-  if(m_Protocol == MQTT && m_Encoding==TEXT)  addToPayload(easyDataPayload[JSONVALUE].createNestedObject("networkInfo"),"mac",m_sMac,"ssid",SECRET_SSID,"ip",m_sIP,"strength",tmp);
-  else addToPayload(m_sMac,SECRET_SSID,m_sIP,tmp);
+  if(m_Protocol == MQTT && m_Encoding==TEXT)
+    addToPayload(easyDataPayload[JSONVALUE].createNestedObject("networkInfo"),"mac",m_sMac,"ssid",SECRET_SSID,"ip",m_sIP,"rssi",tmp);
+  else
+    addToPayload(m_sMac,SECRET_SSID,m_sIP,tmp);
 }
 #endif