diff --git a/bsp/src/at_device_ml307.c b/bsp/src/at_device_ml307.c index 370cc6e..389be20 100644 --- a/bsp/src/at_device_ml307.c +++ b/bsp/src/at_device_ml307.c @@ -348,6 +348,7 @@ int at_send_data(struct at_device *device, const char *data, rt_size_t send_len) size_t len = 0, error_code; #define ML307_SEND_RESP_TIME (5000) + at_response_t resp = at_create_resp(AT_CLIENT_RECV_BUFF_LEN, 0, ML307_SEND_RESP_TIME); if (resp == RT_NULL) @@ -368,6 +369,13 @@ int at_send_data(struct at_device *device, const char *data, rt_size_t send_len) return RT_EOK; } } + else if (at_resp_parse_line_args_by_kw(resp, "+CME ERROR:", "+CME ERROR: %d", &error_code) > 0) + { + ml307_conncet_tcp_flag = 0; + LOG_E("send data fail error_code: %d", error_code); + at_delete_resp(resp); + return -RT_ERROR; + } } else if (at_resp_parse_line_args_by_kw(resp, "+CME ERROR:", "+CME ERROR: %d", &error_code) > 0) { diff --git a/bsp/src/bsp_ml307.c b/bsp/src/bsp_ml307.c index c24984d..aff6023 100644 --- a/bsp/src/bsp_ml307.c +++ b/bsp/src/bsp_ml307.c @@ -951,7 +951,6 @@ int Ml307_Process_Events (Ml307Event ml307_recv_event, struct at_device *device, if (event) // 处理该事件 { // 打印事件的名称 - ml307_current_evnet = event->event_flag; for (size_t i = 0; i < max_retry_count; i++) { @@ -992,6 +991,7 @@ int Ml307_Process_Events (Ml307Event ml307_recv_event, struct at_device *device, else { ret = RT_ERROR; + break; } if (event->priority < Get_Event_Priority (ml307_latest_evnet)) // 查看当前事件和新传入的事件的优先级哪个高,如果有高的直接退出处理高优先级的 { @@ -1025,7 +1025,7 @@ int Ml307_Process_Events (Ml307Event ml307_recv_event, struct at_device *device, if (!ml307_disconnect_retry_flag) { LOG_D("与服务器断开,重连网络中"); - rt_sem_release (ml307_disconnect_sem); + rt_sem_release (ml307_disconnect_sem); } else { @@ -2015,7 +2015,7 @@ static void Ml307_Life_Thread_Entry (void *parameter) } } } - rt_thread_mdelay (3000); + rt_thread_mdelay (1000); } if (i == 60) { diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h index bb8c993..0fd4645 100644 --- a/rt-thread/rtconfig.h +++ b/rt-thread/rtconfig.h @@ -88,7 +88,7 @@ #define FINSH_THREAD_NAME "tshell" #define FINSH_THREAD_PRIORITY 11 -#define FINSH_THREAD_STACK_SIZE 4096 +#define FINSH_THREAD_STACK_SIZE 3072 #define FINSH_USING_HISTORY #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB @@ -156,7 +156,7 @@ #define RT_USING_ULOG #define ULOG_OUTPUT_LVL_D -#define ULOG_OUTPUT_LVL 7 +#define ULOG_OUTPUT_LVL 7 #define ULOG_USING_ISR_LOG #define ULOG_ASSERT_ENABLE #define ULOG_LINE_BUF_SIZE 1024