Skip to content

Commit d79368c

Browse files
authored
Merge pull request #76 from Neotron-Compute/release-052
Updated to v0.5.2
2 parents 20e002a + 184ea62 commit d79368c

18 files changed

+2288
-1563
lines changed

.cargo/config.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
# This will make a UF2 and copy it to the RP2040's Mass Storage Device bootloader
33
# runner = "elf2uf2-rs -d"
44
# This will flash over SWD with any compatible probe it finds. You need 0.3.1 or higher for RP2040 support.
5-
runner = "probe-run --chip RP2040 --measure-stack"
6-
5+
runner = "probe-run --chip RP2040"
76
rustflags = [
87
# This is needed if your flash or ram addresses are not aligned to 0x10000 in memory.x
98
# See https://github.com/rust-embedded/cortex-m-quickstart/pull/95
@@ -17,4 +16,8 @@ rustflags = [
1716
]
1817

1918
[build]
20-
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
19+
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
20+
21+
[env]
22+
DEFMT_LOG = { value = "info", force = true }
23+

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
# Changelog
22

3-
## Unreleased Changes ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/develop) | [Changes](https://github.com/neotron-compute/neotron-pico-bios/compare/v0.5.0...develop))
3+
In this repository, changes are made in branches which are merged into **develop**. Those changes should also update this file under "Unreleased Changes". Periodically a release branch is made which updates the crate version in `Cargo.toml` and is merged into **main**. The **main** branch thus only has commits corresponding to releases of the firmware. Once the release has been merged into **main** it is tagged, and the changes then merged back into **develop**.
4+
5+
## Unreleased Changes ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/develop) | [Changes](https://github.com/neotron-compute/neotron-pico-bios/compare/v0.5.2...develop))
46

57
* None
68

9+
## v0.5.2 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.5.2) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.5.2))
10+
11+
* Update to neotron-common-bios 0.9.0
12+
* Use published neotron-bmc-protocol and neotron-bmc-commands crates
13+
* Clarify how BMC speaker works
14+
* Add ANSI art boot-up logo
15+
* Speed up boot, and add "ESC to Pause"
16+
* Print message on hardfault
17+
* Update to OS 0.4.0
18+
* Re-arrange BIOS memory and stack for Core 1
19+
* Re-wrote the video render system to be more robust
20+
721
## v0.5.1 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.5.1) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.5.1))
822

923
* Implement SD Card block read/write

Cargo.lock

Lines changed: 43 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,25 @@ resolver = "2"
55
readme = "README.md"
66
license = "GPL-3.0-or-later"
77
name = "neotron-pico-bios"
8-
version = "0.5.1"
8+
version = "0.5.2"
99

1010
[dependencies]
1111
# Useful Cortex-M specific functions (e.g. SysTick)
1212
cortex-m = "0.7"
1313
# The Raspberry Pi Pico HAL
14-
rp-pico = { version = "0.7", default-features = false, features = [ "rt", "critical-section-impl", "rom-func-cache" ] }
14+
rp-pico = { version = "0.7", default-features = false, features = [
15+
"rt",
16+
"critical-section-impl",
17+
"rom-func-cache"
18+
] }
1519
# Cortex-M run-time (or start-up) code
1620
cortex-m-rt = "0.7"
1721
# The BIOS to OS API
18-
neotron-common-bios = "0.8.0"
22+
neotron-common-bios = "0.9.0"
1923
# For the RP2040 bootloader
2024
rp2040-boot2 = "0.3.0"
2125
# For hardware abstraction traits
22-
embedded-hal ="0.2"
26+
embedded-hal = "0.2"
2327
# Gives us formatted PC-side logging
2428
defmt = "=0.3.2"
2529
# Sends defmt logs to the SWD debugger
@@ -33,9 +37,9 @@ pio-proc = "0.2"
3337
# Hardware locks for sharing data with interrupts
3438
critical-section = "1.0"
3539
# Commands for talking to a Neotron BMC. The tag is for the repo as a whole, of which the commands crate is a small part.
36-
neotron-bmc-commands = { version = "0.1.0", git = "https://github.com/neotron-compute/neotron-bmc", tag="v0.5.2" }
40+
neotron-bmc-commands = { version = "0.2.0" }
3741
# Protocol for talking to a Neotron BMC. The tag is for the repo as a whole, of which the protocol crate is a small part.
38-
neotron-bmc-protocol = { version = "0.1.0", git = "https://github.com/neotron-compute/neotron-bmc", tag="v0.5.2", features = ["defmt"] }
42+
neotron-bmc-protocol = { version = "0.1.0", features = ["defmt"] }
3943
# Time and frequency related functions
4044
fugit = "0.3"
4145
# PS/2 scancode decoding
@@ -51,7 +55,13 @@ shared-bus = "0.2"
5155
# Gets us compare-swap atomic operations
5256
atomic-polyfill = "1.0.2"
5357
# SD Card driver
54-
embedded-sdmmc = { version = "0.5", default-features = false, features = ["defmt-log"] }
58+
embedded-sdmmc = { version = "0.5", default-features = false, features = [
59+
"defmt-log"
60+
] }
61+
62+
[build-dependencies]
63+
neotron-common-bios = "0.9.0"
64+
vte = "0.11"
5565

5666
[[bin]]
5767
name = "neotron-pico-bios"
@@ -69,3 +79,6 @@ lto = true
6979
# good choice for performance on the RP2040, where code executes from external
7080
# SPI Flash and has to be buffered in a small on-chip cache memory.
7181
opt-level = "s"
82+
83+
[features]
84+
check-stack = []

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ See [CHANGELOG.md](./CHANGELOG.md)
116116

117117
## Licence
118118

119-
Neotron-Pico-BIOS Copyright (c) Jonathan 'theJPster' Pallant and the Neotron Developers, 2021
119+
Neotron-Pico-BIOS Copyright (c) Jonathan 'theJPster' Pallant and the Neotron Developers, 2023
120120

121121
This program is free software: you can redistribute it and/or modify
122122
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)