Diff: main.cpp

Revision:

49:d51f96a46cc3

Parent:

48:244d6d81bb52

Child:

51:47f5db68500b

--- a/main.cpp	Tue Jan 09 00:37:01 2018 +0000
+++ b/main.cpp	Tue Jan 09 11:41:07 2018 +0000
@@ -1,15 +1,13 @@
 /*
 ELEC 351 Group T
 Team Members : Christopher Hills, Thomas Morris
-Current Verision 19
+Current Verision 22
 Overiew: Working Tasks 1,2,3,5,6,7,8,9,10,11,12,13,14,15
 
 Last Revision: Added Mail Box to serial
 Todo:
-Add functionality to SD card import chris's work on delete serial commnads
 Commnet code
 Check for race conditions
-Move code around
 Other fixes
 */
 
@@ -20,7 +18,6 @@
 #include "SERIAL_COMMANDS.hpp"
 #include "SAMPLE.hpp"
 #include "THREADS.hpp"
-
 void SD_Card()//Writes data to the SD card
 {
     while(1)
@@ -58,7 +55,6 @@
 {
     while(1)
     {
-        Yellow_led.switchOn();
         if(Log_Value == 0)
         {
             Thread::wait(3000);
@@ -151,20 +147,20 @@
     id5 = t5.gettid();
     id6 = t6.gettid();
 
-    
     while(true) 
     {
         if(SD_CARD_DETECT.read() == 1)
         {
-            t2.signal_set(0);
+            t2.signal_set(DONT_WRITE_TO_SD_CARD);
+            errorCode(SD_CARD_REMOVED);
         } 
         else if(SD_CARD_DETECT.read() == 0)
         {
-            t2.signal_set(1);
+            t2.signal_set(SD_CARD_WRITE);
         }
         else
         {
-            t2.signal_set(1);   
+            t2.signal_set(SD_CARD_WRITE);   
         }
         if(onBoardSwitch == 1)
         {