chore: Fix protocol and config issues after PR #784 rebase

Meant to compile as I went along, oops.

Author: qdot

crates/buttplug_server/src/device/protocol_impl/galaku.rs

@@ -107,7 +107,7 @@ impl ProtocolInitializer for GalakuInitializer {
   async fn initialize(
     &mut self,
     hardware: Arc<Hardware>,
-    _: &ServerDeviceDefinition,
+    def: &ServerDeviceDefinition,
   ) -> Result<Arc<dyn ProtocolHandler>, ButtplugDeviceError> {
     let mut protocol = Galaku::default();
     protocol.is_caiping_pump_device = false;

crates/buttplug_server/src/device/protocol_impl/hismith_mini.rs

@@ -184,33 +184,11 @@ impl ProtocolHandler for HismithMini {
     feature_id: Uuid,
     speed: i32,
   ) -> Result<Vec<HardwareCommand>, ButtplugDeviceError> {
-        Ok(vec![
-            HardwareWriteCmd::new(
-                &[feature_id],
-                Endpoint::Tx,
-                vec![0xCC, 0x03, speed as u8, speed as u8 + 3],
-                false,
-            ).into(),
-            HardwareWriteCmd::new(
-                &vec![HISMITH_MINI_ROTATE_DIRECTIOM_UUID],
-                Endpoint::Tx,
-                vec![0xCC, 0x01, if clockwise { 0xc0 } else {0xc1}, if clockwise { 0xc1 } else {0xc2}],
-                false,
-            ).into(),
-        ])
-    }
-
-  fn handle_output_spray_cmd(&self, _feature_index: u32, feature_id: Uuid, _level: u32) -> Result<Vec<HardwareCommand>, ButtplugDeviceError> {
     Ok(vec![
       HardwareWriteCmd::new(
         &[feature_id],
         Endpoint::Tx,
-        vec![
-          0xCC,
-          0x03,
-          speed.unsigned_abs() as u8,
-          speed.unsigned_abs() as u8 + 3,
-        ],
+        vec![0xCC, 0x03, speed.unsigned_abs() as u8, speed.unsigned_abs() as u8 + 3],
         false,
       )
       .into(),
@@ -228,4 +206,21 @@ impl ProtocolHandler for HismithMini {
       .into(),
     ])
   }
+
+  fn handle_output_spray_cmd(
+    &self,
+    _feature_index: u32,
+    feature_id: Uuid,
+    _level: u32,
+  ) -> Result<Vec<HardwareCommand>, ButtplugDeviceError> {
+    Ok(vec![
+      HardwareWriteCmd::new(
+        &[feature_id],
+        Endpoint::Tx,
+        vec![0xcc, 0x0b, 0x01, 0x0c],
+        false,
+      )
+      .into(),
+    ])
+  }
 }

crates/buttplug_server/src/device/protocol_impl/kiiroo_v3.rs

@@ -18,7 +18,7 @@ use crate::device::{
 use async_trait::async_trait;
 use buttplug_core::errors::ButtplugDeviceError;
 use buttplug_server_device_config::{
-  DeviceDefinition,
+  ServerDeviceDefinition,
   ProtocolCommunicationSpecifier,
   UserDeviceIdentifier,
 };
@@ -36,7 +36,7 @@ impl ProtocolInitializer for KiirooV3Initializer {
   async fn initialize(
     &mut self,
     _: Arc<Hardware>,
-    _: &DeviceDefinition,
+    _: &ServerDeviceDefinition,
   ) -> Result<Arc<dyn ProtocolHandler>, ButtplugDeviceError> {
     Ok(Arc::new(KiirooV21::default()))
   }