Diff: EPS.cpp

Revision:

39:670133e7ffd8

Parent:

33:76f2b8735501

Child:

40:c2538d97e78b

Child:

44:da258a0977a4

Child:

48:9fd15e3e0b53

--- a/EPS.cpp	Mon Jul 04 04:29:59 2016 +0000
+++ b/EPS.cpp	Tue Jul 05 13:44:15 2016 +0000
@@ -36,6 +36,7 @@
 extern uint8_t jm_mms[9];
 extern uint8_t bb_mms[3];
 extern uint8_t singularity_flag_mms;
+extern uint8_t B_SCZ_ANGLE;
 
 
 //bcn
@@ -85,9 +86,9 @@
 uint8_t EPS_BAT_TEMP_LOW;
 uint8_t EPS_BAT_TEMP_HIGH;
 uint8_t EPS_BAT_TEMP_DEFAULT;
-DigitalOut EPS_CHARGER_FAULT(PIN42);
-DigitalOut EPS_CHARGER_STATUS(PIN31);
-DigitalOut EPS_BATTERY_GAUGE_ALERT(PIN73);
+DigitalInOut EPS_CHARGER_FAULT(PIN42);
+DigitalInOut EPS_CHARGER_STATUS(PIN31);
+DigitalInOut EPS_BATTERY_GAUGE_ALERT(PIN73);
 
 //m_I2C.frequency(10000)
 const char RCOMP0= 0x97;// don't know what it is now 
@@ -103,10 +104,10 @@
 Serial pc_eps(USBTX,USBRX);
 
 I2C m_I2C(PIN85,PIN84);
-DigitalOut TRXY(TRXY_DR_EN);            //active high
-DigitalOut TRZ(TRZ_DR_EN);              //active high
-DigitalOut EN3V3A(ENBL3V3A);
-DigitalOut BTRY_HTR_ENABLE(BATT_HEAT);// earlier BTRY_HTR_ENABLE
+DigitalInOut TRXY(TRXY_DR_EN);            //active high
+DigitalInOut TRZ(TRZ_DR_EN);              //active high
+DigitalInOut EN3V3A(ENBL3V3A);
+DigitalInOut BTRY_HTR_ENABLE(BATT_HEAT);// earlier BTRY_HTR_ENABLE
 //DigitalIn BTRY_HT_OUTPUT(BATT_HEAT_OUTPUT);
 //AnalogIn Vbatt_ang(VBATT);
 AnalogIn Batt_voltage(PIN20);   //Battery voltage
@@ -143,7 +144,7 @@
 
 //eps cdms fault
 extern uint8_t CDMS_SW_STATUS;
-extern DigitalOut CDMS_OC_FAULT;
+extern DigitalInOut CDMS_OC_FAULT;
 extern bool CDMS_SW_ENABLE;
 extern int CDMS_FAULT_COUNTER;
 extern uint8_t EPS_BTRY_HTR_AUTO;
@@ -153,32 +154,32 @@
 /********* EXTERN ACS VAR ********************/
 extern uint8_t ACS_ATS_STATUS;
 extern uint8_t ACS_TR_Z_SW_STATUS;
-extern DigitalOut ACS_TR_Z_ENABLE;
-extern DigitalOut ACS_TR_Z_OC_FAULT;
-extern DigitalOut ACS_TR_Z_FAULT;            //Driver IC fault
+extern DigitalInOut ACS_TR_Z_ENABLE;
+extern DigitalInOut ACS_TR_Z_OC_FAULT;
+extern DigitalInOut ACS_TR_Z_FAULT;            //Driver IC fault
 extern int ACS_TR_Z_FAULT_COUNTER;
 
 extern uint8_t ACS_TR_XY_SW_STATUS;
-extern DigitalOut ACS_TR_XY_ENABLE;
-extern DigitalOut ACS_TR_XY_OC_FAULT;
-extern DigitalOut ACS_TR_XY_FAULT;            //Driver IC fault
+extern DigitalInOut ACS_TR_XY_ENABLE;
+extern DigitalInOut ACS_TR_XY_OC_FAULT;
+extern DigitalInOut ACS_TR_XY_FAULT;            //Driver IC fault
 extern int ACS_TR_XY_FAULT_COUNTER;
 
 //extern uint8_t ACS_ATS1_SW_STATUS;
-extern DigitalOut ATS1_SW_ENABLE;
-extern DigitalOut ACS_ATS1_OC_FAULT;
+extern DigitalInOut ATS1_SW_ENABLE;
+extern DigitalInOut ACS_ATS1_OC_FAULT;
 extern int ACS_ATS1_FAULT_COUNTER;
 
 //extern uint8_t ACS_ATS2_SW_STATUS;
 
-extern DigitalOut ATS2_SW_ENABLE;
-extern DigitalOut ACS_ATS2_OC_FAULT;
+extern DigitalInOut ATS2_SW_ENABLE;
+extern DigitalInOut ACS_ATS2_OC_FAULT;
 extern int ACS_ATS2_FAULT_COUNTER;
 
 /********* EXTERN BCN VAR ********************/
 extern uint8_t BCN_TX_SW_STATUS;
 extern bool BCN_TX_ENABLE;
-extern DigitalOut BCN_TX_OC_FAULT;
+extern DigitalInOut BCN_TX_OC_FAULT;
 extern int BCN_TX_FAULT_COUNTER;
 extern uint8_t BCN_TMP;
 
@@ -652,7 +653,7 @@
     //assigned it to counter HTR_CYCLE_COUNTER
                                                                 
     //assign it b_scz_angle
-    LONG_HK_data[1][67] = 0x00; 
+    LONG_HK_data[1][67] = B_SCZ_ANGLE>>4; ; 
     LONG_HK_data[1][67] = (LONG_HK_data[1][67]<<1) | alarmmode;
     LONG_HK_data[1][67] = (LONG_HK_data[1][67]<<1) | controlmode_mms;
     LONG_HK_data[1][67] = (LONG_HK_data[1][67]<<2);