Diff: main.cpp

Revision:

4:104dd82c99b8

Parent:

3:6c81fc8834e2

Child:

6:79d422d1ed42

diff -r 6c81fc8834e2 -r 104dd82c99b8 main.cpp
--- a/main.cpp	Wed Dec 23 05:37:55 2015 +0000
+++ b/main.cpp	Tue Dec 29 06:50:19 2015 +0000
@@ -13,9 +13,10 @@
 #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******************
@@ -29,8 +30,7 @@
     RX1M.attach(&rx_read, Serial::RxIrq);
     
     // DEBUG
-    gPC.baud(1200);
-    gPC.puts("welcome to mng_tm_tc\r\n");
+//    gPC.puts("welcome to mng_tm_tc\r\n");
     
     // COMMON SPI
     spi.format(8,0);
@@ -53,28 +53,6 @@
     gCOM_MNG_TMTC_THREAD->set_priority(osPriorityAboveNormal);
     // *******************INITIALISATIONS END********************
     
-    // SCIENCE THREAD
-    gSCIENCE_THREAD = new Thread(SCIENCE_FUN);
-    gSCIENCE_THREAD->set_priority(osPriorityBelowNormal);
-    
-    //adf test
-    gPC.puts("Testing ADF\r\n");
-    Base_tm *testTM = new Short_tm;
-    uint8_t temp8;
-    temp8 = 0xA;
-    PUTtmid(testTM->fields, temp8);
-    temp8 = 0x00;
-    PUTshort_or_long_tm(testTM->fields, temp8);
-    testTM->TM_string[0] = TMID_ACK_L1 << 4;
-    testTM->TM_string[1] = gTOTAL_INCORRECT_SIZE_TC & 0xFF;
-    testTM->TM_string[2] = gTOTAL_CRC_FAIL_TC & 0xFF;
-    testTM->TM_string[3] = (gMASTER_STATE << 4) & 0xF0;
-    testTM->next_TM = NULL;
-    gPC.puts("sending now\r\n");
-    snd_tm.head_pointer(testTM);
-    adf_not_SDcard();
-    gPC.puts("Completed testing ADF\r\n");
-    
     int theAcount = 0;
     while(true){
         if(theAcount >= 700000){