Skip to content

Commit

Permalink
fixed ci after changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BartMassey committed Jul 27, 2024
1 parent 91300c7 commit a52464a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ To run an example, simply use `cargo run` from the `examples` folder:

- `cd examples && cargo run --bin ble_bas_peripheral --features nrf52840-dk`

Examples can also built for nrf52832 chip targeting S132 softdevice (feature flag `nrf52832`, board is unknown), or for nrf52833 targeting S140 softdevice on the BBC micro:bit v2 (feature flag `microbit-v2`). In these cases, edit `.cargo/config.toml` as needed.
Examples can also built for nrf52832 development kit targeting S132 softdevice (feature flag `nrf52832-dk`), or for nrf52833 targeting S140 softdevice on the BBC micro:bit v2 (feature flag `microbit-v2`). In these cases, edit `.cargo/config.toml` as needed.

## Configuring a SoftDevice

Expand Down
5 changes: 3 additions & 2 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ set -euxo pipefail
#===============

cd examples
cargo build --target thumbv7em-none-eabihf --features nrf52832 --bins
cargo build --target thumbv7em-none-eabihf --features nrf52840 --bins
cargo build --target thumbv7em-none-eabihf --features nrf52832-dk --bins
cargo build --target thumbv7em-none-eabihf --features microbit-v2 --bins
cargo build --target thumbv7em-none-eabihf --features nrf52840-dk --bins
cd ..


Expand Down
1 change: 1 addition & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ nrf52840 = [
]

nrf52840-dk = ["nrf52840"]
nrf52832-dk = ["nrf52832"]
microbit-v2 = ["nrf52833"]

[dependencies]
Expand Down
4 changes: 1 addition & 3 deletions examples/src/bin/ble_peripheral_onoff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ async fn main(spawner: Spawner) {
info!("Press button 1 to enable, button 2 to disable");
#[cfg(feature = "microbit-v2")]
let (b1_pin, b2_pin) = (p.P0_14, p.P0_23);
#[cfg(feature = "nrf52840-dk")]
#[cfg(any(feature = "nrf52840-dk", feature = "nrf52832-dk"))]
let (b1_pin, b2_pin) = (p.P0_11, p.P0_12);
#[cfg(not(any(feature = "nrf52840-dk", feature = "microbit-v2")))]
panic!("unsupported board");

let button1 = Input::new(b1_pin.degrade(), Pull::Up);
let button2 = Input::new(b2_pin.degrade(), Pull::Up);
Expand Down

0 comments on commit a52464a

Please sign in to comment.