Diff: main.cpp

Revision:

258:7d404e9dc9e2

Parent:

254:22d97475ca79

Child:

259:066a7abd2a5f

--- a/main.cpp	Tue Jul 12 11:10:48 2016 +0000
+++ b/main.cpp	Tue Jul 12 17:07:17 2016 +0000
@@ -1,7 +1,6 @@
 
 // TESTING PUSH PULL IN MAIN CPP
 
-
 #include "mbed.h"
 
 #define DEBUG 1
@@ -27,8 +26,8 @@
 #include "adf.h"
 #include "COM_RCV_TC.h"
 //#include "Flash.h"
+#include "CDMS_PL.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"
@@ -99,7 +98,7 @@
     gRX_COUNT = 0;
     RX1M.attach(&rx_read, Serial::RxIrq);
     
-    gPC.baud(1200);//changed for bypassing COM
+    gPC.baud(115200);//changed for bypassing COM
     
     // COMMON SPI
     spi.format(8,0);
@@ -110,12 +109,12 @@
     gCS_RTC = 1;
     gCS_ADF = 1;
     
-    //FCTN_CDMS_INIT_RTC();/* rtc initialization*/
-    FCTN_CDMS_SD_INIT();/* sd card initialization*/
+    FCTN_CDMS_INIT_RTC();/* rtc initialization*/
+    //FCTN_CDMS_SD_INIT();/* sd card initialization*/
     
     
-    uint8_t test[512] = {0};
-    disk_write(test,7000); //to be used only just before launch
+    //uint8_t test[512] = {0};
+    //disk_write(test,7000); //to be used only just before launch
     
     #if DEBUG
     gPC.puts("welcome to mng_tmtc\r\n");
@@ -143,13 +142,11 @@
     
     master.frequency(400000);
     
-    HK_counter = new RtosTimer(hk_isr, osTimerPeriodic,(void * )NULL);
-    HK_counter->start(10000);
+    /*HK_counter = new RtosTimer(hk_isr, osTimerPeriodic,(void * )NULL);
+    HK_counter->start(10000);*/
     
-    gPC.printf("HK counter started");
-    
-    /*PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
-    PL_wo_dma->start(6000);*///
+    PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
+    PL_wo_dma->start(6000);//
     //gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);