From 1c0c391ceb5f0d738af0f36bedbccccda0c73e2a Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Tue, 1 Sep 2020 15:37:21 +0800 Subject: [PATCH] fix a bug in tencent_firmware wrapper --- devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c | 6 ++++-- .../tencent_firmware_module_wrapper.c | 6 +++--- .../tencent_firmware_module_wrapper.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c b/devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c index 9974f9b5..e06d491f 100644 --- a/devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c +++ b/devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c @@ -487,6 +487,8 @@ tencent_firmware_module_t tencent_firmware_module_esp8266 = { int esp8266_tencent_firmware_sal_init(hal_uart_port_t uart_port) { + int ret = -1; + if (tos_at_init(uart_port, esp8266_tencent_firmware_at_event, sizeof(esp8266_tencent_firmware_at_event) / sizeof(esp8266_tencent_firmware_at_event[0])) != 0) { @@ -497,8 +499,8 @@ int esp8266_tencent_firmware_sal_init(hal_uart_port_t uart_port) return -1; } - if (tos_tf_module_init() != 0) { - return -1; + if ((ret = tos_tf_module_init()) != 0) { + return ret; } return 0; diff --git a/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.c b/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.c index 67b8a0df..b549452b 100644 --- a/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.c +++ b/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.c @@ -56,19 +56,19 @@ int tos_tf_module_register(tencent_firmware_module_t *module) int tos_tf_module_init(void) { if (tos_mail_q_create(&mqtt_message_mail, mqtt_message_pool, MQTT_MESSAGE_NUM_MAX, sizeof(mqtt_message_t)) != K_ERR_NONE) { - return -1; + return -2; } tos_list_init(&mqtt_sub_list); if (tos_mmblk_pool_create(&sub_list_node_mbp, sub_list_node_pool, MQTT_SUB_TOPIC_MAX, sizeof(mqtt_message_handlers_t)) != K_ERR_NONE) { - return -1; + return -3; } if (tos_task_create(&mqtt_message_handle_task, "mqtt_message_handle", mqtt_message_handle_task_entry, NULL, MQTT_MESSAGE_HANDLE_TASK_PRIO, mqtt_message_handle_task_stack, MQTT_MESSAGE_HANDLE_TASK_STACK_SIZE, 10) != K_ERR_NONE) { - return -1; + return -4; } if (g_tencent_firmware_module && g_tencent_firmware_module->init) { diff --git a/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.h b/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.h index 4a45439f..72729624 100644 --- a/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.h +++ b/net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.h @@ -79,7 +79,7 @@ typedef struct mqtt_param_st { typedef struct mqtt_message_st { char topic[64]; - char payload[128]; + char payload[256]; } mqtt_message_t; typedef void (*message_handler_t)(mqtt_message_t* msg);