mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2025-01-23 14:28:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123 from ferrous-systems/panic-udf

Browse source 
use asm::udf in panic-log
This commit is contained in:
Jorge Aparicio 2021-01-21 15:31:54 +01:00 committed by GitHub
commit b053ee2dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advanced/firmware/Cargo.toml
View file

@ -12,8 +12,8 @@ usb2 = { git = "https://github.com/japaric/usb2" }
[dependencies]
consts = { path = "../common/consts" }
cortex-m = "0.6.2"
cortex-m-rt = "0.6.12"
cortex-m = "0.6.4"
cortex-m-rt = "0.6.13"
cortex-m-rtic = "0.5.1"
dk = { path = "../../boards/dk", features = ["advanced"] }
heapless = "0.5.5"

4
beginner/apps/Cargo.toml
View file

@ -6,8 +6,8 @@ name = "apps"
version = "0.0.0"
[dependencies]
cortex-m = "0.6.2"
cortex-m-rt = "0.6.12"
cortex-m = "0.6.4"
cortex-m-rt = "0.6.13"
dk = { path = "../../boards/dk", features = ["beginner"] }
heapless = "0.5.5"
log = "0.4.8"

4
boards/dk/Cargo.toml
View file

@ -6,8 +6,8 @@ name = "dk"
version = "0.0.0"
[dependencies]
cortex-m = "0.6.2"
cortex-m-rt = "0.6.12"
cortex-m = "0.6.4"
cortex-m-rt = "0.6.13"
embedded-hal = "0.2.3"
hal = { package = "nrf52840-hal", git = "https://github.com/japaric/nrf-hal", branch = "radio" }
log = "0.4.8"

2
common/panic-log/Cargo.toml
View file

@ -6,5 +6,5 @@ name = "panic-log"
version = "0.0.0"
[dependencies]
cortex-m = "0.6.2"
cortex-m = "0.6.4"
log = "0.4.8"

5
common/panic-log/src/lib.rs
View file

@ -8,7 +8,6 @@ use cortex_m::asm;
fn panic(info: &PanicInfo) -> ! {
log::error!("{}", info);
loop {
asm::bkpt()
}
// abort instruction: triggers a HardFault exception which causes probe-run to exit
asm::udf()
}