Diff: DefinitionsAndGlobals.h

Revision:

218:c63cdba0550f

Parent:

217:93505a6f8db7

Child:

219:8e8396f15bc2

--- a/DefinitionsAndGlobals.h	Sun Jul 03 11:35:55 2016 +0000
+++ b/DefinitionsAndGlobals.h	Sun Jul 03 15:25:24 2016 +0000
@@ -50,6 +50,7 @@
 #define COM_SESSION_VALIDITY 0x0020
 #define ALL_CRC_PASS_FLAG 0x0040
 #define COM_PA_HOT_FLAG 0x0080
+#define COM_PA_OC_FLAG 0x8000
 #define COM_TX_FLAG 0x0100
 #define COM_SESSION_TIMEOUT_FLAG 0x0200
 #define COM_AUTO_POWER_OFF_BAE_FLAG 0x0400
@@ -68,6 +69,7 @@
 #define COM_MNG_TMTC_SIGNAL_ADF_NSD 0x02
 #define COM_MNG_TMTC_SIGNAL_ADF_SD 0x03
 #define SCIENCE_SIGNAL 0x04
+
 // COM_MNG_TMTC
 #define COM_PA_COOLING_TIME_LIMIT 20
 #define COM_MAX_TC_LIMIT 200
@@ -265,6 +267,8 @@
 DigitalOut BAE_SW_EN_DS (PIN47);
 DigitalOut PL_SW_EN_DS (PIN73);
 
+#define RESET_CDMS CDMS_INTERNAL_RESET()
+
 //SD HK
 uint32_t FSC_CURRENT[6];
 uint32_t FSC_LAST[6];
@@ -308,17 +312,17 @@
 uint8_t EPS_V_A_EN_STATUS;
 uint8_t BAE_SW_STATUS;
 uint8_t CDMS_SD_SW_STATUS;
-uint8_t PL_BEE_SW_STATUS =0 ;
+uint8_t PL_BEE_SW_STATUS;
 uint8_t PL_EPS_LATCH_SW_EN;
 uint8_t RTC_INIT_STATUS;
 uint8_t CDMS_RTC_DISABLE;
-uint8_t CDMS_RESET_COUNTER;
-uint8_t TIME_LATEST_CDSMS_RESET;
-uint8_t COM_TC_BYTES_LIMIT;
+uint16_t CDMS_RESET_COUNTER;
+uint32_t TIME_LATEST_CDSMS_RESET;
+uint16_t COM_TC_BYTES_LIMIT;
 uint8_t COM_RX_CURRENT_MAX;
 uint8_t COM_RX_DISABLE_TIMEOUT;
 uint8_t COM_PA_TMP_HIGH;
 uint8_t COM_PA_RECOVERY_TIMEOUT;
 uint8_t COM_SESSION_TIMEOUT;
 uint8_t COM_RSSI_MIN;
-uint8_t SD_LIB_BLK_CURRENT_NMBR;
\ No newline at end of file
+uint16_t SD_LIB_BLK_CURRENT_NMBR;
\ No newline at end of file