mirrors/n-link
1
0
Fork 0
mirror of https://github.com/lights0123/n-link.git synced 2025-07-10 12:57:24 +00:00
Code Issues Projects Releases Wiki Activity

More debug info

Browse source
This commit is contained in:
lights0123 2020-09-26 23:16:02 -04:00
parent 33902ee606
commit 50a5496e31
No known key found for this signature in database
GPG key ID: 28F315322E37972F
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src-tauri/src/cmd.rs
View file

@ -2,7 +2,7 @@ use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use libnspire::{PID, PID_CX2, VID}; use libnspire::{PID, PID_CX2, VID};
use rusb::GlobalContext; use rusb::{GlobalContext, Error};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::{Device, DeviceState}; use crate::{Device, DeviceState};
@ -146,7 +146,7 @@ pub enum Cmd {
} }
pub fn add_device(dev: Arc<rusb::Device<GlobalContext>>) -> rusb::Result<((u8, u8), Device)> { pub fn add_device(dev: Arc<rusb::Device<GlobalContext>>) -> rusb::Result<((u8, u8), Device)> {
let descriptor = dev.device_descriptor()?; let descriptor = dbg!(dev.device_descriptor()?);
if !(descriptor.vendor_id() == VID && matches!(descriptor.product_id(), PID | PID_CX2)) { if !(descriptor.vendor_id() == VID && matches!(descriptor.product_id(), PID | PID_CX2)) {
return Err(rusb::Error::Other); return Err(rusb::Error::Other);
} }
@ -155,11 +155,11 @@ pub fn add_device(dev: Arc<rusb::Device<GlobalContext>>) -> rusb::Result<((u8, u
Ok(( Ok((
(dev.bus_number(), dev.address()), (dev.bus_number(), dev.address()),
Device { Device {
name: handle.read_product_string( name: dbg!(handle.read_product_string(
handle.read_languages(Duration::from_millis(100))?[0], handle.read_languages(Duration::from_millis(100))?[0],
&descriptor, &descriptor,
Duration::from_millis(100), Duration::from_millis(100),
)?, ))?,
device: dev, device: dev,
state: DeviceState::Closed, state: DeviceState::Closed,
}, },
@ -170,7 +170,10 @@ pub fn enumerate() -> Result<(), libnspire::Error> {
crate::DEVICES.write().unwrap().extend( crate::DEVICES.write().unwrap().extend(
rusb::devices()? rusb::devices()?
.iter() .iter()
.filter_map(|dev| add_device(Arc::new(dev)).ok()), .filter_map(|dev| match add_device(Arc::new(dev)){
Ok(d) => Ok(d),
Err(e) => Err(dbg!(e)),
}.ok()),
); );
Ok(()) Ok(())
} }

4
src-tauri/src/main.rs
View file

@ -188,10 +188,10 @@ fn main() {
.unwrap() .unwrap()
.iter() .iter()
.map(|dev| AddDevice { .map(|dev| AddDevice {
dev: DevId { dev: dbg!(DevId {
bus_number: (dev.0).0, bus_number: (dev.0).0,
address: (dev.0).1, address: (dev.0).1,
}, }),
name: (dev.1).name.clone(), name: (dev.1).name.clone(),
is_cx_ii: (dev.1) is_cx_ii: (dev.1)
.device .device