Removed 12h initialization

As discussed in the issue #3944

Author: agdl

Diff for: examples/SimpleRTC/SimpleRTC.ino

@@ -9,6 +9,9 @@
 
   created by Arturo Guadalupi <[email protected]>
   15 Jun 2015
+
+  modified
+  21 Oct 2015
 */
 
 #include <RTCZero.h>
@@ -30,7 +33,7 @@ void setup()
 {
   Serial.begin(9600);
 
-  rtc.begin(H24); // initialize RTC 24H format. The dual option is H12
+  rtc.begin(); // initialize RTC
 
   // Set the time
   rtc.setHours(hours);

Diff for: examples/SimpleRTCAlarm/SimpleRTCAlarm.ino

@@ -9,6 +9,9 @@
 
   created by Arturo Guadalupi <[email protected]>
   25 Sept 2015
+  
+  modified
+  21 Oct 2015
 */
 
 #include <RTCZero.h>
@@ -19,7 +22,7 @@ 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 = 17;
+const uint8_t hours = 16;
 
 /* Change these values to set the current initial date */
 const uint8_t day = 25;
@@ -30,7 +33,7 @@ void setup()
 {
   Serial.begin(9600);
 
-  rtc.begin(H24); // initialize RTC 24H format. The dual option is H12
+  rtc.begin(); // initialize RTC 24H format
 
   rtc.setTime(hours, minutes, seconds);
   rtc.setDate(day, month, year);

Diff for: keywords.txt

@@ -50,5 +50,3 @@ disableAlarm 		KEYWORD2
 #######################################
 # Constants (LITERAL1)
 #######################################
-H24 						LITERAL1
-H12 						LITERAL1

Diff for: library.properties

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

Diff for: src/RTCZero.cpp

@@ -19,17 +19,12 @@
 
 #include "RTCZero.h"
 
-static bool __time24 = false;
-
 voidFuncPtr RTC_callBack = NULL;
 
-void RTCZero::begin(bool timeRep) 
+void RTCZero::begin() 
 {
   uint16_t tmp_reg = 0;
 
-  if (timeRep)
-    __time24 = true; // 24h representation chosen
-  
   PM->APBAMASK.reg |= PM_APBAMASK_RTC; // turn on digital interface clock
   config32kOSC();
 
@@ -51,11 +46,7 @@ void RTCZero::begin(bool timeRep)
   tmp_reg |= RTC_MODE2_CTRL_MODE_CLOCK; // set clock operating mode
   tmp_reg |= RTC_MODE2_CTRL_PRESCALER_DIV1024; // set prescaler to 1024 for MODE2
   tmp_reg &= ~RTC_MODE2_CTRL_MATCHCLR; // disable clear on match
-  
-  if (timeRep)
-    tmp_reg |= RTC_MODE2_CTRL_CLKREP; // 24h time representation
-  else
-    tmp_reg &= ~RTC_MODE2_CTRL_CLKREP; // 12h time representation
+  tmp_reg |= RTC_MODE2_CTRL_CLKREP; // 24h time representation
 
   RTC->MODE2.READREQ.reg &= ~RTC_READREQ_RCONT; // disable continuously mode
 
@@ -193,11 +184,7 @@ void RTCZero::setMinutes(uint8_t minutes)
 
 void RTCZero::setHours(uint8_t hours)
 {
-  if ((__time24) || (hours < 13)) {
-    RTC->MODE2.CLOCK.bit.HOUR = hours;
-  } else {
-    RTC->MODE2.CLOCK.bit.HOUR = hours - 12;
-  }
+  RTC->MODE2.CLOCK.bit.HOUR = hours;
   while (RTCisSyncing())
     ;
 }
@@ -253,12 +240,7 @@ void RTCZero::setAlarmMinutes(uint8_t minutes)
 
 void RTCZero::setAlarmHours(uint8_t hours)
 {
-  if ((__time24) || (hours < 13)) {
-    RTC->MODE2.Mode2Alarm[0].ALARM.bit.HOUR = hours;
-  }
-  else {
-    RTC->MODE2.Mode2Alarm[0].ALARM.bit.HOUR = hours - 12;
-  }
+  RTC->MODE2.Mode2Alarm[0].ALARM.bit.HOUR = hours;
   while (RTCisSyncing())
     ;
 }
@@ -346,4 +328,3 @@ void RTCZero::RTCresetRemove()
   while (RTCisSyncing())
     ;
 }
-

Diff for: src/RTCZero.h

@@ -41,7 +41,7 @@ class RTCZero {
   };
 
   RTCZero() {};
-  void begin(bool timeRep);
+  void begin();
 
   void enableAlarm(Alarm_Match match);
   void disableAlarm();