gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

More verbose error log on startup

Browse Source
This commit is contained in:
Luke
2020-05-23 09:41:28 +12:00
parent 8f9c81e863
commit 0b3046b31f
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rog-core/src/core.rs
View File

@@ -32,10 +32,16 @@ pub struct RogCore {
impl RogCore { impl RogCore {
pub fn new(vendor: u16, product: u16, led_endpoint: u8) -> Result<RogCore, Box<dyn Error>> { pub fn new(vendor: u16, product: u16, led_endpoint: u8) -> Result<RogCore, Box<dyn Error>> {
let mut dev_handle = RogCore::get_device(vendor, product)?; let mut dev_handle = RogCore::get_device(vendor, product).map_err(|err| {
error!("Could not get device handle: {:?}", err);
err
})?;
dev_handle.set_active_configuration(0).unwrap_or(()); dev_handle.set_active_configuration(0).unwrap_or(());
let dev_config = dev_handle.device().config_descriptor(0)?; let dev_config = dev_handle.device().config_descriptor(0).map_err(|err| {
error!("Could not get device config: {:?}", err);
err
})?;
// Interface with outputs // Interface with outputs
let mut interface = 0; let mut interface = 0;
for iface in dev_config.interfaces() { for iface in dev_config.interfaces() {
@@ -54,8 +60,16 @@ impl RogCore {
} }
} }
dev_handle.set_auto_detach_kernel_driver(true)?; dev_handle
dev_handle.claim_interface(interface)?; .set_auto_detach_kernel_driver(true)
.map_err(|err| {
error!("Auto-detach kernel driver failed: {:?}", err);
err
})?;
dev_handle.claim_interface(interface).map_err(|err| {
error!("Could not claim device interface: {:?}", err);
err
})?;
Ok(RogCore { Ok(RogCore {
handle: dev_handle, handle: dev_handle,

2
rog-core/src/daemon.rs
View File

@@ -138,7 +138,7 @@ pub async fn start_daemon() -> Result<(), Box<dyn Error>> {
// Check if single mode // Check if single mode
if let Ok(mut lock) = input.try_lock() { if let Ok(mut lock) = input.try_lock() {
if let Some(bytes) = lock.take() { if let Some(bytes) = lock.take() {
if bytes.len() > 0 { if !bytes.is_empty() {
let mut config = config.lock().await; let mut config = config.lock().await;
led_writer led_writer
.do_command(AuraCommand::WriteBytes(bytes), &mut config) .do_command(AuraCommand::WriteBytes(bytes), &mut config)