Diff: main.cpp

Revision:

5:ab9d82256e26

Parent:

4:e5d7d2122d4d

Child:

6:2641d53a460a

--- a/main.cpp	Thu Mar 12 19:48:46 2015 +0000
+++ b/main.cpp	Tue Mar 17 22:30:32 2015 +0000
@@ -1,4 +1,3 @@
-//Test Ds3231 class
 /**********************************************************************
 * 
 * Demo DS3231 Library
@@ -52,9 +51,9 @@
     //DS3231 rtc variables
     
     //default, use bit masks in ds3231.h for desired operation
-    ds3231_cntl_stat_t rtc_control_status = {0,0}; 
-    ds3231_time_t rtc_time;
-    ds3231_calendar_t rtc_calendar;
+    Ds3231::ds3231_cntl_stat_t rtc_control_status = {0,0}; 
+    Ds3231::ds3231_time_t rtc_time;
+    Ds3231::ds3231_calendar_t rtc_calendar;
     
     rtc.set_cntl_stat_reg(rtc_control_status);
     
@@ -177,7 +176,7 @@
 
 void get_user_input(char* message, uint8_t min, uint8_t max, bool* member)
 {
-    bool temp;
+    uint32_t temp;
 
     do
     {