diff --git a/.mrs/launch.json b/.mrs/launch.json index be75f06..25a7cbf 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": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K", + "cwd": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS", "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": "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", + "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", "executableFileOffset": 0, "symbolFileOffset": 0 }, diff --git a/applications/user_sys.c b/applications/user_sys.c index 637c46c..ce106ff 100644 --- a/applications/user_sys.c +++ b/applications/user_sys.c @@ -36,7 +36,7 @@ #include -#define K 3 * 1000 +#define K (5 * 1000) volatile rt_uint16_t work_duration = 1; // 工作时长 volatile rt_uint8_t device_life_check = 0; diff --git a/applications/user_sys.h b/applications/user_sys.h index 3d204e9..e0d3406 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 (0X19U) +#define SYS_SW_VERSION (0X11U) #define SYS_IOT_UPLOAD_CYCLE_MIN (0X3C00U) // 高位在前,低位在后 #define SYS_IOT_RETRY (0X03U) #define SYS_TEMP_ALARM_THRESHOLD (0X30U) @@ -32,14 +32,20 @@ #define SYS_IOT_URL ("8.130.127.158") #define SYS_IOT_PORT ("7101") -// #define SYS_IOT_URL ("8.130.117.149") -// #define SYS_IOT_PORT ("7137") // 定义宏来打印编译时间和日期 #define COMPILE_TIME \ do { \ - rt_kprintf("Compiled at: %s\n", __TIMESTAMP__); \ + rt_kprintf("Compiled on: %s at %s\n", __DATE__, __TIME__); \ } while (0) +// #define SYS_IOT_URL ("8.130.117.149") +// #define SYS_IOT_PORT ("7137") +// 定义宏来打印编译时间和日期 +// #define COMPILE_TIME \ +// do { \ +// rt_kprintf("Compiled at: %s\n", __TIMESTAMP__); \ +// } while (0) + typedef enum { kPowerOnEvent, diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index 310b9ec..12df637 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -1457,7 +1457,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) RT_ASSERT(device); rt_err_t result = RT_EOK; rt_uint32_t delay_n = 0; - + at_response_t resp = RT_NULL; LOG_D("nt26k_life_thread entry\n"); while (1) @@ -1469,7 +1469,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) { LOG_D("重连网络中...\n"); nt26k_connect_sever_flag = 0; - at_response_t resp = at_create_resp(128, 0, 5000); + resp = at_create_resp(128, 0, 5000); if (resp == RT_NULL) { LOG_E("No memory for response structure!"); @@ -1527,6 +1527,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) nt26k_conncet_tcp_flag = RT_TRUE; delay_n = 0; nt26k_disconnect_retry_flag = 0; + at_delete_resp(resp); } else { @@ -1536,8 +1537,6 @@ static void Nt26k_Life_Thread_Entry(void *parameter) goto __exit; } } - rt_thread_mdelay(1); - at_delete_resp(resp); } } else @@ -1553,7 +1552,11 @@ static void Nt26k_Life_Thread_Entry(void *parameter) LOG_D("重连网络失败,等待10s后重连\n"); // rt_thread_mdelay(delay_n * 5000); - + if (resp != RT_NULL) + { + at_delete_resp(resp); + } + delay_n++; if (delay_n >= 360) // 连续重连大于1小时都不行,则重启设备 { @@ -1561,7 +1564,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) rt_thread_mdelay(100); reboot(); } - rt_thread_mdelay(10000); + rt_thread_mdelay(IMEI_Delay() + 10000); // nt26k_conncet_tcp_flag = 0; rt_sem_release(nt26k_disconnect_sem); } @@ -1632,7 +1635,7 @@ int BSP_Nt26k_Thread_Init(void) nt26k_error_timer = rt_timer_create("nt26k_error_timer", Nt26k_Error_Timer_Cb, RT_NULL, - 3 * 60 * RT_TICK_PER_SECOND, // (3分钟) + 1 * 60 * RT_TICK_PER_SECOND, // (1分钟) RT_TIMER_FLAG_PERIODIC); nt26k_upload_timer = rt_timer_create("nt26k_upload_timer", Nt26k_Upload_Timer_Cb, diff --git a/bsp/src/bsp_rng.c b/bsp/src/bsp_rng.c index 44fedc7..790bff8 100644 --- a/bsp/src/bsp_rng.c +++ b/bsp/src/bsp_rng.c @@ -20,8 +20,8 @@ int Get_RandomNumber(void) while(RNG_GetFlagStatus(RNG_FLAG_DRDY) == RESET); random = RNG_GetRandomNumber(); - LOG_D("random = %d\r\n", random % 31); +// LOG_D("random = %d\r\n", random % 31); // 生成0到1000之间的随机数 - return random % 1000; + return random % 2000; } diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h index 4662ee6..7d09260 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 //打开所有的终端测试程序