diff --git a/applications/core.c b/applications/core.c index ab722d5..bb5e856 100644 --- a/applications/core.c +++ b/applications/core.c @@ -562,6 +562,11 @@ static void chkAndSendFile_thread_entry() deInitTT(); } } + + if (!isTCPok()) { + deInitTT(); + break; + } } LOG_W("--------one mission DONE--------"); } diff --git a/applications/getinfo.c b/applications/getinfo.c index 5ae18b1..cb6a9ed 100644 --- a/applications/getinfo.c +++ b/applications/getinfo.c @@ -80,7 +80,7 @@ rt_uint8_t info2HEX(TT *TTinfo, rt_uint8_t *buffer) // 第1节为高3位分别为sim、rw和jh,其余位为xh,xh值若大于31则为31(31=b0001 1111) // 第2-5字节为经度。114.410050= 0xF2 0xD1 0xE4 0x42//根据系统大小端的不同可能是反序 // 第6-9字节为纬度。30.426840= 0x2B 0x6A 0xF3 0x41 - // 第10字节为高度,只保留整数。-31.5= 0x0A + // 第10字节为高度,只保留整数。-31.5= 0xE1 rt_uint8_t tmp = (atoi(TTinfo->sim) << 7) + (atoi(TTinfo->rw) << 6) + (atoi(TTinfo->jh) << 5) + (atoi(TTinfo->xh) > 31 ? 31 : atoi(TTinfo->xh)); // 位操作 diff --git a/applications/log2file.c b/applications/log2file.c index 59f97a3..40fd692 100644 --- a/applications/log2file.c +++ b/applications/log2file.c @@ -99,9 +99,9 @@ void sys_log_file_backend_init(void) strcat(logfilename,"/"); //总路径不能太长 - strcat(logfilename,tmstr+11); - + strcat(logfilename,tmstr+11);//sd/debug/2023-09-03/11- +// ulog_file_backend_deinit(file_be); ulog_file_backend_init( file_be, strcat(logfilename,table[id].name), diff --git a/applications/main.c b/applications/main.c index 9bae3d3..cf897a2 100644 --- a/applications/main.c +++ b/applications/main.c @@ -86,7 +86,7 @@ void show_version(void) char str[30]; uint8_t t[10]; size_t len=time2Byte(t); - rt_kprintf("SW Version: %s, build-%s\n","1.7d",bytes2str(t, 3, 10, "", str)); + rt_kprintf("SW Version: %s, build-%s\n","1.8d",bytes2str(t, 3, 10, "", str)); } MSH_CMD_EXPORT(show_version,显示版本号);