Merge tag 'v0.5.0' into develop

Release v0.5.0

Author: jonathanpallant

CHANGELOG.md

@@ -1,9 +1,22 @@
 # 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.3.0...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.0...develop))
 
 * None
 
+## v0.5.0 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.5.0) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.5.0))
+
+* Full-colour 80 column text
+* Bump to 151.2 MHz clock speed (needed to get 80 column colour text working)
+* Reports video timing on Pi Pico LED
+* Shiny new colour start-up banner
+* Plays start-up tune
+* Updated keyboard driver
+* Added RTC support
+* Implement new kind of Mutex
+* Updated to OS 0.3.2
+* Supports initialising SD Cards and reporting card size
+ 
 ## v0.4.1 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.4.1) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.4.1))
 
 * Wait for interrupts from the BMC before reading PS/2 key codes

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 name = "neotron-pico-bios"
-version = "0.4.1"
+version = "0.5.0"
 
 [dependencies]
 # Useful Cortex-M specific functions (e.g. SysTick)

Cargo.toml

@@ -49,8 +49,10 @@ The Neotron BIOS uses the [defmt](https://crates.io/crates/defmt) crate to provi
 
 3. On your PC, install [*probe-run*](https://github.com/knurling-rs/probe-run), the programming tool from [Ferrous System's](https://www.ferrous-systems.com) [Knurling Project](https://github.com/knurling).
 
-```console
-user@host ~ $ cargo install probe-run
+We are temporarily stuck at 0.3.6 as 0.3.7 is broken and 0.3.8 doesn't support the RP2040. A 0.3.9 should be along shortly, but the logging binary format has changed, and we currently pin ourselves to a 0.3.6 compatible version.
+
+```sh
+cargo install probe-run --version=0.3.6
 ```
 
 4. Power on your Neotron Pico.

README.md

@@ -332,7 +332,11 @@ fn main() -> ! {
 	let mut watchdog = hal::watchdog::Watchdog::new(pp.WATCHDOG);
 
 	// VERSION has a trailing `\0` as that is what the BIOS/OS API requires.
-	info!("Neotron BIOS {} starting...", VERSION.trim_matches('\0'));
+	info!(
+		"Neotron BIOS v{} (git:{}) starting...",
+		env!("CARGO_PKG_VERSION"),
+		VERSION.trim_matches('\0')
+	);
 
 	// Run at 151.2 MHz SYS_PLL, 48 MHz, USB_PLL. This is important, we as clock
 	// the PIO at ÷ 6, to give 25.2 MHz (which is close enough to the 25.175
@@ -1308,7 +1312,13 @@ fn sign_on() {
 		TextBackgroundColour::BLUE,
 		false,
 	));
-	writeln!(&tc, "BIOS Version: {}", VERSION.trim_matches('\0')).unwrap();
+	writeln!(
+		&tc,
+		"BIOS: v{} (git:{})",
+		env!("CARGO_PKG_VERSION"),
+		VERSION.trim_matches('\0')
+	)
+	.unwrap();
 
 	tc.change_attr(Attr::new(
 		TextForegroundColour::WHITE,
@@ -1328,14 +1338,14 @@ fn sign_on() {
 	match bmc_ver {
 		Ok(string_bytes) => match core::str::from_utf8(&string_bytes) {
 			Ok(s) => {
-				writeln!(&tc, "BMC  Version: {}", s.trim_matches('\0')).unwrap();
+				writeln!(&tc, "BMC : {}", s.trim_matches('\0')).unwrap();
 			}
 			Err(_e) => {
-				writeln!(&tc, "BMC  Version: Unknown").unwrap();
+				writeln!(&tc, "BMC : Version Unknown").unwrap();
 			}
 		},
 		Err(_e) => {
-			writeln!(&tc, "BMC  Version: Error reading").unwrap();
+			writeln!(&tc, "BMC : Error reading version").unwrap();
 		}
 	}