summaryrefslogtreecommitdiffhomepage
path: root/proto-iokit-foohid
diff options
context:
space:
mode:
Diffstat (limited to 'proto-iokit-foohid')
-rw-r--r--proto-iokit-foohid/foohidjoystick.cpp2
-rw-r--r--proto-iokit-foohid/iokitprotocol.cpp14
-rw-r--r--proto-iokit-foohid/lang/zh_CN.ts2
3 files changed, 7 insertions, 11 deletions
diff --git a/proto-iokit-foohid/foohidjoystick.cpp b/proto-iokit-foohid/foohidjoystick.cpp
index 898db2f4..b4964bb7 100644
--- a/proto-iokit-foohid/foohidjoystick.cpp
+++ b/proto-iokit-foohid/foohidjoystick.cpp
@@ -7,8 +7,6 @@
#include "foohidjoystick.h"
-#include "compat/macros.hpp"
-
const char FOOHID_SERVICE_NAME[] = "it_unbit_foohid";
enum class FooHIDMethod {
diff --git a/proto-iokit-foohid/iokitprotocol.cpp b/proto-iokit-foohid/iokitprotocol.cpp
index abc43a60..a364fd8a 100644
--- a/proto-iokit-foohid/iokitprotocol.cpp
+++ b/proto-iokit-foohid/iokitprotocol.cpp
@@ -10,8 +10,6 @@
#include "foohidjoystick.h"
#include "iokitprotocoldialog.h"
-#include "compat/macros.hpp"
-
#include <QDebug>
IOKitProtocol::IOKitProtocol()
@@ -49,12 +47,12 @@ static uint8_t valueToStick(FooHIDJoystick *stick, double min, double value, dou
void IOKitProtocol::pose(const double *headpose, const double*)
{
- const uint8_t x = valueToStick(joystick.get(), -75., headpose[0], +75.);
- const uint8_t y = valueToStick(joystick.get(), -75., headpose[1], +75.);
- const uint8_t z = valueToStick(joystick.get(), -75., headpose[2], +75.);
- const uint8_t rx = valueToStick(joystick.get(), -180., headpose[3], +180.);
- const uint8_t ry = valueToStick(joystick.get(), -180., headpose[4], +180.);
- const uint8_t rz = valueToStick(joystick.get(), -180., headpose[5], +180.);
+ const uint8_t x = valueToStick(&*joystick, -75., headpose[0], +75.);
+ const uint8_t y = valueToStick(&*joystick, -75., headpose[1], +75.);
+ const uint8_t z = valueToStick(&*joystick, -75., headpose[2], +75.);
+ const uint8_t rx = valueToStick(&*joystick, -180., headpose[3], +180.);
+ const uint8_t ry = valueToStick(&*joystick, -180., headpose[4], +180.);
+ const uint8_t rz = valueToStick(&*joystick, -180., headpose[5], +180.);
joystick->setValue({x, y, z, rx, ry, rz});
}
diff --git a/proto-iokit-foohid/lang/zh_CN.ts b/proto-iokit-foohid/lang/zh_CN.ts
index 6401616d..e5ca8aa9 100644
--- a/proto-iokit-foohid/lang/zh_CN.ts
+++ b/proto-iokit-foohid/lang/zh_CN.ts
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
</TS>