maxscout/HyperHeadset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add vendor and product ID to DeviceState

Browse Source
This commit is contained in:
Lennard Kittner
2025-03-27 21:25:16 +01:00
parent 5436004d12
commit b970760c74
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/mod.rs
View File

@@ -26,6 +26,8 @@ pub fn connect_compatible_device() -> Result<Box<dyn Device>, DeviceError> {
#[derive(Debug)] #[derive(Debug)]
pub struct DeviceState { pub struct DeviceState {
pub hid_device: HidDevice, pub hid_device: HidDevice,
pub product_id: u16,
pub vendor_id: u16,
pub device_name: Option<String>, pub device_name: Option<String>,
pub battery_level: Option<u8>, pub battery_level: Option<u8>,
pub charging: Option<ChargingStatus>, pub charging: Option<ChargingStatus>,
@@ -80,21 +82,24 @@ Connected: {}",
impl DeviceState { impl DeviceState {
pub fn new(product_ids: &[u16], vendor_ids: &[u16]) -> Result<Self, DeviceError> { pub fn new(product_ids: &[u16], vendor_ids: &[u16]) -> Result<Self, DeviceError> {
let hid_api = HidApi::new()?; let hid_api = HidApi::new()?;
let hid_device = hid_api let (hid_device, product_id, vendor_id) = hid_api
.device_list() .device_list()
.find_map(|info| { .find_map(|info| {
if product_ids.contains(&info.product_id()) if product_ids.contains(&info.product_id())
&& vendor_ids.contains(&info.vendor_id()) && vendor_ids.contains(&info.vendor_id())
{ {
Some(hid_api.open(info.vendor_id(), info.product_id())) Some((hid_api.open(info.vendor_id(), info.product_id()), info.product_id(), info.vendor_id()))
} else { } else {
None None
} }
}) })
.ok_or(DeviceError::NoDeviceFound())??; .ok_or(DeviceError::NoDeviceFound())?;
let hid_device = hid_device?;
let device_name = hid_device.get_product_string()?; let device_name = hid_device.get_product_string()?;
Ok(DeviceState { Ok(DeviceState {
hid_device, hid_device,
product_id,
vendor_id,
device_name, device_name,
charging: None, charging: None,
battery_level: None, battery_level: None,