Changeset 214 in flair-src for trunk/tools


Ignore:
Timestamp:
02/07/18 17:49:27 (4 years ago)
Author:
Sanahuja Guillaume
Message:

matrix

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/Controller/DualShock3/src/DualShock3.cpp

    r148 r214  
    1818#include "DualShock3.h"
    1919#include <Controller.h>
    20 #include <cvmatrix.h>
     20#include <Matrix.h>
    2121#include <Tab.h>
    2222#include <TabWidget.h>
     
    9696    axisDescriptor->SetElementName(i, 0, GetAxisDescription(i));
    9797  }
    98   axis = new cvmatrix((IODevice *)this, axisDescriptor, Int16Type);
     98  axis = new Matrix((IODevice *)this, axisDescriptor, Int16Type);
    9999  delete axisDescriptor;
    100100  AddDataToLog(axis);
     
    107107    buttonDescriptor->SetElementName(i, 0, GetButtonDescription(i));
    108108  }
    109   button = new cvmatrix((IODevice *)this, buttonDescriptor, Int8Type);
     109  button = new Matrix((IODevice *)this, buttonDescriptor, Int8Type);
    110110  AddDataToLog(button);
    111111
  • trunk/tools/FlairGCS/src/file_ui.cpp

    r51 r214  
    193193        uint8_t *value = (uint8_t *)(data + offset);
    194194        offset += sizeof(uint8_t);
     195        out << "," << *value;
     196      } else if (data_type.at(i) == "int16_t)") {
     197        int16_t *value = (int16_t *)(data + offset);
     198        offset += sizeof(int16_t);
     199        out << "," << *value;
     200      } else if (data_type.at(i) == "uint16_t)") {
     201        uint16_t *value = (uint16_t *)(data + offset);
     202        offset += sizeof(uint16_t);
    195203        out << "," << *value;
    196204      } else {
Note: See TracChangeset for help on using the changeset viewer.