Revision 141:b29541186a74, committed 2016-03-29

Comitter:

ee12b079

Date:

Tue Mar 29 08:32:29 2016 +0000

Parent:

136:8074893cd24e

Commit message:

backup

Changed in this revision

--- a/COM_MNG_TMTC.h	Thu Mar 10 15:26:50 2016 +0000
+++ b/COM_MNG_TMTC.h	Tue Mar 29 08:32:29 2016 +0000
@@ -495,7 +495,9 @@
                             }                            
                             case 0x2:
                             {
+                            #if DEBUG
                             printf("sub_service:Read from Flash_Memory\r\n");
+                            #endif
                             mid=(uint16_t)(tc_ptr->TC_string[3]<<4)+(uint16_t)(tc_ptr->TC_string[4]);                           
                                                                                              
                                     //Data[0] = FCTN_CDMS_RD_FLASH(0);
@@ -513,7 +515,7 @@
                                     {
                                         tm_pointer->TM_string[3+i] = (uint8_t)((Data[1]>>(8*i))&0x00FF);
                                     }
-                                    crc16 = crc16_gen(tm_ptr->TM_string,9);
+                                    crc16 = crc16_gen(tm_ptr->TM_string,11);
                                     tm_pointer->TM_string[11] = (uint8_t)((crc16&0xFF00)>>8);
                                     tm_pointer->TM_string[12] = (uint8_t)(crc16&0x00FF);
                                     //for(int i = )

--- a/COM_SND_TM.h	Thu Mar 10 15:26:50 2016 +0000
+++ b/COM_SND_TM.h	Tue Mar 29 08:32:29 2016 +0000
@@ -266,6 +266,8 @@
         DS_state = !DS_state;\
         if (DS_f){\
             DS_f = false;\
+            if(bypass_adf)\
+                print_tm(ptr);\
             exor(ptr);\
             convolution(ptr);\
             interleave(convoluted_frame,interleave_data[0]);\

--- a/ThreadsAndFunctions.h	Thu Mar 10 15:26:50 2016 +0000
+++ b/ThreadsAndFunctions.h	Tue Mar 29 08:32:29 2016 +0000
@@ -106,7 +106,7 @@
             gPC.puts("NEW TC RECEIVED\r\n");
             #endif
 //            DEBUF_PRINT("NEW TC RECEIVED\r\n");
-            //Thread::wait(2000);    /*To be removed in flight model*/
+            Thread::wait(2000);    /*To be removed in flight model*/
             gFLAGS = gFLAGS & (~NEW_TC_RECEIVED);
             gFLAGS = gFLAGS | COM_MNG_TMTC_RUNNING_FLAG;
 

--- a/adf.h	Thu Mar 10 15:26:50 2016 +0000
+++ b/adf.h	Tue Mar 29 08:32:29 2016 +0000
@@ -215,8 +215,6 @@
         spi.write(0x20);\
         for(unsigned char i=0; i<112;i++){\
             spi.write(buffer_112[i]);\
-            if(bypass_adf == 1)\
-            gPC.putc(buffer_112[i]);\
         }\
     }\
     else{\
@@ -224,8 +222,6 @@
         spi.write(0x90);\
         for(unsigned char i=0; i<112;i++){\
             spi.write(buffer_112[i]);\
-            if(bypass_adf == 1)\
-            gPC.putc(buffer_112[i]);\
         }\
     }\
     gCS_ADF=1;\

--- a/main.cpp	Thu Mar 10 15:26:50 2016 +0000
+++ b/main.cpp	Tue Mar 29 08:32:29 2016 +0000
@@ -4,8 +4,8 @@
 
 uint8_t rcv_isr = 0; // flag for interrupt
 
-#define DEBUG 1
-#define SDCARD 1
+#define DEBUG 0
+#define SDCARD 0
 #define I2C_PL 0
 
 
@@ -41,7 +41,7 @@
     
     // ******************INITIALISATIONS START******************
     // COM RX
-    RX1M.baud(1200);
+    RX1M.baud(115200);
     gRX_HEAD_DATA_NODE = new COM_RX_DATA_NODE;
     gRX_HEAD_DATA_NODE->next_node = NULL;
     gRX_CURRENT_DATA_NODE = gRX_HEAD_DATA_NODE;