diff options
| author | dskleingeld <[email protected]> | 2021-05-02 20:58:01 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-02 20:58:01 +0200 |
| commit | e40346a54495e2cf2de6cf45c8c6e87bb634165f (patch) | |
| tree | 3e18d8e99442cf21f9480ce4838543363712e39a | |
| parent | 1f2551d7cd9b0aa45d5c688ae6d1b7be20d1e8e8 (diff) | |
Fix core::panic! not printing in examples (#153)
* fixes panic not showing in examples
removes panic_immediate_abort feature where present, renames config -> config.toml, enables panic-probe defmt printing feature and updates panic-probe to 0.2
* fix unintended changes in build_core and arch
* revert uninteded change
| -rw-r--r-- | embassy-nrf-examples/.cargo/config.toml (renamed from embassy-nrf-examples/.cargo/config) | 2 | ||||
| -rw-r--r-- | embassy-nrf-examples/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-rp-examples/.cargo/config.toml (renamed from embassy-rp-examples/.cargo/config) | 1 | ||||
| -rw-r--r-- | embassy-rp-examples/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32-examples/.cargo/config.toml (renamed from embassy-stm32-examples/.cargo/config) | 0 | ||||
| -rw-r--r-- | embassy-stm32-examples/Cargo.toml | 2 |
6 files changed, 5 insertions, 8 deletions
diff --git a/embassy-nrf-examples/.cargo/config b/embassy-nrf-examples/.cargo/config.toml index 17b9c8d80..1dbeb002e 100644 --- a/embassy-nrf-examples/.cargo/config +++ b/embassy-nrf-examples/.cargo/config.toml | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | [unstable] | 1 | [unstable] |
| 2 | build-std = ["core"] | 2 | build-std = ["core"] |
| 3 | build-std-features = ["panic_immediate_abort"] | ||
| 4 | 3 | ||
| 5 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] | 4 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] |
| 6 | runner = "probe-run --chip nRF52840_xxAA" | 5 | runner = "probe-run --chip nRF52840_xxAA" |
| @@ -19,4 +18,3 @@ rustflags = [ | |||
| 19 | 18 | ||
| 20 | [build] | 19 | [build] |
| 21 | target = "thumbv7em-none-eabi" | 20 | target = "thumbv7em-none-eabi" |
| 22 | |||
diff --git a/embassy-nrf-examples/Cargo.toml b/embassy-nrf-examples/Cargo.toml index 2a5b52dd9..29614f133 100644 --- a/embassy-nrf-examples/Cargo.toml +++ b/embassy-nrf-examples/Cargo.toml | |||
| @@ -27,5 +27,5 @@ defmt-rtt = "0.2.0" | |||
| 27 | cortex-m = { version = "0.7.1", features = ["inline-asm"] } | 27 | cortex-m = { version = "0.7.1", features = ["inline-asm"] } |
| 28 | cortex-m-rt = "0.6.13" | 28 | cortex-m-rt = "0.6.13" |
| 29 | embedded-hal = { version = "0.2.4" } | 29 | embedded-hal = { version = "0.2.4" } |
| 30 | panic-probe = "0.1.0" | 30 | panic-probe = { version = "0.2.0", features = ["print-defmt"] } |
| 31 | futures = { version = "0.3.8", default-features = false, features = ["async-await"] } \ No newline at end of file | 31 | futures = { version = "0.3.8", default-features = false, features = ["async-await"] } |
diff --git a/embassy-rp-examples/.cargo/config b/embassy-rp-examples/.cargo/config.toml index 8db641544..1bbbe97da 100644 --- a/embassy-rp-examples/.cargo/config +++ b/embassy-rp-examples/.cargo/config.toml | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | [unstable] | 1 | [unstable] |
| 2 | build-std = ["core"] | 2 | build-std = ["core"] |
| 3 | build-std-features = ["panic_immediate_abort"] | ||
| 4 | 3 | ||
| 5 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] | 4 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] |
| 6 | runner = "probe-run-rp --chip RP2040" | 5 | runner = "probe-run-rp --chip RP2040" |
diff --git a/embassy-rp-examples/Cargo.toml b/embassy-rp-examples/Cargo.toml index dae22f809..2cee99bc5 100644 --- a/embassy-rp-examples/Cargo.toml +++ b/embassy-rp-examples/Cargo.toml | |||
| @@ -28,5 +28,5 @@ defmt-rtt = "0.2.0" | |||
| 28 | cortex-m = { version = "0.7.1", features = ["inline-asm"] } | 28 | cortex-m = { version = "0.7.1", features = ["inline-asm"] } |
| 29 | cortex-m-rt = "0.6.13" | 29 | cortex-m-rt = "0.6.13" |
| 30 | embedded-hal = { version = "0.2.4" } | 30 | embedded-hal = { version = "0.2.4" } |
| 31 | panic-probe = "0.1.0" | 31 | panic-probe = { version = "0.2.0", features = ["print-defmt"] } |
| 32 | futures = { version = "0.3.8", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } \ No newline at end of file | 32 | futures = { version = "0.3.8", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } |
diff --git a/embassy-stm32-examples/.cargo/config b/embassy-stm32-examples/.cargo/config.toml index 7c1d4dfb6..7c1d4dfb6 100644 --- a/embassy-stm32-examples/.cargo/config +++ b/embassy-stm32-examples/.cargo/config.toml | |||
diff --git a/embassy-stm32-examples/Cargo.toml b/embassy-stm32-examples/Cargo.toml index f12ed9101..bdb1ca84a 100644 --- a/embassy-stm32-examples/Cargo.toml +++ b/embassy-stm32-examples/Cargo.toml | |||
| @@ -46,7 +46,7 @@ defmt-rtt = "0.2.0" | |||
| 46 | cortex-m = "0.7.1" | 46 | cortex-m = "0.7.1" |
| 47 | cortex-m-rt = "0.6.13" | 47 | cortex-m-rt = "0.6.13" |
| 48 | embedded-hal = { version = "0.2.4" } | 48 | embedded-hal = { version = "0.2.4" } |
| 49 | panic-probe = "0.1.0" | 49 | panic-probe = { version = "0.2.0", features = ["print-defmt"] } |
| 50 | futures = { version = "0.3.8", default-features = false, features = ["async-await"] } | 50 | futures = { version = "0.3.8", default-features = false, features = ["async-await"] } |
| 51 | rtt-target = { version = "0.3", features = ["cortex-m"] } | 51 | rtt-target = { version = "0.3", features = ["cortex-m"] } |
| 52 | bxcan = "0.5.0" | 52 | bxcan = "0.5.0" |
