Diff: main.cpp

Revision:

130:d5b53088270b

Parent:

126:b7c024b5632d

Child:

131:8745e6041ebc

Child:

132:d4a4461214ad

--- a/main.cpp	Fri Feb 26 13:29:33 2016 +0000
+++ b/main.cpp	Sat Feb 27 07:12:04 2016 +0000
@@ -2,7 +2,7 @@
 
 #include "mbed.h"
 
-#define DEBUG 0
+#define DEBUG 1
 
 #include "SimpleDMA.h"
 #include "dmaSPIslave.h"
@@ -13,7 +13,7 @@
 #include "pinconfig.h"
 #include "DefinitionsAndGlobals.h"
 #include "crc.h"
-//#include "i2c.h"
+#include "i2c.h"
 #include "COM_SND_TM_functions.h"
 #include "COM_SND_TM.h"
 #include "cdms_sd.h"
@@ -42,8 +42,8 @@
 //    gRX_CURRENT_PTR = gRX_CURRENT_DATA_NODE->values;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
-    //I2C to Payload
-    PYLD_I2C_Int.rise(&isr_pyldtm);
+    //I2C to Payload    (depends on pl interrupt design)
+    //PYLD_I2C_Int.rise(&isr_pyldtm);
     
     
     // DEBUG
@@ -76,11 +76,6 @@
    // gPC.puts("step one complete\r\n");
     gSCIENCE_THREAD->set_priority(osPriorityBelowNormal);
     
-    //thread for I2C
-    ptr_t_pyldtm = new Thread(pyldtm);
-    gSCIENCE_THREAD->set_priority(osPriorityLow);//need to check the priorities
-    
-    
     #if DEBUG
     gPC.puts("competed allocating threads\r\n");
     #endif