samp Srinivasan
publishing to check changes in cdms code
Dependencies: FreescaleIAP SimpleDMA mbed-rtos mbed
Fork of
CDMS_CODE_samp_23SEP_DMA_flag
by 
samp Srinivasan
Revision 275:605dd29161ad, committed 2016-07-23
- Comitter:
- aniruddhv
- Date:
- Sat Jul 23 23:37:46 2016 +0000
- Parent:
- 268:ded5306a1fd1
- Commit message:
- Changed pin of com_tx_oc_fault, combined global variables
Changed in this revision
--- 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;
--- a/COM_MNG_TMTC.h Wed Jul 20 09:58:59 2016 +0000
+++ b/COM_MNG_TMTC.h Sat Jul 23 23:37:46 2016 +0000
@@ -1607,7 +1607,7 @@
}\
else if( (gFLAGS & COM_PA_HOT_FLAG) || (gFLAGS & COM_PA_OC_FLAG) ){\
/*PA HOT: WAIT FOR TIMEOUT*/\
- gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_COOLING_TIME_LIMIT);\
+ gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_RECOVERY_TIMEOUT);\
COM_TX_CNTRL = 0;\
RX1M.attach(&rx_read, Serial::RxIrq);\
gFLAGS = gFLAGS & (~COM_MNG_TMTC_RUNNING_FLAG);\
--- a/COM_POWER_OFF_TX.h Wed Jul 20 09:58:59 2016 +0000
+++ b/COM_POWER_OFF_TX.h Sat Jul 23 23:37:46 2016 +0000
@@ -86,8 +86,8 @@
resume_bcn;\
}\
else{\
- if( /*gFLAGS & BAE_SW_EN_FLAG*/true ){\
- gPC.puts("resumning bcn2\r\n");\
+ if( BAE_SW_STATUS == DEVICE_POWERED ){\
+ gPC.puts("resumning bcn2\r\n");\
resume_bcn;\
}\
}\
--- a/COM_POWER_ON_TX.h Wed Jul 20 09:58:59 2016 +0000
+++ b/COM_POWER_ON_TX.h Sat Jul 23 23:37:46 2016 +0000
@@ -116,8 +116,7 @@
if( !(gFLAGS & COM_TX_FLAG) ){
gFLAGS = gFLAGS | COM_TX_FLAG;
gPC.puts("Inside COM_TX_FLAG\r\n");
- gFLAGS = gFLAGS | BAE_SW_EN_FLAG ;
- if( gFLAGS & BAE_SW_EN_FLAG ){
+ if( BAE_SW_STATUS == DEVICE_POWERED ){
/*WARNING: INFINITE WHILE LOOP POSSIBLE: if standby ack received and bcn tx main status = 0*/
bool retryFlag = true;
while( retryFlag == true ){
--- 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;
--- a/ThreadsAndFunctions.h Wed Jul 20 09:58:59 2016 +0000
+++ b/ThreadsAndFunctions.h Sat Jul 23 23:37:46 2016 +0000
@@ -128,7 +128,7 @@
HK_counter->stop();
gPAY_SPI->bulkRead_pause();
gFLAGS = gFLAGS | COM_SESSION_FLAG;
- gSESSION_TIMEOUT.attach(&after_session, SESSION_TIME_LIMIT);
+ gSESSION_TIMEOUT.attach(&after_session, COM_SESSION_TIMEOUT);
gFLAGS = gFLAGS | COM_RX_FLAG;
gTOTAL_RAW_BYTES = 0;
PUT_RAW_BYTE;
@@ -149,7 +149,7 @@
gFLAGS = gFLAGS | COM_RX_FLAG;
PUT_RAW_BYTE;
}
- if(gTOTAL_RAW_BYTES > BYTE_OVERFLOW_CONSTANT){
+ if(gTOTAL_RAW_BYTES > COM_TC_BYTES_LIMIT){
RX1M.attach(NULL);
gCOM_RX_DISABLE.attach(&after_com_disable, COM_RX_DISABLE_TIMEOUT);
after_receive();
@@ -192,7 +192,7 @@
if( tempGSver == 0xFF ){
gPC.puts("GS code match !!\r\n");
gFLAGS = gFLAGS | COM_SESSION_VALIDITY;
- //sys_reset_cdms_timer->start(cdms_reset_timeout);
+ sys_reset_cdms_timer->start(cdms_reset_timeout);
COM_POWER_ON_TX();
gPC.puts("P_com_hk !!\r\n");
P_COM_HK;
@@ -200,7 +200,7 @@
if( (gFLAGS & COM_PA_HOT_FLAG) || ( gFLAGS & COM_PA_OC_FLAG ) ){
gPC.puts("Pahot or paoc !!\r\n");
COM_TX_CNTRL = 0;
- gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_COOLING_TIME_LIMIT);
+ gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_RECOVERY_TIMEOUT);
gFLAGS = gFLAGS & (~COM_MNG_TMTC_RUNNING_FLAG);
RX1M.attach(&rx_read, Serial::RxIrq);
}
@@ -283,12 +283,12 @@
gFLAGS = gFLAGS & (~COM_SESSION_FLAG);
}
}
- else if( gFLAGS & COM_PA_HOT_FLAG ){
+ else if( (gFLAGS & COM_PA_HOT_FLAG) || (gFLAGS & COM_PA_OC_FLAG) ){
gPC.puts("checking for PA hot in main\r\n");
P_COM_HK;
if((gFLAGS & COM_PA_HOT_FLAG) || (gFLAGS & COM_PA_OC_FLAG)){
COM_TX_CNTRL = 0;
- gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_COOLING_TIME_LIMIT);
+ gCOM_PA_COOLING_TIMEOUT.attach(&after_cooling_pa, COM_PA_RECOVERY_TIMEOUT);
}
else{
gCOM_PA_COOLING_TIMEOUT.detach();
--- a/common_functions.h Wed Jul 20 09:58:59 2016 +0000
+++ b/common_functions.h Sat Jul 23 23:37:46 2016 +0000
@@ -154,15 +154,15 @@
}
#define isPAhot(returnHere){\
- uint8_t pa_temp = 0;\
- uint8_t pa_temp_quant = 0;\
+ float pa_temp = 0;\
+ float pa_temp_quant = 0;\
SelectLinec0=0;\
SelectLinec1=0;\
SelectLinec2=0;\
SelectLinec3=1;\
pa_temp = TempInput.read();\
pa_temp = pa_temp * 3.3;\
- int resistance;\
+ float resistance;\
resistance = 24000 * pa_temp/(3.3 - pa_temp);\
if(pa_temp > 1.47) {\
pa_temp = 3694/log(24.032242*resistance);\
@@ -171,7 +171,7 @@
pa_temp = 3365.4/log(7.60573*resistance);\
}\
pa_temp_quant = quantiz(tstart_thermistor,tstep_thermistor,pa_temp);\
- pa_temp_quant = 0;\
+ /*pa_temp_quant = 0;*/\
if (pa_temp_quant > COM_PA_TMP_HIGH){\
returnHere = 0xFF;\
gPC.puts("PA is measured HOT\r\n");\
@@ -184,12 +184,14 @@
#define isPAoc(returnHere){\
if (COM_TX_OC_FAULT){\
- returnHere = 0xFF;\
+ returnHere = 0;\
+ gPC.puts("PA is measured not OC\r\n");\
}\
else{\
- returnHere = 0;\
+ returnHere = 0xFF;\
+ gPC.puts("PA is measured OC\r\n");\
}\
- returnHere = 0;\
+ /*returnHere = 0;*/\
}
#define get_call_sign(tm_ptr) {\