Merge pull request #76 from Neotron-Compute/main

Backport v0.6.0 from main

Author: thejpster

.github/workflows/rust.yml

@@ -11,22 +11,40 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+ 
       - name: Check Syntax
         run: |
           cargo check
+ 
       - name: Test
         run: |
           cargo test --lib
+
       - name: Install Targets and Tools
         run: |
           rustup target add thumbv7em-none-eabi
           rustup target add thumbv7m-none-eabi
           rustup target add thumbv6m-none-eabi
           rustup component add llvm-tools-preview
-          cargo install cargo-binutils
+  
+      - name: Install tools
+        uses: taiki-e/install-action@v2
+        with:
+          tool: [email protected]
+
       - name: Build
         run: |
           ./build.sh --verbose
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        if: ${{success()}}
+        with:
+          name: Artifacts
+          if-no-files-found: error
+          path: |
+            ./release/
+
       - name: Upload files to Release
         if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1

CHANGELOG.md

@@ -2,60 +2,67 @@
 
 ## Unreleased changes
 
+* None
+
+## v0.6.0  (2023-10-08, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.6.0))
+
 * Can set/set video mode
 * Stores video mode as part of config
 * Removed demo commands (they should be applications)
 * Added raw PCM sound playback
 * Added mixer command
-* Switch to neotron-common-bios 0.11.1
+* Switch to [`neotron-common-bios`] 0.11.1
 
-## v0.5.0
+## v0.5.0  (2023-07-21, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.5.0))
 
-* Switch to neotron-common-bios 0.11
+* Switch to [`neotron-common-bios`] 0.11
 * Added "Shutdown" command
 * Added ANSI decoder for colour changes (SGI) and cursor position support
 * Added 'standard input' support for applications
 * Use new compare-and-swap BIOS API to implement mutexes, instead of `static mut`
 * OS now requires 256K Flash space
 
-## v0.4.0
+## v0.4.0  (2023-06-25, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.4.0))
 
 * The `load` command now takes ELF binaries, not raw binaries.
 * Neotron OS can now be used as a dependency within an application, if desired.
 
-## v0.3.3
+## v0.3.3  (2023-05-22, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.3.3))
 
 * Add `dir` command
 * Change `load` command to load from disk
 * Repository includes `Cargo.lock` file
 * Update to `postcard` 1.0
 * Fix `readblk` help text, and print 32 bytes per line
 
-## v0.3.2
+## v0.3.2  (2023-05-05, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.3.2))
 
 * Add `date` command.
 * Add `lsblk` and `blkread` commands.
 * Renamed `bioshw` to `lshw`
 
-## v0.3.1
+## v0.3.1  (2023-03-09, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.3.1))
 
 * Add `hexdump`, `load` and `run` commands.
 * Set colour attributes correctly (White on Black only currently)
 
-## v0.3.0
+## v0.3.0  (2023-02-12, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.3.0))
 
-* Updated to Neotron Common BIOS v0.8.0
-* Use pc-keyboard for decoding HID events
+* Updated to [`neotron-common-bios`] v0.8.0
+* Use [`pc-keyboard`] for decoding HID events
 * Fix Windows library build
 * Added 'kbtest' command
 * Added 'lshw' command
 * Added 'config' command
 * Uses BIOS to store/load OS configuration
 
-## v0.2.0
+[`neotron-common-bios`]: https://crates.io/crates/neotron-common-bios
+[`pc-keyboard`]: https://crates.io/crates/pc-keyboard
+
+## v0.2.0  (2023-01-07, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.2.0))
 
 Adds HID support and basic shell, with 'mem' and 'fill' commands.
 
-## v0.1.0
+## v0.1.0  (2022-03-18, [Github Release](https://github.com/neotron-compute/neotron-os/releases/tag/v0.1.0))
 
 First version.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "neotron-os"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
     "Jonathan 'theJPster' Pallant <[email protected]>",
     "The Neotron Developers"

Cargo.toml

@@ -13,7 +13,7 @@ This OS is a work in progress. We intend to support:
 * [x] Running built-in commands from a shell
 * [x] Executing applications from RAM
   * [x] Applications can print to stdout
-  * [ ] Applications can read from stdin
+  * [x] Applications can read from stdin
   * [ ] Applications can open/close/read/write files
 * [x] MBR/FAT32 formatted block devices
   * [x] Read blocks
@@ -22,9 +22,9 @@ This OS is a work in progress. We intend to support:
   * [ ] Delete files
   * [ ] Change directory
 * [x] Load ELF binaries from disk
-* [ ] Changing text modes
+* [x] Changing text modes
 * [ ] Basic networking
-* [ ] Music playback
+* [x] Music playback
 * [ ] Various keyboard layouts
 * [ ] Ethernet / WiFi networking
 * [ ] Built-in scripting language

README.md

@@ -13,7 +13,7 @@ for TARGET_ARCH in thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi; do
     echo "BINARY is ${BINARY}"
     cargo build $* --release --target=${TARGET_ARCH} --bin ${BINARY}
     # objcopy would do the build for us first, but it doesn't have good build output
-    cargo objcopy $* --release --target=${TARGET_ARCH} --bin ${BINARY} -- -O binary ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
+    rust-objcopy -O binary ./target/${TARGET_ARCH}/release/${BINARY} ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
     # Keep the ELF file too (for debugging)
     cp ./target/${TARGET_ARCH}/release/${BINARY} ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.elf
   done