Merge pull request #101 from Neotron-Compute/update-video-api

Update Video API

Author: thejpster

.cargo/config.toml

@@ -2,7 +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.
-runner = "probe-rs run --chip RP2040"
+runner = "probe-rs run --chip RP2040 --speed 10000"
 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

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

.github/workflows/clippy.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

.github/workflows/format.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0

.vscode/README.md

@@ -5,7 +5,7 @@
             "type": "probe-rs-debug",
             "request": "launch",
             "name": "Run with probe-rs",
-            "speed": 20000,
+            "speed": 10000,
             "preLaunchTask": "Cargo Build (release)",
             "flashingConfig": {
                 "flashingEnabled": true,

.vscode/extensions.json

@@ -21,7 +21,7 @@ rp2040-hal = { version = "0.9", features = [ "defmt" ] }
 # Cortex-M run-time (or start-up) code
 cortex-m-rt = "0.7"
 # The BIOS to OS API
-neotron-common-bios = "0.11.1"
+neotron-common-bios = "0.12.0"
 # For the RP2040 bootloader
 rp2040-boot2 = "0.3.0"
 # For hardware abstraction traits
@@ -64,7 +64,7 @@ embedded-sdmmc = { version = "0.6", default-features = false, features = [
 tlv320aic23 = "0.1.0"
 
 [build-dependencies]
-neotron-common-bios = "0.11.1"
+neotron-common-bios = "0.12.0"
 vte = "0.11"
 
 [[bin]]
@@ -89,6 +89,4 @@ check-stack = []
 
 [patch.crates-io]
 # Patched to include the WriteIterRead trait on i2c
-rp2040-hal = { git = "https://github.com/rp-rs/rp-hal", rev = "9c17a2d" }
-# Patched to include the WriteIterRead trait on i2c
 shared-bus = { git = "https://github.com/thejpster/shared-bus", rev = "639a2e6" }

.vscode/launch.json

@@ -79,8 +79,8 @@ struct NeotronOutput {
 
 impl NeotronOutput {
 	const DEFAULT_ATTR: Attr = Attr::new(
-		TextForegroundColour::LIGHT_GRAY,
-		TextBackgroundColour::BLACK,
+		TextForegroundColour::LightGray,
+		TextBackgroundColour::Black,
 		false,
 	);
 
@@ -124,54 +124,54 @@ impl vte::Perform for NeotronOutput {
 					}
 					// Background
 					40 => {
-						self.attr.set_bg(TextBackgroundColour::BLACK);
+						self.attr.set_bg(TextBackgroundColour::Black);
 					}
 					41 => {
-						self.attr.set_bg(TextBackgroundColour::RED);
+						self.attr.set_bg(TextBackgroundColour::Red);
 					}
 					42 => {
-						self.attr.set_bg(TextBackgroundColour::GREEN);
+						self.attr.set_bg(TextBackgroundColour::Green);
 					}
 					43 => {
-						self.attr.set_bg(TextBackgroundColour::BROWN);
+						self.attr.set_bg(TextBackgroundColour::Brown);
 					}
 					44 => {
-						self.attr.set_bg(TextBackgroundColour::BLUE);
+						self.attr.set_bg(TextBackgroundColour::Blue);
 					}
 					45 => {
-						self.attr.set_bg(TextBackgroundColour::MAGENTA);
+						self.attr.set_bg(TextBackgroundColour::Magenta);
 					}
 					46 => {
-						self.attr.set_bg(TextBackgroundColour::CYAN);
+						self.attr.set_bg(TextBackgroundColour::Cyan);
 					}
 					47 | 49 => {
 						// Default
-						self.attr.set_bg(TextBackgroundColour::BLACK);
+						self.attr.set_bg(TextBackgroundColour::Black);
 					}
 					// Foreground
 					30 => {
-						self.attr.set_fg(TextForegroundColour::BLACK);
+						self.attr.set_fg(TextForegroundColour::Black);
 					}
 					31 => {
-						self.attr.set_fg(TextForegroundColour::RED);
+						self.attr.set_fg(TextForegroundColour::Red);
 					}
 					32 => {
-						self.attr.set_fg(TextForegroundColour::GREEN);
+						self.attr.set_fg(TextForegroundColour::Green);
 					}
 					33 => {
-						self.attr.set_fg(TextForegroundColour::YELLOW);
+						self.attr.set_fg(TextForegroundColour::Yellow);
 					}
 					34 => {
-						self.attr.set_fg(TextForegroundColour::BLUE);
+						self.attr.set_fg(TextForegroundColour::Blue);
 					}
 					35 => {
-						self.attr.set_fg(TextForegroundColour::MAGENTA);
+						self.attr.set_fg(TextForegroundColour::Magenta);
 					}
 					36 => {
-						self.attr.set_fg(TextForegroundColour::CYAN);
+						self.attr.set_fg(TextForegroundColour::Cyan);
 					}
 					37 | 39 => {
-						self.attr.set_fg(TextForegroundColour::LIGHT_GRAY);
+						self.attr.set_fg(TextForegroundColour::LightGray);
 					}
 					0 => {
 						self.attr = Self::DEFAULT_ATTR;
@@ -184,29 +184,29 @@ impl vte::Perform for NeotronOutput {
 			}
 			if self.bright {
 				match self.attr.fg() {
-					TextForegroundColour::BLACK => {
-						self.attr.set_fg(TextForegroundColour::DARK_GRAY);
+					TextForegroundColour::Black => {
+						self.attr.set_fg(TextForegroundColour::DarkGray);
 					}
-					TextForegroundColour::RED => {
-						self.attr.set_fg(TextForegroundColour::LIGHT_RED);
+					TextForegroundColour::Red => {
+						self.attr.set_fg(TextForegroundColour::LightRed);
 					}
-					TextForegroundColour::GREEN => {
-						self.attr.set_fg(TextForegroundColour::LIGHT_GREEN);
+					TextForegroundColour::Green => {
+						self.attr.set_fg(TextForegroundColour::LightGreen);
 					}
-					TextForegroundColour::BROWN => {
-						self.attr.set_fg(TextForegroundColour::YELLOW);
+					TextForegroundColour::Brown => {
+						self.attr.set_fg(TextForegroundColour::Yellow);
 					}
-					TextForegroundColour::BLUE => {
-						self.attr.set_fg(TextForegroundColour::LIGHT_BLUE);
+					TextForegroundColour::Blue => {
+						self.attr.set_fg(TextForegroundColour::LightBlue);
 					}
-					TextForegroundColour::MAGENTA => {
-						self.attr.set_fg(TextForegroundColour::PINK);
+					TextForegroundColour::Magenta => {
+						self.attr.set_fg(TextForegroundColour::Magenta);
 					}
-					TextForegroundColour::CYAN => {
-						self.attr.set_fg(TextForegroundColour::LIGHT_CYAN);
+					TextForegroundColour::Cyan => {
+						self.attr.set_fg(TextForegroundColour::LightCyan);
 					}
-					TextForegroundColour::LIGHT_GRAY => {
-						self.attr.set_fg(TextForegroundColour::WHITE);
+					TextForegroundColour::LightGray => {
+						self.attr.set_fg(TextForegroundColour::White);
 					}
 					_ => {
 						// Do nothing