Diff: TCTM.cpp

Revision:

14:a9588f443f1a

Parent:

13:fb7facaf308b

Child:

15:e09aaaccf134

--- a/TCTM.cpp	Wed Apr 13 21:48:21 2016 +0000
+++ b/TCTM.cpp	Thu Apr 14 09:34:06 2016 +0000
@@ -40,7 +40,7 @@
 /*given a default value as of now shuld read value from flash and increment it write it back very time it starts(bae)*/
 extern uint8_t BAE_RESET_COUNTER=0;
 
-extern uint8_t BCN_FAIL_COUNT;
+//extern uint8_t BCN_FAIL_COUNT;
 
 extern PwmOut PWM1; //x                         //Functions used to generate PWM signal
 extern PwmOut PWM2; //y
@@ -165,7 +165,7 @@
                             telemetry[15] = BAE_STATUS & 0xFF;
 
                             /*to be fixed*/
-                            telemetry[16] = BCN_FAIL_COUNT;
+                            //telemetry[16] = BCN_FAIL_COUNT;
                             telemetry[17] = actual_data.power_mode;
                             /*to be fixed*/
                             uint16_t P_BAE_I2CRX_COUNTER=0;
@@ -479,21 +479,21 @@
                             moment_tc[2] = 0;
                             FCTN_ACS_GENPWM_MAIN(moment_tc);
                             PWM_measured[0] = PWM1.read();
-                            FCTN_CONVERT_FLOAT(actual_data.current_actual[i],&telemetry[16 + (0*4)]);
+                            FCTN_CONVERT_FLOAT(actual_data.current_actual[5],&telemetry[16 + (0*4)]);
                             
                             FCTN_CONVERT_UINT(M1, &moment_tc[1]);
                             moment_tc[0] = 0;
                             moment_tc[2] = 0;
                             FCTN_ACS_GENPWM_MAIN(moment_tc);
                             PWM_measured[1] = PWM2.read();
-                            FCTN_CONVERT_FLOAT(actual_data.current_actual[i],&telemetry[16 + (1*4)]);
+                            FCTN_CONVERT_FLOAT(actual_data.current_actual[5],&telemetry[16 + (1*4)]);
                             
                             FCTN_CONVERT_UINT(M2, &moment_tc[2]);
                             moment_tc[0] = 0;
                             moment_tc[1] = 0;
                             FCTN_ACS_GENPWM_MAIN(moment_tc);
                             PWM_measured[2] = PWM3.read();
-                            FCTN_CONVERT_FLOAT(actual_data.current_actual[i],&telemetry[16 + (2*4)]);
+                            FCTN_CONVERT_FLOAT(actual_data.current_actual[5],&telemetry[16 + (2*4)]);
 
                             FCTN_CONVERT_FLOAT(PWM_measured[0],&telemetry[4]);    //4-7
                             FCTN_CONVERT_FLOAT(PWM_measured[1],&telemetry[8]);    //8-11