Diff: TCTM.cpp

Revision:

40:c2538d97e78b

Parent:

39:670133e7ffd8

Child:

41:5df2bed2157d

diff -r 670133e7ffd8 -r c2538d97e78b TCTM.cpp
--- a/TCTM.cpp	Tue Jul 05 13:44:15 2016 +0000
+++ b/TCTM.cpp	Tue Jul 05 19:14:06 2016 +0000
@@ -84,36 +84,36 @@
 extern uint8_t HTR_ON_DURATION;          //EPS_HTR_OFF timer duration in minutes
 extern uint16_t HTR_CYCLE_PERIOD; 
 
-extern DigitalInOut ACS_TR_XY_ENABLE;
-extern DigitalInOut ACS_TR_Z_ENABLE;
-extern DigitalInOut ACS_TR_XY_OC_FAULT;
-extern DigitalInOut ACS_TR_Z_OC_FAULT;
-extern DigitalInOut ACS_TR_XY_FAULT;
-extern DigitalInOut ACS_TR_Z_FAULT;
-extern DigitalInOut ACS_ATS1_OC_FAULT;
-extern DigitalInOut ACS_ATS2_OC_FAULT;
+extern DigitalOut ACS_TR_XY_ENABLE;
+extern DigitalOut ACS_TR_Z_ENABLE;
+extern DigitalIn ACS_TR_XY_OC_FAULT;
+extern DigitalIn ACS_TR_Z_OC_FAULT;
+extern DigitalIn ACS_TR_XY_FAULT;
+extern DigitalIn ACS_TR_Z_FAULT;
+extern DigitalIn ACS_ATS1_OC_FAULT;
+extern DigitalIn ACS_ATS2_OC_FAULT;
 
-extern DigitalInOut ATS1_SW_ENABLE; // enable of att sens2 switch
-extern DigitalInOut ATS2_SW_ENABLE; // enable of att sens switch
+extern DigitalOut ATS1_SW_ENABLE; // enable of att sens2 switch
+extern DigitalOut ATS2_SW_ENABLE; // enable of att sens switch
 
-extern DigitalInOut DRV_Z_EN;
-extern DigitalInOut DRV_XY_EN;
-extern DigitalInOut TRXY_SW;  //TR XY Switch if any TR_SW error arises then it is same as TR_SW_EN
-extern DigitalInOut TRZ_SW;  //TR Z Switch
+extern DigitalOut DRV_Z_EN;
+extern DigitalOut DRV_XY_EN;
+extern DigitalOut TRXY_SW;  //TR XY Switch if any TR_SW error arises then it is same as TR_SW_EN
+extern DigitalOut TRZ_SW;  //TR Z Switch
 
-extern DigitalInOut phase_TR_x;
-extern DigitalInOut phase_TR_y;
-extern DigitalInOut phase_TR_z;
+extern DigitalOut phase_TR_x;
+extern DigitalOut phase_TR_y;
+extern DigitalOut phase_TR_z;
 
 
 //CDMS
-extern DigitalInOut CDMS_RESET; // CDMS RESET
+extern DigitalOut CDMS_RESET; // CDMS RESET
 extern uint8_t CDMS_SW_STATUS;
-extern DigitalInOut CDMS_OC_FAULT;
+extern DigitalIn CDMS_OC_FAULT;
 
 
 //BCN
-extern DigitalInOut BCN_SW;      //Beacon switch
+extern DigitalOut BCN_SW;      //Beacon switch
 extern uint8_t BCN_TX_STATUS;
 extern uint8_t BCN_FEN;
 extern uint8_t BCN_SPND_TX;
@@ -123,7 +123,7 @@
 extern uint8_t BCN_INIT_STATUS;
 extern uint8_t BCN_FAIL_COUNT;
 extern uint16_t BCN_TX_MAIN_COUNTER;
-extern DigitalInOut BCN_TX_OC_FAULT;
+extern DigitalIn BCN_TX_OC_FAULT;
 extern uint8_t BCN_TMP;
 extern void F_BCN();
 extern void FCTN_BCN_TX_MAIN();
@@ -174,9 +174,9 @@
 extern DigitalOut SelectLineb2;
 extern DigitalOut SelectLineb1;
 extern DigitalOut SelectLineb0;
-extern DigitalInOut EPS_CHARGER_FAULT;
-extern DigitalInOut EPS_CHARGER_STATUS;
-extern DigitalInOut EPS_BATTERY_GAUGE_ALERT;
+extern DigitalIn EPS_CHARGER_FAULT;
+extern DigitalIn EPS_CHARGER_STATUS;
+extern DigitalIn EPS_BATTERY_GAUGE_ALERT;
 
 extern void F_EPS();
 extern AnalogIn CurrentInput;
@@ -849,6 +849,9 @@
                                         
                                                                 // Control algo commissioning
                                                                 uint16_t moment_ret;
+                                                                telemetry[0] = 0xF0;
+                                                                telemetry[1] = tc[0];
+                                                                telemetry[2] = ACK_CODE;
                                                                 telemetry[3] = 0x00;
                                                                 telemetry[4] = ACS_STATUS;
                                                                 moment_ret = float_to_uint16(-2.2,2.2,moment_comm[0]);
@@ -894,7 +897,7 @@
                                                                 
                                                                 DRV_Z_EN = 1;
                                                                 DRV_XY_EN = 1;  
-                                                                telemetry[0]=0xB0;
+                                                                telemetry[0]=0xF0;
                                                                 telemetry[1]=tc[0];
                                                                 telemetry[2]=ACK_CODE;
                                                                 telemetry[3] = 0x00;
@@ -1239,7 +1242,7 @@
                                     
                                                                 // to include commission TR as well
                                                                 
-                                                                telemetry[58] = SENSOR_NO;
+                                                                telemetry[59] = SENSOR_NO;
                                                                 
                                                                 for(uint8_t i=60;i<132;i++)
                                                                     {