Revision 36:d1424f871de1, committed 2016-01-08

Comitter:

ee12b079

Date:

Fri Jan 08 08:02:36 2016 +0000

Parent:

35:3beac900a034

Commit message:

Commented RLY_TMTC for cheking RAM;

Changed in this revision

--- a/COM_MNG_TMTC.h	Thu Jan 07 10:35:40 2016 +0000
+++ b/COM_MNG_TMTC.h	Fri Jan 08 08:02:36 2016 +0000
@@ -421,8 +421,9 @@
     }\
 }
 
-// CDMS TEAM CODE START
-inline Base_tm* FCTN_CDMS_RLY_TMTC(Base_tc *tc_ptr){
+// CDMS TEAM CODE START (
+
+/*inline Base_tm* FCTN_CDMS_RLY_TMTC(Base_tc *tc_ptr){
     uint8_t ACKCODE = 0x00;
     printf("\rTC execution in progress\r\n");
     Base_tm *tm_ptr = new Long_tm;
@@ -525,7 +526,7 @@
                             {                                                                 
                                     Data[0] = FCTN_CDMS_RD_FLASH(0);
                                     Data[1] = FCTN_CDMS_RD_FLASH(1);                                                                                             
-                                    tm_pointer = new Long_tm;
+                                    //tm_pointer = new Long_tm;
                                     tm_pointer->TM_string[0] = 0x30;
                                     tm_pointer->TM_string[1] = GETpacket_seq_count(tc_ptr);
                                     tm_pointer->TM_string[2] = (uint8_t)(flash_counter);
@@ -1053,7 +1054,7 @@
         }
      }
 }
-// CDMS TEAM CODE END
+// CDMS TEAM CODE END*/
 
 // EXECUTE OBOSC
 #define execute_obosc_core(tc_ptr, tm_ptr) {\
@@ -1326,6 +1327,7 @@
                             else{\
                                 gPC.printf("cdms relay tmtc at %u\r\n", execute_psc);\
                                 put_tm_here =  FCTN_CDMS_RLY_TMTC(current_TC);\
+                                gPC.printf("first : %02X\n",put_tm_here->TM_string[0]);\
                             }\
                             /*DETECT ACK OR NACK*/\
                             uint8_t temp83 = 0x00;\
@@ -1392,15 +1394,17 @@
                                 else{\
                                     length = TM_LONG_SIZE;\
                                 }\
+                                gPC.printf("\ndata: \n");\
                                 /*gPC.puts("Printing Call Sign, ACK_L1, TM list");*/\
                                 for(int i = 0 ; i < length ; ++i){\
-                                    gPC.putc(tm_ptr->TM_string[i]);\
+                                    /*gPC.putc(tm_ptr->TM_string[i]);*/\
+                                    gPC.printf("%02X",tm_ptr->TM_string[i]);\
                                 }\
                                 tm_ptr = tm_ptr->next_TM;\
                             }\
                             /*SEND DATA TO GS*/\
-                            /*snd_tm.head_pointer(tm_ptr_head);*/\
-                            /*adf_not_SDcard();*/\
+                            snd_tm.head_pointer(tm_ptr_head);\
+                            adf_not_SDcard;\
                             /*DELETE THE TM AFTER USE*/\
                             tm_ptr = tm_ptr_head;\
                             overflowCountExecute = 0;\

--- a/Structures.h	Thu Jan 07 10:35:40 2016 +0000
+++ b/Structures.h	Fri Jan 08 08:02:36 2016 +0000
@@ -46,7 +46,7 @@
 #define GETshort_or_long_tc(x) ( ( (x->flags) & SHORT_LONG_TC_MASK ) >> 4 )
 #define GETcrc_pass(x) ( ( (x->flags) & CRC_MASK ) >> 3 )
 #define GETabort_on_nack(x) ( ( (x->TC_string[1]) & 0x08 ) >> 3 )
-#define GETapid(x) ( ( (x->TC_string[1]) & 0xA0 ) >> 6 )
+#define GETapid(x) ( ( (x->TC_string[1]) & 0xc0 ) >> 6 )
 #define GETexec_status(x) ( (x->flags) & EXEC_STATUS_MASK )
 #define GETpacket_seq_count(x) (x->TC_string[0])
 #define GETservice_type(x) ( (x->TC_string[2]) & 0xF0 )