Skip to content

Commit

Permalink
Merge pull request #52 from FrameworkComputer/v0.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAZoidberg authored Jun 28, 2023
2 parents 216ee9d + 0a4cc4b commit a7398f0
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 15 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/firmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ jobs:
- run: cargo build -p ledmatrix
- run: cargo build -p b1display
- run: cargo build -p c1minimal
# TODO: Also build release versions
#- run: cargo build --all --release
- run: cargo build -p ledmatrix --release
- run: cargo build -p b1display --release
- run: cargo build -p c1minimal --release

- run: |
sudo apt-get update
sudo apt-get install -y libudev-dev
cargo install elf2uf2-rs
elf2uf2-rs target/thumbv6m-none-eabi/debug/b1display b1display.uf2
elf2uf2-rs target/thumbv6m-none-eabi/debug/c1minimal c1minimal.uf2
elf2uf2-rs target/thumbv6m-none-eabi/debug/ledmatrix ledmatrix.uf2
elf2uf2-rs target/thumbv6m-none-eabi/release/b1display b1display.uf2
elf2uf2-rs target/thumbv6m-none-eabi/release/c1minimal c1minimal.uf2
elf2uf2-rs target/thumbv6m-none-eabi/release/ledmatrix ledmatrix.uf2
- name: Upload Linux tool
uses: actions/upload-artifact@v3
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion b1display/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "b1display"
version = "0.1.4"
version = "0.1.5"

[dependencies]
cortex-m = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion c1minimal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "c1minimal"
version = "0.1.4"
version = "0.1.5"

[dependencies]
cortex-m = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion fl16-inputmodules/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "fl16-inputmodules"
version = "0.1.4"
version = "0.1.5"

[dependencies]
cortex-m = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion inputmodule-control/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "inputmodule-control"
version = "0.1.4"
version = "0.1.5"

[dependencies]
clap = { version = "4.3", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion ledmatrix/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "ledmatrix"
version = "0.1.4"
version = "0.1.5"

[dependencies]
cortex-m = "0.7"
Expand Down

0 comments on commit a7398f0

Please sign in to comment.