Diff: main.cpp

Revision:

32:8f2795716e97

Parent:

31:4a88bf97b53e

Child:

33:3b5096f0126a

diff -r 4a88bf97b53e -r 8f2795716e97 main.cpp
--- a/main.cpp	Sat Jan 06 23:04:05 2018 +0000
+++ b/main.cpp	Sat Jan 06 23:10:13 2018 +0000
@@ -1,7 +1,7 @@
 /*
 ELEC 351 Group T
 Team Members : Christopher Hills, Thomas Morris
-Current Verision 14
+Current Verision 15
 Overiew: Working Tasks 1,2,4,5,6,7,8,10,11,12,13
 
 Last Revision: Added Mail Box to serial
@@ -172,8 +172,8 @@
             LCD.Display_Clear();
             while(1)
             {          
+                LCD_Write_Year();
                 Thread::wait(1000);
-                LCD_Write_Year();
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
                 {
@@ -197,8 +197,8 @@
             cout << "In Mode 3" << endl;
             LCD.Display_Clear();
             while(1)
-                {
-                    
+            {
+                LCD_Write_Month();
                 Thread::wait(1000);
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
@@ -208,9 +208,7 @@
                 else if(SW2.read() == 1 & SW1.read() == 0)
                 {
                     Subtract_Month();   
-                }
-                LCD_Write_Month();
-                
+                }                
                 if(SW1.read() & SW2.read() == 1)
                 {
                     mode = 4;
@@ -223,7 +221,8 @@
             cout << "In Mode 4" << endl;
             LCD.Display_Clear();
             while(1)
-            {
+            {      
+                LCD_Write_Day();
                 Thread::wait(1000);
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
@@ -233,9 +232,7 @@
                 else if(SW2.read() == 1 & SW1.read() == 0)
                 {
                     Subtract_Day();   
-                }
-                LCD_Write_Day();
-                
+                }                
                 if(SW1.read() & SW2.read() == 1)
                 {
                     mode = 0;   
@@ -249,7 +246,8 @@
             LCD.Display_Clear();
             while(1)
             {
-                 Thread::wait(1000);
+                LCD_Write_Hour();
+                Thread::wait(1000);
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
                 {
@@ -259,7 +257,6 @@
                 {
                     Subtract_Hour();   
                 }
-                LCD_Write_Hour();
                 
                 if(SW1.read() & SW2.read() == 1)
                 {
@@ -274,7 +271,8 @@
             LCD.Display_Clear();
             while(1)
             {
-                 Thread::wait(1000);
+                LCD_Write_Minute();
+                Thread::wait(1000);
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
                 {
@@ -283,9 +281,7 @@
                 else if(SW2.read() == 1 & SW1.read() == 0)
                 {
                     Subtract_Minute();   
-                }
-                LCD_Write_Minute();
-                
+                }                
                 if(SW1.read() & SW2.read() == 1)
                 {
                     mode = 7;  
@@ -299,7 +295,8 @@
             LCD.Display_Clear();
             while(1)
             {
-                 Thread::wait(1000);
+                LCD_Write_Seconds();
+                Thread::wait(1000);
                 
                 if(SW1.read() == 1 & SW2.read() == 0)
                 {
@@ -308,9 +305,7 @@
                 else if(SW2.read() == 1 & SW1.read() == 0)
                 {
                     Subtract_Second();   
-                }
-                LCD_Write_Seconds();
-                
+                }                
                 if(SW1.read() & SW2.read() == 1)
                 {
                     mode = 0;