updated OSC namespace of T-Stick 4GW

IDMIL · Nov 8, 2023 · 9ab565c · 9ab565c
1 parent 202f6b0
commit 9ab565c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/docs/designs/T-Stick 4GW.md b/docs/designs/T-Stick 4GW.md
@@ -32,18 +32,12 @@ The fourth generation T-Sticks are the first T-Sticks to include embedded gestur
 | /instrument/touch/frame/position | integer | 0 | Number of touch sensors - 1 | Position of frame start from bottom |
 | /instrument/touch/frame/size | integer | 0 | Number of touch sensors - 2 | Size of frame |
 | /instrument/touch/frame/touch\[N\] | integer | 0 | 1 | Touch values within frame |
-| /instrument/brush/up | float | 0 | 1 | Distance traveled during brush up |
-| /instrument/brush/down | float | 0 | 1 | Distance traveled during brush down |
-| /instrument/brush/amplitude | float | 0 | 1 | Amplitude of brush |
-| /instrument/brush/energy | float | 0 | 1 | Brush energy |
-| /instrument/orientation/yaw | float | -1 | 1 | Yaw |
-| /instrument/orientation/pitch | float | -1 | 1 | Pitch |
-| /instrument/orientation/roll | float | -1 | 1 | Roll |
-| /instrument/shake | float | 0 | 1 | TBD |
-| /instrument/jerk | float | 0 | 1 | TBD |
-| /instrument/thrust/x | float | -1 | 1 | Thrust/jab gesture magnitude |
-| /instrument/thrust/y | float | -1 | 1 | Thrust/jab gesture magnitude |
-| /instrument/thrust/z | float | -1 | 1 | Thrust/jab gesture magnitude |
+| /instrument/brush | float | 0 | 1 | Distance traveled during brush up |
+| /instrument/multibrush | float | 0 | 1 | Distance traveled during brush down |
+| /instrument/orientation | float [3] | -1 | 1 | Quaternion Data |
+| /instrument/ypr | float [4] | -1 | 1 | Yaw, pitch, roll|
+| /instrument/shakexyz | float | 0 | 1 | TBD |
+| /instrument/jabxyz | float | -1 | 1 | Thrust/jab gesture magnitude |
 | /instrument/squeez | float | 0 | 1 | Same as pressure for now |
 | /instrument/rest | float | 0 | 1 | High when interaction activity is low |
 | /instrument/effort | float | 0 | 1 | High when interaction activity is high |

diff --git a/docs/designs/T-Stick 4GW/Technical Information.md b/docs/designs/T-Stick 4GW/Technical Information.md
@@ -41,13 +41,13 @@
 
 ## OSC Signal Namespace
 
-### firmware 220916
+### firmware 231031
 
 **Replace XXX for the T-Stick ID number**
 
 #### Raw data
 
-/TStick_XXX/raw/capsense, i..., 0--255, ... (1 int per 8 capacitive stripes -- 8 bits)
+/TStick_XXX/raw/capsense, i..., 0--4095,
 
 /TStick_XXX/raw/fsr, i, 0--4095
 
@@ -67,10 +67,18 @@
 
 /TStick_XXX/instrument/button/ttap, i, 0 or 1
 
+/TStick_XXX/instrument/squeeze, f, 0--1
+
 /TStick_XXX/orientation, ffff, ?, ? ,? ,?
 
 /TStick_XXX/instrument/ypr, fff, +/-180, +/-90 ,+/-180 (degrees)
 
+/TStick_XXX/instrument/touch/discrete, i, i..., 0 or 1
+
+/TStick_XXX/instrument/touch/normalised, i, i..., 0--100
+
+/TStick_XXX/instrument/touch/all, f, 0--1
+
 /TStick_XXX/instrument/touch/all, f, 0--1
 
 /TStick_XXX/instrument/touch/top, f, 0--1
@@ -91,4 +99,6 @@
 
 /TStick_XXX/instrument/jabxyz, fff, 0--?
 
-/TStick_XXX/battery
+/TStick_XXX/battery/percentage, f, 0--100
+
+/TStick_XXX/battery/voltage, f, 0--?