From 892bef64e9a7c10fbb0458fb4317c319907157f0 Mon Sep 17 00:00:00 2001 From: huang <1085210385@qq.com> Date: Mon, 6 Nov 2023 13:59:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3CJson=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=8F=8ALWIP=E4=B8=8D=E8=83=BD=E8=AE=BF=E9=97=AE=E5=A4=96?= =?UTF-8?q?=E7=BD=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Applications/app_test/test_mqttclient/test_mqttclient.c | 2 +- APP_Framework/lib/cJSON/Makefile | 4 +++- Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c b/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c index 2ceb1b892..4ca7a2858 100644 --- a/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c +++ b/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c @@ -569,7 +569,7 @@ int32_t MQTTMsgPublish(int32_t sock, char *topic, int8_t qos, uint8_t* msg) uint8_t buf[MSG_MAX_LEN]; int32_t buflen = sizeof(buf),len; MQTTString topicString = MQTTString_initializer; - uint16_t packid = 0,packetidbk; + uint16_t packid = 0,packetidbk = 0; //填充主题 topicString.cstring = (char *)topic; diff --git a/APP_Framework/lib/cJSON/Makefile b/APP_Framework/lib/cJSON/Makefile index 8d2e20e45..17d79ea6b 100755 --- a/APP_Framework/lib/cJSON/Makefile +++ b/APP_Framework/lib/cJSON/Makefile @@ -1,4 +1,6 @@ SRC_FILES := cJSON.c -SRC_FILES += cJSON_Process.c +ifeq ($(CONFIG_USER_TEST_MQTTCLIENT),y) + SRC_FILES += cJSON_Process.c +endif include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c index 8204064b4..99b1c8579 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c @@ -387,7 +387,7 @@ void lwip_config_tcp(uint8_t enet_port, char* ip, char* mask, char* gw) #endif } - // netif_set_default(&gnetif); + netif_set_default(&gnetif); netif_set_up(&gnetif); lw_print("\r\n************************************************\r\n");