renamed XDK_MQTT_Z.h to MQTTClient.h

Cumulocity-IoT · Mar 23, 2020 · 0ddf9b1 · 0ddf9b1
1 parent a989ac5
commit 0ddf9b1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/source/AppController.c b/source/AppController.c
@@ -35,7 +35,6 @@
 #include "Serval_Ip.h"
 #include "XDK_Utils.h"
 #include "XDK_WLAN.h"
-#include "XDK_MQTT_Z.h"
 #include "XDK_Sensor.h"
 #include "XDK_SNTP.h"
 #include "XDK_ServalPAL.h"
@@ -46,6 +45,7 @@
 #include "timers.h"
 #include "Serval_Ip.h"
 #include "BatteryMonitor.h"
+#include "MQTTClient.h"
 #include "MQTTStorage.h"
 #include "MQTTCfgParser.h"
 #include "MQTTRegistration.h"

diff --git a/source/XDK_MQTT_Z.c → source/MQTTClient.c b/source/XDK_MQTT_Z.c → source/MQTTClient.c
@@ -5,7 +5,7 @@
  **
  *******************************************************************************
  **
- ** OBJECT NAME: XDK_MQTT_Z.c
+ ** OBJECT NAME: MQTTClient.c
  **
  ** DESCRIPTION: Source Code for the Cumulocity MQTT Client for the Bosch XDK
  **
@@ -30,8 +30,8 @@
 #define BCDS_MODULE_ID XDK_COMMON_ID_MQTT
 
 #if XDK_CONNECTIVITY_MQTT
-/* own header files */
-#include "XDK_MQTT_Z.h"
+
+#include "MQTTClient.h"
 
 /* system header files */
 #include <stdio.h>

diff --git a/source/XDK_MQTT_Z.h → source/MQTTClient.h b/source/XDK_MQTT_Z.h → source/MQTTClient.h
@@ -5,7 +5,7 @@
  **
  *******************************************************************************
  **
- ** OBJECT NAME: XDK_MQTT_Z.h
+ ** OBJECT NAME: MQTTClient.h
  **
  ** DESCRIPTION: Source Code for the Cumulocity MQTT Client for the Bosch XDK
  **

diff --git a/source/MQTTOperation.c b/source/MQTTOperation.c
@@ -758,13 +758,12 @@ static void MQTTOperation_AssetUpdate(xTimerHandle xTimer) {
  MQTTCfgParser_GetFirmwareName(),
  MQTTCfgParser_GetFirmwareVersion(),
  MQTTCfgParser_GetFirmwareURL());
- assetStreamBuffer.length +=
- snprintf(
- assetStreamBuffer.data
- + assetStreamBuffer.length,
- sizeof(assetStreamBuffer.data)
- - assetStreamBuffer.length,
- "400,xdk_FirmwareChangeEvent,\"Firmware updated!\"\r\n");
+ assetStreamBuffer.length += snprintf(
+ assetStreamBuffer.data
+ + assetStreamBuffer.length,
+ sizeof(assetStreamBuffer.data)
+ - assetStreamBuffer.length,
+ "400,xdk_FirmwareChangeEvent,\"Firmware updated!\"\r\n");
  break;
  case CMD_PUBLISH_START:
  assetStreamBuffer.length += snprintf(
@@ -891,7 +890,10 @@ static void MQTTOperation_AssetUpdate(xTimerHandle xTimer) {
  //UBaseType_t stackHighWaterMark = 0;
  UBaseType_t stackHighWaterMarkApp = uxTaskGetStackHighWaterMark(AppControllerHandle);
  UBaseType_t stackHighWaterMarkMain = uxTaskGetStackHighWaterMark(MainCmdProcessor.task);
- printf("MQTTOperation_SensorUpdate: Memory stat: everFreeHeap:[%lu], freeHeap:[%lu], stackHighWaterMarkApp:[%lu],stackHighWaterMarkMain:[%lu]\r\n", everFreeHeap, freeHeap, stackHighWaterMarkApp, stackHighWaterMarkMain);
+ UBaseType_t numberOfTasks = uxTaskGetNumberOfTasks();
+ printf("MQTTOperation_SensorUpdate: Memory stat: everFreeHeap:[%lu], freeHeap:[%lu], stackHighWaterMarkApp:[%lu],stackHighWaterMarkMain:[%lu], numberOfTasks[%lu]\r\n",
+ everFreeHeap, freeHeap, stackHighWaterMarkApp, stackHighWaterMarkMain, numberOfTasks);
+
 #endif
 
  }
@@ -962,7 +964,6 @@ static void MQTTOperation_SensorUpdate(xTimerHandle xTimer) {
  sensorValue.Gyro.X, sensorValue.Gyro.Y, sensorValue.Gyro.Z);
  }
  if (SensorSetup.Enable.Mag) {
-
  sensorStreamBuffer.length += snprintf(
  sensorStreamBuffer.data + sensorStreamBuffer.length,
  sizeof(sensorStreamBuffer.data) - sensorStreamBuffer.length,

diff --git a/source/MQTTOperation.h b/source/MQTTOperation.h
@@ -13,9 +13,9 @@
  **
  **
  *******************************************************************************/
-#include "XDK_MQTT_Z.h"
 #include "XDK_MQTT.h"
 #include "XDK_Sensor.h"
+#include "MQTTClient.h"
 
 /* header definition ******************************************************** */
 #ifndef _MQTT_OPERATION_H_

diff --git a/source/MQTTRegistration.h b/source/MQTTRegistration.h
@@ -14,7 +14,7 @@
  **
  *******************************************************************************/
 
-#include "XDK_MQTT_Z.h"
+#include "MQTTClient.h"
 
 /* header definition ******************************************************** */
 #ifndef MQTTREGISTRATION_H_