Merge pull request #1 from arduino-libraries/master

Pulling in changes from the main fork

Author: GabrielNotman

README.adoc

@@ -1,6 +1,6 @@
 = RTC Library for Arduino =
 
-The RTC library enables an Arduino Zero board to take control of the internal RTC.
+The RTC library enables an Arduino Zero or MKR1000 board to take control of the internal RTC.
 
 For more information about this library please visit us at
 http://arduino.cc/en/Reference/RTC

examples/Epoch/Epoch.ino

@@ -0,0 +1,58 @@
+/*
+  Epoch time example for Arduino Zero
+
+  Demonstrates the use of the RTC library for the Arduino Zero
+
+  This example code is in the public domain
+
+  created by Sandeep Mistry <[email protected]>
+  31 Dec 2015
+*/
+
+#include <RTCZero.h>
+
+/* Create an rtc object */
+RTCZero rtc;
+
+void setup() {
+  Serial.begin(9600);
+
+  rtc.begin(); // initialize RTC
+
+  rtc.setEpoch(1451606400); // Jan 1, 2016
+}
+
+void loop() {
+  Serial.print("Unix time = ");
+  Serial.println(rtc.getEpoch());
+
+  Serial.print("Seconds since Jan 1 2000 = ");
+  Serial.println(rtc.getY2kEpoch());
+
+  // Print date...
+  Serial.print(rtc.getDay());
+  Serial.print("/");
+  Serial.print(rtc.getMonth());
+  Serial.print("/");
+  Serial.print(rtc.getYear());
+  Serial.print("\t");
+
+  // ...and time
+  print2digits(rtc.getHours());
+  Serial.print(":");
+  print2digits(rtc.getMinutes());
+  Serial.print(":");
+  print2digits(rtc.getSeconds());
+
+  Serial.println();
+
+  delay(1000);
+}
+
+void print2digits(int number) {
+  if (number < 10) {
+    Serial.print("0");
+  }
+  Serial.print(number);
+}
+

examples/SimpleRTC/SimpleRTC.ino

@@ -20,14 +20,14 @@
 RTCZero rtc;
 
 /* Change these values to set the current initial time */
-const uint8_t seconds = 0;
-const uint8_t minutes = 0;
-const uint8_t hours = 16;
+const byte seconds = 0;
+const byte minutes = 0;
+const byte hours = 16;
 
 /* Change these values to set the current initial date */
-const uint8_t day = 15;
-const uint8_t month = 6;
-const uint8_t year = 15;
+const byte day = 15;
+const byte month = 6;
+const byte year = 15;
 
 void setup()
 {

examples/SimpleRTCAlarm/SimpleRTCAlarm.ino

@@ -20,14 +20,14 @@
 RTCZero rtc;
 
 /* Change these values to set the current initial time */
-const uint8_t seconds = 0;
-const uint8_t minutes = 0;
-const uint8_t hours = 16;
+const byte seconds = 0;
+const byte minutes = 0;
+const byte hours = 16;
 
 /* Change these values to set the current initial date */
-const uint8_t day = 25;
-const uint8_t month = 9;
-const uint8_t year = 15;
+const byte day = 25;
+const byte month = 9;
+const byte year = 15;
 
 void setup()
 {

examples/SleepRTCAlarm/SleepRTCAlarm.ino

@@ -17,14 +17,14 @@
 RTCZero rtc;
 
 /* Change these values to set the current initial time */
-const uint8_t seconds = 0;
-const uint8_t minutes = 00;
-const uint8_t hours = 17;
+const byte seconds = 0;
+const byte minutes = 00;
+const byte hours = 17;
 
 /* Change these values to set the current initial date */
-const uint8_t day = 17;
-const uint8_t month = 11;
-const uint8_t year = 15;
+const byte day = 17;
+const byte month = 11;
+const byte year = 15;
 
 void setup()
 {

keywords.txt

@@ -28,6 +28,11 @@ setSeconds 			KEYWORD2
 setDate					KEYWORD2
 setTime					KEYWORD2
 
+getEpoch			KEYWORD2
+getY2kEpoch			KEYWORD2
+setEpoch			KEYWORD2
+setY2kEpoch			KEYWORD2
+
 getAlarmDay			KEYWORD2
 getAlarmMonth		KEYWORD2
 getAlarmYear		KEYWORD2

library.properties

@@ -1,9 +1,9 @@
 name=RTCZero
-version=1.3.0
+version=1.4.2
 author=Arduino
 maintainer=Arduino <[email protected]>
-sentence=Allows to use the RTC functionalities. For Arduino Zero only.
-paragraph=With this library you can use the RTC peripheral of an Arduino Zero in order to program actions related to date and time.
+sentence=Allows to use the RTC functionalities. For Arduino Zero and MKR1000 only.
+paragraph=With this library you can use the RTC peripheral of an Arduino Zero or MKR1000 in order to program actions related to date and time.
 category=Timing
 url=http://www.arduino.cc/en/Reference/RTCZero
 architectures=samd

src/RTCZero.cpp

@@ -16,12 +16,13 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
- 
-#include "RTCZero.h"
 
-#define EPOCH_TIME_OFF 946684800  // This is 1st January 2000, 00:00:00 in epoch time
+#include <time.h>
+
+#include "RTCZero.h"
 
-static const uint8_t daysInMonth[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 };
+#define EPOCH_TIME_OFF      946684800  // This is 1st January 2000, 00:00:00 in epoch time
+#define EPOCH_TIME_YEAR_OFF 100        // years since 1900
 
 voidFuncPtr RTC_callBack = NULL;
 
@@ -296,80 +297,51 @@ void RTCZero::setAlarmDate(uint8_t day, uint8_t month, uint8_t year)
 
 uint32_t RTCZero::getEpoch()
 {
-  return getY2kEpoch() + EPOCH_TIME_OFF;
+  struct tm tm;
+
+  tm.tm_isdst = -1;
+  tm.tm_yday = 0;
+  tm.tm_wday = 0;
+  tm.tm_year = getYear() + EPOCH_TIME_YEAR_OFF;
+  tm.tm_mon = getMonth() - 1;
+  tm.tm_mday = getDay();
+  tm.tm_hour = getHours();
+  tm.tm_min = getMinutes();
+  tm.tm_sec = getSeconds();
+
+  return mktime(&tm);
 }
 
 uint32_t RTCZero::getY2kEpoch()
 {
-  uint16_t days = RTC->MODE2.CLOCK.bit.DAY;
-  days = days > 0 ? days : 1;
-  uint8_t months = RTC->MODE2.CLOCK.bit.MONTH;
-  uint16_t years = RTC->MODE2.CLOCK.bit.YEAR;
-
-  for (uint8_t i = 1; i < months; ++i) {
-    days += daysInMonth[i - 1];
-  }
-
-  if ((months > 2) && (years % 4 == 0)) {
-    ++days;
-  }
-  days += 365 * years + (years + 3) / 4 - 1;
-  
-  uint8_t hours = RTC->MODE2.CLOCK.bit.HOUR;
-
-  return ((days * 24 + hours) * 60 +
-    RTC->MODE2.CLOCK.bit.MINUTE) * 60 + RTC->MODE2.CLOCK.bit.SECOND;
+  return (getEpoch() - EPOCH_TIME_OFF);
 }
 
 void RTCZero::setEpoch(uint32_t ts)
 {
   if (ts < EPOCH_TIME_OFF) {
-    setY2kEpoch(0);
-  }
-  else {
-    setY2kEpoch(ts - EPOCH_TIME_OFF);
+    ts = EPOCH_TIME_OFF;
   }
-}
-
-void RTCZero::setY2kEpoch(uint32_t ts)
-{
-  RTC->MODE2.CLOCK.bit.SECOND = ts % 60;
-  ts /= 60;
-  RTC->MODE2.CLOCK.bit.MINUTE = ts % 60;
-  ts /= 60;
-  RTC->MODE2.CLOCK.bit.HOUR = ts % 24;
-
-  uint16_t days = ts / 24;
-  uint8_t months;
-  uint8_t years;
-
-  uint8_t leap;
 
-  // Calculate years
-  for (years = 0; ; ++years) {
-    leap = years % 4 == 0;
-    if (days < 365 + leap)
-      break;
-    days -= 365 + leap;
-  }
+  time_t t = ts;
+  struct tm* tmp = gmtime(&t);
 
-  // Calculate months
-  for (months = 1; ; ++months) {
-    uint8_t daysPerMonth = daysInMonth[months - 1];
-    if (leap && months == 2)
-      ++daysPerMonth;
-    if (days < daysPerMonth)
-      break;
-    days -= daysPerMonth;
-  }
+  RTC->MODE2.CLOCK.bit.YEAR = tmp->tm_year - EPOCH_TIME_YEAR_OFF;
+  RTC->MODE2.CLOCK.bit.MONTH = tmp->tm_mon + 1;
+  RTC->MODE2.CLOCK.bit.DAY = tmp->tm_mday;
+  RTC->MODE2.CLOCK.bit.HOUR = tmp->tm_hour;
+  RTC->MODE2.CLOCK.bit.MINUTE = tmp->tm_min;
+  RTC->MODE2.CLOCK.bit.SECOND = tmp->tm_sec;
 
-  RTC->MODE2.CLOCK.bit.YEAR = years;
-  RTC->MODE2.CLOCK.bit.MONTH = months;
-  RTC->MODE2.CLOCK.bit.DAY = days + 1;
   while (RTCisSyncing())
     ;
 }
 
+void RTCZero::setY2kEpoch(uint32_t ts)
+{
+  setEpoch(ts + EPOCH_TIME_OFF);
+}
+
 /*
  * Private Utility Functions
  */