From 844b9faf8d9dcde9eb22d2354f02328d529f03aa Mon Sep 17 00:00:00 2001 From: David Lin Date: Thu, 14 Jan 2021 19:25:01 +0800 Subject: [PATCH 1/6] Fixed bug in l610_tencent_firmware --- devices/l610_tencent_firmware/mqtt_iot_explorer_tc_demo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b1978658..5001a8b2 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 */ + /* 驴陋脢录露漏脭脛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) { @@ -78,7 +78,7 @@ 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) { @@ -88,7 +88,7 @@ void mqtt_demo_task(void) while (1) { - /* 上报值 */ + /* 脡脧卤篓脰碌 */ memset(payload, 0, sizeof(payload)); snprintf(payload, sizeof(payload), REPORT_DATA_TEMPLATE, 30); From 99e59126c82836b52a2cbdd739ee5da223133f0d Mon Sep 17 00:00:00 2001 From: David Lin Date: Thu, 14 Jan 2021 21:12:59 +0800 Subject: [PATCH 2/6] Update E53_ST1.h --- .../BSP/Hardware/E53_ST1/E53_ST1.h | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 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 7a7ef30d..5190c8db 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() /*************************************************************** -* 鍚 绉: GasStatus_ENUM +* 鍚 绉: E53ST1_Status_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,9 +62,5 @@ void E53_ST1_Read_Data(void); void E53_ST1_LED_StatusSet(E53ST1_Status_ENUM status); void E53_ST1_Beep(E53ST1_Status_ENUM status); -#endif - - - - +#endif /* __E53_ST1_H__ */ From 20427623153bfd83b2d0ff375b6eb45517250766 Mon Sep 17 00:00:00 2001 From: David Lin Date: Thu, 14 Jan 2021 21:17:17 +0800 Subject: [PATCH 3/6] Update E53_ST1.c --- .../BSP/Hardware/E53_ST1/E53_ST1.c | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.c b/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.c index d63185a6..37caf87c 100644 --- a/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.c +++ b/board/BearPi_STM32L431RC/BSP/Hardware/E53_ST1/E53_ST1.c @@ -225,20 +225,20 @@ void Init_E53_ST1(void) * 鍑芥暟鍚嶇О: NMEA_Comma_Pos * 鍑芥暟鍔熻兘锛氫粠buf閲岄潰寰楀埌绗琧x涓楀彿鎵鍦ㄧ殑浣嶇疆 * 杈撳叆鍊硷細 -* 杩斿洖鍊硷細0~0xFE锛屼唬琛ㄩ楀彿鎵鍦ㄤ綅缃殑渚垮疁 -* 0xFF锛屼唬琛ㄤ笉瀛樺湪绗琧x涓楀彿 +* 杩斿洖鍊硷細0~0xFE锛屼唬琛ㄩ楀彿鎵鍦ㄤ綅缃殑鍋忕Щ +* 0xFF锛屼唬琛ㄤ笉瀛樺湪绗琧x涓楀彿 \***************************************************/ uint8_t NMEA_Comma_Pos(uint8_t *buf,uint8_t cx) { - uint8_t *p = buf; - while(cx) - { - if(*buf=='*'||*buf<' '||*buf>'z')return 0xFF; - if(*buf==',')cx--; - buf++; - } - return buf-p; + uint8_t *p = buf; + while(cx) + { + if(*buf=='*'||*buf<' '||*buf>'z')return 0xFF; + if(*buf==',')cx--; + buf++; + } + return buf-p; } /***************************************************\ * 鍑芥暟鍚嶇О: NMEA_Pow @@ -346,32 +346,32 @@ void E53_ST1_Read_Data(void) } /*************************************************************** -* 鍑芥暟鍚嶇О: E53SF1_LED_StatusSet -* 璇 鏄: E53SF1寮鍙戞澘涓婄殑LED鐏殑浜伃鎺у埗 +* 鍑芥暟鍚嶇О: E53_ST1_LED_StatusSet +* 璇 鏄: E53 ST1寮鍙戞澘涓婄殑LED鐏殑浜伃鎺у埗 * 鍙 鏁: status,LED鐏殑鐘舵 -* 闈1,鍏崇伅 -* 1,寮鐏 +* 闈1,鍏崇伅 +* 1,寮鐏 * 杩 鍥 鍊: 鏃 ***************************************************************/ void E53_ST1_LED_StatusSet(E53ST1_Status_ENUM status) { - HAL_GPIO_WritePin(ST1_LED_GPIO_Port, ST1_LED_Pin, status != ST1_ON ? GPIO_PIN_RESET : GPIO_PIN_SET ); + HAL_GPIO_WritePin(ST1_LED_GPIO_Port, ST1_LED_Pin, status != ST1_ON ? GPIO_PIN_RESET : GPIO_PIN_SET ); } /*************************************************************** -* 鍑芥暟鍚嶇О: E53SF1_BEEP -* 璇 鏄: E53SF1铚傞福鍣ㄦ姤璀︿笌鍚 +* 鍑芥暟鍚嶇О: E53_ST1_Beep +* 璇 鏄: E53 ST1铚傞福鍣ㄦ姤璀︿笌鍚 * 鍙 鏁: status,LED_ENUM鏋氫妇鐨勬暟鎹 -* LED_OFF,鍏崇伅 -* LED_ON,寮鐏 +* ST1_OFF,鍏 +* ST1_ON,寮 * 杩 鍥 鍊: 鏃 ***************************************************************/ void E53_ST1_Beep(E53ST1_Status_ENUM status) { - if(status == ST1_ON) - HAL_TIM_PWM_Start(&htim16,TIM_CHANNEL_1); - if(status == ST1_OFF) - HAL_TIM_PWM_Stop(&htim16,TIM_CHANNEL_1); + if(status == ST1_ON) + HAL_TIM_PWM_Start(&htim16,TIM_CHANNEL_1); + if(status == ST1_OFF) + HAL_TIM_PWM_Stop(&htim16,TIM_CHANNEL_1); } From 8587e4decb2d6d8f594ff91fcf7e15489fc25c7b Mon Sep 17 00:00:00 2001 From: DavidLin1577 Date: Sun, 6 Jun 2021 21:19:47 +0800 Subject: [PATCH 4/6] [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); From fb664cf9957ffe0e9bebd898abc8f823f3946b21 Mon Sep 17 00:00:00 2001 From: DavidLin1577 Date: Mon, 21 Jun 2021 16:35:04 +0800 Subject: [PATCH 5/6] Update sensor_parser.h --- .../BSP/Hardware/PM25/sensor_parser.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/PM25/sensor_parser.h b/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/PM25/sensor_parser.h index b69c8169..3ff57c7a 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/PM25/sensor_parser.h +++ b/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/PM25/sensor_parser.h @@ -15,8 +15,8 @@ * within TencentOS. *---------------------------------------------------------------------------*/ -#ifndef _TOS_SHELL_H_ -#define _TOS_SHELL_H_ +#ifndef _SENSOR_PARSER_H_ +#define _SENSOR_PARSER_H_ #include "tos_k.h" @@ -50,5 +50,5 @@ __API__ void tos_shell_printf(const char *format, ...); __API__ void tos_shell_input_byte(uint8_t data); -#endif /* _TOS_SHELL_H_ */ +#endif /* _SENSOR_PARSER_H_ */ From ec7428acab927449e8dc4f38e0e1a713a3f9a3cc Mon Sep 17 00:00:00 2001 From: DavidLin1577 Date: Mon, 21 Jun 2021 16:50:50 +0800 Subject: [PATCH 6/6] Updated E53_ST1.c --- .../BSP/Hardware/E53_ST1/E53_ST1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/E53_ST1/E53_ST1.c b/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/E53_ST1/E53_ST1.c index 3cab776e..f3e10ea5 100644 --- a/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/E53_ST1/E53_ST1.c +++ b/board/TencentOS_tiny_EVB_MX_Plus/BSP/Hardware/E53_ST1/E53_ST1.c @@ -360,9 +360,9 @@ void E53_ST1_LED_StatusSet(E53ST1_Status_ENUM status) /*************************************************************** * 鍑芥暟鍚嶇О: E53_ST1_Beep * 璇 鏄: E53 ST1铚傞福鍣ㄦ姤璀︿笌鍚 -* 鍙 鏁: status,LED_ENUM鏋氫妇鐨勬暟鎹 -* LED_OFF,鍏崇伅 -* LED_ON,寮鐏 +* 鍙 鏁: status,E53_ST1鏋氫妇鐨勬暟鎹 +* ST1_OFF,鍏宠渹楦ｅ櫒 +* ST1_ON,寮铚傞福鍣 * 杩 鍥 鍊: 鏃 ***************************************************************/ void E53_ST1_Beep(E53ST1_Status_ENUM status)