Diff: DefinitionsAndGlobals.h

Revision:

338:d63eb331a67d

Parent:

333:cddef120cae3

Child:

339:5c4bda268e08

Child:

344:1675dbde0bae

Child:

346:204497974293

--- a/DefinitionsAndGlobals.h	Sun Jan 01 09:50:36 2017 +0000
+++ b/DefinitionsAndGlobals.h	Mon Jan 02 14:21:44 2017 +0000
@@ -77,7 +77,6 @@
     #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
@@ -207,7 +206,7 @@
 DigitalOut RF_SW_CNTRL_TX(RF_RELAY_CNTRL_TX);
 
 //COM_RX
-DigitalOut COM_RX_CNTRL(PIN72,1);
+DigitalOut COM_RX_CNTRL(PIN55,1);//changed!! earlier version had PIN72
 DigitalOut COM_TX_CNTRL(PIN56,1);
 //DigitalIn COM_TX_OC_FAULT(PIN69);
 DigitalIn COM_TX_OC_FAULT(PIN58);
@@ -240,7 +239,6 @@
 
 // PAYLOAD OR SCIENCE_THREAD
 Thread* gSCIENCE_THREAD = NULL;
-dmaSPISlave *gPAY_SPI;
 uint8_t gPAYLOAD_BUFFER[PAYLOAD_BUFFER_LENGTH] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,1,44,1,44,1,44,1,44,1,44,1,188,2,188,2,188,2,188,2,88,2,88,2,88,2,88,2,100,0,100,0,200,0,200,0,244,1,244,1,88,2,88,2,208,2,208,2,246,0,246,0,10,0,250,0,250,0,250,0,120,0,0,0,172,13,0,0,184,11,0,0,160,15,0,0};
 RtosTimer *PL_wo_dma;
 
@@ -284,7 +282,7 @@
 DigitalIn V_A_PGOOD (PIN88);
 DigitalIn V_B_PGOOD_1 (PIN6);
 DigitalIn V_B_PGOOD_2 (PIN7);
-DigitalIn V_C_PGOOD (PIN54);
+AnalogIn V_C_PGOOD (PIN54);
 DigitalIn COMRX_OC_FAULT (PIN68);
 //DigitalIn COMTX_OC_FAULT (PIN69);
 DigitalIn BAE_OC_FAULT (PIN92);
@@ -376,9 +374,16 @@
 uint8_t COM_RX_DISABLE_TIMEOUT;
 uint8_t COM_PA_TMP_HIGH;
 uint8_t COM_PA_RECOVERY_TIMEOUT;
-uint8_t COM_SESSION_TIMEOUT = 1500;  //confirm with Anirudh 
+uint8_t COM_SESSION_TIMEOUT = 60;  //confirm with Anirudh 
 uint8_t COM_RSSI_MIN;
 uint16_t SD_LIB_BLK_CURRENT;
 
 // Ambigouties
-uint8_t EN_RTC = 0x01;
\ No newline at end of file
+uint8_t EN_RTC = 0x01;
+
+//Variables used by shubham (02-01-2017)
+uint8_t com_oc_sw_status = 1;
+uint8_t COM_OC_SET = 0;
+uint8_t COM_RSSI_SET = 0;
+uint8_t resume_pl_dma = 0;
+