Diff: main.cpp

Revision:

71:9193fbdaa3e1

Parent:

52:0bd68655c651

diff -r 5c59f28620bc -r 9193fbdaa3e1 main.cpp
--- a/main.cpp	Fri Jan 15 12:02:12 2016 +0000
+++ b/main.cpp	Tue Jan 19 10:30:46 2016 +0000
@@ -1,24 +1,26 @@
 // TESTING PUSH PULL IN MAIN CPP
+bool loop_on;
+#define ENDL "\r" << endl
 
 #include "mbed.h"
 #include "rtos.h"
 #include "mbed_debug.h"
-
+#include "cdms_sd.h"
 #include "Structures.h"
 #include "DefinitionsAndGlobals.h"
 #include "crc.h"
 #include "COM_SND_TM_functions.h"
 #include "COM_SND_TM.h"
-#include "SDCread.h"
+#include "Compression.h"
+#include "COM_RCV_TC.h"
+#include "OBSRS.h"
 #include "adf.h"
-#include "Compression.h"
-#include "SDC_init.h"
-#include "COM_RCV_TC.h"
 #include "COM_MNG_TMTC.h"
 #include "COM_POWER_ON_TX.h"
 #include "COM_POWER_OFF_TX.h"
 #include "ThreadsAndFunctions.h"
 
+
 int main()
 {
     // ******************INITIALISATIONS START******************