Diff: DefinitionsAndGlobals.h

Revision:

352:022c513aee03

Parent:

348:8e6b2b4d244e

Child:

353:e1803e801e20

--- a/DefinitionsAndGlobals.h	Sun Jan 22 04:47:11 2017 +0000
+++ b/DefinitionsAndGlobals.h	Mon Feb 06 16:36:46 2017 +0000
@@ -17,8 +17,8 @@
     #define SPI_CLK PTE2
     #define SPI_CS_ADF PTA15
     #define SPI_CS_SDC PIN20
-  //#define SPI_CS_RTC PIN26 // actual
-     #define SPI_CS_RTC PIN60 // sbc with jumper v1.0
+     #define SPI_CS_RTC PIN26 // actual
+  //   #define SPI_CS_RTC PIN60 // sbc with jumper v1.0
     
 // COM_TX
     #define COM_TX_CONFIG_LIMIT 3
@@ -33,20 +33,20 @@
     DigitalOut PL_I2C_GPIO(PTC1);
             
 //I2C - CDMS to BAE
-    //DigitalIn BAE_I2C_GPIO(PIN67);//PTB21 from bae to cdms
-    //DigitalOut CDMS_I2C_GPIO(PIN39);//PTA5 from cdms to bae 
+  //  DigitalOut CDMS_I2C_GPIO(PIN67);//PTB21 from bae to cdms
+  //  DigitalIn BAE_I2C_GPIO(PIN39);//PTA5 from cdms to bae 
     
-    #define SBC 1
+ //   #define SBC 1
     
-    #if SBC
-    DigitalOut CDMS_I2C_GPIO(PIN67,1);
-    DigitalIn BAE_I2C_GPIO(PIN1);
-    #endif
+ //   #if SBC
+ //   DigitalOut CDMS_I2C_GPIO(PIN67,1);
+ //   DigitalIn BAE_I2C_GPIO(PIN1);
+ //   #endif
     
-    #if !SBC
+  //  #if !SBC
     DigitalIn BAE_I2C_GPIO(PIN67);
     DigitalOut CDMS_I2C_GPIO(PIN39,0);    
-    #endif
+   // #endif
 
 // TC LIST
     #define TCL_STATE_INCOMPLETE 0x00
@@ -155,8 +155,8 @@
     #define BAE_RESET_PID 0x33
 
 //RF RELAY
-    #define RF_RELAY_CNTRL_TX PTB7
-    #define RF_RELAY_CNTRL_BCN PTB17 
+    #define RF_RELAY_CNTRL_TX PTA12
+    #define RF_RELAY_CNTRL_BCN PTA7 
     
 //CDMS HK
 #define HK_SIGNAL 0x05
@@ -180,6 +180,7 @@
 DigitalOut gLEDR(LED_RED);
 DigitalOut gLEDG(LED_GREEN);
 
+
 // COM_RX
 RawSerial RX1M( COM_RX_UART_TX, COM_RX_UART_RX );
 COM_RX_DATA_NODE *gRX_HEAD_DATA_NODE = NULL;
@@ -268,8 +269,8 @@
 float RSSI_VOLTAGE;
 uint8_t COM_ADF_TMP = 0;
 uint8_t COM_PA_IC_TMP = 0;
-uint8_t BAE_HK_SD_DATA_READY = 1;
-uint8_t CDMS_HK_SD_DATA_READY = 1;
+uint8_t BAE_HK_SD_DATA_READY = 0;
+uint8_t CDMS_HK_SD_DATA_READY = 0;
 
 CDMS_HK_actual actual_data;
 CDMS_HK_quant quant_data;
@@ -288,7 +289,7 @@
 DigitalIn COMRX_OC_FAULT (PIN68);
 //DigitalIn COMTX_OC_FAULT (PIN69);
 DigitalIn BAE_OC_FAULT (PIN92);
-DigitalOut PL_GPIO_1_STATUS (PIN71,0); // PYLD EPS CNTRL Signal1 / PYLD_EPS_CNTRL_SIG1
+DigitalOut PL_GPIO_1_STATUS (PIN71,1); // PYLD EPS CNTRL Signal1 / PYLD_EPS_CNTRL_SIG1
 DigitalOut PL_GPIO_2_STATUS (PIN81);//PYLD EPS CNTRL 2 / PYLD_EPS_CNTRL_2
 DigitalOut PL_GPIO_3_STATUS (PIN80);// PYLD EPS CNTRL 3 / PYLD_EPS_CNTRL_3
 DigitalIn PL_BEE_SW_OC_FAULT (PIN91);
@@ -315,6 +316,15 @@
 
 DigitalOut DMA_LED1(PIN61,0);
 DigitalOut SCI_LED1(PIN62,0);
+DigitalOut WDTrigger(PIN33,0);
+
+// Digital Isolator SD card
+    DigitalOut SD_CARD_fromuC_ENA3(PIN85,1); 
+    DigitalOut SD_CARD_fromISO_ENA4 (PIN84,1);    
+
+// COM TX Digital Isolator
+    DigitalOut COM_DATA_fromuC_ENAIN(PIN6,0);
+    DigitalOut COM_DATA_fromISO_ENAOUT(PIN7,0);   
 
 //SD HK
 uint32_t FSC_CURRENT[6];