diff --git a/.mrs/launch.json b/.mrs/launch.json index ea52fff..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\\1\\Desktop\\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\\1\\Desktop\\JT-DT-YD4N02A_4G_RTT_MRS\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf", - "symbolFile": "c:\\Users\\1\\Desktop\\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/.template b/.template index 7a75afa..6477dcb 100644 --- a/.template +++ b/.template @@ -18,6 +18,6 @@ Program=true Verify=true Reset=true SDIPrintf=false -Disable Power Output=false +Disable Power Output=true Clear CodeFlash=false -Disable Code-Protect=false \ No newline at end of file +Disable Code-Protect=true \ No newline at end of file diff --git a/JT-DT-YD4N02A_RTT_MRS-4G.wvproj b/JT-DT-YD4N02A_RTT_MRS-4G.wvproj index c151bee..3aed49d 100644 --- a/JT-DT-YD4N02A_RTT_MRS-4G.wvproj +++ b/JT-DT-YD4N02A_RTT_MRS-4G.wvproj @@ -779,9 +779,9 @@ "verify": true, "reset": true, "sdiPrintf": false, - "disablepowerout": false, + "disablepowerout": true, "clearcodeflash": false, - "disablecodeprotect": false, + "disablecodeprotect": true, "exepath": "", "exearguments": "" }, diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index 909ba1d..8f27670 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-08 10:17:31 + * @LastEditTime: 2025-02-08 21:07:48 * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c * @Description: * @@ -818,7 +818,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, } else { - if (rt_sem_take(nt26k_recv_msg_sem, 5000) == RT_EOK) + if (rt_sem_take(nt26k_recv_msg_sem, 4000) == RT_EOK) { LOG_D("收到回复\n"); nt26k_connect_sever_flag = 1; @@ -838,7 +838,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, { ret = RT_ERROR; } - rt_thread_mdelay(3000); + rt_thread_mdelay(5000); } } if (rt_strcmp(event->event_name, "掉电事件") == RT_EOK) diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h index 50a3a0f..f7da23a 100644 --- a/rt-thread/rtconfig.h +++ b/rt-thread/rtconfig.h @@ -15,8 +15,8 @@ /*使用动态日志及密码功能时,需开启宏 FINSH_USING_AUTH ULOG_USING_FILTER ENABLE_LOG_ALL ULOG_OUTPUT_LVL = 7 以及设置ulog.c 1522行 输出等级为0*/ /**/ -#define FINSH_USING_AUTH //开启终端密码登录功能 -#define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行 +// #define FINSH_USING_AUTH //开启终端密码登录功能 +// #define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行 #define ENABLE_LOG_ALL #define TEST_ENABLE //打开所有的终端测试程序