Diff: DefinitionsAndGlobals.h

Revision:

187:2c7263530c57

Parent:

160:ef280e6dda44

Child:

206:fba4aeebf004

diff -r ccc21cc163f8 -r 2c7263530c57 DefinitionsAndGlobals.h
--- a/DefinitionsAndGlobals.h	Wed May 25 15:28:32 2016 +0000
+++ b/DefinitionsAndGlobals.h	Wed Jun 29 13:59:21 2016 +0000
@@ -11,11 +11,11 @@
     #define COM_RX_UART_RX USBRX
     
 // COMMON SPI
-    #define SPI_MOSI PTE1
-    #define SPI_MISO PTE3
-    #define SPI_CLK PTE2
+    #define SPI_MOSI PTD6
+    #define SPI_MISO PTD7
+    #define SPI_CLK PTD5
     #define SPI_CS_ADF PTA15
-    #define SPI_CS_SDC PIN20
+    #define SPI_CS_SDC PTD4
     #define SPI_CS_RTC PIN26
     
 // COM_TX
@@ -137,6 +137,14 @@
     #define RF_RELAY_CNTRL_TX PTA7
     #define RF_RELAY_CNTRL_BCN PTA12 
     
+//CDMS HK
+    #define COMRX_ALIVE 0xFF;
+    #define COMRX_DEAD 0x00;
+    #define DEVICE_ENABLED 0x00;
+    #define DEVICE_POWERED 0x01;
+    #define DEVICE_OC_FAULT 0x02;
+    #define DEVICE_DISABLED 0x03;
+    
 // ****************GLOBAL VARIABLES******************
 // DEBUG
 Serial gPC( USBTX, USBRX );
@@ -203,7 +211,31 @@
 const uint8_t gCALL_SIGN_STRING[TM_SHORT_SIZE] = {0xE0, 0x00, 0x00, 0x00, 0x56, 0x55, 0x32, 0x4E, 0x43, 0x46, 0x00, 0xAC, 0x11};
 
 // CDMS HK
+uint8_t CDMS_HEALTH_DATA[134];
+uint8_t CDMS_RAM[59];
+uint16_t GPIO_STATUS;
+uint8_t CDMS_HK_MAIN_STATUS;  
+uint16_t CDMS_HK_MAIN_COUNTER;  
+uint8_t COMRX_STATUS;
+uint16_t COMRX_RESET_COUNTER;
+uint8_t RTC_FAULTCOUNT;
+uint16_t SD_FAULTCOUNT;
+uint8_t SD_STATUS;
+uint8_t BAE_FAULTCOUNT;
+uint8_t BAE_STATUS;
+uint8_t PL_STATUS;
+uint16_t PL_FAULTCOUNT;
+bool BAE_HK_I2C;
+uint8_t RTC_STATUS;
+uint32_t CDMS_HK_FSC;
+uint32_t BAE_HK_FSC;
+float RSSI_volatge;
+
 CDMS_HK_actual actual_data;
 CDMS_HK_quant quant_data;
 CDMS_HK_min_max min_max_data;
-bool firstCount=true;
\ No newline at end of file
+bool firstCount=true;
+
+//SD HK
+uint32_t FSC_CURRENT[6];
+uint32_t FSC_LAST[6];
\ No newline at end of file