Diff: TCTM.cpp

Revision:

8:aad4f22221b1

Parent:

6:036d08b62785

--- a/TCTM.cpp	Sat Jan 23 11:35:20 2016 +0000
+++ b/TCTM.cpp	Mon Jan 25 17:27:26 2016 +0000
@@ -24,7 +24,7 @@
 extern float moment[3];
 
 extern void FCTN_ATS_DATA_ACQ();
-extern void FCTN_ACS_CNTRLALGO(float*,float*);
+extern void FCTN_ACS_CNTRLALGO (float moment[3], float b1[3], float omega1[3], float b_old[3], int &alarmmode, int &flag_firsttime, int &controlmode);
 
 uint8_t* FCTN_BAE_TM_TC (uint8_t* tc)
 
@@ -250,9 +250,10 @@
                             B[2] = B2;
                             W[0] = W0;
                             W[1] = W1; 
-                            W[2] = W2; 
+                            W[2] = W2;
+                            int flag_firsttime=0, controlmode, alarmmode=1; 
                             // Control algo commissioning
-                            FCTN_ACS_CNTRLALGO(B,W);
+                            FCTN_ACS_CNTRLALGO(moment,B,W,B,alarmmode, flag_firsttime, controlmode);
                             FCTN_CONVERT_FLOAT(moment[0],&tm[30]); //tm[30] - tm[33] 
                             FCTN_CONVERT_FLOAT(moment[1],&tm[34]); //tm[34] - tm[37] 
                             FCTN_CONVERT_FLOAT(moment[2],&tm[38]); //tm[38] - tm[41]