PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[master]

Browse Source 
sync
This commit is contained in:
DavidLin1577
2021-06-06 21:19:47 +08:00
parent 4605e895d3
commit 8587e4decb
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.h
View File

@@ -16,13 +16,13 @@
#define ST1_GPS_POW_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE() #define ST1_GPS_POW_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE()
/*************************************************************** /***************************************************************
* 名 称: E53ST1_Status_ENUM * 名 称: GasStatus_ENUM
* 说 明：枚举状态结构体 * 说 明：枚举状态结构体
***************************************************************/ ***************************************************************/
typedef enum typedef enum
{ {
ST1_OFF = 0, ST1_OFF = 0,
ST1_ON ST1_ON
} E53ST1_Status_ENUM; } E53ST1_Status_ENUM;
/***************************************************\ /***************************************************\
@@ -31,25 +31,25 @@ typedef enum
\***************************************************/ \***************************************************/
__packed typedef struct __packed typedef struct
{ {
uint32_t latitude_bd; //纬度 分扩大100000倍,实际要除以100000 uint32_t latitude_bd; //纬度 分扩大100000倍，实际要除以100000
uint8_t nshemi_bd; //北纬/南纬,N:北纬;S:南纬 uint8_t nshemi_bd; //北纬/南纬,N:北纬;S:南纬
uint32_t longitude_bd; //经度 分扩大100000倍,实际要除以100000 uint32_t longitude_bd; //经度 分扩大100000倍,实际要除以100000
uint8_t ewhemi_bd; //东经/西经,E:东经;W:西经 uint8_t ewhemi_bd; //东经/西经,E:东经;W:西经
}gps_msg; }gps_msg;
/* E53_ST1传感器数据类型定义 ------------------------------------------------------------*/ /* E53_ST1传感器数据类型定义 ------------------------------------------------------------*/
typedef struct typedef struct
{ {
float Longitude; //经度 float Longitude; //经度
float Latitude; //纬度 float Latitude; //纬度
} E53_ST1_Data_TypeDef; } E53_ST1_Data_TypeDef;
extern E53_ST1_Data_TypeDef E53_ST1_Data; extern E53_ST1_Data_TypeDef E53_ST1_Data;
typedef struct typedef struct
{ {
char Longitude[9]; //经度 char Longitude[9]; //经度
char Latitude[8]; //纬度 char Latitude[8]; //纬度
} E53_ST1_Send_TypeDef; } E53_ST1_Send_TypeDef;
extern E53_ST1_Send_TypeDef E53_ST1_Send; 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_LED_StatusSet(E53ST1_Status_ENUM status);
void E53_ST1_Beep(E53ST1_Status_ENUM status); void E53_ST1_Beep(E53ST1_Status_ENUM status);
#endif /* __E53_ST1_H__ */ #endif

5
devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c
View File

@@ -66,7 +66,7 @@ void mqtt_demo_task(void)
printf("MQTT: %s\n", state == MQTT_STATE_CONNECTED ? "CONNECTED" : "DISCONNECTED"); 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); 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) { if (size < 0 || size > sizeof(report_reply_topic_name) - 1) {
@@ -87,8 +87,7 @@ void mqtt_demo_task(void)
while (1) { while (1) {
/* Éϱ¨Öµ */
memset(payload, 0, sizeof(payload)); memset(payload, 0, sizeof(payload));
snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, 30); snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, 30);