Merge pull request #6 from Neotron-Compute/add-snake

Add snake

Author: thejpster

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "./samples/input-test/Cargo.toml",
+        "./samples/panic/Cargo.toml",
+        "./samples/hello/Cargo.toml",
+        "./samples/fault/Cargo.toml",
+        "./samples/snake/Cargo.toml",
+        "./Cargo.toml"
+    ]
+}

Cargo.toml

@@ -7,10 +7,15 @@ version = "0.1.0"
 authors = ["Jonathan 'theJPster' Pallant <[email protected]>"]
 
 [dependencies]
-bitflags = "2"
 neotron-ffi = "0.1"
 neotron-api = "0.1"
 
+[target.'cfg(unix)'.dependencies]
+crossterm = "0.26"
+
+[target.'cfg(windows)'.dependencies]
+crossterm = "0.26"
+
 [features]
 # Prints panic info. Costs you about 14K of code.
 fancy-panic = []

samples/.cargo/config.toml

@@ -1,11 +1,11 @@
 [target.thumbv7em-none-eabihf]
-rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld"] # , "-C", "link-arg=--nmagic"]
+rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld", "-C", "link-arg=--nmagic"]
 
 [target.thumbv7em-none-eabi]
-rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld"] # , "-C", "link-arg=--nmagic"]
+rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld", "-C", "link-arg=--nmagic"]
 
 [target.thumbv7m-none-eabi]
-rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld"] # , "-C", "link-arg=--nmagic"]
+rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld", "-C", "link-arg=--nmagic"]
 
 [target.thumbv6m-none-eabi]
-rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld"] # , "-C", "link-arg=--nmagic"]
+rustflags = ["-C", "link-arg=-Tneotron-cortex-m.ld", "-C", "link-arg=--nmagic"]

samples/.gitignore

@@ -1,2 +1,2 @@
-*.bin
-
+target
+release

samples/Cargo.toml

@@ -0,0 +1,12 @@
+[workspace]
+members = [
+    "fault",
+    "hello",
+    "input-test",
+    "snake",
+    "panic",
+]
+
+[profile.release]
+opt-level = "z"
+lto = "fat"

samples/build.sh

@@ -1,11 +1,29 @@
 #!/bin/bash
 
+#
+# Builds all the Neotron SDK sample binaries.
+#
+# Specify the target as the first argument. Defaults to "thumbv6m-none-eabi" if
+# not given.
+#
+# ```console
+# $ ./build.sh thumbv7em-none-eabi
+# $ ls ./release/*.elf
+# ```
+#
+
 set -euo pipefail
 
 TARGET=${1:-thumbv6m-none-eabi}
 
+mkdir -p ./release
+
+echo "Building for host"
+cargo build
+
 echo "Building for ${TARGET}"
-for program in panic hello fault; do
-    ( cd ${program} && cargo build --target=${TARGET} --release )
-    cp ./${program}/target/${TARGET}/release/${program} ${program}.elf
+cargo build --target ${TARGET} --release
+
+for program in panic hello fault input-test snake; do
+    cp ./target/${TARGET}/release/${program} ./release/${program}.elf
 done

samples/fault/.gitignore

@@ -9,10 +9,4 @@ description = "Hello World for Neotron systems"
 [dependencies]
 neotron-sdk = { path = "../.." }
 
-[profile.dev]
-panic = "abort"
-
-[profile.release]
-panic = "unwind"
-opt-level = "z"
-lto = "fat"
+# See workspace for profile settings

samples/fault/Cargo.toml

@@ -1,13 +1,18 @@
-#![no_std]
-#![no_main]
+#![cfg_attr(target_os = "none", no_std)]
+#![cfg_attr(target_os = "none", no_main)]
+
+#[cfg(not(target_os = "none"))]
+fn main() {
+    neotron_sdk::init();
+}
 
 use core::fmt::Write;
 
 #[no_mangle]
 extern "C" fn neotron_main() -> i32 {
     let stdout = neotron_sdk::stdout();
     writeln!(&stdout, "About to fault...\n").unwrap();
-    let bad_address: u32 = 0xDEAD_C0DE;
+    let bad_address: usize = 0xDEAD_C0DE;
     let bad_fn: fn() = unsafe { core::mem::transmute(bad_address) };
     bad_fn();
     0