From b1169d663f3015b93f4c0d05ff0e13f566b6dbe6 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 6 Jun 2020 10:35:22 +0800 Subject: [PATCH 1/3] Update esp8266_evtdrv.h __ESP8266_H__ ->__ESP8266_EVTDRV_H__ --- .../esp8266_evtdrv/esp8266_evtdrv.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/event_driven_at_module/esp8266_evtdrv/esp8266_evtdrv.h b/examples/event_driven_at_module/esp8266_evtdrv/esp8266_evtdrv.h index e02ac0a2..995767a0 100644 --- a/examples/event_driven_at_module/esp8266_evtdrv/esp8266_evtdrv.h +++ b/examples/event_driven_at_module/esp8266_evtdrv/esp8266_evtdrv.h @@ -15,8 +15,8 @@ * within TencentOS. *---------------------------------------------------------------------------*/ -#ifndef __ESP8266_H__ -#define __ESP8266_H__ +#ifndef __ESP8266_EVTDRV_H__ +#define __ESP8266_EVTDRV_H__ #include "tos_evtdrv.h" #include "tos_hal.h" @@ -50,14 +50,14 @@ typedef struct esp8266_event_header_st { evtdrv_event_flag_t event; - evtdrv_task_id_t sender_id; + evtdrv_task_id_t sender_id; } esp8266_event_hdr_t; typedef struct esp8266_in_msg_init_st { esp8266_event_hdr_t header; hal_uart_port_t uart_port; - evtdrv_task_id_t at_task_id; - evtdrv_task_id_t esp8266_task_id; + evtdrv_task_id_t at_task_id; + evtdrv_task_id_t esp8266_task_id; } esp8266_imsg_init_t; typedef struct esp8266_in_msg_join_ap_st { @@ -130,5 +130,5 @@ int esp8266_join_ap(const char *ssid, const char *pwd); evtdrv_event_flag_t esp8266_task(evtdrv_event_flag_t event); -#endif /* __ESP8266_H__ */ +#endif /* __ESP8266_EVTDRV_H__ */ From 0316ef630da43c28db95d424699b5b62c2d0ab2c Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 6 Jun 2020 10:43:08 +0800 Subject: [PATCH 2/3] Update tos_at_utils_evtdrv.h _TOS_AT_UTILS_H_ -> _TOS_AT_UTILS_EVTDRV_H_ --- .../at_evtdrv/include/tos_at_utils_evtdrv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/event_driven_at_module/at_evtdrv/include/tos_at_utils_evtdrv.h b/examples/event_driven_at_module/at_evtdrv/include/tos_at_utils_evtdrv.h index 46e7a094..d69e8ea9 100644 --- a/examples/event_driven_at_module/at_evtdrv/include/tos_at_utils_evtdrv.h +++ b/examples/event_driven_at_module/at_evtdrv/include/tos_at_utils_evtdrv.h @@ -1,5 +1,5 @@ -#ifndef _TOS_AT_UTILS_H_ -#define _TOS_AT_UTILS_H_ +#ifndef _TOS_AT_UTILS_EVTDRV_H_ +#define _TOS_AT_UTILS_EVTDRV_H_ typedef struct at_timer_st { evtdrv_tick_t end_time; @@ -19,5 +19,5 @@ evtdrv_tick_t at_timer_remain(at_timer_t *tmr); void at_timer_init(at_timer_t *tmr); -#endif +#endif//_TOS_AT_UTILS_EVTDRV_H_ From 6b508b4184682a40630c551f730abbbd6559dcdf Mon Sep 17 00:00:00 2001 From: David Lin Date: Sat, 6 Jun 2020 10:47:45 +0800 Subject: [PATCH 3/3] Update tos_at_evtdrv.h _TOS_AT_H_ -> _TOS_AT_EVTDRV_H_ --- .../at_evtdrv/include/tos_at_evtdrv.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/event_driven_at_module/at_evtdrv/include/tos_at_evtdrv.h b/examples/event_driven_at_module/at_evtdrv/include/tos_at_evtdrv.h index 25656119..deebf379 100644 --- a/examples/event_driven_at_module/at_evtdrv/include/tos_at_evtdrv.h +++ b/examples/event_driven_at_module/at_evtdrv/include/tos_at_evtdrv.h @@ -15,8 +15,8 @@ * within TencentOS. *---------------------------------------------------------------------------*/ -#ifndef _TOS_AT_H_ -#define _TOS_AT_H_ +#ifndef _TOS_AT_EVTDRV_H_ +#define _TOS_AT_EVTDRV_H_ #include "tos_evtdrv.h" #include "tos_at_utils_evtdrv.h" @@ -53,8 +53,8 @@ typedef struct at_cache_st { uint8_t *buffer; size_t buffer_size; size_t recv_len; - size_t curr_len; - size_t last_data; + size_t curr_len; + size_t last_data; } at_cache_t; typedef enum at_parse_status_en { @@ -95,8 +95,8 @@ typedef struct at_echo_st { char *buffer; size_t buffer_size; char *echo_expect; - evtdrv_task_id_t module_task_id; - evtdrv_event_flag_t event_flags; + evtdrv_task_id_t module_task_id; + evtdrv_event_flag_t event_flags; int line_num; at_echo_status_t status; size_t __w_idx; @@ -401,5 +401,5 @@ const char *tos_at_agent_channel_port_get(int channel_id); evtdrv_event_flag_t tos_at_evtdrv_task(evtdrv_event_flag_t event); -#endif /* __AT_AGENT_H_ */ +#endif /* _TOS_AT_EVTDRV_H_ */