Rename field names to prevent misunderstanding

The roll-pitch-yaw convention differs among industries, thus, is better to explicitly state the axis which rotation is considered. The field names also explicitly states that the values are "angular velocity" and "linear acceleration," as opposed to "orientation" and "motion," which are ambiguous (and technically incorrect).
chrippa · Aug 25, 2019 · 7e5f220 · 7e5f220
1 parent aa91813
commit 7e5f220
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/ds4drv/device.py b/ds4drv/device.py
@@ -41,12 +41,12 @@ class DS4Report(object):
                  "button_options",
                  "button_trackpad",
                  "button_ps",
-                 "orientation_roll",
-                 "orientation_pitch",
-                 "orientation_yaw",
-                 "motion_x",
-                 "motion_y",
-                 "motion_z",
+                 "ang_vel_x",
+                 "ang_vel_y",
+                 "ang_vel_z",
+                 "lin_acc_x",
+                 "lin_acc_y",
+                 "lin_acc_z",
                  "trackpad_touch0_id",
                  "trackpad_touch0_active",
                  "trackpad_touch0_x",
@@ -181,12 +181,12 @@ def parse_report(self, buf):
             # Trackpad and PS buttons
             (buf[7] & 2) != 0, (buf[7] & 1) != 0,
 
-            # Orientation
+            # Angular velocity
             S16LE.unpack_from(buf, 13)[0],
             S16LE.unpack_from(buf, 15)[0],
             S16LE.unpack_from(buf, 17)[0],
 
-            # Acceleration
+            # Linear acceleration
             S16LE.unpack_from(buf, 19)[0],
             S16LE.unpack_from(buf, 21)[0],
             S16LE.unpack_from(buf, 23)[0],

diff --git a/ds4drv/uinput.py b/ds4drv/uinput.py
@@ -72,12 +72,12 @@ def create_mapping(name, description, bustype=0, vendor=0, product=0,
         "ABS_RZ":       "right_analog_y",
         "ABS_RX":       "l2_analog",
         "ABS_RY":       "r2_analog",
-        "ABS_THROTTLE": "orientation_roll",
-        "ABS_RUDDER":   "orientation_pitch",
-        "ABS_WHEEL":    "orientation_yaw",
-        "ABS_DISTANCE": "motion_z",
-        "ABS_TILT_X":   "motion_x",
-        "ABS_TILT_Y":   "motion_y",
+        "ABS_THROTTLE": "ang_vel_x",
+        "ABS_RUDDER":   "ang_vel_y",
+        "ABS_WHEEL":    "ang_vel_z",
+        "ABS_DISTANCE": "lin_acc_z",
+        "ABS_TILT_X":   "lin_acc_x",
+        "ABS_TILT_Y":   "lin_acc_y",
     },
     # Axes options
     {