Change CurieRTC lib to have Processing style time API's based on the RTC value

Author: sandeepmistry

libraries/CurieRTC/examples/ReadTest/ReadTest.ino

@@ -1,30 +1,26 @@
-#include <TimeLib.h>
 #include <CurieRTC.h>
 
 void setup() {
-  Serial.begin(115200);
-  delay(200);
+  while(!Serial);
+  Serial.begin(9600);
+
   Serial.println("CurieRTC Read Test");
   Serial.println("-------------------");
 }
 
-void loop() {
-  tmElements_t tm;
-  time_t t = RTC.get();
-  breakTime(t, tm);
-  
+void loop() {  
   Serial.print("Ok, Time = ");
-  print2digits(tm.Hour);
+  print2digits(hour());
   Serial.write(':');
-  print2digits(tm.Minute);
+  print2digits(minute());
   Serial.write(':');
-  print2digits(tm.Second);
+  print2digits(second());
   Serial.print(", Date (D/M/Y) = ");
-  Serial.print(tm.Day);
+  Serial.print(day());
   Serial.write('/');
-  Serial.print(tm.Month);
+  Serial.print(month());
   Serial.write('/');
-  Serial.print(tmYearToCalendar(tm.Year));
+  Serial.print(year());
   Serial.println();
   delay(1000);
 }

libraries/CurieRTC/examples/SetTime/SetTime.ino

@@ -1,34 +1,25 @@
-#include <TimeLib.h>
 #include <CurieRTC.h>
 
 const char *monthName[12] = {
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 
-tmElements_t tm;
+int Hour, Min, Sec;
+int Day, Month, Year;
 
 void setup() {
-  bool parse=false;
-  bool config=false;
-  time_t t;
+  while(!Serial);
+  Serial.begin(9600);
 
   // get the date and time the compiler was run
   if (getDate(__DATE__) && getTime(__TIME__)) {
-    t = makeTime(tm);
-    RTC.set(t);
-    parse = true;
-    config = true;
-  }
-
-  Serial.begin(115200);
-  delay(3000);
-  
-  if (parse && config) {
     Serial.print("Curie configured Time=");
     Serial.print(__TIME__);
     Serial.print(", Date=");
     Serial.println(__DATE__);
+
+    setTime(Hour, Min, Sec, Day, Month, Year);
   } else {
     Serial.print("Could not parse info from the compiler, Time=\"");
     Serial.print(__TIME__);
@@ -39,33 +30,53 @@ void setup() {
 }
 
 void loop() {
+  Serial.print("Time now is: ");
+
+  print2digits(hour());
+  Serial.print(":");
+  print2digits(minute());
+  Serial.print(":");
+  print2digits(second());
+
+  Serial.print(" ");
+
+  Serial.print(day());
+  Serial.print("/");
+  Serial.print(month());
+  Serial.print("/");
+  Serial.print(year());
+
+  Serial.println();
+
+  delay(1000);
 }
 
 bool getTime(const char *str)
 {
-  int Hour, Min, Sec;
-
   if (sscanf(str, "%d:%d:%d", &Hour, &Min, &Sec) != 3) return false;
-  tm.Hour = Hour;
-  tm.Minute = Min;
-  tm.Second = Sec;
   return true;
 }
 
 bool getDate(const char *str)
 {
-  char Month[12];
-  int Day, Year;
-  uint8_t monthIndex;
+  char monthString[12];
 
-  if (sscanf(str, "%s %d %d", Month, &Day, &Year) != 3) return false;
-  for (monthIndex = 0; monthIndex < 12; monthIndex++) {
-    if (strcmp(Month, monthName[monthIndex]) == 0) break;
+  if (sscanf(str, "%s %d %d", monthString, &Day, &Year) != 3) {
+    return false;
   }
-  if (monthIndex >= 12) return false;
-  tm.Day = Day;
-  tm.Month = monthIndex + 1;
-  tm.Year = CalendarYrToTm(Year);
-  return true;
+
+  for (Month = 1; Month <= 12; Month++) {
+    if (strcmp(monthString, monthName[Month - 1]) == 0) {
+      break;
+    }
+  }
+
+  return (Month <= 12);
 }
 
+void print2digits(int number) {
+  if (number >= 0 && number < 10) {
+    Serial.print('0');
+  }
+  Serial.print(number);
+}

libraries/CurieRTC/keywords.txt

@@ -0,0 +1,27 @@
+#######################################
+# Syntax Coloring Map For Time
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+now	KEYWORD2
+second	KEYWORD2
+minute	KEYWORD2
+hour	KEYWORD2
+day	KEYWORD2
+month	KEYWORD2
+year	KEYWORD2
+setTime	KEYWORD2
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+
+#######################################
+# Constants (LITERAL1)
+#######################################

libraries/CurieRTC/src/CurieRTC.cpp

@@ -20,23 +20,85 @@
   
  */
 
+#include <time.h>
+
 #include "CurieRTC.h"
 
-CurieRTC::CurieRTC()
+#define YEAR_OFFSET     1900
+#define MONTH_OFFSET    1
+
+unsigned long now()
 {
+    return *(int*)RTC_CCVR;
 }
+
+struct tm* nowTm() {
+    time_t t = now();
 
-// PUBLIC FUNCTIONS
-time_t CurieRTC::get()
+    return gmtime(&t);
+}
+
+int year()
+{
+    struct tm* tm = nowTm();
+
+    return (tm->tm_year + YEAR_OFFSET);
+}
+
+int month()
+{
+    struct tm* tm = nowTm();
+
+    return (tm->tm_mon + MONTH_OFFSET);
+}
+
+int day()
 {
-  // Read the value of the RTC_CCVR register
-  return *(int*)RTC_CCVR;
+    struct tm* tm = nowTm();
+
+    return tm->tm_mday;
 }
 
-void CurieRTC::set(time_t t)
+int hour()
 {
-  // Write t into the RTC_CLR register
-  *(int*)RTC_CLR = t;
+    struct tm* tm = nowTm();
+
+    return tm->tm_hour;
 }
 
-CurieRTC RTC = CurieRTC(); // create an instance for the user
+int minute()
+{
+    struct tm* tm = nowTm();
+
+    return tm->tm_min;
+}
+
+int second()
+{
+    struct tm* tm = nowTm();
+
+    return tm->tm_sec;
+}
+
+void setTime(unsigned long t)
+{
+    *(int*)RTC_CLR = t;
+}
+
+void setTime(int hour, int minute, int second, int day, int month, int year)
+{
+    struct tm tm;
+    time_t t;
+
+    tm.tm_year = year - YEAR_OFFSET;
+    tm.tm_mon = month - MONTH_OFFSET;
+    tm.tm_mday = day;
+    tm.tm_hour = hour;
+    tm.tm_min = minute;
+    tm.tm_sec = second;
+    tm.tm_isdst = -1;
+
+    t = mktime(&tm);
+
+    setTime(t);
+}

libraries/CurieRTC/src/CurieRTC.h

@@ -1,6 +1,5 @@
 /*
  * CurieRTC.h - RTC library for Arduino101
- * This library is intended to be uses with Arduino Time.h library functions
  */
 
 #ifndef CurieRTC_h
@@ -14,24 +13,16 @@
 #define RTC_RSTAT   0xb0000414 // Interrupt Raw Status Register
 #define RTC_EOI     0xb0000418 // End of Interrupt Register
 
-#include <Time.h>
+unsigned long now(); // current time as seconds since Jan 1 1970 
 
-// library interface description
-class CurieRTC
-{
-  // user-accessible "public" interface
-  public:
-    CurieRTC();
-    static time_t get();
-    static void set(time_t t);
-};
+int year(); // current year as an integer
+int month(); // current month as an integer (1 - 12)
+int day(); // current day as an integer (1 - 31)
+int hour(); // current hour as an integer (0 - 23)
+int minute(); // current minute as an integer (0 - 59)
+int second(); // current second as an integer (0 - 59)
 
-#ifdef RTC
-#undef RTC // workaround for Arduino Due, which defines "RTC"...
-#endif
-
-extern CurieRTC RTC;
+void setTime(int hour, int minute, int second, int day, int month, int year); // set the current time
+void setTime(unsigned long t); // set the current time from seconds since Jan 1 1970
 
 #endif
- 
-