autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move mqtt to APP_Framework/lib dir for ota

This commit is contained in:
wgzAIIT 2023-07-27 10:58:14 +08:00
parent 6559210341
commit 02089a48ee
11 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APP_Framework/lib/Kconfig
View File

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

4
APP_Framework/lib/Makefile
View File

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

2
Ubiquitous/XiZi_IIoT/tool/mqtt/Kconfig → APP_Framework/lib/mqtt/Kconfig
View File

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

0
Ubiquitous/XiZi_IIoT/tool/mqtt/Makefile → APP_Framework/lib/mqtt/Makefile
View File

6
Ubiquitous/XiZi_IIoT/tool/mqtt/platform_mqtt.c → APP_Framework/lib/mqtt/platform_mqtt.c
View File

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

2
Ubiquitous/XiZi_IIoT/tool/mqtt/platform_mqtt.h → APP_Framework/lib/mqtt/platform_mqtt.h
View File

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

2
Ubiquitous/XiZi_IIoT/tool/mqtt/utils_hmacsha1.c → APP_Framework/lib/mqtt/utils_hmacsha1.c
View File

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

2
Ubiquitous/XiZi_IIoT/tool/mqtt/utils_hmacsha1.h → APP_Framework/lib/mqtt/utils_hmacsha1.h
View File

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

2
Ubiquitous/XiZi_IIoT/path_kernel.mk
View File

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

1
Ubiquitous/XiZi_IIoT/tool/Kconfig
View File

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

4
Ubiquitous/XiZi_IIoT/tool/Makefile
View File

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