Revision 60:768056b558b2, committed 2016-01-15

Comitter:

ee12b079

Date:

Fri Jan 15 11:54:40 2016 +0000

Parent:

57:bf998cb2a104

Commit message:

testing in progress

Changed in this revision

--- a/COM_MNG_TMTC.h	Fri Jan 15 08:59:09 2016 +0000
+++ b/COM_MNG_TMTC.h	Fri Jan 15 11:54:40 2016 +0000
@@ -10,8 +10,6 @@
 //added RLY_TMTC function
 //added included related files
 
-#define print_in_snd_tm 1
-
 #include "pinconfig.h"
 #include "i2c.h"
 #include "Flash.h"
@@ -1230,6 +1228,7 @@
                                 }\
                                 obosc_tm_current = obosc_tm_current->next_TM;\
                             }\
+                            /*Send OBOSC TM to GS;*/\
                             /*snd_tm.head_pointer(obosc_tm_head);*/\
                             /*adf_not_SDcard();*/\
                             /*DELETE THE TM AFTER USE*/\
@@ -1303,6 +1302,7 @@
                             }\
                             tm_ptr = tm_ptr->next_TM;\
                         }\
+                        /*Send Blank TM to GS*/\
                         /*snd_tm.head_pointer(tm_ptr_head);*/\
                         /*DELETE THE TM AFTER USE*/\
                         tm_ptr = tm_ptr_head;\
@@ -1543,6 +1543,7 @@
                                 tm_ptr = tm_ptr->next_TM;\
                             }\
                             /*SEND DATA TO GS*/\
+                            /*SD_CARD telemetry*/\
                             /*snd_tm.head_pointer(tm_ptr_head);*/\
                             /*adf_SDcard();*/\
                             /*DELETE THE TM AFTER USE*/\

--- a/COM_SND_TM.h	Fri Jan 15 08:59:09 2016 +0000
+++ b/COM_SND_TM.h	Fri Jan 15 11:54:40 2016 +0000
@@ -89,6 +89,7 @@
         if(SEGMENT_NO == 1) segment_r = 0; else segment_r = 1;
         TOTAL_SEGMENT_NO -= SEGMENT_NO;
         LAST_SEGMENT_SIZE = total_frames*2%ISR?total_frames*2%ISR:ISR;
+        gPC.printf("last_seg_size = %d,%d\n",LAST_SEGMENT_SIZE,segment_r);
     }
  
 #define next_type_structure(ptr){\
@@ -230,8 +231,9 @@
         }\
         DS_state = !DS_state;\
         if (DS_f){\
+            gPC.printf("\n1\n");\
             DS_f = false;\
-            if(print_in_snd_tm == 1);\
+            if(print_in_snd_tm)\
             print_tm(ptr);\
             exor(ptr);\
             convolution(ptr);\
@@ -315,6 +317,7 @@
                         }
                         else
                         {
+                            printf("here");
                             data_f = true;
                             make_DataStream;
                         }

--- a/ThreadsAndFunctions.h	Fri Jan 15 08:59:09 2016 +0000
+++ b/ThreadsAndFunctions.h	Fri Jan 15 11:54:40 2016 +0000
@@ -103,7 +103,7 @@
         }
         else if( gFLAGS & NEW_TC_RECEIVED ){
             /*gPC.puts("NEW TC RECEIVED\r\n");*/
-            Thread::wait(7000);
+            Thread::wait(3000);
             gFLAGS = gFLAGS & (~NEW_TC_RECEIVED);
             gFLAGS = gFLAGS | COM_MNG_TMTC_RUNNING_FLAG;
 

--- a/main.cpp	Fri Jan 15 08:59:09 2016 +0000
+++ b/main.cpp	Fri Jan 15 11:54:40 2016 +0000
@@ -1,5 +1,7 @@
 // TESTING PUSH PULL IN MAIN CPP
 
+#define print_in_snd_tm 1
+
 #include "mbed.h"
 #include "rtos.h"
 #include "mbed_debug.h"