Skip to content

Commit e911506

Browse files
committed
Pumps up p256, rand (though they are still rc; no longer pre!); changes to 'security' feature flag use.
1 parent 53e3402 commit e911506

32 files changed

+450
-292
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ jobs:
7474
- name: Save binary
7575
run: |
7676
mv ./examples/nrf52/target/thumbv7em-none-eabihf/release/ble_bas_peripheral ./examples/nrf52/target/thumbv7em-none-eabihf/release/original.elf
77+
- name: "[PR] transitioning from 'nrf-sdc' to 'nrf52' needs this." #hack
78+
if: ${{ github.event.pull_request }}
79+
run: git restore examples/nrf52/Cargo.lock
7780
- name: If it's a PR checkout the base commit
7881
if: ${{ github.event.pull_request }}
7982
run: git checkout ${{ github.event.pull_request.base.sha }}

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"] }

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
@@ -8,8 +8,10 @@ pub mod ble_advertise;
88
pub mod ble_advertise_multiple;
99
pub mod ble_bas_central;
1010
pub mod ble_bas_central_multiple;
11+
#[cfg(feature = "security")]
1112
pub mod ble_bas_central_sec;
1213
pub mod ble_bas_peripheral;
14+
#[cfg(feature = "security")]
1315
pub mod ble_bas_peripheral_sec;
1416
pub mod ble_beacon;
1517
pub mod ble_l2cap_central;

0 commit comments

Comments
 (0)