Revision 148:46763854fa83, committed 2016-04-06

Comitter:

krishanprajapat

Date:

Wed Apr 06 10:22:10 2016 +0000

Parent:

146:d9ce37c49409

Child:

149:827e23febfdf

Commit message:

Eos detected for OBSRS data not matching

Changed in this revision

--- a/OBSRS.h	Sat Apr 02 12:41:55 2016 +0000
+++ b/OBSRS.h	Wed Apr 06 10:22:10 2016 +0000
@@ -162,7 +162,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;\
@@ -173,7 +173,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;\
@@ -184,7 +184,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;\
@@ -202,7 +202,7 @@
             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{\
@@ -241,7 +241,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;\
@@ -280,7 +280,7 @@
                     snd_tm.head_pointer_sdcard(callsign);\
                     int temp = snd_tm.make_shor_tm();\
                     delete callsign;\
-                    gPC.printf("new tc\r\n");\
+                    /*gPC.printf("new tc\r\n");*/\
                }\
                else{\
                    if(!enable_ackandcallsign){\
@@ -297,7 +297,7 @@
             if (counter_SCH40 == 5)\
             {   \
                 counter_SCH40 = 0;\
-                gPC.printf("csch40 sent\r\n");\
+                /*gPC.printf("csch40 sent\r\n");*/\
                 enable_SCH = false;\
                 enable_DS = true;\
             }\
@@ -312,7 +312,7 @@
                 enable_FCCH = true;\
                 counter_interleavedata = 0;\
                 /*counter_interleavedata = 0;not required here*/\
-                gPC.printf("cds sent sent \r\n");\
+                /*gPC.printf("cds sent sent \r\n");*/\
             }\
         }\
         else if (enable_FCCH)\
@@ -322,7 +322,7 @@
             {\
                 enable_FCCH = false;\
                 counter_FCCH80 = 0;\
-                gPC.printf("cfcch sent\r\n");\
+                /*gPC.printf("cfcch sent\r\n");*/\
                 if(half_buffer == 0){\
                     enable_SCH = true;\
                     half_buffer = 1;\
@@ -365,7 +365,7 @@
 }
 
 void send_tm_from_SD_card_fun(){
-    gPC.printf("\n\rsend tm sd called\r\n");
+/*    gPC.printf("\n\rsend tm sd called\r\n");*/
     for(counter_buffer_112=0;counter_buffer_112<112;counter_buffer_112++){
         if(enable_new_segment){                     // starting new segment
             send_S_frame;
@@ -382,7 +382,7 @@
                         buffer_112[counter_buffer_112] = SCH40[counter_SCH40++];
                         if (counter_SCH40 == 5)
                         {   
-                            gPC.printf("tsch40 sent\r\n");\
+/*                            gPC.printf("tsch40 sent\r\n");*/
                             counter_SCH40 = 0;
                             enable_SCH = false;
                             enable_DS = true;
@@ -393,7 +393,7 @@
                         buffer_112[counter_buffer_112] = buffer_512[counter_buffer_512++];
                         if ((counter_buffer_512 == 288) || (counter_buffer_512 == 144))
                         {   
-                            gPC.printf("tds sent\r\n");
+/*                            gPC.printf("tds sent\r\n");*/
 //                            counter_buffer_512 = 0;
                             enable_DS = false;
                             enable_FCCH = true;
@@ -404,7 +404,7 @@
                         buffer_112[counter_buffer_112] = FCCH80[counter_FCCH80++];
                         if (counter_FCCH80 == 10)
                         {
-                            gPC.printf("tfcch80 sent\r\n");
+/*                            gPC.printf("tfcch80 sent\r\n");*/
                             enable_FCCH = false;
                             if(counter_buffer_512 == 144){
                                 enable_SCH = true;
@@ -422,7 +422,7 @@
 //                        cout<<"T_frames_sent "<<T_frames_sent<<ENDL;
                         if(last_block){
 //                            cout<<"last block"<<endl<<"\r";
-                            gPC.printf("last block\r\n");
+/*                            gPC.printf("last block\r\n");*/
                             enable_read_block = false;
                             enable_T_frame = false;
                             enable_ackandcallsign = true;
@@ -498,7 +498,7 @@
         }
         else if(enable_ackandcallsign){
             if(create_Ack_andcallsign){
-                gPC.printf("cr ack\r\n");
+/*                gPC.printf("cr ack\r\n");*/
                 enable_SCH = true;
                 create_Ack_andcallsign = false;
                 Base_tm *ack_and_callsign = NULL;
@@ -512,7 +512,7 @@
                 get_ack_l234(ack_and_callsign->next_TM); 
                 snd_tm.head_pointer_sdcard(ack_head);
                 T_frame_in_Ackandcallsign = 2*snd_tm.make_shor_tm();
-                gPC.printf(" T_frame_in_Ackandcallsign = %d\r\n",T_frame_in_Ackandcallsign);
+/*                gPC.printf(" T_frame_in_Ackandcallsign = %d\r\n",T_frame_in_Ackandcallsign);*/
                 Base_tm *ack_l234 = ack_and_callsign->next_TM;
                 uint8_t temp2 = TC_STATE_SUCCESSFULLY_EXECUTED; // see all the possible cases
                 PUTexec_status(current_obsrs_tc, temp2);
@@ -534,10 +534,9 @@
                         gLAST_TM_SHORT_OR_LONG = LONG_TM_CODE;
                     }
                 }
-                gPC.printf("test 5\r\n");
                 ack_and_callsign = ack_head->next_TM;
                 
-                gPC.printf("ex cr ack\r\n");
+/*                gPC.printf("ex cr ack\r\n");*/
             }    
             send_Ack_andcallsign;
         }
@@ -576,7 +575,7 @@
                    int write_success = SD_WRITE(write_buffer,FSC + block_counter,SID);
 //                   wait_ms(8);
                    read_success = SD_READ(buffer_512, FSC + block_counter,SID);
-                   gPC.printf("read block %d \n\r",read_success);
+/*                   gPC.printf("read block %d \n\r",read_success);*/
                }
                else{
                    read_success = SD_READ(buffer_512, list_of_FSC[block_counter],SID);

--- a/adf.h	Sat Apr 02 12:41:55 2016 +0000
+++ b/adf.h	Wed Apr 06 10:22:10 2016 +0000
@@ -251,23 +251,18 @@
  
 #define send_data {\
 if(sent_tmfrom_SDcard){\
-        gPC.printf("sd call\n\r");\
-        send_tm_from_SD_card_fun();\
-    }else{\
-        snd_tm.transmit_data(buffer_112,&last_buffer);\
-    }\
-    gPC.printf("en write data\n\r");\
-    write_data;\
-    gPC.printf("ex write data\n\r");\
-    if(sent_tmfrom_SDcard){\
-        gPC.printf("sd call\n\r");\
         send_tm_from_SD_card_fun();\
     }else{\
         snd_tm.transmit_data(buffer_112,&last_buffer);\
     }\
     write_data;\
     if(sent_tmfrom_SDcard){\
-        gPC.printf("sd call\n\r");\
+        send_tm_from_SD_card_fun();\
+    }else{\
+        snd_tm.transmit_data(buffer_112,&last_buffer);\
+    }\
+    write_data;\
+    if(sent_tmfrom_SDcard){\
         send_tm_from_SD_card_fun();\
     }else{\
         snd_tm.transmit_data(buffer_112,&last_buffer);\