Diff: Rtc_Ds1307.cpp

Revision:

5:30531f2121a2

Parent:

4:d2cc690aaac7

Child:

7:dca20be3ef38

diff -r d2cc690aaac7 -r 30531f2121a2 Rtc_Ds1307.cpp
--- a/Rtc_Ds1307.cpp	Sun Jun 23 16:29:35 2013 +0000
+++ b/Rtc_Ds1307.cpp	Sun Jun 23 17:02:21 2013 +0000
@@ -1,8 +1,9 @@
 /* Rtc_Ds1307.cpp */
-
+#include "mbed.h"
 #include "Rtc_Ds1307.h"
+#ifndef DEBUG
 //#define DEBUG
-#undef DEBUG
+#endif
 #include "debug.h"
 
 const char *Rtc_Ds1307::m_weekDays[] = { "Saturday", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday" };    
@@ -25,7 +26,7 @@
         delete m_rtc;
 }
 
-bool Rtc_Ds1307::setTime(Time& time, bool start, bool thm)
+bool Rtc_Ds1307::setTime(Time_rtc& time, bool start, bool thm)
 {
     char buffer[7];
     INFO("reading clock registers to write the new time : %d:%d:%d\n", time.hour, time.min, time.sec);
@@ -57,7 +58,7 @@
     return true;
 }
 
-bool Rtc_Ds1307::getTime(Time& time)
+bool Rtc_Ds1307::getTime(Time_rtc& time)
 {
     char buffer[7];
     bool thm = false;
@@ -133,7 +134,7 @@
     return true;
 }
 
-bool Rtc_Ds1307::setSquareWaveOutput(bool ena, RateSelect_t rs)
+bool Rtc_Ds1307::setSquareWaveOutput(bool ena, SqwRateSelect_t rs)
 {
     char reg;
     INFO("Reading register value first\n");