Diff: CAN/function_CAN.cpp

Revision:

162:9dd4f35e9de8

Parent:

161:a3b26117104c

Child:

169:645207e160ca

diff -r a3b26117104c -r 9dd4f35e9de8 CAN/function_CAN.cpp
--- a/CAN/function_CAN.cpp	Mon Oct 12 10:28:55 2020 +0000
+++ b/CAN/function_CAN.cpp	Mon Oct 12 10:48:56 2020 +0000
@@ -770,34 +770,34 @@
         f_future[num_array_f_future-1] = torq.ref;  //N
 
 
-        int ind = 0;
-        for(int i=0;i<numpast_u;i++){
-            input_NN[ind] = u_past[1*i];
-            ind = ind + 1;
-        }
-        
-        for(int i=0;i<numpast_x;i++){
-            input_NN[ind] = x_past[1*i] / 60.0f;
-            ind = ind + 1;
-        }
-        input_NN[ind] = (pos.sen / ENC_PULSE_PER_POSITION) / 60.0f;
-        ind = ind + 1;
-//        for(int i=0;i<numfuture_x;i++){
-//            input_NN[ind] = x_future[2*i+2] / 60.0f;
+//        int ind = 0;
+//        for(int i=0;i<numpast_u;i++){
+//            input_NN[ind] = u_past[1*i];
+//            ind = ind + 1;
+//        }
+//        
+//        for(int i=0;i<numpast_x;i++){
+//            input_NN[ind] = x_past[1*i] / 60.0f;
 //            ind = ind + 1;
 //        }
-        
-        for(int i=0;i<numpast_f;i++){
-            input_NN[ind] = f_past[1*i] / 10000.0f + 0.5f;
-            ind = ind + 1;
-        }
-        input_NN[ind] = torq.sen / 10000.0f + 0.5f;
-        ind = ind + 1;
-        for(int i=0;i<numfuture_f;i++){
-            input_NN[ind] = (f_future[1*i+1] - f_future[0])/10000.0f+0.5f;
-//            input_NN[ind] = (f_future[2*i+2])/10000.0f+0.5f;
-            ind = ind + 1;
-        }
+//        input_NN[ind] = (pos.sen / ENC_PULSE_PER_POSITION) / 60.0f;
+//        ind = ind + 1;
+////        for(int i=0;i<numfuture_x;i++){
+////            input_NN[ind] = x_future[2*i+2] / 60.0f;
+////            ind = ind + 1;
+////        }
+//        
+//        for(int i=0;i<numpast_f;i++){
+//            input_NN[ind] = f_past[1*i] / 10000.0f + 0.5f;
+//            ind = ind + 1;
+//        }
+//        input_NN[ind] = torq.sen / 10000.0f + 0.5f;
+//        ind = ind + 1;
+//        for(int i=0;i<numfuture_f;i++){
+//            input_NN[ind] = (f_future[1*i+1] - f_future[0])/10000.0f+0.5f;
+////            input_NN[ind] = (f_future[2*i+2])/10000.0f+0.5f;
+//            ind = ind + 1;
+//        }
         
     } else if(address==CID_RX_REF_VALVE_POS) {
         int16_t temp_ref_valve_pos = (int16_t) (msg.data[0] | msg.data[1] << 8);