Changeset 318 in flair-src for trunk/tools

Timestamp:

Jul 3, 2019, 5:05:33 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

• completely removed cvmatrix
• replaced cvmatrix_descriptor by MatrixDescriptor

Location:

trunk/tools/Controller

Files:

• DualShock3/src/DualShock3.cpp (modified) (2 diffs)
• Mavlink/src/GuiInterface.cpp (modified) (1 diff)

trunk/tools/Controller/DualShock3/src/DualShock3.cpp

@@ -92 +92 @@
   axisNumber = 4;
   nativeBitsPerAxis = 8;
-  cvmatrix_descriptor *axisDescriptor = new cvmatrix_descriptor(axisNumber, 1);
+  MatrixDescriptor *axisDescriptor = new MatrixDescriptor(axisNumber, 1);
   for (unsigned int i = 0; i < axisNumber; i++) {
     axisDescriptor->SetElementName(i, 0, GetAxisDescription(i));
@@ -102 +102 @@
   // buttons stuff
   buttonNumber = 16;
-  cvmatrix_descriptor *buttonDescriptor =
-      new cvmatrix_descriptor(buttonNumber, 1);
+  MatrixDescriptor *buttonDescriptor =
+      new MatrixDescriptor(buttonNumber, 1);
   for (unsigned int i = 0; i < buttonNumber; i++) {
     buttonDescriptor->SetElementName(i, 0, GetButtonDescription(i));

trunk/tools/Controller/Mavlink/src/GuiInterface.cpp

@@ -18 +18 @@
 #include "GuiInterface.h"
 
-#include <cvmatrix.h>
 #include <FrameworkManager.h>
 #include <Thread.h>