chore: Simplify the JoyHub implementation by using explicit feature indexes

Author: blackspherefollower

…rc/device/protocol_impl/joyhub/joyhub.rs …erver/src/device/protocol_impl/joyhub.rscrates/buttplug_server/src/device/protocol_impl/joyhub/joyhub.rs renamed to crates/buttplug_server/src/device/protocol_impl/joyhub.rs crates/buttplug_server/src/device/protocol_impl/joyhub/joyhub.rs renamed to crates/buttplug_server/src/device/protocol_impl/joyhub.rs

@@ -22,7 +22,7 @@ generic_protocol_setup!(JoyHub, "joyhub");
 
 #[derive(Default)]
 pub struct JoyHub {
-  last_cmds: [AtomicU8; 3],
+  last_cmds: [AtomicU8; 4],
 }
 
 impl JoyHub {
@@ -40,9 +40,9 @@ impl JoyHub {
           0xa0,
           0x03,
           self.last_cmds[0].load(Ordering::Relaxed),
-          self.last_cmds[2].load(Ordering::Relaxed),
           self.last_cmds[1].load(Ordering::Relaxed),
-          0x00,
+          self.last_cmds[2].load(Ordering::Relaxed),
+          self.last_cmds[3].load(Ordering::Relaxed),
           0xaa,
         ],
         false,
@@ -68,7 +68,7 @@ impl ProtocolHandler for JoyHub {
     _feature_id: Uuid,
     speed: i32,
   ) -> Result<Vec<HardwareCommand>, ButtplugDeviceError> {
-    self.form_hardware_command(feature_index, speed as u32)
+    self.form_hardware_command(feature_index, speed.abs() as u32)
   }
 
   fn handle_output_oscillate_cmd(
@@ -82,25 +82,37 @@ impl ProtocolHandler for JoyHub {
 
   fn handle_output_constrict_cmd(
     &self,
-    _feature_index: u32,
+    feature_index: u32,
     feature_id: Uuid,
     level: u32,
   ) -> Result<Vec<HardwareCommand>, ButtplugDeviceError> {
-    Ok(vec![
-      HardwareWriteCmd::new(
-        &[feature_id],
-        Endpoint::Tx,
-        vec![
-          0xa0,
-          0x07,
-          if level == 0 { 0x00 } else { 0x01 },
-          0x00,
-          level as u8,
-          0xff,
-        ],
-        false,
-      )
-      .into(),
-    ])
+    if feature_index == 4 {
+      Ok(vec![
+        HardwareWriteCmd::new(
+          &[feature_id],
+          Endpoint::Tx,
+          vec![
+            0xa0,
+            0x07,
+            if level == 0 { 0x00 } else { 0x01 },
+            0x00,
+            level as u8,
+            0xff,
+          ],
+          false,
+        )
+        .into(),
+      ])
+    } else {
+      Ok(vec![
+        HardwareWriteCmd::new(
+          &[feature_id],
+          Endpoint::Tx,
+          vec![0xa0, 0x0d, 0x00, 0x00, level as u8, 0xff],
+          false,
+        )
+        .into(),
+      ])
+    }
   }
 }