Fixed Cron event handling

sharky76 · sharky76 · commit f71b6a5099b1 · 2017-02-22T09:20:49.000-06:00
diff --git a/services/Cron/Cron.c b/services/Cron/Cron.c
@@ -117,7 +117,7 @@ void  timer_tick_event(const char* name, event_t* pevent)
 {
     service_event_data_t* timer_event_data = (service_event_data_t*)variant_get_ptr(pevent->data);
 
-    if(++timer_tick_counter > 60 && strcmp(timer_event_data->data, "tick") == 0)
+    if(strcmp(timer_event_data->data, "tick") == 0 && ++timer_tick_counter > 59)
     {
         timer_tick_counter = 0;
         LOG_DEBUG(DT_CRON, "Event %s tick", name);
@@ -132,6 +132,8 @@ void  timer_tick_event(const char* name, event_t* pevent)
         ADD_MONTH(job_time, p_tm->tm_mon);
         ADD_WEEKDAY(job_time, p_tm->tm_wday);
 
+        //printf("Cron Event %d %d %d %d %d\n", MINUTE(job_time), HOUR(job_time), DAY(job_time), MONTH(job_time), WEEKDAY(job_time));
+
         variant_stack_t* scene_list = crontab_get_scene(job_time);
 
         if(NULL != scene_list)

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void timer_tick_event(const char* name, event_t* pevent)`
`117`	`117`	`{`
`118`	`118`	`service_event_data_t* timer_event_data = (service_event_data_t*)variant_get_ptr(pevent->data);`
`119`	`119`
`120`		`- if(++timer_tick_counter > 60 && strcmp(timer_event_data->data, "tick") == 0)`
	`120`	`+ if(strcmp(timer_event_data->data, "tick") == 0 && ++timer_tick_counter > 59)`
`121`	`121`	`{`
`122`	`122`	`timer_tick_counter = 0;`
`123`	`123`	`LOG_DEBUG(DT_CRON, "Event %s tick", name);`
`@@ -132,6 +132,8 @@ void timer_tick_event(const char* name, event_t* pevent)`
`132`	`132`	`ADD_MONTH(job_time, p_tm->tm_mon);`
`133`	`133`	`ADD_WEEKDAY(job_time, p_tm->tm_wday);`
`134`	`134`
	`135`	`+ //printf("Cron Event %d %d %d %d %d\n", MINUTE(job_time), HOUR(job_time), DAY(job_time), MONTH(job_time), WEEKDAY(job_time));`
	`136`	`+`
`135`	`137`	`variant_stack_t* scene_list = crontab_get_scene(job_time);`
`136`	`138`
`137`	`139`	`if(NULL != scene_list)`