Changeset 214 in flair-src for trunk/tools

Timestamp:

Feb 7, 2018, 5:49:27 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

Location:

trunk/tools

Files:

• Controller/DualShock3/src/DualShock3.cpp (modified) (3 diffs)
• FlairGCS/src/file_ui.cpp (modified) (1 diff)

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

@@ -18 +18 @@
 #include "DualShock3.h"
 #include <Controller.h>
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Tab.h>
 #include <TabWidget.h>
@@ -96 +96 @@
     axisDescriptor->SetElementName(i, 0, GetAxisDescription(i));
   }
-  axis = new cvmatrix((IODevice *)this, axisDescriptor, Int16Type);
+  axis = new Matrix((IODevice *)this, axisDescriptor, Int16Type);
   delete axisDescriptor;
   AddDataToLog(axis);
@@ -107 +107 @@
     buttonDescriptor->SetElementName(i, 0, GetButtonDescription(i));
   }
-  button = new cvmatrix((IODevice *)this, buttonDescriptor, Int8Type);
+  button = new Matrix((IODevice *)this, buttonDescriptor, Int8Type);
   AddDataToLog(button);
 

trunk/tools/FlairGCS/src/file_ui.cpp

@@ -193 +193 @@
         uint8_t *value = (uint8_t *)(data + offset);
         offset += sizeof(uint8_t);
+        out << "," << *value;
+      } else if (data_type.at(i) == "int16_t)") {
+        int16_t *value = (int16_t *)(data + offset);
+        offset += sizeof(int16_t);
+        out << "," << *value;
+      } else if (data_type.at(i) == "uint16_t)") {
+        uint16_t *value = (uint16_t *)(data + offset);
+        offset += sizeof(uint16_t);
         out << "," << *value;
       } else {