Added ability to set multiple alarms

Like requested in issue #6

Author: agdl

examples/MultipleRTCAlarm/MultipleRTCAlarm.ino

@@ -0,0 +1,91 @@
+/*
+  Multiple RTC Alarm for Arduino Zero
+
+  Demonstrates multiple use of alarms using the RTC library for the Arduino Zero
+
+  This example code is in the public domain
+
+  http://arduino.cc/en/Tutorial/MultipleRTCAlarm
+
+  created by Arturo Guadalupi <[email protected]>
+  15 Jan 2016
+*/
+
+#include <RTCZero.h>
+
+/* Create an rtc object */
+RTCZero rtc;
+
+/* Change these values to set the current initial time */
+const byte seconds = 0;
+const byte minutes = 0;
+const byte hours = 16;
+
+/* Change these values to set the current initial date */
+const byte day = 25;
+const byte month = 9;
+const byte year = 15;
+
+void setup()
+{
+  Serial.begin(9600);
+
+  rtc.begin(); // initialize RTC 24H format
+
+  rtc.setTime(hours, minutes, seconds);
+  rtc.setDate(day, month, year);
+
+  rtc.addAlarm(16, 0, 10, 0, 0, 0, rtc.MATCH_HHMMSS, alarmMatch1);
+  rtc.addAlarm(16, 0, 20, 0, 0, 0, rtc.MATCH_HHMMSS, alarmMatch2);
+  rtc.addAlarm(16, 0, 30, 0, 0, 0, rtc.MATCH_HHMMSS, alarmMatch3);
+
+  rtc.updateAlarms();
+
+  delay(3000);
+  Serial.println("First alarm is:");
+  Serial.print(RTC->MODE2.Mode2Alarm[0].ALARM.bit.HOUR);
+  Serial.print(RTC->MODE2.Mode2Alarm[0].ALARM.bit.MINUTE);
+  Serial.println(RTC->MODE2.Mode2Alarm[0].ALARM.bit.SECOND);
+}
+
+void loop()
+{
+
+}
+
+void alarmMatch1()
+{
+  Serial.println("Alarm Match1!");
+  rtc.updateAlarms();
+  Serial.println("Next alarm is");
+  Serial.print(rtc.getAlarmHours());
+  Serial.print(":");
+  Serial.print(rtc.getAlarmMinutes());
+  Serial.print(":");
+  Serial.println(rtc.getAlarmSeconds());
+}
+
+void alarmMatch2()
+{
+  Serial.println("Alarm Match2!");
+  rtc.updateAlarms();
+  Serial.println("Next alarm is");
+  Serial.print(rtc.getAlarmHours());
+  Serial.print(":");
+  Serial.print(rtc.getAlarmMinutes());
+  Serial.print(":");
+  Serial.println(rtc.getAlarmSeconds());
+}
+
+void alarmMatch3()
+{
+  Serial.println("Alarm Match3!");
+  rtc.updateAlarms();
+  Serial.println("Next alarm is");
+  Serial.println("Next alarm is");
+  Serial.print(rtc.getAlarmHours());
+  Serial.print(":");
+  Serial.print(rtc.getAlarmMinutes());
+  Serial.print(":");
+  Serial.println(rtc.getAlarmSeconds());
+}

keywords.txt

@@ -54,6 +54,9 @@ disableAlarm 		KEYWORD2
 
 standbyMode			KEYWORD2
 
+addAlarm				KEYWORD2
+updateAlarms		KEYWORD2
+
 #######################################
 # Constants (LITERAL1)
 #######################################

library.properties

@@ -1,5 +1,5 @@
 name=RTCZero
-version=1.4.1
+version=1.5.0
 author=Arduino
 maintainer=Arduino <[email protected]>
 sentence=Allows to use the RTC functionalities. For Arduino Zero only.

src/RTCZero.cpp

@@ -72,6 +72,9 @@ void RTCZero::begin()
 
   RTCenable();
   RTCresetRemove();
+  
+  _alarmsStartPtr = NULL;
+  isFirstAlarm = true;
 }
 
 void RTC_Handler(void)
@@ -342,11 +345,33 @@ void RTCZero::setY2kEpoch(uint32_t ts)
   setEpoch(ts + EPOCH_TIME_OFF);
 }
 
+
+void RTCZero::addAlarm(uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t day, uint8_t month, uint8_t year, uint8_t typeOfMatch, voidFuncPtr callback){
+	_alarmsEndPtr = insertAlarm ( hours, minutes, seconds, day, month, year, typeOfMatch, callback);
+}
+
+void RTCZero::updateAlarms(void){
+	if(_alarmsStartPtr != NULL){
+ 		setAlarmTime(_alarmsStartPtr->hours, _alarmsStartPtr->minutes, _alarmsStartPtr->seconds);
+  	setAlarmDate(_alarmsStartPtr->day, _alarmsStartPtr->month, _alarmsStartPtr->year);
+  	enableAlarm((Alarm_Match) _alarmsStartPtr->typeOfMatch);
+  	attachInterrupt(_alarmsStartPtr->thisCallback);
+ 	}
+ 	else{
+ 	  setAlarmTime(0, 0, 0);
+  	setAlarmDate(0, 0, 0);
+  	enableAlarm(MATCH_OFF);
+ 	}
+ 	
+ 	destroyAlarm();
+}
+
 /*
  * Private Utility Functions
  */
 
 /* Configure the 32768Hz Oscillator */
+
 void RTCZero::config32kOSC() 
 {
   SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_ONDEMAND |
@@ -390,3 +415,52 @@ void RTCZero::RTCresetRemove()
   while (RTCisSyncing())
     ;
 }
+
+alarms* RTCZero::insertAlarm (uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t day, uint8_t month, uint8_t year, uint8_t typeOfMatch, voidFuncPtr callback){
+	
+	alarms *currentPtr, *newPtr;
+
+  currentPtr = _alarmsStartPtr;
+
+	if(isFirstAlarm){
+	  _alarmsStartPtr = (alarms*) malloc(sizeof (alarms));
+  	_alarmsStartPtr->hours = hours;
+  	_alarmsStartPtr->minutes = minutes;
+  	_alarmsStartPtr->seconds = seconds;
+  	_alarmsStartPtr->day = day;
+  	_alarmsStartPtr->month = month;
+  	_alarmsStartPtr->year = year;
+  	_alarmsStartPtr->typeOfMatch = (Alarm_Match) typeOfMatch;
+  	_alarmsStartPtr->thisCallback = callback;
+  	_alarmsStartPtr->nextAlarmPtr = NULL;
+  	isFirstAlarm = false;
+	}
+	else{
+  	while (currentPtr->nextAlarmPtr != NULL){
+  		currentPtr = currentPtr->nextAlarmPtr;
+  	}
+
+  	newPtr = (alarms*) malloc(sizeof (alarms));
+  	newPtr->hours = hours;
+  	newPtr->minutes = minutes;
+  	newPtr->seconds = seconds;
+  	newPtr->day = day;
+  	newPtr->month = month;
+  	newPtr->year = year;
+  	newPtr->typeOfMatch = typeOfMatch;
+  	newPtr->thisCallback = callback;
+  	newPtr->nextAlarmPtr = NULL;
+  }
+  currentPtr->nextAlarmPtr = newPtr;
+	
+  return newPtr;
+}
+
+void RTCZero::destroyAlarm(void){
+	alarms *currentPtr;
+	
+	currentPtr = _alarmsStartPtr;
+	_alarmsStartPtr = currentPtr->nextAlarmPtr;
+	free(currentPtr);
+	 
+}

src/RTCZero.h

@@ -24,6 +24,18 @@
 
 typedef void(*voidFuncPtr)(void);
 
+typedef struct ALARMS{
+	uint8_t seconds;
+	uint8_t minutes;
+	uint8_t hours;
+	uint8_t day;
+	uint8_t month;
+	uint8_t year;
+	uint8_t typeOfMatch;
+	voidFuncPtr thisCallback;  
+	struct ALARMS *nextAlarmPtr;
+} alarms;
+	
 class RTCZero {
 public:
 
@@ -38,6 +50,10 @@ class RTCZero {
     MATCH_YYMMDDHHMMSS = RTC_MODE2_MASK_SEL_YYMMDDHHMMSS_Val  // Once, on a specific date and a specific time
   };
 
+ 	alarms *_alarmsStartPtr, *_alarmsEndPtr;
+ 	
+ 	bool isFirstAlarm;
+ 
   RTCZero() {};
   void begin();
 
@@ -90,7 +106,9 @@ class RTCZero {
   void setAlarmMonth(uint8_t month);
   void setAlarmYear(uint8_t year);
   void setAlarmDate(uint8_t day, uint8_t month, uint8_t year);
-
+  
+  void addAlarm(uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t day, uint8_t month, uint8_t year, uint8_t typeOfMatch, voidFuncPtr callback);
+  void updateAlarms(void);
   /* Epoch Functions */
 
   uint32_t getEpoch();
@@ -105,6 +123,9 @@ class RTCZero {
   void RTCenable();
   void RTCreset();
   void RTCresetRemove();
+  
+  alarms* insertAlarm (uint8_t hours, uint8_t minutes, uint8_t seconds, uint8_t day, uint8_t month, uint8_t year, uint8_t typeOfMatch, voidFuncPtr callback);
+  void destroyAlarm(void);
 };
 
 #endif // RTC_ZERO_H