diff --git a/.mrs/launch.json b/.mrs/launch.json index 25a7cbf..be75f06 100644 --- a/.mrs/launch.json +++ b/.mrs/launch.json @@ -5,7 +5,7 @@ "type": "mrs-debugger", "request": "launch", "name": "JT-DT-YD4N02A_RTT_MRS-4G", - "cwd": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS", + "cwd": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K", "openOCDCfg": { "useLocalOpenOCD": true, "executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe", @@ -39,8 +39,8 @@ "additionalCommands": [] }, "loadedFiles": { - "executableFile": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf", - "symbolFile": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf", + "executableFile": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf", + "symbolFile": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf", "executableFileOffset": 0, "symbolFileOffset": 0 }, diff --git a/applications/user_sys.h b/applications/user_sys.h index d823194..305bef6 100644 --- a/applications/user_sys.h +++ b/applications/user_sys.h @@ -20,7 +20,7 @@ #define MAX_EXPIRATION_DAYS (365 * MAX_EXPIRATION_YEARS + 30 * 3U) #define SYS_HW_VERSION (0X22U) -#define SYS_SW_VERSION (0X10U) +#define SYS_SW_VERSION (0X12U) #define SYS_IOT_UPLOAD_CYCLE_MIN (0X3C00U) // 高位在前,低位在后 #define SYS_IOT_RETRY (0X03U) #define SYS_TEMP_ALARM_THRESHOLD (0X30U) diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index c5987c3..f323ecc 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -2,7 +2,7 @@ * @Author: mbw * @Date: 2024-10-09 08:42:14 * @LastEditors: mbw && 1600520629@qq.com - * @LastEditTime: 2025-02-07 08:44:58 + * @LastEditTime: 2025-02-08 10:17:31 * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c * @Description: * @@ -234,7 +234,7 @@ int _Pack_Send(struct Nt26k_Ops *ops, char *buf) return -RT_ERROR; } // 打印调试信息 - // LOG_D("nt26k_send_buf: %s", nt26k_send_buf); + LOG_D("nt26k_send_buf: %s", nt26k_send_buf); rt_uint16_t data_len = rt_strlen(nt26k_send_buf); // 通过AT指令发送数据给NT26K模块 if (at_send_data(device, nt26k_send_buf, data_len / 2) != RT_EOK) @@ -777,6 +777,7 @@ const Nt26kEventInfo nt26k_event_info[] = { */ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, void *param) { + rt_uint8_t cnt = 0; rt_err_t ret = RT_EOK; rt_uint8_t max_retry_count = (rt_uint8_t)Flash_Get_SysCfg(kIotRetryId); LOG_D("max_retry_count:%d\n", max_retry_count); @@ -807,6 +808,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, RTC_ShowTime(); // 每次发送打印下时间,容易定位问题 #endif rt_thread_mdelay(IMEI_Delay()); + LOG_D("send data cnt :%d", cnt); int result = event->send_func(device, nt26k_ops); if (result != RT_EOK) { @@ -839,15 +841,15 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, } else { - // if (!nt26k_disconnect_retry_flag) - // { - LOG_D("断网,启动重连\n"); - rt_sem_release(nt26k_disconnect_sem); - // } - // LOG_D("断网,等待连接中......\n"); + if (!nt26k_disconnect_retry_flag) + { + LOG_D("断网,启动重连\n"); + rt_sem_release(nt26k_disconnect_sem); + } + LOG_D("断网,等待连接中......\n"); ret = RT_ERROR; } - rt_thread_mdelay(5000); + rt_thread_mdelay(3000); } } if (rt_strcmp(event->event_name, "掉电事件") == RT_EOK) @@ -1558,7 +1560,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) __exit: if (result != RT_EOK) { - // nt26k_disconnect_retry_flag = 1; + nt26k_disconnect_retry_flag = 1; // LOG_D("重连网络失败,等待%d s后重连\n", delay_n * 5); LOG_D("重连网络失败,等待10s后重连\n"); @@ -1576,7 +1578,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) reboot(); } rt_thread_mdelay(IMEI_Delay() + 10000); - // nt26k_conncet_tcp_flag = 0; + nt26k_conncet_tcp_flag = 0; rt_sem_release(nt26k_disconnect_sem); } }