Merge branch 'master' of github.com:arduino-libraries/RTCZero

Author: agdl

examples/SimpleRTC/SimpleRTC.ino

@@ -1,17 +1,18 @@
 /*
   Simple RTC for Arduino Zero and MKR1000
 
- Demonstrates the use of the RTC library for the Arduino Zero and MKR1000
+  Demonstrates the use of the RTC library for the Arduino Zero and MKR1000
 
- This example code is in the public domain
+  This example code is in the public domain
 
- http://arduino.cc/en/Tutorial/SimpleRTC
+  http://arduino.cc/en/Tutorial/SimpleRTC
 
   created by Arturo Guadalupi <[email protected]>
   15 Jun 2015
-
-  modified
+  modified 
   18 Feb 2016
+  modified by Andrea Richetta <[email protected]>
+  24 Aug 2016
 */
 
 #include <RTCZero.h>
@@ -32,19 +33,19 @@ const byte year = 15;
 void setup()
 {
   Serial.begin(9600);
-  
+
   rtc.begin(); // initialize RTC
-  
+
   // Set the time
   rtc.setHours(hours);
   rtc.setMinutes(minutes);
   rtc.setSeconds(seconds);
-  
+
   // Set the date
   rtc.setDay(day);
   rtc.setMonth(month);
   rtc.setYear(year);
-  
+
   // you can use also
   //rtc.setTime(hours, minutes, seconds);
   //rtc.setDate(day, month, year);
@@ -53,21 +54,30 @@ void setup()
 void loop()
 {
   // Print date...
-  Serial.print(rtc.getDay());
+  print2digits(rtc.getDay());
   Serial.print("/");
-  Serial.print(rtc.getMonth());
+  print2digits(rtc.getMonth());
   Serial.print("/");
-  Serial.print(rtc.getYear());
-  Serial.print("\t");
-  
+  print2digits(rtc.getYear());
+  Serial.print(" ");
+
   // ...and time
-  Serial.print(rtc.getHours());
+  print2digits(rtc.getHours());
   Serial.print(":");
-  Serial.print(rtc.getMinutes());
+  print2digits(rtc.getMinutes());
   Serial.print(":");
-  Serial.print(rtc.getSeconds());
- 
+  print2digits(rtc.getSeconds());
+
   Serial.println();
-  
+
   delay(1000);
 }
+
+
+
+void print2digits(int number) {
+  if (number < 10) {
+    Serial.print("0"); // print a 0 before if the number is < than 10
+  }
+  Serial.print(number);
+}

src/RTCZero.cpp

@@ -52,15 +52,7 @@ void RTCZero::begin(bool resetTime)
   }
 
   // Setup clock GCLK2 with OSC32K divided by 32
-  GCLK->GENDIV.reg = GCLK_GENDIV_ID(2)|GCLK_GENDIV_DIV(4);
-  while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
-    ;
-  GCLK->GENCTRL.reg = (GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(2) | GCLK_GENCTRL_DIVSEL );
-  while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
-    ;
-  GCLK->CLKCTRL.reg = (uint32_t)((GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | (RTC_GCLK_ID << GCLK_CLKCTRL_ID_Pos)));
-  while (GCLK->STATUS.bit.SYNCBUSY)
-    ;
+  configureClock();
 
   RTCdisable();
 
@@ -390,6 +382,21 @@ uint32_t RTCZero::getY2kEpoch()
   return (getEpoch() - EPOCH_TIME_OFF);
 }
 
+void RTCZero::setAlarmEpoch(uint32_t ts)
+{
+  if (_configured) {
+    if (ts < EPOCH_TIME_OFF) {
+      ts = EPOCH_TIME_OFF;
+    }
+
+    time_t t = ts;
+    struct tm* tmp = gmtime(&t);
+
+    setAlarmDate(tmp->tm_year - EPOCH_TIME_YEAR_OFF, tmp->tm_mon + 1, tmp->tm_mday);
+    setAlarmTime(tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+  }
+}
+
 void RTCZero::setEpoch(uint32_t ts)
 {
   if (_configured) {
@@ -419,6 +426,19 @@ void RTCZero::setY2kEpoch(uint32_t ts)
   }
 }
 
+/* Attach peripheral clock to 32k oscillator */
+void RTCZero::configureClock() {
+  GCLK->GENDIV.reg = GCLK_GENDIV_ID(2)|GCLK_GENDIV_DIV(4);
+  while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
+    ;
+  GCLK->GENCTRL.reg = (GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(2) | GCLK_GENCTRL_DIVSEL );
+  while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
+    ;
+  GCLK->CLKCTRL.reg = (uint32_t)((GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | (RTC_GCLK_ID << GCLK_CLKCTRL_ID_Pos)));
+  while (GCLK->STATUS.bit.SYNCBUSY)
+    ;
+}
+
 /*
  * Private Utility Functions
  */

src/RTCZero.h

@@ -95,11 +95,19 @@ class RTCZero {
   uint32_t getY2kEpoch();
   void setEpoch(uint32_t ts);
   void setY2kEpoch(uint32_t ts);
+  void setAlarmEpoch(uint32_t ts);
+
+  bool isConfigured() {
+    _configured = RTC->MODE2.CTRL.reg & RTC_MODE2_CTRL_ENABLE;
+    configureClock();
+    return _configured;
+  }
 
 private:
   bool _configured;
 
   void config32kOSC(void);
+  void configureClock(void);
   void RTCreadRequest();
   bool RTCisSyncing(void);
   void RTCdisable();