reboot on all devices

carlossless · Mar 9, 2024 · 02b9862 · 02b9862
1 parent d2ba2f7
commit 02b9862
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/carlossless/sinowealth-kb-tool"
 version = "0.0.8"
 edition = "2021"
 license = "MIT"
-rust-version = "1.65"
+rust-version = "1.76"
 
 [dependencies]
 clap = "4.1"
@@ -17,9 +17,9 @@ md5 = "0.7"
 thiserror = "1.0"
 
 [dependencies.hidapi]
-version = "2.4"
+version = "2.6"
 default-features = false
-features = ["linux-static-libusb"]
+features = ["linux-static-libusb", "macos-shared-device"]
 
 [dependencies.log]
 version = "0.4"

diff --git a/src/isp.rs b/src/isp.rs
@@ -293,12 +293,7 @@ impl ISPDevice {
             ReadType::Full => self.read(0, self.part.firmware_size + self.part.bootloader_size)?,
         };
 
-        // The Royal Kludge RK84 ISO Return will be stuck in ISP mode otherwise
-        if self.part.product_id == PART_ROYALKLUDGE_RK84_ISO_RETURN.product_id
-            && self.part.vendor_id == PART_ROYALKLUDGE_RK84_ISO_RETURN.vendor_id
-        {
-            self.reboot()?;
-        }
+        self.reboot()?;
 
         return Ok(firmware);
     }
@@ -320,12 +315,7 @@ impl ISPDevice {
 
         self.enable_firmware()?;
 
-        // The Royal Kludge RK84 ISO Return will be stuck in ISP mode otherwise
-        if self.part.product_id == PART_ROYALKLUDGE_RK84_ISO_RETURN.product_id
-            && self.part.vendor_id == PART_ROYALKLUDGE_RK84_ISO_RETURN.vendor_id
-        {
-            self.reboot()?;
-        }
+        self.reboot()?;
 
         Ok(())
     }