Diff: DefinitionsAndGlobals.h

Revision:

248:407ab7e337cd

Parent:

235:c127b15409b2

Child:

249:1560c64adffb

--- a/DefinitionsAndGlobals.h	Wed Jul 06 08:09:22 2016 +0000
+++ b/DefinitionsAndGlobals.h	Fri Jul 08 12:53:24 2016 +0000
@@ -225,7 +225,7 @@
 // CDMS HK
 uint8_t CDMS_STANDBY;
 uint8_t CDMS_HEALTH_DATA[128];
-uint8_t CDMS_RAM[59];
+uint8_t CDMS_RAM[84];
 uint16_t GPIO_STATUS;
 uint8_t CDMS_HK_MAIN_STATUS;    
 uint8_t COMRX_STATUS;
@@ -245,6 +245,7 @@
 CDMS_HK_min_max min_max_data;
 bool firstCount=true;
 
+    
 //GPIO PINS
 DigitalIn V_A_PGOOD (PIN88);
 DigitalIn V_B_PGOOD_1 (PIN6);
@@ -253,12 +254,13 @@
 DigitalIn COMRX_OC_FAULT (PIN68);
 DigitalIn COMTX_OC_FAULT (PIN69);
 DigitalIn BAE_OC_FAULT (PIN92);
-DigitalIn PL_GPIO_1_STATUS (PIN71);
-DigitalIn PL_GPIO_2_STATUS (PIN81);
-DigitalIn PL_GPIO_3_STATUS (PIN80);
+DigitalOut PL_GPIO_1_STATUS (PIN71);
+DigitalOut PL_GPIO_2_STATUS (PIN81);
+DigitalOut PL_GPIO_3_STATUS (PIN80);
 DigitalIn PL_BEE_SW_OC_FAULT (PIN91);
 DigitalIn PL_EPS_LATCH_SW_OC_FAULT (PIN5);
-DigitalIn V_D_EN_STATUS (PIN56);
+DigitalOut EPS_V_C_EN_STATUS (PIN72);
+DigitalOut EPS_V_D_EN_STATUS (PIN56);
 
 
 DigitalIn SD_OC_FAULT (PIN90);
@@ -295,6 +297,8 @@
 uint16_t COMRX_RESET_COUNTER;
 uint16_t PL_MAIN_COUNTER;
 uint16_t PL_RCV_SC_DATA_COUNTER;
+uint16_t CDMS_WR_SD_FAULT_COUNTER;
+uint16_t SD_LIB_WRITES = 0;
 
 //CDMS RAM parameters
 uint8_t PL_INIT_STATUS;
@@ -308,8 +312,10 @@
 uint8_t COM_TX;
 uint8_t COM_TX_STATUS;
 uint8_t COM_MNG_TMTC;
-uint8_t CDMS_STANDBY_HK;
-uint8_t CDMS_STANDBY_PL;
+uint8_t EN_CDMS_HK;
+uint8_t EN_PL;
+uint8_t EN_RCV_SC;
 uint8_t CDMS_INIT_STATUS;
 uint8_t CDMS_HK_STATUS;
-uint8_t CDMS_RTC_BL;
\ No newline at end of file
+uint8_t COM_RX_STATUS;
+uint8_t CDMS_RTC_BL;