move mqtt to APP_Framework/lib dir for ota

APP_Framework/lib/Kconfig

@@ -14,4 +14,5 @@ menu "app lib"
     source "$APP_DIR/lib/lvgl/Kconfig"
     source "$APP_DIR/lib/embedded_database/Kconfig"
     source "$APP_DIR/lib/lorawan/Kconfig"
+    source "$APP_DIR/lib/mqtt/Kconfig"
 endmenu

APP_Framework/lib/Makefile

@@ -18,4 +18,8 @@ ifeq ($(CONFIG_LIB_USING_LORAWAN),y)
 	SRC_DIR += lorawan
 endif
 
+ifeq ($(CONFIG_TOOL_USING_MQTT),y)
+  SRC_DIR += mqtt
+endif
+
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/lib/mqtt/Kconfig

@@ -1,4 +1,4 @@
-menu "MQTT function"
+menu "lib using MQTT"
 
     menuconfig TOOL_USING_MQTT
         bool "Enable support MQTT function"

APP_Framework/lib/mqtt/platform_mqtt.c

@@ -15,16 +15,14 @@
 * @brief:   platform_mqtt.c file
 * @version: 1.0
 * @author:  AIIT XUOS Lab
-* @date:    2023/6/14
+* @date:    2023/7/27
 *
 */
 
 #include <string.h>
 #include <stdint.h>
 #include <adapter.h>
-#include "shell.h"
-#include "xsconfig.h"
-#include <adapter.h>
+#include <transform.h>
 #include "platform_mqtt.h"
 
 MQTT_TCB Platform_mqtt;  //创建一个用于连接云平台mqtt的结构体

APP_Framework/lib/mqtt/platform_mqtt.h

@@ -15,7 +15,7 @@
 * @brief:   platform_mqtt.h file
 * @version: 1.0
 * @author:  AIIT XUOS Lab
-* @date:    2023/6/14
+* @date:    2023/7/27
 *
 */
 

APP_Framework/lib/mqtt/utils_hmacsha1.c

@@ -15,7 +15,7 @@
 * @brief:   utils_hmacsha1.c file
 * @version: 1.0
 * @author:  AIIT XUOS Lab
-* @date:    2023/6/29
+* @date:    2023/7/27
 *
 */
 

APP_Framework/lib/mqtt/utils_hmacsha1.h

@@ -15,7 +15,7 @@
 * @brief:   utils_hmacsha1.h file
 * @version: 1.0
 * @author:  AIIT XUOS Lab
-* @date:    2023/6/29
+* @date:    2023/7/27
 *
 */
 

Ubiquitous/XiZi_IIoT/path_kernel.mk

@@ -565,7 +565,7 @@ KERNELPATHS +=-I$(KERNEL_ROOT)/tool/bootloader/flash \
 endif
 
 ifeq ($(CONFIG_TOOL_USING_MQTT), y)
-KERNELPATHS +=-I$(KERNEL_ROOT)/tool/mqtt
+KERNELPATHS +=-I$(KERNEL_ROOT)/../../APP_Framework/lib/mqtt
 endif
 
 ifeq ($(CONFIG_FS_LWEXT4),y)

Ubiquitous/XiZi_IIoT/tool/Kconfig

@@ -1,6 +1,5 @@
 menu "Tool feature"
 
     source "$KERNEL_DIR/tool/bootloader/Kconfig"
-    source "$KERNEL_DIR/tool/mqtt/Kconfig"
 
 endmenu

Ubiquitous/XiZi_IIoT/tool/Makefile

@@ -8,8 +8,4 @@ ifeq ($(CONFIG_TOOL_USING_OTA),y)
   SRC_DIR += bootloader
 endif
 
-ifeq ($(CONFIG_TOOL_USING_MQTT),y)
-  SRC_DIR += mqtt
-endif
-
 include $(KERNEL_ROOT)/compiler.mk