Revert "Added ability to set multiple alarms"

This reverts commit 863adf2.

Author: agdl

examples/MultipleRTCAlarm/MultipleRTCAlarm.ino

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

keywords.txt

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

library.properties

@@ -72,9 +72,6 @@ void RTCZero::begin()
 
   RTCenable();
   RTCresetRemove();
-  
-  _alarmsStartPtr = NULL;
-  isFirstAlarm = true;
 }
 
 void RTC_Handler(void)
@@ -345,33 +342,11 @@ 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 |
@@ -415,52 +390,3 @@ 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.cpp

@@ -24,18 +24,6 @@
 
 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:
 
@@ -50,10 +38,6 @@ 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();
 
@@ -106,9 +90,7 @@ 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();
@@ -123,9 +105,6 @@ 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