diff --git a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/lwipopts.h b/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/lwipopts.h
deleted file mode 100644
index cd102ebe..00000000
--- a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/lwipopts.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- ******************************************************************************
- * @file lwipopts.h
- * @author MCD Application Team
- * @version V1.1.0
- * @date 31-July-2013
- * @brief lwIP Options Configuration.
- * This file is based on Utilities\lwip_v1.4.1\src\include\lwip\opt.h
- * and contains the lwIP configuration for the STM32F4x7 demonstration.
- ******************************************************************************
- * @attention
- *
- * © COPYRIGHT 2013 STMicroelectronics
- *
- * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.st.com/software_license_agreement_liberty_v2
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ******************************************************************************
- */
-
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
-
-/**
- * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
- * critical regions during buffer allocation, deallocation and memory
- * allocation and deallocation.
- */
-#define SYS_LIGHTWEIGHT_PROT 1
-
-/**
- * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
- * use lwIP facilities.
- */
-#define NO_SYS 0
-
-/**
- * NO_SYS_NO_TIMERS==1: Drop support for sys_timeout when NO_SYS==1
- * Mainly for compatibility to old versions.
- */
-#define NO_SYS_NO_TIMERS 0
-
-/* ---------- Memory options ---------- */
-/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
- lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
- byte alignment -> define MEM_ALIGNMENT to 2. */
-#define MEM_ALIGNMENT 4
-
-/* MEM_SIZE: the size of the heap memory. If the application will send
-a lot of data that needs to be copied, this should be set high. */
-#define MEM_SIZE (5 * 1024)
-
-/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
- sends a lot of data out of ROM (or other static memory), this
- should be set high. */
-#define MEMP_NUM_PBUF 25
-/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
- per active UDP "connection". */
-#define MEMP_NUM_UDP_PCB 4
-/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
- connections. */
-#define MEMP_NUM_TCP_PCB 6
-/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
- connections. */
-#define MEMP_NUM_TCP_PCB_LISTEN 6
-/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
- segments. */
-#define MEMP_NUM_TCP_SEG 150
-/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
- timeouts. */
-#define MEMP_NUM_SYS_TIMEOUT 6
-
-/* ---------- Pbuf options ---------- */
-/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
-#define PBUF_POOL_SIZE 25
-/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
-#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
-
-/* ---------- TCP options ---------- */
-#define LWIP_TCP 1
-#define TCP_TTL 255
-
-/* Controls if TCP should queue segments that arrive out of
- order. Define to 0 if your device is low on memory. */
-#define TCP_QUEUE_OOSEQ 0
-
-/* TCP Maximum segment size. */
-#define TCP_MSS (1500 - 40) /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */
-
-/* TCP sender buffer space (bytes). */
-#define TCP_SND_BUF (7 * TCP_MSS)
-
-/* TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least
- as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. */
-
-#define TCP_SND_QUEUELEN (8 * TCP_SND_BUF / TCP_MSS)
-
-/* TCP receive window. */
-#define TCP_WND (9 * TCP_MSS)
-
-/* ---------- ICMP options ---------- */
-#define LWIP_ICMP 1
-
-/* ---------- DHCP options ---------- */
-/* Define LWIP_DHCP to 1 if you want DHCP configuration of
- interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
- turning this on does currently not work. */
-#define LWIP_DHCP 1
-
-/* ---------- UDP options ---------- */
-#define LWIP_UDP 1
-#define UDP_TTL 255
-
-/* ---------- Statistics options ---------- */
-#define LWIP_STATS 0
-#define LWIP_PROVIDE_ERRNO 1
-
-/* ---------- link callback options ---------- */
-/* LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
- * whenever the link changes (i.e., link down)
- */
-#define LWIP_NETIF_LINK_CALLBACK 0
-/*
- --------------------------------------
- ---------- Checksum options ----------
- --------------------------------------
-*/
-
-/*
-The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums by hardware:
- - To use this feature let the following define uncommented.
- - To disable it and process by CPU comment the the checksum.
-*/
-#define CHECKSUM_BY_HARDWARE
-//#undef CHECKSUM_BY_HARDWARE
-
-#ifdef CHECKSUM_BY_HARDWARE
-/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
-#define CHECKSUM_GEN_IP 0
-/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
-#define CHECKSUM_GEN_UDP 0
-/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
-#define CHECKSUM_GEN_TCP 0
-/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
-#define CHECKSUM_CHECK_IP 0
-/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
-#define CHECKSUM_CHECK_UDP 0
-/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
-#define CHECKSUM_CHECK_TCP 0
-/* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/
-#define CHECKSUM_GEN_ICMP 0
-#else
-/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
-#define CHECKSUM_GEN_IP 1
-/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
-#define CHECKSUM_GEN_UDP 1
-/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
-#define CHECKSUM_GEN_TCP 1
-/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
-#define CHECKSUM_CHECK_IP 1
-/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
-#define CHECKSUM_CHECK_UDP 1
-/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
-#define CHECKSUM_CHECK_TCP 1
-/* CHECKSUM_CHECK_ICMP==1: Check checksums by hardware for incoming ICMP packets.*/
-#define CHECKSUM_GEN_ICMP 1
-#endif
-
-#define LWIP_TCPIP_CORE_LOCKING 1
-
-/*
- ----------------------------------------------
- ---------- Sequential layer options ----------
- ----------------------------------------------
-*/
-/**
- * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
- */
-#define LWIP_NETCONN 1
-
-/*
- ------------------------------------
- ---------- Socket options ----------
- ------------------------------------
-*/
-/**
- * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
- */
-#define LWIP_SOCKET 1
-
-/*
- ---------------------------------
- ---------- OS options ----------
- ---------------------------------
-*/
-
-#define DEFAULT_UDP_RECVMBOX_SIZE 10
-#define DEFAULT_TCP_RECVMBOX_SIZE 10
-#define DEFAULT_ACCEPTMBOX_SIZE 10
-#define DEFAULT_THREAD_STACKSIZE 1024 * 2
-
-#define TCPIP_THREAD_NAME "lwip"
-#define TCPIP_THREAD_STACKSIZE 1024
-#define TCPIP_MBOX_SIZE 10
-#define TCPIP_THREAD_PRIO 1
-
-#define LWIP_DNS_API_DECLARE_STRUCTS 1
-#define LWIP_DNS 1
-
-/** DNS server IP address */
-#ifndef DNS_SERVER_ADDRESS
-#define DNS_SERVER_ADDRESS(ipaddr) (ip4_addr_set_u32(ipaddr, ipaddr_addr("208.67.222.222"))) /* resolver1.opendns.com */
-#endif
-
-/*
- ----------------------------------------
- ---------- Lwip Debug options ----------
- ----------------------------------------
-*/
-#define LWIP_DEBUG 0
-
-#define ethernet_with_mac 1
-
-#endif /* __LWIPOPTS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/mqtt_config.h b/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/mqtt_config.h
deleted file mode 100644
index 8ddef331..00000000
--- a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/mqtt_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * @Author: jiejie
- * @Github: https://github.com/jiejieTop
- * @Date: 2019-12-15 00:42:16
- * @LastEditTime : 2020-01-16 00:39:23
- * @Description: the code belongs to jiejie, please keep the author information and source code according to the license.
- */
-#ifndef _MQTT_CONFIG_H_
-#define _MQTT_CONFIG_H_
-
-#define MQTT_NO 0
-#define MQTT_YES 1
-
-#define MQTT_MAX_PACKET_ID (0xFFFF - 1)
-#define MQTT_TOPIC_LEN_MAX 64
-#define MQTT_ACK_HANDLER_NUM_MAX 64
-#define MQTT_DEFAULT_BUF_SIZE 1024
-#define MQTT_DEFAULT_CMD_TIMEOUT 4000
-#define MQTT_MAX_CMD_TIMEOUT 20000
-#define MQTT_MIN_CMD_TIMEOUT 1000
-#define MQTT_KEEP_ALIVE_INTERVAL 20 // unit: second
-#define MQTT_VERSION 4 // 4 is mqtt 3.1.1
-#define MQTT_RECONNECT_DEFAULT_DURATION 1000
-#define MQTT_THREAD_STACK_SIZE 2048
-#define MQTT_THREAD_PRIO 5
-#define MQTT_THREAD_TICK 50
-
-
-#define MQTT_NETWORK_TYPE_TLS MQTT_YES
-
-
-#if MQTT_NETWORK_TYPE_TLS
-
- #define MQTT_TLS_HANDSHAKE_TIMEOUT (5 * 1000)
-
- #include "mbedtls/config.h"
- #include "mbedtls/ssl.h"
- #include "mbedtls/entropy.h"
- #include "mbedtls/net_sockets.h"
- #include "mbedtls/ctr_drbg.h"
- #include "mbedtls/error.h"
- #include "mbedtls/debug.h"
-#endif /* MQTT_NETWORK_TYPE_TLS */
-
-#endif /* _MQTT_CONFIG_H_ */
diff --git a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/tos_config.h b/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/tos_config.h
deleted file mode 100644
index b2deac98..00000000
--- a/board/Fire_STM32F429/KEIL/mqttclient/TOS-CONFIG/tos_config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef _TOS_CONFIG_H_
-#define _TOS_CONFIG_H_
-
-#include "stm32f4xx.h"
-
-#define TOS_CFG_TASK_PRIO_MAX 10u
-
-#define TOS_CFG_ROUND_ROBIN_EN 1u
-
-#define TOS_CFG_OBJECT_VERIFY_EN 1u
-
-#define TOS_CFG_TASK_DYNAMIC_CREATE_EN 0u
-
-#define TOS_CFG_EVENT_EN 1u
-
-#define TOS_CFG_MMBLK_EN 1u
-
-#define TOS_CFG_MMHEAP_EN 1u
-
-#define TOS_CFG_MMHEAP_DEFAULT_POOL_SIZE 0x12000
-
-#define TOS_CFG_TASK_STACK_DRAUGHT_DEPTH_DETACT_EN 1u
-
-#define TOS_CFG_MUTEX_EN 1u
-
-#define TOS_CFG_TIMER_EN 1u
-
-#define TOS_CFG_MESSAGE_QUEUE_EN 1u
-
-#define TOS_CFG_MAIL_QUEUE_EN 0u
-
-#define TOS_CFG_PRIORITY_MESSAGE_QUEUE_EN 1u
-
-#define TOS_CFG_PRIORITY_MAIL_QUEUE_EN 0u
-
-#define TOS_CFG_SEM_EN 1u
-
-#define TOS_CFG_PWR_MGR_EN 0u
-
-#define TOS_CFG_TICKLESS_EN 0u
-
-#define TOS_CFG_VFS_EN 1u
-
-#define TOS_CFG_IDLE_TASK_STK_SIZE 80u
-
-#define TOS_CFG_CPU_TICK_PER_SECOND 1000u
-
-#define TOS_CFG_CPU_CLOCK (SystemCoreClock)
-
-#define TOS_CFG_TIMER_AS_PROC 1u
-
-#endif
-
diff --git a/board/Fire_STM32F429/KEIL/mqttclient/TencentOS_tiny.uvoptx b/board/Fire_STM32F429/KEIL/mqttclient/TencentOS_tiny.uvoptx
index ddc682cc..00a8ec52 100644
--- a/board/Fire_STM32F429/KEIL/mqttclient/TencentOS_tiny.uvoptx
+++ b/board/Fire_STM32F429/KEIL/mqttclient/TencentOS_tiny.uvoptx
@@ -2410,7 +2410,7 @@
mqttclient/salof
- 0
+ 1
0
0
0
@@ -2478,7 +2478,7 @@
mqttclient/common
- 0
+ 1
0
0
0
diff --git a/components/connectivity/mqttclient/common/log.h b/components/connectivity/mqttclient/common/log.h
index 5e7aff62..08eb2363 100644
--- a/components/connectivity/mqttclient/common/log.h
+++ b/components/connectivity/mqttclient/common/log.h
@@ -2,7 +2,7 @@
* @Author: jiejie
* @Github: https://github.com/jiejieTop
* @Date: 2019-12-27 03:25:58
- * @LastEditTime : 2020-01-15 22:11:21
+ * @LastEditTime : 2020-02-20 01:16:25
* @Description: the code belongs to jiejie, please keep the author information and source code according to the license.
*/
#ifndef _LOG_H_
@@ -10,6 +10,8 @@
#define LOG_IS_SALOF 1
+#define LOG_LEVEL DEBUG_LEVEL //WARN_LEVEL DEBUG_LEVEL INFO_LEVEL
+
#if LOG_IS_SALOF
#include "salof.h"
@@ -20,12 +22,53 @@
#define log_init salof_init
#else
#include
- #define LOG_D(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
- #define LOG_I(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
- #define LOG_W(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
- #define LOG_E(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+
+ #define BASE_LEVEL (0)
+ #define ASSERT_LEVEL (BASE_LEVEL + 1)
+ #define ERR_LEVEL (ASSERT_LEVEL + 1)
+ #define WARN_LEVEL (ERR_LEVEL + 1)
+ #define INFO_LEVEL (WARN_LEVEL + 1)
+ #define DEBUG_LEVEL (INFO_LEVEL + 1)
+
+#if LOG_LEVEL < DEBUG_LEVEL
+ #define LOG_D(fmt, ...)
+#else
+ #define LOG_D(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+#endif
+
+#if LOG_LEVEL < INFO_LEVEL
+ #define LOG_I(fmt, ...)
+#else
+ #define LOG_I(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+#endif
+
+#if LOG_LEVEL < WARN_LEVEL
+ #define LOG_W(fmt, ...)
+#else
+ #define LOG_W(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+#endif
+
+#if LOG_LEVEL < ERR_LEVEL
+ #define LOG_E(fmt, ...)
+#else
+ #define LOG_E(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+#endif
+
+#if LOG_LEVEL < ASSERT_LEVEL
+ #define LOG_ASSERT(fmt, ...)
+ #define ASSERT(x)
+#else
+ #define LOG_ASSERT(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+ #define ASSERT(x) if((x)==0) LOG_ASSERT("%s, %d\n",__FILE__,__LINE__)
+#endif
+
+#if LOG_LEVEL < BASE_LEVEL
+ #define LOG(fmt, ...)
+#else
+ #define LOG(fmt, ...) { printf(fmt, ##__VA_ARGS__); printf("\n");}
+#endif
+
#define log_init()
#endif
-
#endif /* _LOG_H_ */