Skip to content

Commit 8d76b38

Browse files
committed
Using latest (rc,pre) versions of rand, p256 etc. ecosystem; enabling 'security' flag for CI runs (clippy, test).
1 parent 6bcfb00 commit 8d76b38

34 files changed

+456
-302
lines changed

bt-hci-linux/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ embedded-io = { version = "0.6.1", features = ["std"] }
1616
libc = "0.2"
1717
bt-hci = "0.6"
1818
embassy-time = { version = "0.5", features = ["std", "generic-queue-8"] }
19-
rand = { version = "0.8.5", features = ["getrandom"] }
2019
env_logger = "0.11"
2120
log = "0.4"
2221
critical-section = { version = "1", features = ["std"] }

ci.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,7 @@ cargo batch \
4747
cargo fmt --check --manifest-path ./host/Cargo.toml
4848
cargo clippy --manifest-path ./host/Cargo.toml --features gatt,peripheral,central
4949
cargo test --manifest-path ./host/Cargo.toml --lib -- --nocapture
50-
cargo test --manifest-path ./host/Cargo.toml --no-run -- --nocapture
51-
cargo test --manifest-path ./examples/tests/Cargo.toml --no-run -- --nocapture
50+
cargo test --manifest-path ./host/Cargo.toml --no-run
51+
cargo test --manifest-path ./host/Cargo.toml --features security --lib -- --nocapture
52+
cargo test --manifest-path ./host/Cargo.toml --features security --no-run
53+
cargo test --manifest-path ./examples/tests/Cargo.toml --no-run

examples/apps/Cargo.toml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ license = "MIT OR Apache-2.0"
88
trouble-host = { path = "../../host", features = ["derive", "scan"] }
99
bt-hci = { version = "0.6" }
1010
embassy-futures = "0.1.1"
11-
embassy-sync = { version = "0.7" }
11+
embassy-sync = { version = "0.7" } # host-macros
1212
embassy-time = "0.5"
13-
#embedded-hal = "1.0"
1413
embedded-hal-async = "1.0"
15-
static_cell = "2"
16-
#embedded-io = "0.6"
17-
heapless = "0.9"
18-
rand_core = { version = "0.6", default-features = false }
14+
static_cell = "2" # host-macros
15+
heapless = "0.9" # ble_scanner.rs
16+
rand_core = { version = "0.9.3", default-features = false, optional = true }
1917

2018
# Used by 'security' feature
2119
embedded-storage-async = { version = "0.4.1", optional = true }
@@ -30,8 +28,6 @@ defmt = [
3028
"dep:defmt",
3129
"trouble-host/defmt",
3230
"bt-hci/defmt",
33-
#"embedded-io/defmt-03",
34-
#"embedded-hal/defmt-03"
3531
]
3632
log = [
3733
"dep:log",
@@ -41,6 +37,7 @@ log = [
4137
security = [
4238
"trouble-host/security",
4339
"dep:sequential-storage",
44-
"dep:embedded-storage-async"
40+
"dep:embedded-storage-async",
41+
"dep:rand_core"
4542
]
4643
std = []

examples/apps/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ pub(crate) mod fmt;
77
pub mod ble_advertise;
88
pub mod ble_advertise_multiple;
99
pub mod ble_bas_central;
10+
#[cfg(feature = "security")]
1011
pub mod ble_bas_central_sec;
1112
pub mod ble_bas_peripheral;
13+
#[cfg(feature = "security")]
1214
pub mod ble_bas_peripheral_sec;
1315
pub mod ble_beacon;
1416
pub mod ble_l2cap_central;

0 commit comments

Comments
 (0)