关闭每次串口收到数据检查缓存的功能
修复RTC启动的bug
This commit is contained in:
parent
dee416d2af
commit
eb2da0915e
@ -70,9 +70,10 @@ MSH_CMD_EXPORT(alarm_sample,alarm sample);
|
||||
void poTT_callback(rt_alarm_t alarm, time_t timestamp)
|
||||
{
|
||||
LOG_I("power UP TT by RTC.");
|
||||
timerIsReady();
|
||||
// timerIsReady();
|
||||
setWindowMode();
|
||||
initTT();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -95,9 +96,9 @@ void pdTT_callback(rt_alarm_t alarm, time_t timestamp)
|
||||
*/
|
||||
void poTT2_callback(rt_alarm_t alarm, time_t timestamp)
|
||||
{
|
||||
LOG_I("power UP TT by INTERVAL RTC");
|
||||
timerIsReady();
|
||||
initTT();
|
||||
// LOG_I("power UP TT by INTERVAL RTC");
|
||||
// timerIsReady();
|
||||
// initTT();
|
||||
}
|
||||
/**
|
||||
* 定时更新debug文件名
|
||||
@ -124,11 +125,9 @@ void addDefaultAlarm()
|
||||
setup.wktime.tm_mon = p_tm.tm_mon;
|
||||
setup.wktime.tm_mday = p_tm.tm_mday;
|
||||
setup.wktime.tm_wday = p_tm.tm_wday;
|
||||
setup.wktime.tm_hour = 1; //整点
|
||||
setup.wktime.tm_hour = 0; //整点
|
||||
setup.wktime.tm_min = 0; //p_tm.tm_min;
|
||||
setup.wktime.tm_sec = 0; //p_tm.tm_sec;
|
||||
|
||||
setup.wktime.tm_min = 1; //每小时的1刻钟启动发送
|
||||
setup.wktime.tm_sec = 1; //p_tm.tm_sec;
|
||||
|
||||
if (RT_NULL != alarm)
|
||||
{
|
||||
|
@ -772,7 +772,7 @@ void deInitTT_thread_entry()
|
||||
// initThread = RT_NULL;
|
||||
|
||||
deinitThread = RT_NULL;
|
||||
pwTT_thread_entry("0");
|
||||
// pwTT_thread_entry("0");
|
||||
// list_thread();
|
||||
}
|
||||
|
||||
|
@ -1214,9 +1214,9 @@ void parse3SData(uint8_t *din, size_t count)
|
||||
}
|
||||
}
|
||||
//检查待发文件,相当于失败重发
|
||||
if (getCntOfFileToSend() && !isInFileMode()) {//不严格
|
||||
fileIsReady();
|
||||
}
|
||||
// if (getCntOfFileToSend() && !isInFileMode()) {//不严格
|
||||
// fileIsReady();
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
@ -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","2.54d",bytes2str(t, 3, 10, "", str));
|
||||
rt_kprintf("SW Version: %s, build-%s\n","2.55d",bytes2str(t, 3, 10, "", str));
|
||||
}
|
||||
|
||||
MSH_CMD_EXPORT(show_version,显示版本号);
|
||||
|
@ -203,7 +203,7 @@
|
||||
#define ULOG_USING_ISR_LOG
|
||||
#define ULOG_ASSERT_ENABLE
|
||||
#define ULOG_LINE_BUF_SIZE 256
|
||||
#define ULOG_USING_ASYNC_OUTPUT
|
||||
//#define ULOG_USING_ASYNC_OUTPUT
|
||||
#define ULOG_ASYNC_OUTPUT_BUF_SIZE 1024*20
|
||||
#define ULOG_ASYNC_OUTPUT_BY_THREAD
|
||||
#define ULOG_ASYNC_OUTPUT_THREAD_STACK 10240
|
||||
|
Loading…
Reference in New Issue
Block a user