Diff: Compression.h

Revision:

346:204497974293

Parent:

342:77b0d59897f7

Child:

347:2517c9f6bb4f

--- a/Compression.h	Thu Jan 05 17:38:21 2017 +0000
+++ b/Compression.h	Fri Jan 13 08:00:33 2017 +0000
@@ -27,6 +27,9 @@
 #define debug_dma 0     //byte reading order in dma, used to read test_cases 4 to 16 since they're in the wrong order
 #define test_science 0
 #define tabulation 0
+uint8_t HK_timer_toggle = 0;
+
+Timer timer_test;
 
 #if debug_dma
 uint16_t read_2byte(uint8_t* ptr)
@@ -1355,8 +1358,21 @@
 //give the pointer of 6 second data to this function
 void srp(uint8_t * head)//void const *args)
 {
+    //timer_test.start();
     uint8_t sd_stat = 0;
-    SCI_LED1 =1;
+//    SCI_LED1 =1;
+   
+   /****** added by samp to HK occurance *********/
+   if (HK_timer_toggle==0)
+   {
+   HK_counter->stop();
+   wait_ms(0.1);
+   HK_counter->start(10000);
+   }
+   HK_timer_toggle = !HK_timer_toggle;
+   
+   /****** added by samp to HK occurance *********/
+   
     // SCI_LED1 = !SCI_LED1;
     //gPC.printf("\n\rsrp");
     debug_cntr = 0;
@@ -1368,8 +1384,15 @@
     #endif
     if(time_prev_scp==0){
         time_prev_scp = sci_time;
-    }    
-    FCTN_SD_MNGR();                                                             ///changed recently
+    } 
+ //   gPC.printf("enterdSCI_SD7");   
+ //  gPC.printf("timer start %d::",HK_counter.read_ms());  
+ 
+      FCTN_SD_MNGR();     
+   
+  //  gPC.printf("timer end %d::",HK_counter.read_ms());                                                    ///changed recently
+   // timer_test.stop();
+//    gPC.printf("endSCI_SD8");
     #if tabulation
     if(head[0]==0 & head[1]==0){
         position_tm_frame[1] = position_tm_starting[1];
@@ -1854,18 +1877,27 @@
                 convolution(frames[id]);
                 interleave(TM_convoluted_data,TM_interleave_data);
                 interleave(TM_convoluted_data+ 135,TM_interleave_data + 144);
+  //              gPC.printf("enterSCI_SD11");
+                
+  //              gPC.printf("timer start %d::",HK_counter);
                 if(id == 1)
                 {
-                    sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,3);     //sd_write will return ack later, for now not included
+             //       sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,3);     //sd_write will return ack later, for now not included
                 }
                 else if (id == 2)
                 {
-                    sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,2);     //sd_write will return ack later, for now not included
+          //          sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,2);     //sd_write will return ack later, for now not included
                 }
                 if(sd_stat)
                 {
                     gPC.printf("\n\n\rsd write fail---------------------------------------");
                 }
+                
+             //  gPC.printf("timer end %d::",timer_test.read_ms());                                                    ///changed recently
+             //    timer_test.stop();
+              
+             
+ //              gPC.printf("endSCI_SD12");
                 position_tm_frame[id] = position_tm_starting[id];
                 if(j!=0)
                     frames[id][6-id] = (length - j)+position_tm_starting[id];
@@ -2745,8 +2777,9 @@
             convolution(frames[id]);
             interleave(TM_convoluted_data,TM_interleave_data);
             interleave(TM_convoluted_data+ 135,TM_interleave_data + 144);
-
-            sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,1);         //sd_write returns ack, for now not included
+            gPC.printf("endSCI_SD13");
+      //      sd_stat = SD_WRITE(TM_interleave_data,FSC_science+1,1);         //sd_write returns ack, for now not included
+            gPC.printf("endSCI_SD14");
             if(sd_stat)
             {
                 gPC.puts("sd write fail");
@@ -2805,7 +2838,7 @@
     #endif
     gPC.printf("End of SRP function\n\r"); 
     //SCI_LED1 = !SCI_LED1;
-    SCI_LED1 = 0;
+ //   SCI_LED1 = 0;
 }
 /*void test_sci_main(){
     gPAYLOAD_BUFFER[2] &= (~0x01);  //calibrated mode data generation