Merge pull request #44 from KaiseiYokoyama/dev/0.4.1

Dev/0.4.1
KaiseiYokoyama · May 3, 2020 · ce3480a · ce3480a
2 parents 11be1f2 + b066252
commit ce3480a
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 63 deletions.
diff --git a/examples/home_light.rs b/examples/home_light.rs
@@ -10,17 +10,15 @@ fn main() -> JoyConResult<()> {
 
     let manager =
         JoyConManager::get_instance();
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(manager) =>
-                (manager.managed_devices(), manager.new_devices()),
+            Ok(manager) => manager.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .inspect(|d| {
             let lock = d.lock();
             let device = match lock {

diff --git a/examples/player_lights.rs b/examples/player_lights.rs
@@ -9,23 +9,22 @@ fn main() -> JoyConResult<()> {
 
     let manager =
         JoyConManager::get_instance();
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(manager) =>
-                (manager.managed_devices(), manager.new_devices()),
+            Ok(manager) => manager.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .inspect(|d| {
             let lock = d.lock();
             let device = match lock {
                 Ok(device) => device,
                 Err(e) => e.into_inner(),
             };
+            dbg!(&device);
             let hid_device: JoyConResult<&HidDevice> = device.deref().try_into();
             if let Ok(hid_device) = hid_device {
                 println!("{:?}", hid_device.get_product_string())

diff --git a/examples/rumble.rs b/examples/rumble.rs
@@ -8,17 +8,15 @@ fn main() -> JoyConResult<()> {
 
     let manager =
         JoyConManager::get_instance();
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(manager) =>
-                (manager.managed_devices(), manager.new_devices()),
+            Ok(manager) => manager.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .inspect(|d| {
             let lock = d.lock();
             let device = match lock {

diff --git a/examples/scan_for_joycons.rs b/examples/scan_for_joycons.rs
@@ -8,16 +8,15 @@ fn main() -> JoyConResult<()> {
     // First, connect your Joy-Cons to your computer!
 
     let manager = JoyConManager::get_instance();
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(m) => (m.managed_devices(), m.new_devices()),
+            Ok(m) => m.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .try_for_each::<_, JoyConResult<()>>(|d| {
             if let Ok(device) = d.lock() {
                 let device: &HidDevice = device.deref().try_into()?;

diff --git a/examples/simple_hid_report.rs b/examples/simple_hid_report.rs
@@ -17,16 +17,15 @@ fn main() -> JoyConResult<()> {
 
     let manager = JoyConManager::get_instance();
 
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+            Ok(manager) => manager.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .try_for_each::<_, JoyConResult<()>>(|d| {
             let driver = SimpleJoyConDriver::new(&d)?;
 

diff --git a/examples/standard_full_report.rs b/examples/standard_full_report.rs
@@ -17,16 +17,15 @@ fn main() -> JoyConResult<()> {
 
     let manager = JoyConManager::get_instance();
 
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+            Ok(manager) => manager.new_devices(),
             Err(_) => unreachable!(),
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .try_for_each::<_, JoyConResult<()>>(|d| {
             let driver = SimpleJoyConDriver::new(&d)?;
             let standard_full_mode = StandardFullMode::new(driver)?;

diff --git a/src/joycon/driver.rs b/src/joycon/driver.rs
@@ -72,17 +72,15 @@ pub enum Rotation {
 /// use joycon_rs::prelude::{*, joycon_features::JoyConFeature};
 ///
 /// let manager = JoyConManager::get_instance();
-/// let (managed_devices, new_devices) = {
+/// let devices = {
 ///     let lock = manager.lock();
 ///     match lock {
-///         Ok(manager) =>
-///             (manager.managed_devices(), manager.new_devices()),
+///         Ok(manager) => manager.new_devices(),
 ///         Err(_) => unreachable!(),
 ///     }
 /// };
 ///
-/// managed_devices.into_iter()
-///     .chain(new_devices)
+/// devices.iter()
 ///     .try_for_each::<_, JoyConResult<()>>(|d| {
 ///         let mut driver = SimpleJoyConDriver::new(&d)?;
 ///
@@ -357,16 +355,15 @@ mod global_packet_number {
 ///
 /// let manager = JoyConManager::get_instance();
 ///
-/// let (managed_devices, new_devices) = {
+/// let devices = {
 ///     let lock = manager.lock();
 ///     match lock {
-///         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+///         Ok(manager) => manager.new_devices(),
 ///         Err(_) => return,
 ///     }
 /// };
 ///
-/// managed_devices.into_iter()
-///     .chain(new_devices)
+/// devices.iter()
 ///     .try_for_each::<_,JoyConResult<()>>(|device| {
 ///         let mut driver = SimpleJoyConDriver::new(&device)?;
 ///
@@ -1239,16 +1236,15 @@ pub mod input_report_mode {
         ///
         /// let manager = JoyConManager::get_instance();
         ///
-        /// let (managed_devices, new_devices) = {
+        /// let devices = {
         ///     let lock = manager.lock();
         ///     match lock {
-        ///         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+        ///         Ok(manager) => manager.new_devices(),
         ///         Err(_) => return,
         ///     }
         /// };
         ///
-        /// managed_devices.into_iter()
-        ///     .chain(new_devices)
+        /// devices.iter()
         ///     .flat_map(|device| SimpleJoyConDriver::new(&device))
         ///     .try_for_each::<_, JoyConResult<()>>(|driver| {
         ///         let sender = sender.clone();
@@ -1469,16 +1465,15 @@ pub mod input_report_mode {
         ///
         /// let manager = JoyConManager::get_instance();
         ///
-        /// let (managed_devices, new_devices) = {
+        /// let devices = {
         ///     let lock = manager.lock();
         ///     match lock {
-        ///         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+        ///         Ok(manager) => manager.new_devices(),
         ///         Err(_) => return,
         ///     }
         /// };
         ///
-        /// managed_devices.into_iter()
-        ///     .chain(new_devices)
+        /// devices.iter()
         ///     .flat_map(|d| SimpleJoyConDriver::new(&d))
         ///     .try_for_each::<_, JoyConResult<()>>(|driver| {
         ///         let sender = sender.clone();

diff --git a/src/joycon/manager.rs b/src/joycon/manager.rs
@@ -54,7 +54,9 @@ impl JoyConManager {
     }
 
     fn with_interval(interval: Duration) -> JoyConResult<Arc<Mutex<Self>>> {
-        let (tx, rx) = crossbeam_channel::bounded(0);
+        let (tx, rx) =
+            crossbeam_channel::unbounded();
+            // crossbeam_channel::bounded(0);
 
         let manager = {
             let mut manager = JoyConManager {
@@ -66,7 +68,11 @@ impl JoyConManager {
             };
 
             // First scan
-            manager.scan()?;
+            manager.scan()?
+                .into_iter()
+                .for_each(|new_device| {
+                    let _ = tx.send(new_device);
+                });
 
             Arc::new(Mutex::new(manager))
         };
@@ -84,7 +90,7 @@ impl JoyConManager {
 
                     // Send new devices
                     if let Ok(new_devices) = manager.scan() {
-                        // If mspc channel is disconnected, end this thread.
+                        // If mpsc channel is disconnected, end this thread.
                         let send_result = new_devices.into_iter()
                             .try_for_each::<_, Result<(), crossbeam_channel::SendError<_>>>(|new_device| {
                                 tx.send(new_device)
@@ -259,16 +265,15 @@ impl JoyConManager {
     ///
     /// let manager = JoyConManager::get_instance();
     ///
-    /// let (managed_devices, new_devices) = {
+    /// let devices = {
     ///     let lock = manager.lock();
     ///     match lock {
-    ///         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+    ///         Ok(manager) => manager.new_devices(),
     ///         Err(_) => return,
     ///     }
     /// };
     ///
-    /// managed_devices.into_iter()
-    ///     .chain(new_devices)
+    /// devices.iter()
     ///     .flat_map(|device| SimpleJoyConDriver::new(&device))
     ///     .try_for_each::<_, JoyConResult<()>>(|driver| {
     ///         let simple_hid_mode = SimpleHIDMode::new(driver)?;

diff --git a/src/lib.rs b/src/lib.rs
@@ -42,16 +42,15 @@
 //!
 //! let manager = JoyConManager::get_instance();
 //!
-//! let (managed_devices, new_devices) = {
+//! let devices = {
 //!     let lock = manager.lock();
 //!     match lock {
-//!         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+//!         Ok(manager) => manager.new_devices(),
 //!         Err(_) => return,
 //!     }
 //! };
 //!
-//! managed_devices.into_iter()
-//!     .chain(new_devices)
+//! devices.iter()
 //!     .flat_map(|dev| SimpleJoyConDriver::new(&dev))
 //!     .try_for_each::<_, JoyConResult<()>>(|driver| {
 //!         // Change JoyCon to Simple hid mode.
@@ -98,16 +97,15 @@
 //!
 //! let manager = JoyConManager::get_instance();
 //!
-//! let (managed_devices, new_devices) = {
+//! let devices = {
 //!     let lock = manager.lock();
 //!     match lock {
-//!         Ok(manager) => (manager.managed_devices(), manager.new_devices()),
+//!         Ok(manager) => manager.new_devices(),
 //!         Err(_) => return,
 //!     }
 //! };
 //!
-//! managed_devices.into_iter()
-//!     .chain(new_devices)
+//! devices.iter()
 //!     .flat_map(|dev| SimpleJoyConDriver::new(&dev))
 //!     .try_for_each::<_, JoyConResult<()>>(|mut driver| {
 //!         // Set player lights

diff --git a/src/main.rs b/src/main.rs
@@ -17,16 +17,15 @@ fn main() -> JoyConResult<()> {
     });
 
     let manager = JoyConManager::get_instance();
-    let (managed_devices, new_devices) = {
+    let devices = {
         let lock = manager.lock();
         match lock {
-            Ok(m) => (m.managed_devices(),m.new_devices()),
+            Ok(m) => m.new_devices(),
             Err(_) => unreachable!()
         }
     };
 
-    managed_devices.into_iter()
-        .chain(new_devices)
+    devices.iter()
         .try_for_each::<_, JoyConResult<()>>(|d| {
             let mut driver = SimpleJoyConDriver::new(&d)?;
             let tx = tx.clone();