From 8587e4decb2d6d8f594ff91fcf7e15489fc25c7b Mon Sep 17 00:00:00 2001 From: DavidLin1577 Date: Sun, 6 Jun 2021 21:19:47 +0800 Subject: [PATCH] [master] sync --- .../BSP/Hardware/E53_ST1/E53_ST1.h | 28 +++++++++++-------- .../mqtt_iot_explorer_tc_demo.c | 5 ++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.h b/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.h index 5190c8db..7a7ef30d 100644 --- a/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.h +++ b/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.h @@ -16,13 +16,13 @@ #define ST1_GPS_POW_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE() /*************************************************************** -* 名 称: E53ST1_Status_ENUM +* 名 称: GasStatus_ENUM * 说 明:枚举状态结构体 ***************************************************************/ typedef enum { - ST1_OFF = 0, - ST1_ON + ST1_OFF = 0, + ST1_ON } E53ST1_Status_ENUM; /***************************************************\ @@ -31,25 +31,25 @@ typedef enum \***************************************************/ __packed typedef struct { - uint32_t latitude_bd; //纬度 分扩大100000倍,实际要除以100000 - uint8_t nshemi_bd; //北纬/南纬,N:北纬;S:南纬 - uint32_t longitude_bd; //经度 分扩大100000倍,实际要除以100000 - uint8_t ewhemi_bd; //东经/西经,E:东经;W:西经 + uint32_t latitude_bd; //纬度 分扩大100000倍,实际要除以100000 + uint8_t nshemi_bd; //北纬/南纬,N:北纬;S:南纬 + uint32_t longitude_bd; //经度 分扩大100000倍,实际要除以100000 + uint8_t ewhemi_bd; //东经/西经,E:东经;W:西经 }gps_msg; /* E53_ST1传感器数据类型定义 ------------------------------------------------------------*/ typedef struct { - float Longitude; //经度 - float Latitude; //纬度 + float Longitude; //经度 + float Latitude; //纬度 } E53_ST1_Data_TypeDef; extern E53_ST1_Data_TypeDef E53_ST1_Data; typedef struct { - char Longitude[9]; //经度 - char Latitude[8]; //纬度 + char Longitude[9]; //经度 + char Latitude[8]; //纬度 } E53_ST1_Send_TypeDef; extern E53_ST1_Send_TypeDef E53_ST1_Send; @@ -62,5 +62,9 @@ void E53_ST1_Read_Data(void); void E53_ST1_LED_StatusSet(E53ST1_Status_ENUM status); void E53_ST1_Beep(E53ST1_Status_ENUM status); -#endif /* __E53_ST1_H__ */ +#endif + + + + diff --git a/devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c b/devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c index 5001a8b2..9d98bf67 100644 --- a/devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c +++ b/devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c @@ -66,7 +66,7 @@ void mqtt_demo_task(void) printf("MQTT: %s\n", state == MQTT_STATE_CONNECTED ? "CONNECTED" : "DISCONNECTED"); } - /* ¿ªÊ¼¶©ÔÄtopic */ + 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) { @@ -87,8 +87,7 @@ void mqtt_demo_task(void) while (1) { - - /* Éϱ¨Öµ */ + memset(payload, 0, sizeof(payload)); snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, 30); -- GitLab