Revision 275:a2f1d544ab8b, committed 2016-07-24

Comitter:

ee12b079

Date:

Sun Jul 24 12:15:03 2016 +0000

Parent:

269:72529b247333

Commit message:

CDMS code for testing sbc

Changed in this revision

diff -r 72529b247333 -r a2f1d544ab8b Compression.h
--- a/Compression.h	Thu Jul 21 13:18:02 2016 +0000
+++ b/Compression.h	Sun Jul 24 12:15:03 2016 +0000
@@ -449,11 +449,11 @@
                 frames[id][133] = temp_crc & 0xff;
                 
                 #if srpz
-                gPC.printf("\n\rPrinting SFP_TM\n\r{");                
+                /*gPC.printf("\n\rPrinting SFP_TM\n\r{");                
                 for(uint8_t z=0;z<134;z++){
                     gPC.printf("0x%02X,",frames[id][z]);
                 }
-                gPC.printf("}\n\r");
+                gPC.printf("}\n\r");*/
                 #endif
                 /*------------------current TM frame completely filled-----------------------*/
                 
@@ -511,11 +511,11 @@
         frames[id][132] = temp_crc>>8;
         frames[id][133] = temp_crc & 0xff;        
         
-        gPC.printf("\n\rPrinting SFP_TM\n\r{");
+        /*gPC.printf("\n\rPrinting SFP_TM\n\r{");
         for(uint8_t z=0;z<134;z++){
             gPC.printf("0x%02X,",frames[id][z]);
         }
-        gPC.printf("}\n\r");
+        gPC.printf("}\n\r");*/
     }
     #endif
     at = 0;     pzf = 1;    ezf = 1;
@@ -1132,11 +1132,11 @@
             frames[id][133] = temp_crc & 0xff;
             #if scpz
             //gPC.printf("\n\rFirst head pointer contents: 0x%02X",frames[id][frames[id][4]]);
-            gPC.printf("\n\rPrinting SCP_TM\n\r{");
+            /*gPC.printf("\n\rPrinting SCP_TM\n\r{");
             for(uint8_t z=0;z<134;z++){
                 gPC.printf("0x%02X,",frames[id][z]);
             }
-            gPC.printf("}\n\r");
+            gPC.printf("}\n\r");*/
             #endif
             exor(frames[id]);
             convolution(frames[id]);
@@ -1186,11 +1186,11 @@
         frames[id][133] = temp_crc & 0xff;
         
         
-        gPC.printf("\n\rPrinting SCP_TM\n\r{");
+        /*gPC.printf("\n\rPrinting SCP_TM\n\r{");
         for(uint8_t z=0;z<134;z++){
             gPC.printf("0x%02X,",frames[id][z]);
         }
-        gPC.printf("}\n\r");
+        gPC.printf("}\n\r");*/
     }
     #endif    
 }
\ No newline at end of file

diff -r 72529b247333 -r a2f1d544ab8b DefinitionsAndGlobals.h
--- a/DefinitionsAndGlobals.h	Thu Jul 21 13:18:02 2016 +0000
+++ b/DefinitionsAndGlobals.h	Sun Jul 24 12:15:03 2016 +0000
@@ -1,6 +1,6 @@
 // **************DEFINITIONS*********************
 
-#define dma 0
+#define dma 1
 
 // COM_RX
     #define RX_TIMEOUT_LIMIT 0.5
@@ -285,12 +285,12 @@
 DigitalOut PL_GPIO_3_STATUS (PIN80);
 DigitalIn PL_BEE_SW_OC_FAULT (PIN91);
 DigitalIn PL_EPS_LATCH_SW_OC_FAULT (PIN5);
-DigitalOut EPS_V_C_EN_STATUS (PIN72);
-DigitalOut EPS_V_D_EN_STATUS (PIN56);
+DigitalOut EPS_V_C_EN_STATUS (PIN72,0);
+DigitalOut EPS_V_D_EN_STATUS (PIN56,1);
 
 
 DigitalIn SD_OC_FAULT (PIN90);
-DigitalOut SD_SW_EN_DS (PIN97);
+DigitalOut SD_SW_EN_DS (PIN97,1);
 DigitalOut BAE_SW_EN_DS (PIN47,1);
 DigitalOut TRXY_EN (PIN84);
 DigitalOut TRZ_EN (PIN88);
@@ -303,7 +303,7 @@
 DigitalOut PYLD_EPS_DFF_PWR_CLK (PIN40);
 
 DigitalOut RESET_TO_BAE(PIN93,1);
-DigitalOut RESET_TO_PYLD(PIN21);
+DigitalOut RESET_TO_PYLD(PIN21,1);
 
 //SD HK
 uint32_t FSC_CURRENT[6];

diff -r 72529b247333 -r a2f1d544ab8b main.cpp
--- a/main.cpp	Thu Jul 21 13:18:02 2016 +0000
+++ b/main.cpp	Sun Jul 24 12:15:03 2016 +0000
@@ -92,6 +92,7 @@
     master.frequency(400000);
     
     HK_counter = new RtosTimer(hk_isr, osTimerPeriodic,(void * )NULL);
+    gHK_THREAD->signal_set(HK_SIGNAL);
     //HK_counter->start(10000);
     
     sys_reset_cdms_timer = new RtosTimer(sys_pwr_reset, osTimerPeriodic, (void * )NULL);