diff --git a/examples/use_config/esp32c3_ble/Cargo.lock b/examples/use_config/esp32c3_ble/Cargo.lock index 37555ff6..03600711 100644 --- a/examples/use_config/esp32c3_ble/Cargo.lock +++ b/examples/use_config/esp32c3_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_config/esp32c3_ble/Cargo.toml b/examples/use_config/esp32c3_ble/Cargo.toml index d90366fe..6440964e 100644 --- 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 index 1841aafd..f824a60b 100644 --- a/examples/use_config/esp32c6_ble/Cargo.lock +++ b/examples/use_config/esp32c6_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_config/esp32c6_ble/Cargo.toml b/examples/use_config/esp32c6_ble/Cargo.toml index cbd97399..1a65ccef 100644 --- 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 index 1db32428..14ca075b 100644 --- a/examples/use_config/esp32s3_ble/Cargo.lock +++ b/examples/use_config/esp32s3_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_config/esp32s3_ble/Cargo.toml b/examples/use_config/esp32s3_ble/Cargo.toml index f17fb268..445b3a12 100644 --- 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 index 37555ff6..03600711 100644 --- a/examples/use_rust/esp32c3_ble/Cargo.lock +++ b/examples/use_rust/esp32c3_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_rust/esp32c3_ble/Cargo.toml b/examples/use_rust/esp32c3_ble/Cargo.toml index d90366fe..6440964e 100644 --- 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 index 1841aafd..f824a60b 100644 --- a/examples/use_rust/esp32c6_ble/Cargo.lock +++ b/examples/use_rust/esp32c6_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_rust/esp32c6_ble/Cargo.toml b/examples/use_rust/esp32c6_ble/Cargo.toml index 6e25603c..fc3b21c2 100644 --- 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 index 1db32428..14ca075b 100644 --- a/examples/use_rust/esp32s3_ble/Cargo.lock +++ b/examples/use_rust/esp32s3_ble/Cargo.lock @@ -1009,8 +1009,9 @@ dependencies = [ [[package]] name = "esp32-nimble" -version = "0.9.0" -source = "git+https://github.com/taks/esp32-nimble?rev=9c33c98#9c33c989342e6848824124b5d2d0e4fe31af153c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88cc737968921dc601fafaf3ca83f8fca5039cfc6a46e402cb042da647a0c00f" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/examples/use_rust/esp32s3_ble/Cargo.toml b/examples/use_rust/esp32s3_ble/Cargo.toml index f17fb268..445b3a12 100644 --- 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 index a308cfa0..a6ab5c04 100644 --- 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 index 29e77629..93b66b0c 100644 --- 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 { - 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) }