Revision 202:8700a3e6324c, committed 2016-07-01

Comitter:

ee12b079

Date:

Fri Jul 01 08:56:27 2016 +0000

Parent:

201:3410fc4d80f0

Child:

203:424308159a56

Commit message:

Test obsrs for all cases

Changed in this revision

--- a/OBSRS.h	Fri Jul 01 07:55:06 2016 +0000
+++ b/OBSRS.h	Fri Jul 01 08:56:27 2016 +0000
@@ -175,7 +175,7 @@
             buffer_112[counter_buffer_112] = SCH40[counter_SCH40++];\
             if (counter_SCH40 == 5)\
             {   \
-                gPC.printf("Asch40 sent\r\n");\
+                /*gPC.printf("Asch40 sent\r\n");*/\
                 counter_SCH40 = 0;\
                 enable_SCH = false;\
                 enable_DS = true;\
@@ -186,7 +186,7 @@
             buffer_112[counter_buffer_112] = interleave_data[half_buffer][counter_interleavedata++];\
             if (counter_interleavedata == 144)\
             {   \
-                gPC.printf("Ads sent  %d\r\n",half_buffer);\
+                /*gPC.printf("Ads sent  %d\r\n",half_buffer);*/\
                 enable_DS = false;\
                 enable_FCCH = true;\
                 counter_interleavedata = 0;\
@@ -197,7 +197,7 @@
             buffer_112[counter_buffer_112] = FCCH80[counter_FCCH80++];\
             if (counter_FCCH80 == 10)\
             {\
-                gPC.printf("Afcch80 sent\r\n");\
+                /*gPC.printf("Afcch80 sent\r\n");*/\
                 enable_FCCH = false;\
                 counter_FCCH80 = 0;\
                 enable_SCH = true;\
@@ -215,11 +215,11 @@
             T_frames_sent = T_frames_sent +2;\
             if(repeat_last_2T_frames){\
                 enable_SCH = true;\
-                gPC.printf("repeated last 2 tframes\r\n");\
+                /*gPC.printf("repeated last 2 tframes\r\n");*/\
                 /*cout<<"T_frames_sent = "<<T_frames_sent<<ENDL;*/\
             }\
             else{\
-                gPC.printf("Ackandcallsign sent");\
+                /*gPC.printf("Ackandcallsign sent");*/\
                 /*cout<<"T_frames_sent = "<<T_frames_sent<<ENDL;*/\
                 T_frame_Ack_andcallsign_sent = T_frame_Ack_andcallsign_sent + 2;\
                 if(T_frame_Ack_andcallsign_sent == T_frame_in_Ackandcallsign ){\
@@ -254,7 +254,7 @@
     else if(send_EoS_and_stop){\
         buffer_112[counter_buffer_112] = EoS[counter_EoS++];\
         if(counter_EoS == 120){\
-            gPC.printf("A eos sent\r\n");\
+            /*gPC.printf("A eos sent\r\n");*/\
             /*cout<<"EoS sent"<<ENDL;*/\
             counter_EoS = 0;\
             enable_ackandcallsign = false;\
@@ -267,7 +267,7 @@
         buffer_112[counter_buffer_112] = EoS[counter_EoS++];\
         if(counter_EoS == 120){\
             counter_EoS = 0;\
-            gPC.printf("EoS sent");\
+            /*gPC.printf("EoS sent");*/\
             restart_adf();\
             enable_new_segment = true;\
             /*cout<<"new session"<<ENDL;*/\
@@ -353,17 +353,6 @@
             new_session =false;\
             /*cout<<"call_sign_sent"<<" ";*/\
             T_frames_sent = T_frames_sent+2;\
-            if(SID==0x1 || SID==0x2 || SID==0x3 || SID==0x4 || SID==0x5){\
-                valid_SID=true;\
-                /*cout<<"valid SID"<<ENDL;*/\
-            }\
-            else{\
-                valid_SID=false;\
-                /*gPC.printf("invalid SID");*/\
-                enable_ackandcallsign = true;\
-                create_Ack_andcallsign = true;\
-                ack_code = 0x02;\
-            }\
             check_PA_temp;\
             /*cout<<"pa_hot = "<<PA_HOT<<ENDL;*/\
             if(PA_HOT){\
@@ -515,7 +504,7 @@
         }
         else if(enable_ackandcallsign){
             if(create_Ack_andcallsign){
-                gPC.printf("cr ack\r\n");
+                /*gPC.printf("cr ack\r\n")*/;
                 enable_SCH = true;
                
                 if( (GETexec_status(current_obsrs_tc) == TC_STATE_EXECUTION_FAILED) && (GETabort_on_nack(current_obsrs_tc) == 1) ){
@@ -555,11 +544,11 @@
                     }
                 }
                 
-                gPC.printf("ex cr ack\r\n");
+                /*gPC.printf("ex cr ack\r\n");*/
             }    
             send_Ack_andcallsign;
             if(last_buffer){
-                gPC.printf("last buffer"); 
+                /*gPC.printf("last buffer"); */
  //               delete ack_head;
 //                while(ack_and_callsign != NULL){
 //                Base_tm *temp = ack_and_callsign->next_TM;
@@ -569,7 +558,8 @@
             
         }
         else if(last_buffer){
-            gPC.printf("last buffer2");
+            /*gPC.printf("last buffer2");*/
+            buffer_112[counter_buffer_112] = 0;
 //            delete ack_head;
 //            while(ack_and_callsign != NULL){
 //            Base_tm *temp = ack_and_callsign->next_TM;
@@ -579,7 +569,7 @@
         }
         else if(enable_EoS){
 //            send_EoS();
-            gPC.printf("eos2");
+            /*gPC.printf("eos2");*/
             buffer_112[counter_buffer_112] = EoS[counter_EoS++];
             if(counter_EoS == 120){
 //                cout<<"segments_sent = "<<segments_sent<<ENDL;
@@ -617,7 +607,7 @@
                }
                enable_read_block = false;
                if(ack_code == 0xA0){
-                   gPC.puts("read one block successfully");
+                  /* gPC.puts("read one block successfully");*/
                    enable_T_frame = true;
                    enable_SCH = true;
                 }
@@ -640,8 +630,8 @@
                     stop = true;
                 }
         }
-        if((PA_HOT || (!valid_SID)|| (gFLAGS & COM_SESSION_TIMEOUT_FLAG) ||(ack_code != 0xA0))&&(!enable_ackandcallsign)&&(!last_buffer)){
-            gPC.printf("last condition");
+        if((PA_HOT || (gFLAGS & COM_SESSION_TIMEOUT_FLAG) ||(ack_code != 0xA0))&&(!enable_ackandcallsign)&&(!last_buffer)){
+            /*gPC.printf("last condition");*/
             uint8_t temp2 = TC_STATE_EXECUTION_FAILED;
             PUTexec_status(current_obsrs_tc, temp2);
             enable_ackandcallsign = true;