Skip to content

ledmatrix: Update to DVT2 mapping #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 19, 2023
Merged

ledmatrix: Update to DVT2 mapping #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2ca1df
fl16: Add whitespace padding
JohnAZoidberg Sep 18, 2023
12a341a
led-matrix: Make sure it's sorted properly
JohnAZoidberg Sep 18, 2023
09aada8
ledmatrix: Update to DVT2 mapping
JohnAZoidberg Sep 18, 2023
2442093
ledmatrix: Can't detect dip1. Doesn't have external pullup/down
JohnAZoidberg Sep 18, 2023
01d86af
Update to 0.1.7-pre version
JohnAZoidberg Sep 18, 2023
b35084a
ledmatrix: Disable SW9 in DVT2
JohnAZoidberg Sep 18, 2023
70fab05
ledmatrix: Build separate EVT version
JohnAZoidberg Sep 18, 2023
e6543fd
gh-actions: Make sure apt is updated
JohnAZoidberg Sep 18, 2023
5afe451
Bump to v0.1.7 release version
JohnAZoidberg Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/firmware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- run: cargo make --cwd c1minimal
- run: cargo make --cwd ledmatrix build-release
- run: cargo make --cwd ledmatrix build-release-10k
- run: cargo make --cwd ledmatrix build-release-evt
- run: cargo make --cwd b1display build-release
- run: cargo make --cwd c1minimal build-release

Expand All @@ -46,6 +47,7 @@ jobs:
cargo make --cwd b1display uf2
cargo make --cwd c1minimal uf2
cargo make --cwd ledmatrix build-release-10k-uf2
cargo make --cwd ledmatrix build-release-evt-uf2
cargo make --cwd ledmatrix uf2

- name: Convert to bin format
Expand All @@ -64,6 +66,7 @@ jobs:
ledmatrix.bin
ledmatrix.uf2
ledmatrix_10k.uf2
ledmatrix_evt.uf2

- name: Upload b1display files
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -93,6 +96,7 @@ jobs:
- run: cargo install cargo-make

- run: |
sudo apt-get update
sudo apt-get install -y libudev-dev
cargo make clippy --cwd b1display
cargo make clippy --cwd c1minimal
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/traditional-cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ jobs:
- run: cargo install flip-link

- run: cargo build -p ledmatrix
- run: cargo build -p ledmatrix --features 10k
- run: cargo build -p ledmatrix --features 10k,evt
- run: cargo build -p ledmatrix --features evt
- run: cargo build -p b1display
- run: cargo build -p c1minimal

Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ usbd-serial = "0.1.1"
usbd-hid = "0.6.1"
fugit = "0.3.7"
# LED Matrix
is31fl3741 = { git = "https://github.com/FrameworkComputer/is31fl3741-rs", branch = "main" }
is31fl3741 = { git = "https://github.com/FrameworkComputer/is31fl3741-rs", branch = "sw-enablement" }
# B1 Display
st7306 = { git = "https://github.com/FrameworkComputer/st7306-rs", branch = "update-deps" }
embedded-graphics = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion b1display/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "b1display"
version = "0.1.6"
version = "0.1.7"

[dependencies]
cortex-m.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion c1minimal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "c1minimal"
version = "0.1.6"
version = "0.1.7"

[dependencies]
cortex-m.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion fl16-inputmodules/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
edition = "2021"
name = "fl16-inputmodules"
version = "0.1.6"
version = "0.1.7"

[dependencies]
crc = "3.0"
Expand Down
Loading