Skip to content

Commit

Permalink
Merge pull request #76 from Neotron-Compute/release-052
Browse files Browse the repository at this point in the history
Updated to v0.5.2
  • Loading branch information
thejpster authored Jul 15, 2023
2 parents 20e002a + 184ea62 commit d79368c
Show file tree
Hide file tree
Showing 18 changed files with 2,288 additions and 1,563 deletions.
9 changes: 6 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# This will make a UF2 and copy it to the RP2040's Mass Storage Device bootloader
# runner = "elf2uf2-rs -d"
# This will flash over SWD with any compatible probe it finds. You need 0.3.1 or higher for RP2040 support.
runner = "probe-run --chip RP2040 --measure-stack"

runner = "probe-run --chip RP2040"
rustflags = [
# This is needed if your flash or ram addresses are not aligned to 0x10000 in memory.x
# See https://github.com/rust-embedded/cortex-m-quickstart/pull/95
Expand All @@ -17,4 +16,8 @@ rustflags = [
]

[build]
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+

[env]
DEFMT_LOG = { value = "info", force = true }

16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Changelog

## 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))
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**.

## 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))

* None

## 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))

* Update to neotron-common-bios 0.9.0
* Use published neotron-bmc-protocol and neotron-bmc-commands crates
* Clarify how BMC speaker works
* Add ANSI art boot-up logo
* Speed up boot, and add "ESC to Pause"
* Print message on hardfault
* Update to OS 0.4.0
* Re-arrange BIOS memory and stack for Core 1
* Re-wrote the video render system to be more robust

## 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))

* Implement SD Card block read/write
Expand Down
49 changes: 43 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 20 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,25 @@ resolver = "2"
readme = "README.md"
license = "GPL-3.0-or-later"
name = "neotron-pico-bios"
version = "0.5.1"
version = "0.5.2"

[dependencies]
# Useful Cortex-M specific functions (e.g. SysTick)
cortex-m = "0.7"
# The Raspberry Pi Pico HAL
rp-pico = { version = "0.7", default-features = false, features = [ "rt", "critical-section-impl", "rom-func-cache" ] }
rp-pico = { version = "0.7", default-features = false, features = [
"rt",
"critical-section-impl",
"rom-func-cache"
] }
# Cortex-M run-time (or start-up) code
cortex-m-rt = "0.7"
# The BIOS to OS API
neotron-common-bios = "0.8.0"
neotron-common-bios = "0.9.0"
# For the RP2040 bootloader
rp2040-boot2 = "0.3.0"
# For hardware abstraction traits
embedded-hal ="0.2"
embedded-hal = "0.2"
# Gives us formatted PC-side logging
defmt = "=0.3.2"
# Sends defmt logs to the SWD debugger
Expand All @@ -33,9 +37,9 @@ pio-proc = "0.2"
# Hardware locks for sharing data with interrupts
critical-section = "1.0"
# 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.
neotron-bmc-commands = { version = "0.1.0", git = "https://github.com/neotron-compute/neotron-bmc", tag="v0.5.2" }
neotron-bmc-commands = { version = "0.2.0" }
# 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.
neotron-bmc-protocol = { version = "0.1.0", git = "https://github.com/neotron-compute/neotron-bmc", tag="v0.5.2", features = ["defmt"] }
neotron-bmc-protocol = { version = "0.1.0", features = ["defmt"] }
# Time and frequency related functions
fugit = "0.3"
# PS/2 scancode decoding
Expand All @@ -51,7 +55,13 @@ shared-bus = "0.2"
# Gets us compare-swap atomic operations
atomic-polyfill = "1.0.2"
# SD Card driver
embedded-sdmmc = { version = "0.5", default-features = false, features = ["defmt-log"] }
embedded-sdmmc = { version = "0.5", default-features = false, features = [
"defmt-log"
] }

[build-dependencies]
neotron-common-bios = "0.9.0"
vte = "0.11"

[[bin]]
name = "neotron-pico-bios"
Expand All @@ -69,3 +79,6 @@ lto = true
# good choice for performance on the RP2040, where code executes from external
# SPI Flash and has to be buffered in a small on-chip cache memory.
opt-level = "s"

[features]
check-stack = []
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ See [CHANGELOG.md](./CHANGELOG.md)

## Licence

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

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

0 comments on commit d79368c

Please sign in to comment.