Diff: main.cpp

Revision:

136:8074893cd24e

Parent:

132:d4a4461214ad

Child:

138:6fcbbaf19284

Child:

141:b29541186a74

Child:

145:fb800fecf128

Child:

151:e6c7d4f87704

Child:

158:6afad8428e82

--- a/main.cpp	Mon Feb 29 13:21:40 2016 +0000
+++ b/main.cpp	Thu Mar 10 15:26:50 2016 +0000
@@ -5,7 +5,9 @@
 uint8_t rcv_isr = 0; // flag for interrupt
 
 #define DEBUG 1
-#define SDCARD 0
+#define SDCARD 1
+#define I2C_PL 0
+
 
 #include "SimpleDMA.h"
 #include "dmaSPIslave.h"
@@ -47,13 +49,14 @@
 //    gRX_CURRENT_PTR = gRX_CURRENT_DATA_NODE->values;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
+    #if I2c
     //I2C to Payload    (depends on pl interrupt design)
     PYLD_I2C_Int.rise(&isr_pyldtm);
-    
+    #endif
     
     // DEBUG
     //gPC.puts("welcome to mng_tm_tc\r\n");
-    gPC.baud(1200);
+    gPC.baud(115200);
     
     // COMMON SPI
     spi.format(8,0);
@@ -108,6 +111,7 @@
     {delete gSCIENCE_THREAD;
     break;}
     }*/
+    #if I2c
     int i =0 ;
     char test[1] ;
     test[0] = 7;
@@ -128,7 +132,7 @@
         }
         
     }
-   
+    #endif
     while(true){
         Thread::wait(osWaitForever);
         //state = gCOM_MNG_TMTC_THREAD->get_state() + '0';