Diff: CDMS_HK.h

Revision:

275:605dd29161ad

Parent:

268:ded5306a1fd1

diff -r ded5306a1fd1 -r 605dd29161ad CDMS_HK.h
--- a/CDMS_HK.h	Wed Jul 20 09:58:59 2016 +0000
+++ b/CDMS_HK.h	Sat Jul 23 23:37:46 2016 +0000
@@ -279,7 +279,7 @@
     //COMRX_OC_FAULT //$
     GPIO_STATUS=(COMRX_OC_FAULT)?(GPIO_STATUS)||((uint16_t)(0x1<<11)):(GPIO_STATUS)&(~((uint16_t)(0x1<<11)));
     // COMTX_OC_FAULT //$
-    GPIO_STATUS=(COMTX_OC_FAULT)?(GPIO_STATUS)||((uint16_t)(0x1<<10)):(GPIO_STATUS)&(~((uint16_t)(0x1<<10)));
+    GPIO_STATUS=(COM_TX_OC_FAULT == 0)?(GPIO_STATUS)||((uint16_t)(0x1<<10)):(GPIO_STATUS)&(~((uint16_t)(0x1<<10)));
     //BAE_OC_FAULT //$
     GPIO_STATUS=(BAE_OC_FAULT)?(GPIO_STATUS)||((uint16_t)(0x1<<9)):(GPIO_STATUS)&(~((uint16_t)(0x1<<9)));
     //PL_GPIO_1_STATUS //$
@@ -416,7 +416,7 @@
 void COLLECT_CDMS_RAM()
 {
     CDMS_RAM[0] = ((PL_INIT_STATUS<<7)&0x80)|((PL_MAIN_STATUS<<6)&0x40)|((PL_LOW_POWER<<5)&0x20)|((PL_STATE<<3)&0x18)|(PL_STATUS&0x07);
-    CDMS_RAM[1] = ((PL_RCV_SC_DATA_STATUS<<7)&0x80)|((COM_SESSION<<6)&0x40)|((COM_RX<<5)&0x20)|((RF_SW_STATUS<<4)&0x10)|((COM_TX<<3)&0x08)|((COM_TX_STATUS<<2)&0x04)|((COM_MNG_TMTC<<1)&0x02)|(EN_CDMS_HK&0x01);
+    CDMS_RAM[1] = ((PL_RCV_SC_DATA_STATUS<<7)&0x80)|(((gFLAGS & COM_SESSION_FLAG)<<4)&0x40)|(((gFLAGS & COM_RX_FLAG)<<2)&0x20)|(((gFLAGS & RF_SW_STATUS_FLAG)>>8)&0x10)|(((gFLAGS & COM_TX_FLAG)>>5)&0x08)|(((gFLAGS & COM_TX_STATUS_FLAG)>>12)&0x04)|(((gFLAGS & COM_MNG_TMTC_RUNNING_FLAG)>>3)&0x02)|(EN_CDMS_HK&0x01);
     CDMS_RAM[2] = ((EN_PL<<7)&0x80)|((EN_RCV_SC<<6)&0x40)|((CDMS_INIT_STATUS<<5)&0x20)|((CDMS_HK_MAIN_STATUS<<4)&0x10)|((CDMS_HK_STATUS<<2)&0x0C)|((COM_RX_STATUS<<1)&0x02)|(CDMS_RTC_BL&0x01);
     CDMS_RAM[3] = CDMS_I2C_ERR_SPEED_COUNTER >> 8;
     CDMS_RAM[4] = CDMS_I2C_ERR_SPEED_COUNTER;