Merge pull request #55 from Neotron-Compute/add-ansi-parser

Add ansi parser

Author: thejpster

.github/workflows/rust.yml

@@ -14,6 +14,9 @@ jobs:
       - name: Check Syntax
         run: |
           cargo check
+      - name: Test
+        run: |
+          cargo test --lib
       - name: Install Targets and Tools
         run: |
           rustup target add thumbv7em-none-eabi
@@ -22,7 +25,8 @@ jobs:
           rustup component add llvm-tools-preview
           cargo install cargo-binutils
       - name: Build
-        run: ./build.sh --verbose
+        run: |
+          ./build.sh --verbose
       - name: Upload files to Release
         if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1

Cargo.lock

@@ -34,14 +34,14 @@ required-features = ["native-log"]
 lto = true
 debug = true
 codegen-units = 1
-opt-level = "s"
+opt-level = "z"
 panic = "abort"
 
 [profile.dev]
 panic = "abort"
 
 [dependencies]
-neotron-common-bios = "0.9"
+neotron-common-bios = "0.10"
 pc-keyboard = "0.7"
 r0 = "1.0"
 postcard = "1.0"
@@ -51,6 +51,7 @@ chrono = { version = "0.4", default-features = false }
 embedded-sdmmc = { version = "0.5", default-features = false }
 neotron-api = "0.1"
 neotron-loader = "0.1"
+vte = { git = "https://github.com/neotron-compute/vte", branch="limit-osc-raw-size" }
 
 [features]
 lib-mode = []

Cargo.toml

@@ -1,6 +1,6 @@
 //! Block Device related commands for Neotron OS
 
-use crate::{bios, print, println, Ctx, API};
+use crate::{bios, osprint, osprintln, Ctx, API};
 
 pub static LSBLK_ITEM: menu::Item<Ctx> = menu::Item {
     item_type: menu::ItemType::Callback {
@@ -34,7 +34,7 @@ fn lsblk(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:
     let api = API.get();
     let mut found = false;
 
-    println!("Block Devices:");
+    osprintln!("Block Devices:");
     for dev_idx in 0..=255u8 {
         if let bios::FfiOption::Some(device_info) = (api.block_dev_get_info)(dev_idx) {
             let (bsize, bunits, dsize, dunits) =
@@ -48,12 +48,12 @@ fn lsblk(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:
                         (10 * x / (1024 * 1024 * 1024), "GiB", x / 100_000_000, "GB")
                     }
                 };
-            println!("Device {}:", dev_idx);
-            println!("          Name: {}", device_info.name);
-            println!("          Type: {:?}", device_info.device_type);
-            println!("    Block size: {}", device_info.block_size);
-            println!("    Num Blocks: {}", device_info.num_blocks);
-            println!(
+            osprintln!("Device {}:", dev_idx);
+            osprintln!("          Name: {}", device_info.name);
+            osprintln!("          Type: {:?}", device_info.device_type);
+            osprintln!("    Block size: {}", device_info.block_size);
+            osprintln!("    Num Blocks: {}", device_info.num_blocks);
+            osprintln!(
                 "     Card Size: {}.{} {} ({}.{} {})",
                 bsize / 10,
                 bsize % 10,
@@ -62,30 +62,30 @@ fn lsblk(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:
                 dsize % 10,
                 dunits
             );
-            println!("     Ejectable: {}", device_info.ejectable);
-            println!("     Removable: {}", device_info.removable);
-            println!(" Media Present: {}", device_info.media_present);
-            println!("     Read Only: {}", device_info.read_only);
+            osprintln!("     Ejectable: {}", device_info.ejectable);
+            osprintln!("     Removable: {}", device_info.removable);
+            osprintln!(" Media Present: {}", device_info.media_present);
+            osprintln!("     Read Only: {}", device_info.read_only);
             found = true;
         }
     }
     if !found {
-        println!("  None");
+        osprintln!("  None");
     }
 }
 
 /// Called when the "read_block" command is executed.
 fn read_block(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], _ctx: &mut Ctx) {
     let api = API.get();
     let Ok(dev_idx) = args[0].parse::<u8>() else {
-        println!("Couldn't parse {:?}", args[0]);
+        osprintln!("Couldn't parse {:?}", args[0]);
         return;
     };
     let Ok(block_idx) = args[1].parse::<u64>() else {
-        println!("Couldn't parse {:?}", args[1]);
+        osprintln!("Couldn't parse {:?}", args[1]);
         return;
     };
-    println!("Reading block {}:", block_idx);
+    osprintln!("Reading block {}:", block_idx);
     let mut buffer = [0u8; 512];
     match (api.block_read)(
         dev_idx,
@@ -97,16 +97,16 @@ fn read_block(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], _
             // Carry on
             let mut count = 0;
             for chunk in buffer.chunks(32) {
-                print!("{:03x}: ", count);
+                osprint!("{:03x}: ", count);
                 for b in chunk {
-                    print!("{:02x}", *b);
+                    osprint!("{:02x}", *b);
                 }
                 count += chunk.len();
-                println!();
+                osprintln!();
             }
         }
         bios::ApiResult::Err(e) => {
-            println!("Failed to read: {:?}", e);
+            osprintln!("Failed to read: {:?}", e);
         }
     }
 }