Skip to content

Commit bb95ba7

Browse files
Merge pull request #76 from FrameworkComputer/dvt2
2 parents 08e9f88 + 5afe451 commit bb95ba7

File tree

13 files changed

+763
-361
lines changed

13 files changed

+763
-361
lines changed

.github/workflows/firmware.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- run: cargo make --cwd c1minimal
3737
- run: cargo make --cwd ledmatrix build-release
3838
- run: cargo make --cwd ledmatrix build-release-10k
39+
- run: cargo make --cwd ledmatrix build-release-evt
3940
- run: cargo make --cwd b1display build-release
4041
- run: cargo make --cwd c1minimal build-release
4142

@@ -46,6 +47,7 @@ jobs:
4647
cargo make --cwd b1display uf2
4748
cargo make --cwd c1minimal uf2
4849
cargo make --cwd ledmatrix build-release-10k-uf2
50+
cargo make --cwd ledmatrix build-release-evt-uf2
4951
cargo make --cwd ledmatrix uf2
5052
5153
- name: Convert to bin format
@@ -64,6 +66,7 @@ jobs:
6466
ledmatrix.bin
6567
ledmatrix.uf2
6668
ledmatrix_10k.uf2
69+
ledmatrix_evt.uf2
6770
6871
- name: Upload b1display files
6972
uses: actions/upload-artifact@v3
@@ -93,6 +96,7 @@ jobs:
9396
- run: cargo install cargo-make
9497

9598
- run: |
99+
sudo apt-get update
96100
sudo apt-get install -y libudev-dev
97101
cargo make clippy --cwd b1display
98102
cargo make clippy --cwd c1minimal

.github/workflows/traditional-cargo.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
- run: cargo install flip-link
3333

3434
- run: cargo build -p ledmatrix
35-
- run: cargo build -p ledmatrix --features 10k
35+
- run: cargo build -p ledmatrix --features 10k,evt
36+
- run: cargo build -p ledmatrix --features evt
3637
- run: cargo build -p b1display
3738
- run: cargo build -p c1minimal
3839

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ usbd-serial = "0.1.1"
3636
usbd-hid = "0.6.1"
3737
fugit = "0.3.7"
3838
# LED Matrix
39-
is31fl3741 = { git = "https://github.com/FrameworkComputer/is31fl3741-rs", branch = "main" }
39+
is31fl3741 = { git = "https://github.com/FrameworkComputer/is31fl3741-rs", branch = "sw-enablement" }
4040
# B1 Display
4141
st7306 = { git = "https://github.com/FrameworkComputer/st7306-rs", branch = "update-deps" }
4242
embedded-graphics = "0.8"

b1display/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
edition = "2021"
33
name = "b1display"
4-
version = "0.1.6"
4+
version = "0.1.7"
55

66
[dependencies]
77
cortex-m.workspace = true

c1minimal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
edition = "2021"
33
name = "c1minimal"
4-
version = "0.1.6"
4+
version = "0.1.7"
55

66
[dependencies]
77
cortex-m.workspace = true

fl16-inputmodules/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
edition = "2021"
33
name = "fl16-inputmodules"
4-
version = "0.1.6"
4+
version = "0.1.7"
55

66
[dependencies]
77
crc = "3.0"

0 commit comments

Comments
 (0)