Retry to Websocket connection failure.

[profile/ivi/ico-vic-carsimulator.git] / src / CJoyStickEV.h

diff --git a/src/CJoyStickEV.h b/src/CJoyStickEV.h
index aeddb79..802ce71 100644 (file)
--- a/src/CJoyStickEV.h
+++ b/src/CJoyStickEV.h
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <poll.h>
 
+#include "CJoyStick.h"
+
 #define D_DEV_NAME_PARTS_EV "event"
 
 class CJoyStickEV : public CJoyStick
@@ -39,17 +41,22 @@ class CJoyStickEV : public CJoyStick
     int getJS_EVENT_BUTTON(int& num, int& val, const struct input_event& s);
     int getJS_EVENT_AXIS(int& num, int& val, const struct input_event& s);
     int calc1pm32767(int val, const struct input_absinfo& ai);
-    int calc2pm32767(int val, const struct input_absinfo& ai);
+    int calc2p65535(int val, const struct input_absinfo& ai);
+    int calc3p32767(int val, const struct input_absinfo& ai);
+    int calc3p32767Reverse(int val, const struct input_absinfo& ai);
     enum {
         E_ABSX = 0, /* ABS_X */
         E_ABSY,     /* ABS_Y */
+        E_ABSZ,
+        E_ABSRZ,
         E_ABSHAT0X, /* ABS_HAT0X */
         E_ABSHAT0Y, /* ABS_HAT0Y */
         E_ABSMAX    /* */
     };
-  private:
     struct input_absinfo m_absInf[E_ABSMAX];
     bool m_grab;
+    std::string m_devName;
+  private:
 };
 
 #endif /* CJOYSTICKEV_H_ */