(g_alarmCtrA.info.hour == curTime.tm_hour) &&\r
(g_alarmCtrA.info.minute == curTime.tm_min))\r
{\r
- g_alarmCtrA.callback();\r
+ g_alarmCtrA.callback(); \r
g_alarmCtrA.state = ALARM_STATUS_CREATED;\r
}\r
}\r
if (g_alarmCtrB.state == ALARM_STATUS_RUNNING)\r
{\r
if ((g_alarmCtrB.callback != NULL) &&\r
- //(g_alarmCtrB.info.week == curTime.tm_wday) &&\r
+ (g_alarmCtrB.info.week == curTime.tm_wday) &&\r
(g_alarmCtrB.info.hour == curTime.tm_hour) &&\r
(g_alarmCtrB.info.minute == curTime.tm_min) &&\r
(g_alarmCtrB.info.second == curTime.tm_sec))\r
{\r
- g_alarmCtrB.callback();\r
g_alarmCtrB.state = ALARM_STATUS_CREATED;\r
+ g_alarmCtrB.callback();//由于只有callback中SetZeroAlarm会设置state为ALARM_STATUS_RUNNING , 所以必须把state=ALARM_STATUS_CREATED提前,或者干脆删除。\r
}\r
}\r
// 整点回调\r