Added BSC slides and BSC demo.

Had to move existing code down a level to avoid a conflict. Workspaces do not like having multiple incompatible targets.
ferrous-systems · Sep 14, 2023 · 4ccedbf · 4ccedbf
1 parent 3ac2186
commit 4ccedbf
Show file tree

Hide file tree

Showing 22 changed files with 578 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,18 +25,19 @@ jobs:
 
       - name: Build book-and-slides
         run: |
-          ./training-slides/build.sh
+          cd ./training-slides && ./build.sh
 
       - name: Build example code
         run: |
-          ./example-code/build.sh
+          cd ./example-code && ./build.sh
   
       - name: Assemble Artifacts
         run: |
           echo "Making ./rust-training-${{ env.slug }}..."
           mkdir -p ./rust-training-${{ env.slug }}
           mv ./training-slides/slides ./rust-training-${{ env.slug }}/training-slides-presentation
           mv ./training-slides/book ./rust-training-${{ env.slug }}/training-slides-book
+          cp -r ./example-code ./rust-training-${{ env.slug }}
           echo "Compressing ./rust-training-${{ env.slug }}.zip..."
           zip -r ./rust-training-${{ env.slug }}.zip ./rust-training-${{ env.slug }}
 

diff --git a/example-code/build.sh b/example-code/build.sh
@@ -2,9 +2,15 @@
 
 set -euo pipefail
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
 # Check the example code
-cargo build --all --manifest-path ${SCRIPT_DIR}/Cargo.toml
+pushd ./native
+cargo build --all
+popd
 # And the C based example
-make -C ${SCRIPT_DIR}/ffi/use-rust-in-c
+pushd native/ffi/use-rust-in-c
+make
+popd
+# And the nRF52 examples
+pushd ./nrf52/bsp_demo
+cargo build
+popd
diff --git a/example-code/Cargo.lock → example-code/native/Cargo.lock b/example-code/Cargo.lock → example-code/native/Cargo.lock
diff --git a/example-code/Cargo.toml → example-code/native/Cargo.toml b/example-code/Cargo.toml → example-code/native/Cargo.toml
@@ -1,2 +1,3 @@
 [workspace]
 members = ["ffi/use-c-in-rust", "ffi/use-rust-in-c"]
+resolver = "2"
diff --git a/example-code/ffi/use-c-in-rust/Cargo.lock → ...-code/native/ffi/use-c-in-rust/Cargo.lock b/example-code/ffi/use-c-in-rust/Cargo.lock → ...-code/native/ffi/use-c-in-rust/Cargo.lock
diff --git a/example-code/ffi/use-c-in-rust/Cargo.toml → ...-code/native/ffi/use-c-in-rust/Cargo.toml b/example-code/ffi/use-c-in-rust/Cargo.toml → ...-code/native/ffi/use-c-in-rust/Cargo.toml
diff --git a/example-code/ffi/use-c-in-rust/build.rs → ...le-code/native/ffi/use-c-in-rust/build.rs b/example-code/ffi/use-c-in-rust/build.rs → ...le-code/native/ffi/use-c-in-rust/build.rs
diff --git a/...code/ffi/use-c-in-rust/src/cool_library.c → ...tive/ffi/use-c-in-rust/src/cool_library.c b/...code/ffi/use-c-in-rust/src/cool_library.c → ...tive/ffi/use-c-in-rust/src/cool_library.c
diff --git a/example-code/ffi/use-c-in-rust/src/main.rs → ...code/native/ffi/use-c-in-rust/src/main.rs b/example-code/ffi/use-c-in-rust/src/main.rs → ...code/native/ffi/use-c-in-rust/src/main.rs
diff --git a/example-code/ffi/use-rust-in-c/.gitignore → ...-code/native/ffi/use-rust-in-c/.gitignore b/example-code/ffi/use-rust-in-c/.gitignore → ...-code/native/ffi/use-rust-in-c/.gitignore
diff --git a/example-code/ffi/use-rust-in-c/Cargo.lock → ...-code/native/ffi/use-rust-in-c/Cargo.lock b/example-code/ffi/use-rust-in-c/Cargo.lock → ...-code/native/ffi/use-rust-in-c/Cargo.lock
diff --git a/example-code/ffi/use-rust-in-c/Cargo.toml → ...-code/native/ffi/use-rust-in-c/Cargo.toml b/example-code/ffi/use-rust-in-c/Cargo.toml → ...-code/native/ffi/use-rust-in-c/Cargo.toml
diff --git a/example-code/ffi/use-rust-in-c/Makefile → ...le-code/native/ffi/use-rust-in-c/Makefile b/example-code/ffi/use-rust-in-c/Makefile → ...le-code/native/ffi/use-rust-in-c/Makefile
diff --git a/example-code/ffi/use-rust-in-c/example.c → ...e-code/native/ffi/use-rust-in-c/example.c b/example-code/ffi/use-rust-in-c/example.c → ...e-code/native/ffi/use-rust-in-c/example.c
diff --git a/example-code/ffi/use-rust-in-c/example.h → ...e-code/native/ffi/use-rust-in-c/example.h b/example-code/ffi/use-rust-in-c/example.h → ...e-code/native/ffi/use-rust-in-c/example.h
diff --git a/example-code/ffi/use-rust-in-c/src/lib.rs → ...-code/native/ffi/use-rust-in-c/src/lib.rs b/example-code/ffi/use-rust-in-c/src/lib.rs → ...-code/native/ffi/use-rust-in-c/src/lib.rs
diff --git a/example-code/nrf52/bsp_demo/.cargo/config.toml b/example-code/nrf52/bsp_demo/.cargo/config.toml
@@ -0,0 +1,8 @@
+[build]
+target = "thumbv7em-none-eabihf"
+
+[target.thumbv7em-none-eabihf]
+runner = "probe-run --chip nRF52840_xxAA"
+rustflags = [
+  "-C", "link-arg=-Tlink.x",
+]