Changeset 106 in flair-src for trunk

Timestamp:

Oct 18, 2016, 10:44:28 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs

Location:

trunk/lib

Files:

• FlairFilter/src/X4X8Multiplex_impl.cpp (modified) (1 diff)
• FlairMeta/src/UavStateMachine.cpp (modified) (1 diff)

trunk/lib/FlairFilter/src/X4X8Multiplex_impl.cpp

@@ -47 +47 @@
     pas = new ComboBox(groupbox->NewRow(), "top front left blade pitch:");
   }
-  pas->AddItem("normal");
-  pas->AddItem("inverted");
+  pas->AddItem("counter clockwise");
+  pas->AddItem("clockwise");
 
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_mot, 1);

trunk/lib/FlairMeta/src/UavStateMachine.cpp

@@ -546 +546 @@
     }
     safeToFly=false;
+    Warn("Emergency stop, UAV will not take off again until program is rerunned\n");
 }