Fix some more timing issues in USB drivers

In combination with slow USB hubs or KVM switches, some drivers apparently fail to initialize due to too strict timing constraints. So be more lenient with timings, and increase the time we wait between issuing of commands. Fix some more timing issues Referencs #161
eruption-project · Oct 11, 2022 · afaf816 · afaf816
1 parent 6745d9e
commit afaf816
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/eruption/src/hwdevices/roccat_elo_71_air.rs b/eruption/src/hwdevices/roccat_elo_71_air.rs
@@ -26,7 +26,7 @@ use std::time::Duration;
 use std::{any::Any, thread};
 use std::{mem::size_of, sync::Arc};
 
-use crate::constants;
+use crate::constants::{self, DEVICE_SETTLE_MILLIS};
 
 use super::{
     DeviceCapabilities, DeviceInfoTrait, DeviceStatus, DeviceTrait, HwDeviceError, MiscDevice,
@@ -203,7 +203,7 @@ impl RoccatElo71Air {
                         Err(_) => return Err(HwDeviceError::InvalidResult {}.into()),
                     }
 
-                    // thread::sleep(Duration::from_millis(10));
+                    // thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
 
                     // let mut buf: [u8; 64] = [0x00; 64];
                     // buf[0] = 0xa1;
@@ -237,7 +237,7 @@ impl RoccatElo71Air {
                         Err(_) => return Err(HwDeviceError::InvalidResult {}.into()),
                     };
 
-                    thread::sleep(Duration::from_millis(10));
+                    thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
 
                     let buf: [u8; 64] = [
                         0xff, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -256,7 +256,7 @@ impl RoccatElo71Air {
                         Err(_) => return Err(HwDeviceError::InvalidResult {}.into()),
                     };
 
-                    thread::sleep(Duration::from_millis(10));
+                    thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
 
                     let buf: [u8; 64] = [
                         0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -275,7 +275,7 @@ impl RoccatElo71Air {
                         Err(_) => return Err(HwDeviceError::InvalidResult {}.into()),
                     };
 
-                    thread::sleep(Duration::from_millis(10));
+                    thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
 
                     let buf: [u8; 64] = [
                         0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -322,8 +322,12 @@ impl RoccatElo71Air {
 
                     #[allow(clippy::if_same_then_else)]
                     if buf[1] == 0x00 || buf[0..5] == [0xe6, 0x06, 0x03, 0x00, 0x04] {
+                        thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
+
                         Ok(())
                     } else if buf[0..4] == [0xa1, 0x84, 0x06, 0x02] {
+                        thread::sleep(Duration::from_millis(DEVICE_SETTLE_MILLIS));
+
                         Ok(()) // directly after device reset
                     } else {
                         hexdump::hexdump_iter(&buf).for_each(|s| debug!("  {}", s));