Diff: main.cpp

Revision:

210:f4acf895b598

Parent:

205:d2ac4580960d

Child:

211:6848a51af734

Child:

214:867de6d350fa

Child:

223:3ac1f91e0ebc

diff -r 63e9c8f8b5d2 -r f4acf895b598 main.cpp
--- a/main.cpp	Sat Jul 02 14:54:52 2016 +0000
+++ b/main.cpp	Sat Jul 02 15:28:21 2016 +0000
@@ -18,19 +18,23 @@
 #include "i2c.h"
 #include "COM_SND_TM_functions.h"
 #include "COM_SND_TM.h"
+#include "cdms_rtc.h"
 #include "cdms_sd.h"
 #include "common_functions.h"
-//#include "CDMS_HK.h"
+#include "RESET_functions.h"
+#include "CDMS_HK.h"
 #include "OBSRS.h"
 #include "adf.h"
 #include "COM_RCV_TC.h"
 //#include "Flash.h"
-#include "cdms_rtc.h"
+#include "FMS_all.h"
+#include "CDMS_PL.h"
 #include "COM_MNG_TMTC.h"
 #include "COM_POWER_ON_TX.h"
 #include "COM_POWER_OFF_TX.h"
 #include "Compression.h"
 #include "ThreadsAndFunctions.h"
+#include "TEST_PL.h"
 
 #define PL_TC(tm_ptr){\
     Base_tc *beacon_tc = new Short_tc;\
@@ -85,7 +89,7 @@
 {
     
     CDMS_I2C_GPIO = 0; 
-    PYLD_I2C_GPIO = 0; 
+    PL_I2C_GPIO = 0; 
     
     //gLEDR = 1;