murmur/TT12-MCU
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复isFileMode的逻辑bug

Browse Source
This commit is contained in:
CSSC-WORK\murmur 2023-09-13 09:11:51 +08:00
parent 103e096122
commit ec50a45884
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/core.c
View File

@ -279,7 +279,6 @@ void timerIsReady(void)
void fileIsReady(void) void fileIsReady(void)
{ {
rt_event_send(&chkSta, FILE_IS_OK); rt_event_send(&chkSta, FILE_IS_OK);
isFileMode = 1;
stopTM(); stopTM();
} }
void TTIsReady(void) void TTIsReady(void)
@ -723,11 +722,13 @@ void deInitTT_thread_entry()
clearWindowMode(); clearWindowMode();
setManualWindow(-1); setManualWindow(-1);
setWorkSta(0); setWorkSta(0);
isFileMode=0;
LOG_W("shunt down TT DONE"); LOG_W("shunt down TT DONE");
} }
// initThread = RT_NULL; // initThread = RT_NULL;
deinitThread = RT_NULL; deinitThread = RT_NULL;
pwTT_thread_entry("0");
// list_thread(); // list_thread();
} }
@ -743,6 +744,7 @@ void initTT()
} }
set3SRTC(); set3SRTC();
setWorkSta(1); setWorkSta(1);
isFileMode=1;
initThread = rt_thread_create("initTT", initTT_thread_entry, RT_NULL, 1024 * 5, 25, 10); initThread = rt_thread_create("initTT", initTT_thread_entry, RT_NULL, 1024 * 5, 25, 10);
/* 创建成功则启动线程 */ /* 创建成功则启动线程 */
if (initThread != RT_NULL) if (initThread != RT_NULL)

2
applications/usrcfg.h
View File

@ -57,8 +57,6 @@ typedef struct
uint8_t locAlert; uint8_t locAlert;
uint8_t locRepInterval; uint8_t locRepInterval;
int8_t isMaWin; int8_t isMaWin;
uint8_t wljd[40];//围栏jd，支持15个点
uint8_t wlwd[40];//围栏wd
} SYS_CFG; } SYS_CFG;