Added RTCC function to increase current time in seconds

examples/zolertia/zoul/rtcc/test-rtcc.c

@@ -59,9 +59,14 @@
 #define DATE "Unknown"
 #endif
 /*---------------------------------------------------------------------------*/
-#define LOOP_PERIOD         60L
-#define LOOP_INTERVAL       (CLOCK_SECOND * LOOP_PERIOD)
-#define TEST_ALARM_SECOND   30
+#define LOOP_PERIOD             60L
+#define LOOP_INTERVAL           (CLOCK_SECOND * LOOP_PERIOD)
+#define TEST_ALARM_SECOND       15
+/*---------------------------------------------------------------------------*/
+/* Enable to match a given second number every minute, else it will trigger an
+ * interrupt every TEST_ALARM_SECOND
+ */
+#define TEST_ALARM_MATCH_MIN    0
 /*---------------------------------------------------------------------------*/
 PROCESS(test_remote_rtcc_process, "Test RTC driver process");
 AUTOSTART_PROCESSES(&test_remote_rtcc_process);
@@ -72,11 +77,34 @@ static simple_td_map *simple_td = (simple_td_map *)rtc_buffer;
 static struct etimer et;
 /*---------------------------------------------------------------------------*/
 void
+configure_new_alarm(void)
+{
+  if(rtcc_date_increment_seconds(simple_td, TEST_ALARM_SECOND) == AB08_ERROR) {
+    printf("Fail: could not increment the next alarm date\n");
+    return;
+  }
+
+  /* We use the RTCC_REPEAT_DAY as we want the RTCC to match the given date */
+  if(rtcc_set_alarm_time_date(simple_td, RTCC_ALARM_ON, RTCC_REPEAT_DAY,
+                              RTCC_TRIGGER_INT1) == AB08_ERROR) {
+    printf("Fail: couldn't set the alarm\n");
+    return;
+  }
+
+  printf("Alarm set to match: ");
+  rtcc_print(RTCC_PRINT_ALARM_DEC);
+}
+/*---------------------------------------------------------------------------*/
+void
 rtcc_interrupt_callback(uint8_t value)
 {
   printf("A RTCC interrupt just happened! time/date: ");
   rtcc_print(RTCC_PRINT_DATE_DEC);
-  leds_toggle(LEDS_PURPLE);
+  leds_toggle(LEDS_ALL);
+
+#if !TEST_ALARM_MATCH_MIN
+  configure_new_alarm();
+#endif
 }
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(test_remote_rtcc_process, ev, data)
@@ -149,9 +177,10 @@ PROCESS_THREAD(test_remote_rtcc_process, ev, data)
   printf("Configured time: ");
   rtcc_print(RTCC_PRINT_DATE_DEC);
 
-  /* Configure the RTCC to trigger an alarm every TEST_ALARM_SECOND tick */
-  printf("Setting an alarm to tick every minute matching %u seconds\n",
-         TEST_ALARM_SECOND);
+#if TEST_ALARM_MATCH_MIN
+  /* Configure the RTCC to trigger an alarm every TEST_ALARM_SECOND match */
+  printf("Setting an alarm to tick every %u seconds match\n", TEST_ALARM_SECOND);
+
   simple_td->seconds = TEST_ALARM_SECOND;
 
   /* Notice the arguments, we want to trigger the alarm every time the clock
@@ -165,8 +194,12 @@ PROCESS_THREAD(test_remote_rtcc_process, ev, data)
     PROCESS_EXIT();
   }
 
-  printf("Alarm set to match: ");
-  rtcc_print(RTCC_PRINT_ALARM_DEC);
+#else
+  /* Configure the RTCC to trigger an alarm every TEST_ALARM_SECOND tick */
+  printf("Setting an alarm to tick every %u seconds\n", TEST_ALARM_SECOND);
+
+  configure_new_alarm();
+#endif
 
   PROCESS_END();
 }

platform/zoul/dev/rtcc.c

@@ -564,6 +564,75 @@ rtcc_set_alarm_time_date(simple_td_map *data, uint8_t state, uint8_t repeat,
   return AB08_SUCCESS;
 }
 /*---------------------------------------------------------------------------*/
+int8_t
+rtcc_date_increment_seconds(simple_td_map *data, uint16_t seconds)
+{
+  uint16_t aux;
+
+  if(data == NULL) {
+    PRINTF("RTC: invalid argument\n");
+    return AB08_ERROR;
+  }
+
+  if(rtcc_get_time_date(data) == AB08_ERROR) {
+    return AB08_ERROR;
+  }
+
+  /* Nothing to do here but congratulate the user */
+  if(!seconds) {
+    return AB08_SUCCESS;
+  }
+
+  aux = data->seconds + seconds;
+  data->seconds = (uint8_t)(aux % 60);
+
+  /* Add the remainder seconds to the minutes counter */
+  if(aux > 59) {
+    aux /= 60;
+    aux += data->minutes;
+    data->minutes = (uint8_t)(aux % 60);
+  }
+
+  /* Add the remainder minutes to the hours counter */
+  if(aux > 59) {
+    aux /= 60;
+    aux += data->hours;
+    data->hours = (uint8_t)(aux % 24);
+  }
+
+  if(aux > 23) {
+    aux /= 24;
+    aux += data->day;
+
+    if(data->months == 2) {
+      if(check_leap_year(data->years)) {
+        if(aux > 29) {
+          data->day = (uint8_t)(aux % 29);
+          data->months++;
+        }
+      } else if(aux > 28) {
+        data->day = (uint8_t)(aux % 28);
+        data->months++;
+      }
+    } else if((data->months == 4) || (data->months == 6) ||
+             (data->months == 9) || (data->months == 11)) {
+      if(aux > 30) {
+        data->day = (uint8_t)(aux % 30);
+        data->months++;
+      }
+    } else if(aux > 31) {
+      data->day = (uint8_t)(aux % 31);
+      data->months++;
+    }
+  }
+
+  if(data->months > 12) {
+    data->months = data->months % 12;
+    data->years++;
+  }
+  return AB08_SUCCESS;
+}
+/*---------------------------------------------------------------------------*/
 PROCESS(rtcc_int_process, "RTCC interruption process handler");
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(rtcc_int_process, ev, data)

platform/zoul/dev/rtcc.h

@@ -352,6 +352,16 @@ int8_t rtcc_print(uint8_t value);
 int8_t rtcc_set_alarm_time_date(simple_td_map *data, uint8_t state,
                                 uint8_t repeat, uint8_t trigger);
 
+/**
+ * \brief Increments the current date by a number of seconds
+ * \param data structure to store the date
+ * \param seconds the numberof seconds to increment the date
+ * \return
+ * \           AB08_SUCCESS updated date values
+ * \           AB08_ERROR failed to return the values
+ */
+int8_t rtcc_date_increment_seconds(simple_td_map *data, uint16_t seconds);
+
 /**
  * \brief Manually calibrate the RTCC
  * \param mode oscillator to calibrate
@@ -385,4 +395,4 @@ int8_t rtcc_init(void);
 /**
  * @}
  * @}
- */
+ */