Diff: main.cpp

Revision:

4:9f3200e6941f

Parent:

3:158f844200a9

Child:

5:19ccff89f555

--- a/main.cpp	Wed Apr 26 16:23:56 2017 +0000
+++ b/main.cpp	Wed Apr 26 17:17:42 2017 +0000
@@ -3,11 +3,23 @@
 #include "ds3231.h"
 
 #define ESC 0x1B
+
 #define I2C_SDA D14
 #define I2C_SCL D15
+#define DHT_PIN D2
+#define LCD_PIN1 D8
+#define LCD_PIN2 D13
+#define LCD_PIN3 D9
+#define LCD_PIN4 D4
+#define LCD_PIN5 D5
+#define LCD_PIN6 D6
+#define LCD_PIN7 D7
+#define M_DIR_PIN D12
+#define M_SPE_PIN D11
 
 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);
+void setupRTC(Ds3231 rtc, time_t* epoch_time, ds3231_cntl_stat_t rtc_control_status, ds3231_time_t rtc_time, ds3231_calendar_t rtc_calendar);
 
 int main(void)
 {
@@ -23,6 +35,31 @@
     ds3231_time_t rtc_time;
     ds3231_calendar_t rtc_calendar;
     
+    setupRTC(rtc, &epoch_time, rtc_control_status, rtc_time, rtc_calendar);
+    
+    char buffer[32];
+    for(;;)
+    {   
+        printf("%c[2J", ESC); //clear screen
+        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);
+        
+        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);
+        
+        wait(1.0);
+    }//loop 
+}
+
+
+void setupRTC(Ds3231 rtc, time_t* epoch_time, ds3231_cntl_stat_t rtc_control_status, ds3231_time_t rtc_time, ds3231_calendar_t rtc_calendar){
+    
     rtc.set_cntl_stat_reg(rtc_control_status);
     
     //get day from user
@@ -86,28 +123,9 @@
         exit(0);
     }
     
-    char buffer[32];
     
-    for(;;)
-    {   
-        printf("%c[2J", ESC); //clear screen
-        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);
-        
-        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);
-        
-        wait(1.0);
-    }//loop 
 }
 
-
 /**********************************************************************
 * Function: get_user_input() 
 * Parameters: message - user prompt