diff --git a/applications/alarmer.c b/applications/alarmer.c index 6742b39..bda0f6f 100644 --- a/applications/alarmer.c +++ b/applications/alarmer.c @@ -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) { diff --git a/applications/core.c b/applications/core.c index 2baa6d2..e25e9dd 100644 --- a/applications/core.c +++ b/applications/core.c @@ -772,7 +772,7 @@ void deInitTT_thread_entry() // initThread = RT_NULL; deinitThread = RT_NULL; - pwTT_thread_entry("0"); +// pwTT_thread_entry("0"); // list_thread(); } diff --git a/applications/func/func.c b/applications/func/func.c index bfb20c6..a91e3dc 100644 --- a/applications/func/func.c +++ b/applications/func/func.c @@ -1214,9 +1214,9 @@ void parse3SData(uint8_t *din, size_t count) } } //检查待发文件,相当于失败重发 - if (getCntOfFileToSend() && !isInFileMode()) {//不严格 - fileIsReady(); - } +// if (getCntOfFileToSend() && !isInFileMode()) {//不严格 +// fileIsReady(); +// } } diff --git a/applications/main.c b/applications/main.c index 023d436..a0e1e40 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","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,显示版本号); diff --git a/rtconfig.h b/rtconfig.h index c496344..3273509 100644 --- a/rtconfig.h +++ b/rtconfig.h @@ -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