Skip to content

Commit d5ef752

Browse files
committed
Merge branch 'release/v0.2.0'
2 parents bee116d + 9c1139f commit d5ef752

File tree

6 files changed

+809
-7
lines changed

6 files changed

+809
-7
lines changed

.cargo/config.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
[target.thumbv6m-none-eabi]
2+
# runner = "elf2uf2-rs -d"
3+
runner = "probe-run-rp --chip RP2040"
4+
25
rustflags = [
36
# This is needed if your flash or ram addresses are not aligned to 0x10000 in memory.x
47
# See https://github.com/rust-embedded/cortex-m-quickstart/pull/95
58
"-C", "link-arg=--nmagic",
69

710
# LLD (shipped with the Rust toolchain) is used as the default linker
811
"-C", "link-arg=-Tlink.x",
12+
13+
# Support defmt formatted logging
14+
"-C", "link-arg=-Tdefmt.x",
915
]
1016

1117
[build]

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
* None
66

7+
## v0.2.0 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.2.0) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.2.0))
8+
9+
* Add RTT debugging using defmt
10+
* Report git version over defmt
11+
* Describe how to flash/debug with a second Raspberry Pi Pico
12+
713
## v0.1.0 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.1.0) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.1.0))
814

915
* First release - it compiles, and blinks an LED.

Cargo.toml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
authors = ["Jonathan 'theJPster' Pallant <[email protected]>"]
33
edition = "2018"
44
readme = "README.md"
5-
license = "GPLv3"
5+
license = "GPL-3.0-or-later"
66
name = "neotron-pico-bios"
7-
version = "0.1.0"
7+
version = "0.2.0"
88

99
[dependencies]
1010
# Useful Cortex-M specific functions (e.g. SysTick)
@@ -19,10 +19,32 @@ neotron-common-bios = { git = "https://github.com/Neotron-Compute/Neotron-Common
1919
embedded-time = "0.12"
2020
# For the RP2040 bootloader
2121
rp2040-boot2 = "0.1"
22-
# For panic handling (todo remove this)
23-
panic-halt = "0.2"
2422
# For hardware abstraction traits
2523
embedded-hal ="0.2"
24+
# Gives us formatted PC-side logging
25+
defmt = "0.2"
26+
# Sends defmt logs to the SWD debugger
27+
defmt-rtt = "0.2"
28+
# Send panics to the debugger
29+
panic-probe = "0.2"
30+
# Fetches the BIOS version from git
31+
git-version = "0.3"
32+
33+
[features]
34+
default = [
35+
"defmt-default",
36+
]
37+
defmt-default = []
38+
# Enables trace logs
39+
defmt-trace = []
40+
# Enables debug logs
41+
defmt-debug = []
42+
# Enables info logs
43+
defmt-info = []
44+
# Enables warn logs
45+
defmt-warn = []
46+
# Enables error logs
47+
defmt-error = []
2648

2749
[[bin]]
2850
name = "neotron-pico-bios"

0 commit comments

Comments
 (0)