Skip to content

Commit

Permalink
Merge pull request #135 from ferrous-systems/copy-paste-install-instr…
Browse files Browse the repository at this point in the history
…uctions

Minor updates to nrf52 instructions.
  • Loading branch information
miguelraz authored Oct 4, 2024
2 parents 0849efa + 54685dd commit 73df4b8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 18 deletions.
10 changes: 5 additions & 5 deletions exercise-book/src/nrf52-code-organisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ $ tree -L 2
27 directories, 17 files
```

### board/dk
### boards/dk

Contains a Board Support Package for the nRF52840 Developer Kit.

### board/dk-solution
### boards/dk-solution

Contains a Board Support Package for the nRF52840 Developer Kit, with a solution to the [BSP exercise](./nrf52-hal-buttons.md).

### board/dongle
### boards/dongle

Contains a Board Support Package for the nRF52840 USB Dongle. You won't be using this.

### board/dongle-fw
### boards/dongle-fw

Contains pre-compiled firmware for the nRF52 USB Dongle. Use in the *nRF52 Radio Exercise*.
In the release zip file, this contains pre-compiled firmware for the nRF52 USB Dongle, which you use in the *nRF52 Radio Exercise*. In the Git repository, it's empty.

### consts

Expand Down
4 changes: 2 additions & 2 deletions exercise-book/src/nrf52-hal-buttons.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ It should now fail to compile, because the `dk` crate doesn't have support for b

## Define a Button

✅ Open up the `dk` crate in VS Code (`nrf52-code/board/dk`) and open `src/lib.rs`.
✅ Open up the `dk` crate in VS Code (`nrf52-code/boards/dk`) and open `src/lib.rs`.

✅ Add a `struct Button` which represents a single button.

Expand Down Expand Up @@ -58,4 +58,4 @@ If you're stuck for ideas, you could have the LEDs do some kind of animation. Th

## Troubleshooting

🔎 If you get totally stuck, ask for help! If all else fails, you could peek in `board/dk-solution`, which has a complete set of the required BSP changes.
🔎 If you get totally stuck, ask for help! If all else fails, you could peek in `nrf52-code/boards/dk-solution`, which has a complete set of the required BSP changes.
14 changes: 3 additions & 11 deletions exercise-book/src/nrf52-tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,9 @@ rustup +stable component add llvm-tools
Install the [`flip-link`](https://crates.io/crates/flip-link), [`nrf-dfu`](https://crates.io/crates/nrfdfu) and [`cyme`](https://crates.io/crates/cyme) tools from source using the following Cargo commands:

```console
$ cargo install flip-link
(..)
Installed package `flip-link v0.1.7` (..)

$ cargo install nrfdfu
(..)
Installed package `nrfdfu v0.1.3` (..)

$ cargo install cyme
(..)
Installed package `cyme v1.7.0` (..)
cargo install flip-link
cargo install nrfdfu
cargo install cyme
```

Install `probe-rs` 0.24 pre-compiled binaries on Linux or macOS with:
Expand Down

0 comments on commit 73df4b8

Please sign in to comment.