chore: update esp32-nimble to v0.10.0

Signed-off-by: Haobo Gu <[email protected]>
HaoboGu · Jan 23, 2025 · dc92b9a · dc92b9a
1 parent 8ec8a26
commit dc92b9a
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 21 deletions.
diff --git a/examples/use_config/esp32c3_ble/Cargo.lock b/examples/use_config/esp32c3_ble/Cargo.lock
diff --git a/examples/use_config/esp32c3_ble/Cargo.toml b/examples/use_config/esp32c3_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32c3_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8"] }
 esp-println = { version = "0.13", features = ["esp32c3", "defmt-espflash"] }

diff --git a/examples/use_config/esp32c6_ble/Cargo.lock b/examples/use_config/esp32c6_ble/Cargo.lock
diff --git a/examples/use_config/esp32c6_ble/Cargo.toml b/examples/use_config/esp32c6_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32c6_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8"] }
 esp-println = { version = "0.13", features = ["esp32c6", "defmt-espflash"] }

diff --git a/examples/use_config/esp32s3_ble/Cargo.lock b/examples/use_config/esp32s3_ble/Cargo.lock
diff --git a/examples/use_config/esp32s3_ble/Cargo.toml b/examples/use_config/esp32s3_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32s3_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8"] }
 esp-println = { version = "0.13", features = ["esp32s3", "defmt-espflash"] }

diff --git a/examples/use_rust/esp32c3_ble/Cargo.lock b/examples/use_rust/esp32c3_ble/Cargo.lock
diff --git a/examples/use_rust/esp32c3_ble/Cargo.toml b/examples/use_rust/esp32c3_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32c3_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8"] }
 esp-println = { version = "0.13", features = ["esp32c3", "defmt-espflash"] }

diff --git a/examples/use_rust/esp32c6_ble/Cargo.lock b/examples/use_rust/esp32c6_ble/Cargo.lock
diff --git a/examples/use_rust/esp32c6_ble/Cargo.toml b/examples/use_rust/esp32c6_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32c6_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8", "defmt-timestamp-uptime"] }
 esp-println = { version = "0.13", features = ["esp32c6", "defmt-espflash"] }

diff --git a/examples/use_rust/esp32s3_ble/Cargo.lock b/examples/use_rust/esp32s3_ble/Cargo.lock
diff --git a/examples/use_rust/esp32s3_ble/Cargo.toml b/examples/use_rust/esp32s3_ble/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 rmk = { path = "../../../rmk", features = ["col2row", "esp32s3_ble"] }
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98"  }
+esp32-nimble = { version = "0.10"  }
 defmt = "0.3"
 embassy-time = { version = "0.4.0", features = ["defmt", "generic-queue-8"] }
 esp-println = { version = "0.13", features = ["esp32s3", "defmt-espflash"] }

diff --git a/rmk/Cargo.toml b/rmk/Cargo.toml
@@ -62,7 +62,7 @@ embassy-nrf = { version = "0.3.1", features = [
 ], optional = true }
 
 # Espressif dependencies
-esp32-nimble = { version = "0.9", git = "https://github.com/taks/esp32-nimble", rev = "9c33c98" , optional = true }
+esp32-nimble = { version = "0.10", optional = true }
 esp-idf-svc = { version = "0.51", default-features = false, optional = true }
 
 # Document feature

diff --git a/rmk/src/ble/esp/server.rs b/rmk/src/ble/esp/server.rs
@@ -50,8 +50,9 @@ impl HidWriterWrapper for BleHidWriter {
 
 impl HidReaderWrapper for BleHidReader {
     async fn read(&mut self, _buf: &mut [u8]) -> Result<usize, HidError> {
-        self.lock().on_read(|a, _| {
-            info!("on_read!, {} {=[u8]:#X}", a.len(), a.as_slice());
+        self.lock().on_read(|characteristic, _conn| {
+            let v = characteristic.value_mut();
+            info!("on_read!, {} {=[u8]:#X}", v.len(), v.as_slice());
         });
         Ok(1)
     }