Diff: main.cpp

Revision:

7:2d2538fb0539

Parent:

6:2641d53a460a

Child:

8:3ee08065ada5

--- a/main.cpp	Thu Mar 19 21:59:08 2015 +0000
+++ b/main.cpp	Mon Dec 21 16:50:57 2015 +0000
@@ -40,11 +40,11 @@
 
 void get_user_input(char* message, uint8_t min, uint8_t max, uint32_t* member);
 void get_user_input(char* message, uint8_t min, uint8_t max, bool* member);
-
+Serial pc(SERIAL_TX, SERIAL_RX);
 int main(void)
 {
     //rtc object
-    Ds3231 rtc(D14, D15); 
+    Ds3231 rtc(D4, D5); 
     
     time_t epoch_time;
     
@@ -107,14 +107,14 @@
     //Set the time, uses inverted logic for return value
     if(rtc.set_time(rtc_time))
     {
-        printf("\nrtc.set_time failed!!\n");
+        pc.printf("\nrtc.set_time failed!!\n");
         exit(0);
     }
     
     //Set the calendar, uses inverted logic for return value
     if(rtc.set_calendar(rtc_calendar))
     {
-        printf("\nrtc.set_calendar failed!!\n");
+        pc.printf("\nrtc.set_calendar failed!!\n");
         exit(0);
     }
     
@@ -122,18 +122,18 @@
     
     for(;;)
     {   
-        printf("%c[2J", ESC); //clear screen
-        printf("%c[H", ESC); //move cursor to Home
+        pc.printf("%c[2J", ESC); //clear screen
+        pc.printf("%c[H", ESC); //move cursor to Home
         
         //new epoch time fx
         epoch_time = rtc.get_epoch();
         
-        printf("\nTime as seconds since January 1, 1970 = %d\n", epoch_time);
+        pc.printf("\nTime as seconds since January 1, 1970 = %d\n", epoch_time);
         
-        printf("\nTime as a basic string = %s", ctime(&epoch_time));
+        pc.printf("\nTime as a basic string = %s", ctime(&epoch_time));
  
         strftime(buffer, 32, "%I:%M %p\n", localtime(&epoch_time));
-        printf("\nTime as a custom formatted string = %s", buffer);
+        pc.printf("\nTime as a custom formatted string = %s", buffer);
         
         wait(1.0);
     }//loop 
@@ -157,7 +157,7 @@
 
     do
     {
-        printf("\n%s", message);
+        pc.printf("\n%s", message);
         
         //for some reason mbed doesn't like a pointer to a member in scanf
         //term.scanf("%d", member); works with gcc on RPi
@@ -167,7 +167,7 @@
        
         if((*(member)< min) || (*(member) > max))
         {
-            printf("\nERROR-RTI");
+            pc.printf("\nERROR-RTI");
         }
     }
     while((*(member) < min) || (*(member) > max));
@@ -180,7 +180,7 @@
 
     do
     {
-        printf("\n%s", message);
+        pc.printf("\n%s", message);
         
         //for some reason mbed doesn't like a pointer to a member in scanf
         //term.scanf("%d", member); works with gcc on RPi
@@ -190,7 +190,7 @@
        
         if((*(member)< min) || (*(member) > max))
         {
-            printf("\nERROR-RTI");
+            pc.printf("\nERROR-RTI");
         }
     }
     while((*(member) < min) || (*(member) > max));