Diff: COM_MNG_TMTC.h

Revision:

240:946a9342a95f

Parent:

238:4abbc6a3a641

Child:

244:cf5b95f5d499

--- a/COM_MNG_TMTC.h	Thu Jul 07 17:25:37 2016 +0000
+++ b/COM_MNG_TMTC.h	Thu Jul 07 18:43:12 2016 +0000
@@ -370,8 +370,8 @@
     Base_tm *tm_pointer = new Long_tm;
     Base_tm *tm_ptr = tm_pointer;
     //Base_tm *tm_ptr = new Long_tm;
-    Base_tm *tm_pointer_short = new Short_tm;
-    Base_tm *tm_ptr_short = tm_pointer_short;
+    //Base_tm *tm_pointer_short = new Short_tm;
+    //Base_tm *tm_ptr_short = tm_pointer_short;
     received = 0;
     switch(GETapid(tc_ptr))             //checking APID's
     {
@@ -385,8 +385,9 @@
                 
             if(y==1)                                                            
             {                                                                               
-                ACK_L234(tm_ptr_short,0x03,GETpacket_seq_count(tc_ptr));
-                return tm_ptr_short;
+                //ACK_L234(tm_ptr_short,0x03,GETpacket_seq_count(tc_ptr));
+                //return tm_ptr_short;
+                return NULL;
             }                                  
             else if(y==0)
             {
@@ -409,17 +410,19 @@
                     }
                     else if(y==1)
                     {
-                        ACK_L234(tm_ptr_short,0x85,GETpacket_seq_count(tc_ptr));                
+                        //ACK_L234(tm_ptr_short,0x85,GETpacket_seq_count(tc_ptr));                
                         //gPC.printf("\n\rPTE->PDIR = 0x%08X",PTE->PDIR);
-                        return tm_ptr_short;
+                        //return tm_ptr_short;
+                        return NULL;
                         break;  
                     }
                 }
                 else if(BAE_I2C_GPIO == 0)                                       //name to be changed later
                 {
                     gPC.printf("BAE_I2C_GPIO is not high\r\n");                    
-                    ACK_L234(tm_ptr_short,0x84,GETpacket_seq_count(tc_ptr));
-                    return tm_ptr_short;
+                    //ACK_L234(tm_ptr_short,0x84,GETpacket_seq_count(tc_ptr));
+                    //return tm_ptr_short;
+                    return NULL;
                 }
             }
             BAE_I2C_mutex.unlock();
@@ -500,7 +503,7 @@
                         }
                     } 
                 }  */                                                                 
-                case 0x80:
+                /*case 0x80:
                 {
                     gPC.printf("service:FUNCTION MANAGEMENT SERVICE\r\n"); 
                     if(GETservice_subtype(tc_ptr)==0x1)
@@ -772,7 +775,7 @@
                             tm_pointer->TM_string[133] = (uint8_t)(crc16&0x00FF);
                             tm_pointer->next_TM = NULL;                 
                             return tm_ptr; */                                                    //incomplete
-                        }
+                        /*}
                         else if(GETpid(tc_ptr)==0xF0)
                         {
                             uint8_t statusbits[64];
@@ -792,7 +795,7 @@
                         ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));  
                         return tm_ptr_short;
                     }                                    
-                }
+                }*/
                 case 0x70:
                 {
                     gPC.printf("\n\n\rService:PAYLOAD MANAGEMENT SERVICE"); 
@@ -890,19 +893,21 @@
                     else
                     {
                         gPC.printf("INVALID SERVICE SUBTYPE\r\n");
-                        ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));  
-                        return tm_ptr_short;
+                        //ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));  
+                        //return tm_ptr_short;
+                        return NULL;
                     }
                 }
                 default:
                 {
                     gPC.printf("ILLEGAL TC"); 
-                    ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));
-                    return tm_ptr_short;                    
+                    //ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));
+                    //return tm_ptr_short;                    
+                    return NULL;
                 }
             }
         }
-        case 3:
+        /*case 3:
         {
             //#if DEBUG
             gPC.printf("\n\rTelecommand is for PL\r\n");
@@ -953,12 +958,13 @@
                     return tm_ptr_short;
                 }
             }                             
-        }
+        }*/
         default:    //invalid TC
         {
             gPC.printf("INVALID TC\r\n");                 
-            ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));
-            return tm_ptr_short;
+            //ACK_L234(tm_ptr_short,0x02,GETpacket_seq_count(tc_ptr));
+            //return tm_ptr_short;
+            return NULL;
         }
     }
     return;