feat: Implement explicit feature indexes in protocols

Author: qdot

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

@@ -121,7 +121,7 @@ impl ProtocolInitializer for GalakuInitializer {
     }
     for _ in 0..def
       .features()
-      .iter()
+      .values()
       .filter(|f| f.output().is_some())
       .count()
     {

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

@@ -85,7 +85,7 @@ impl ProtocolInitializer for HismithMiniInitializer {
     Ok(Arc::new(HismithMini {
       dual_vibe: device_definition
         .features()
-        .iter()
+        .values()
         .filter(|x| {
           x.output()
             .as_ref()
@@ -95,7 +95,7 @@ impl ProtocolInitializer for HismithMiniInitializer {
         >= 2,
       second_constrict: device_definition
         .features()
-        .iter()
+        .values()
         .position(|x| {
           x.output()
             .as_ref()

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

@@ -47,7 +47,7 @@ impl ProtocolInitializer for LovehoneyDesireInitializer {
     Ok(Arc::new(LovehoneyDesire::new(
       def
         .features()
-        .iter()
+        .values()
         .filter(|x| x.output().is_some())
         .count() as u8,
     )))

crates/buttplug_server/src/device/protocol_impl/lovense/mod.rs

@@ -171,7 +171,7 @@ impl ProtocolInitializer for LovenseInitializer {
 
     let vibrator_count = device_definition
       .features()
-      .iter()
+      .values()
       .filter(|x| {
         x.output()
           .as_ref()
@@ -181,14 +181,14 @@ impl ProtocolInitializer for LovenseInitializer {
 
     let output_count = device_definition
       .features()
-      .iter()
+      .values()
       .filter(|x| x.output().is_some())
       .count();
 
     let vibrator_rotator = output_count == 2
       && device_definition
         .features()
-        .iter()
+        .values()
         .filter(|x| {
           x.output()
             .as_ref()
@@ -198,7 +198,7 @@ impl ProtocolInitializer for LovenseInitializer {
         == 1
       && device_definition
         .features()
-        .iter()
+        .values()
         .filter(|x| {
           x.output()
             .as_ref()
@@ -210,7 +210,7 @@ impl ProtocolInitializer for LovenseInitializer {
     let lovense_max = output_count == 2
       && device_definition
         .features()
-        .iter()
+        .values()
         .filter(|x| {
           x.output()
             .as_ref()
@@ -220,7 +220,7 @@ impl ProtocolInitializer for LovenseInitializer {
         == 1
       && device_definition
         .features()
-        .iter()
+        .values()
         .filter(|x| {
           x.output()
             .as_ref()

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

@@ -43,7 +43,7 @@ impl ProtocolInitializer for MagicMotionV4Initializer {
     Ok(Arc::new(MagicMotionV4::new(
       def
         .features()
-        .iter()
+        .values()
         .filter(|x| x.output().is_some())
         .count() as u8,
     )))

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

@@ -137,7 +137,7 @@ impl ProtocolInitializer for MonsterPubInitializer {
     }
     let output_count = def
       .features()
-      .iter()
+      .values()
       .filter(|x| x.output().is_some())
       .count();
 

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

@@ -55,7 +55,7 @@ impl ProtocolInitializer for MysteryVibeInitializer {
     hardware.write_value(&msg).await?;
     let vibrator_count = def
       .features()
-      .iter()
+      .values()
       .filter(|x| x.output().is_some())
       .count();
     Ok(Arc::new(MysteryVibe::new(vibrator_count as u8)))

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

@@ -51,7 +51,7 @@ impl ProtocolInitializer for MysteryVibeV2Initializer {
     hardware.write_value(&msg).await?;
     let vibrator_count = def
       .features()
-      .iter()
+      .values()
       .filter(|x| x.output().is_some())
       .count();
     Ok(Arc::new(MysteryVibe::new(vibrator_count as u8)))

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

@@ -119,7 +119,7 @@ impl ProtocolInitializer for SatisfyerInitializer {
 
     let feature_count = device_definition
       .features()
-      .iter()
+      .values()
       .filter(|x| x.output().is_some())
       .count();
 

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

@@ -67,12 +67,11 @@ impl ProtocolInitializer for SenseeV2Initializer {
       device_definition
         .features()
         .iter()
-        .enumerate()
         .for_each(|(i, x)| {
           if let Some(output_map) = x.output()
             && output_map.contains(output_type)
           {
-            map.insert(i as u32, AtomicU8::new(0));
+            map.insert(*i, AtomicU8::new(0));
           }
         });
       map