Changeset 214 in flair-src for trunk/lib/FlairSimulator/src

Timestamp:

02/07/18 17:49:27 (6 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

Location:

trunk/lib/FlairSimulator/src

Files:

• Model_impl.cpp (modified) (2 diffs)
• SimuLaserGL.cpp (modified) (1 diff)
• SimuUsGL.cpp (modified) (2 diffs)
• X4.cpp (modified) (4 diffs)
• X4.h (modified) (2 diffs)
• X8.cpp (modified) (3 diffs)
• X8.h (modified) (2 diffs)
• unexported/Model_impl.h (modified) (2 diffs)

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -25 +25 @@
 #include "SpinBox.h"
 #include "CheckBox.h"
-#include "cvmatrix.h"
+#include "Matrix.h"
 #include "Euler.h"
 #include <math.h>
@@ -134 +134 @@
   desc->SetElementName(17, 0, "my");
   desc->SetElementName(18, 0, "mz");
-  output = new cvmatrix(this, desc, floatType, "state");
+  output = new Matrix(this, desc, floatType, "state");
   delete desc;
 

trunk/lib/FlairSimulator/src/SimuLaserGL.cpp

@@ -20 +20 @@
 #include "Model.h"
 #include "Gui.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <SharedMem.h>
 #include <TabWidget.h>

trunk/lib/FlairSimulator/src/SimuUsGL.cpp

@@ -17 +17 @@
 #include "SimuUsGL.h"
 #include "Model.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <SharedMem.h>
 #include <TabWidget.h>
@@ -54 +54 @@
 #endif
     // todo: utiliser le placement de l'us dans le drone et sa portée
-    cvmatrix *input = (cvmatrix *)data;
+    Matrix *input = (Matrix *)data;
     value = input->Value(9, 0);
     shmem->Write((char *)&value, sizeof(float));

trunk/lib/FlairSimulator/src/X4.cpp

@@ -20 +20 @@
 #include <Tab.h>
 #include <DoubleSpinBox.h>
+#include <SpinBox.h>
 #include <GroupBox.h>
 #include <math.h>
@@ -73 +74 @@
   j_yaw = new DoubleSpinBox(setup_tab->LastRowLastCol(), "j_yaw:", 0, 1, 0.001,
                             5); // moment d'inertie d'un axe (N.m.s²/rad)
+                            
+  motorTimeout = new SpinBox(setup_tab->NewRow(), "motor timeout:","ms", 0, 1000, 100,100);
 
   motors = new SimuBldc(this, name, 4, modelId,0);
@@ -199 +202 @@
   float fl_speed, fr_speed, rl_speed, rr_speed;
   float u_roll, u_pitch, u_yaw, u_thrust;
+  Time motorTime;
 #ifdef GL
   motor_speed_mutex->GetMutex();
 #endif // GL
-  motors->GetSpeeds(motor_speed);
+  motors->GetSpeeds(motor_speed,&motorTime);
+  if((GetTime()-motorTime)/1000000>motorTimeout->Value()) {
+    for(int i=0;i<4;i++) {
+      if(motor_speed[i]!=0) {
+         //Printf("timout\n");
+        for(int i=0;i<4;i++) motor_speed[i]=0;
+        break;
+      }
+    }
+  }
 #ifdef GL
   motor_speed_mutex->ReleaseMutex();
 #endif // GL
+  
   fl_speed = motor_speed[0];
   fr_speed = motor_speed[1];
@@ -212 +226 @@
 
   /*
-      ** ===================================================================
-      **    u roll: roll torque
-      **
-      ** ===================================================================
-      */
+  ** ===================================================================
+  **    u roll: roll torque
+  **
+  ** ===================================================================
+  */
   u_roll = arm_length->Value() * k_mot->Value() *
            (fl_speed * fl_speed + rl_speed * rl_speed - fr_speed * fr_speed -

trunk/lib/FlairSimulator/src/X4.h

@@ -26 +26 @@
 namespace gui {
 class DoubleSpinBox;
+class SpinBox;
 }
 namespace actuator {
@@ -63 +64 @@
   gui::DoubleSpinBox *f_air_vert, *f_air_lat;
   gui::DoubleSpinBox *j_roll, *j_pitch, *j_yaw;
+  gui::SpinBox *motorTimeout;
 };
 } // end namespace simulator

trunk/lib/FlairSimulator/src/X8.cpp

@@ -20 +20 @@
 #include <Tab.h>
 #include <DoubleSpinBox.h>
+#include <SpinBox.h>
 #include <GroupBox.h>
 #include <math.h>
@@ -81 +82 @@
       setup_tab->LastRowLastCol(), "S:", 1, 2,
       0.1); // coefficient de forme des helices 1<S=1+Ss/Sprop<2 (sans unite)
+      
+  motorTimeout = new SpinBox(setup_tab->NewRow(), "motor timeout:","ms", 0, 1000, 100,100);
 
   motors = new SimuBldc(this, name, 8, modelId,0);
@@ -231 +234 @@
   float u_roll, u_pitch, u_yaw, u_thrust;
   float omega;
+  Time motorTime;
 #ifdef GL
   motor_speed_mutex->GetMutex();
 #endif // GL
-  motors->GetSpeeds(motor_speed);
+  motors->GetSpeeds(motor_speed,&motorTime);
+  if((GetTime()-motorTime)/1000000>motorTimeout->Value()) {
+    for(int i=0;i<8;i++) {
+      if(motor_speed[i]!=0) {
+         //Printf("timout\n");
+        for(int i=0;i<8;i++) motor_speed[i]=0;
+        break;
+      }
+    }
+  }
 #ifdef GL
   motor_speed_mutex->ReleaseMutex();

trunk/lib/FlairSimulator/src/X8.h

@@ -26 +26 @@
 namespace gui {
 class DoubleSpinBox;
+class SpinBox;
 }
 namespace actuator {
@@ -65 +66 @@
   gui::DoubleSpinBox *j_roll, *j_pitch, *j_yaw;
   gui::DoubleSpinBox *j_r, *sigma, *S;
+  gui::SpinBox *motorTimeout;
 };
 } // end namespace simulator

trunk/lib/FlairSimulator/src/unexported/Model_impl.h

@@ -25 +25 @@
 namespace flair {
 namespace core {
-class cvmatrix;
+class Matrix;
 class Mutex;
 class ConditionVariable;
@@ -101 +101 @@
   flair::gui::CheckBox *enable_opti;
   flair::simulator::Model *self;
-  flair::core::cvmatrix *output;
+  flair::core::Matrix *output;
   flair::core::Mutex *states_mutex;