Diff: DefinitionsAndGlobals.h

Revision:

275:605dd29161ad

Parent:

268:ded5306a1fd1

diff -r ded5306a1fd1 -r 605dd29161ad DefinitionsAndGlobals.h
--- a/DefinitionsAndGlobals.h	Wed Jul 20 09:58:59 2016 +0000
+++ b/DefinitionsAndGlobals.h	Sat Jul 23 23:37:46 2016 +0000
@@ -67,24 +67,17 @@
     #define COM_TX_FLAG 0x0100
     #define COM_SESSION_TIMEOUT_FLAG 0x0200
     #define COM_AUTO_POWER_OFF_BAE_FLAG 0x0400
-    #define BAE_SW_EN_FLAG 0x0800
     #define RF_SW_STATUS_FLAG 0x1000
     #define COM_INIT_STATUS_FLAG 0x2000
     #define COM_TX_STATUS_FLAG 0x4000
 
-//RF relay STATUS
-    #define RF_COM_TX 0
-    #define RF_BCN 1
-
 // COM_MNG_TMTC THREAD
-    #define SESSION_TIME_LIMIT 1500
     #define COM_MNG_TMTC_SIGNAL_UART_INT 0x01
     #define COM_MNG_TMTC_SIGNAL_ADF_NSD 0x02
     #define COM_MNG_TMTC_SIGNAL_ADF_SD 0x03
     #define cdms_reset_timeout 345600000
     
 // COM_MNG_TMTC
-    #define COM_PA_COOLING_TIME_LIMIT 20
     #define COM_MAX_TC_LIMIT 256
     #define TM_ACK_CODE_INDEX 2
     #define CRC_FAIL_NACK_CODE 0x01
@@ -96,7 +89,6 @@
     // max value of telecommands in a tcl
     #define TCL_OVERFLOW_CONSTANT 256
     #define TM_OVERFLOW_CONSTANT 256
-    #define BYTE_OVERFLOW_CONSTANT 35000
 
     // starting value of packet sequence count at each pass 
     #define PSC_START_VALUE 1
@@ -209,7 +201,7 @@
 //COM_RX
 DigitalOut COM_RX_CNTRL(PIN72);
 DigitalOut COM_TX_CNTRL(PIN56);
-DigitalIn COM_TX_OC_FAULT(PIN69);
+DigitalIn COM_TX_OC_FAULT(PIN58);
 
 // TC LIST
 Base_tc* gHEAD_NODE_TCL = NULL;
@@ -279,7 +271,6 @@
 DigitalIn V_B_PGOOD_2 (PIN7);
 DigitalIn V_C_PGOOD (PIN54);
 DigitalIn COMRX_OC_FAULT (PIN68);
-DigitalIn COMTX_OC_FAULT (PIN69);
 DigitalIn BAE_OC_FAULT (PIN92);
 DigitalOut PL_GPIO_1_STATUS (PIN71);
 DigitalOut PL_GPIO_2_STATUS (PIN81);
@@ -335,12 +326,6 @@
 uint8_t PL_LOW_POWER;
 uint8_t PL_STATE;
 uint8_t PL_RCV_SC_DATA_STATUS;
-uint8_t COM_SESSION;
-uint8_t COM_RX;
-uint8_t RF_SW_STATUS;
-uint8_t COM_TX;
-uint8_t COM_TX_STATUS;
-uint8_t COM_MNG_TMTC;
 uint8_t EN_CDMS_HK;
 uint8_t EN_PL;
 uint8_t EN_RCV_SC;