From da79f4318f26aa34eb1acf5a6f0715283e0e9a71 Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 1 Jan 2021 11:13:36 +0800 Subject: [PATCH] Fixed bug in mqtt_iot_explorer_tc_ch20_oled.c --- .../demo/mqtt_iot_explorer_tc_ch20_oled.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_ch20_oled/demo/mqtt_iot_explorer_tc_ch20_oled.c b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_ch20_oled/demo/mqtt_iot_explorer_tc_ch20_oled.c index aa71fadb..87bf1a29 100644 --- a/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_ch20_oled/demo/mqtt_iot_explorer_tc_ch20_oled.c +++ b/board/TencentOS_tiny_EVB_G0/KEIL/mqtt_iot_explorer_tc_ch20_oled/demo/mqtt_iot_explorer_tc_ch20_oled.c @@ -47,7 +47,7 @@ void mqtt_demo_task(void) char ch20_ppm_str[20]; - /* OLED显示日志 */ + /* OLED鏄剧ず鏃ュ織 */ OLED_ShowString(0, 2, (uint8_t*)"connecting...", 16); /** @@ -77,7 +77,7 @@ void mqtt_demo_task(void) printf("MQTT: %s\n", state == MQTT_STATE_CONNECTED ? "CONNECTED" : "DISCONNECTED"); } - /* 开始订阅topic */ + /* 寮濮嬭闃卼opic */ size = snprintf(report_reply_topic_name, TOPIC_NAME_MAX_SIZE, "$thing/down/property/%s/%s", product_id, device_name); if (size < 0 || size > sizeof(report_reply_topic_name) - 1) { @@ -89,14 +89,14 @@ void mqtt_demo_task(void) printf("module mqtt sub success\n"); } - memset(report_topic_name, sizeof(report_topic_name), 0); + memset(report_topic_name, 0, sizeof(report_topic_name)); size = snprintf(report_topic_name, TOPIC_NAME_MAX_SIZE, "$thing/up/property/%s/%s", product_id, device_name); if (size < 0 || size > sizeof(report_topic_name) - 1) { printf("pub topic content length not enough! content size:%d buf size:%d", size, (int)sizeof(report_topic_name)); } - /* 创建邮箱 */ + /* 鍒涘缓閭 */ tos_mail_q_create(&mail_q, ch20_value_pool, 3, sizeof(ch20_data_t)); HAL_NVIC_DisableIRQ(USART3_4_IRQn); @@ -107,20 +107,20 @@ void mqtt_demo_task(void) } while (1) { - /* 通过接收邮件来读取数据 */ + /* 閫氳繃鎺ユ敹閭欢鏉ヨ鍙栨暟鎹 */ HAL_NVIC_EnableIRQ(USART3_4_IRQn); tos_mail_q_pend(&mail_q, (uint8_t*)&ch20_value, &mail_size, TOS_TIME_FOREVER); HAL_NVIC_DisableIRQ(USART3_4_IRQn); - /* 接收到之后打印信息 */ + /* 鎺ユ敹鍒颁箣鍚庢墦鍗颁俊鎭 */ ch20_ppm_value = ch20_value.data / 1000.0; printf("ch20 value: %.3f\r\n", ch20_ppm_value); - /* OLED显示值 */ + /* OLED鏄剧ず鍊 */ sprintf(ch20_ppm_str, "%.3f ppm(mg/m3)", ch20_ppm_value); OLED_ShowString(0, 2, (uint8_t*)ch20_ppm_str, 16); - /* 上报值 */ + /* 涓婃姤鍊 */ memset(payload, 0, sizeof(payload)); snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, ch20_ppm_value); @@ -143,7 +143,7 @@ void application_entry(void *arg) { char *str = "TencentOS-tiny"; - /* 初始化OLED */ + /* 鍒濆鍖朞LED */ OLED_Init(); OLED_Clear(); OLED_ShowString(0, 0, (uint8_t*)str, 16);