Changeset 421 in flair-src for trunk

Timestamp:

Apr 22, 2021, 11:57:57 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

add a permanent trim, usefull when uav is not well balanced (ie intel aero)

Location:

trunk/lib/FlairFilter/src

Files:

• X4X8Multiplex_impl.cpp (modified) (3 diffs)
• unexported/X4X8Multiplex_impl.h (modified) (2 diffs)

trunk/lib/FlairFilter/src/X4X8Multiplex_impl.cpp

@@ -24 +24 @@
 #include <ComboBox.h>
 #include <DataPlot1D.h>
+#include <DoubleSpinBox.h>
 #include <math.h>
 
@@ -49 +50 @@
   pas->AddItem("counter clockwise");
   pas->AddItem("clockwise");
+  
+  permanent_trim_roll=new DoubleSpinBox(self->GetLayout()->NewRow(), "permanent trim roll",-1, 1, 0.01);
+  permanent_trim_pitch=new DoubleSpinBox(self->GetLayout()->NewRow(), "permanent trim pitch",-1, 1, 0.01);
 
   MatrixDescriptor *desc = new MatrixDescriptor(nb_mot, 1);
@@ -97 +101 @@
   u_yaw = input->ValueNoMutex(2, 0);
   u_thrust = input->ValueNoMutex(3, 0);
-  trim_roll = input->ValueNoMutex(4, 0);
-  trim_pitch = input->ValueNoMutex(5, 0);
+  trim_roll = input->ValueNoMutex(4, 0)+permanent_trim_roll->Value();
+  trim_pitch = input->ValueNoMutex(5, 0)+permanent_trim_pitch->Value();
   trim_yaw = input->ValueNoMutex(6, 0);
 

trunk/lib/FlairFilter/src/unexported/X4X8Multiplex_impl.h

@@ -24 +24 @@
 class DataPlot1D;
 class ComboBox;
+class DoubleSpinBox;
 }
 namespace filter {
@@ -47 +48 @@
   flair::gui::ComboBox *pas;
   flair::gui::DataPlot1D *plots[4];
+  flair::gui::DoubleSpinBox *permanent_trim_roll,*permanent_trim_pitch;
   flair::filter::X4X8Multiplex *self;
   float Set(float trim, float u);