Revision 204:72f52e74e0e4, committed 2016-07-02

Comitter:

ee12b079

Date:

Sat Jul 02 09:31:22 2016 +0000

Parent:

203:424308159a56

Commit message:

testing obsrs tm

Changed in this revision

--- a/Compression.h	Fri Jul 01 17:41:48 2016 +0000
+++ b/Compression.h	Sat Jul 02 09:31:22 2016 +0000
@@ -292,7 +292,7 @@
                     space = adjust(1,0,pointer,8);
                     space = adjust(4,3,pointer,space);
                     FSC_science = FSC_CURRENT[3]+1;
-                    gPC.printf("SID = 3, FSC = %02X\r\n", FSC_CURRENT[3]+1);
+                    gPC.printf("SID = 3, FSC = %02X\r\n", FSC_science);
                     frames[id][1] = (FSC_science>>24)&0xff;
                     frames[id][2] = (FSC_science>>16)&0xff;
                     frames[id][3] = (FSC_science>>8)&0xff;

--- a/OBSRS.h	Fri Jul 01 17:41:48 2016 +0000
+++ b/OBSRS.h	Sat Jul 02 09:31:22 2016 +0000
@@ -535,25 +535,9 @@
                 /*gPC.printf("ex cr ack\r\n");*/
             }    
             send_Ack_andcallsign;
-            if(last_buffer){
-                /*gPC.printf("last buffer"); */
- //               delete ack_head;
-//                while(ack_and_callsign != NULL){
-//                Base_tm *temp = ack_and_callsign->next_TM;
-//                delete ack_and_callsign;
-//                ack_and_callsign = temp;
-            }
-            
         }
         else if(last_buffer){
-            /*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;
-//            delete ack_and_callsign;
-//            ack_and_callsign = temp;
-//            }
         }
         else if(enable_EoS){
 //            send_EoS();
@@ -626,9 +610,6 @@
             enable_T_frame = false;
         }
     }
-//    for(int i=0;i<112;i++){
-//        printf("0x%02X,",buffer_112[i]);
-//    }
     differential_encode(buffer_112, 112);
     if(last_buffer ==true){
     diff_prev=0;

--- a/main.cpp	Fri Jul 01 17:41:48 2016 +0000
+++ b/main.cpp	Sat Jul 02 09:31:22 2016 +0000
@@ -16,6 +16,7 @@
 #include "DefinitionsAndGlobals.h"
 #include "crc.h"
 #include "i2c.h"
+#include "cdms_rtc.h"
 #include "COM_SND_TM_functions.h"
 #include "COM_SND_TM.h"
 #include "cdms_sd.h"
@@ -25,7 +26,6 @@
 #include "adf.h"
 #include "COM_RCV_TC.h"
 //#include "Flash.h"
-#include "cdms_rtc.h"
 #include "COM_MNG_TMTC.h"
 #include "COM_POWER_ON_TX.h"
 #include "COM_POWER_OFF_TX.h"
@@ -119,7 +119,7 @@
     
     uint8_t test[512] = {0};
     disk_write(test,7000); //to be used only just before launch
-    uint8_t data[512];
+    /*uint8_t data[512];
     for(int i=0;i<512;i++)
         data[i] = i%100;
     for(int i=0;i<512;i++)
@@ -179,7 +179,7 @@
         {
             gPC.printf("\r0x%02X 0x%02X %d %d\n",data[i],test[i],j,FSC_CURRENT[2]);
         }
-    }
+    }*/
     
     
     
@@ -204,19 +204,19 @@
     
     
     master.frequency(400000);
-    PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
+    //PL_wo_dma = new RtosTimer(payload_isr_fun_dma, osTimerPeriodic,(void * )NULL);
     //PL_wo_dma->start(6000);//
-    //gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
+    gSCIENCE_THREAD->signal_set(SCIENCE_SIGNAL);
     
     
     
     
-    gPC.printf("PL_TC sending\r\n");
+    /*gPC.printf("PL_TC sending\r\n");
     
     Base_tm *tm_ptr = new Short_tm;
     OBSRS_TC(tm_ptr);
     
-    gPC.printf("PL_TC sent");
+    gPC.printf("PL_TC sent");*/
     
     // *******************INITIALISATIONS END********************