Merge pull request #64 from Neotron-Compute/release/v0.5.1

Release/v0.5.1

Author: thejpster

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: Neotron-Compute
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * None
 
+## 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
+* SPI bus clock changes depending on which device is being accessed
+* Updated to OS 0.3.3
+* Running `git` in `build.rs` is now optional
+
 ## 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

Cargo.lock

@@ -5,13 +5,13 @@ resolver = "2"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 name = "neotron-pico-bios"
-version = "0.5.0"
+version = "0.5.1"
 
 [dependencies]
 # Useful Cortex-M specific functions (e.g. SysTick)
 cortex-m = "0.7"
 # The Raspberry Pi Pico HAL
-rp-pico = { version = "0.6", 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
@@ -51,7 +51,7 @@ shared-bus = "0.2"
 # Gets us compare-swap atomic operations
 atomic-polyfill = "1.0.2"
 # SD Card driver
-embedded-sdmmc = { version = "0.4", default-features = false, features = ["defmt-log"] }
+embedded-sdmmc = { version = "0.5", default-features = false, features = ["defmt-log"] }
 
 [[bin]]
 name = "neotron-pico-bios"
@@ -69,6 +69,3 @@ 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"
-
-[patch.crates-io]
-rp2040-boot2 = { version = "0.3.0", git = "https://github.com/rp-rs/rp2040-boot2" }

Cargo.toml

@@ -30,22 +30,25 @@ fn main() {
 	println!("cargo:rerun-if-changed=memory.x");
 
 	// Generate a file containing the firmware version
-	let version_output = std::process::Command::new("git")
+	let mut output;
+	if let Ok(version_output) = std::process::Command::new("git")
 		.current_dir(env::var_os("CARGO_MANIFEST_DIR").unwrap())
 		.args(["describe", "--tags", "--dirty"])
 		.output()
-		.expect("running git-describe");
-
-	println!(
-		"Version is {:?}",
-		std::str::from_utf8(&version_output.stdout)
-	);
-	println!("Error is {:?}", std::str::from_utf8(&version_output.stderr));
-	assert!(version_output.status.success());
-
-	// Remove the trailing newline
-	let mut output = version_output.stdout;
-	output.pop();
+	{
+		println!(
+			"Version is {:?}",
+			std::str::from_utf8(&version_output.stdout)
+		);
+		println!("Error is {:?}", std::str::from_utf8(&version_output.stderr));
+		assert!(version_output.status.success());
+
+		// Remove the trailing newline
+		output = version_output.stdout;
+		output.pop();
+	} else {
+		output = String::from(env!("CARGO_PKG_VERSION")).into_bytes();
+	}
 
 	// Add a null
 	output.push(0);