From 5637ebdb454bf92cc177ce69d9636367604002ff Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 28 Mar 2023 08:00:06 +0800 Subject: [PATCH 1/2] gh-actions: Dependencies are public, remove ssh key Signed-off-by: Daniel Schaefer --- .github/workflows/firmware.yml | 8 -------- .github/workflows/software.yml | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 1260574d..730eaf13 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -30,10 +30,6 @@ jobs: runs-on: [ubuntu-latest] #${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_ST7306 }} - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} @@ -69,10 +65,6 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_ST7306 }} - uses: dtolnay/rust-toolchain@stable with: components: clippy diff --git a/.github/workflows/software.yml b/.github/workflows/software.yml index fec0bef5..5f560997 100644 --- a/.github/workflows/software.yml +++ b/.github/workflows/software.yml @@ -35,11 +35,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_ST7306 }} - - name: Install dependencies run: | sudo apt-get update @@ -66,11 +61,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_ST7306 }} - - name: Setup Rust toolchain run: rustup show @@ -92,11 +82,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_ST7306 }} - - name: Install dependencies run: | sudo apt-get update From 1595ed2f95a261a7812a1d27abb43b52752a0285 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 28 Mar 2023 08:30:39 +0800 Subject: [PATCH 2/2] Use newly published st7306 library Signed-off-by: Daniel Schaefer --- Cargo.lock | 9 +++++---- b1display/Cargo.toml | 2 +- b1display/src/main.rs | 2 +- fl16-inputmodules/Cargo.toml | 4 ++-- fl16-inputmodules/src/control.rs | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a1d6c5b..b209c127 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ dependencies = [ "rp2040-boot2", "rp2040-hal", "rp2040-panic-usb-boot", - "st7306-lcd", + "st7306", "tinybmp", "usb-device", "usbd-hid", @@ -546,7 +546,7 @@ dependencies = [ "rp2040-hal", "rp2040-panic-usb-boot", "smart-leds", - "st7306-lcd", + "st7306", "tinybmp", "usb-device", "usbd-hid", @@ -1474,9 +1474,10 @@ dependencies = [ ] [[package]] -name = "st7306-lcd" +name = "st7306" version = "0.8.2" -source = "git+ssh://git@github.com/FrameworkComputer/st7306.git#b5148a927071421562eafa4a19c75d3849b11daf" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a352a20201ed2a68dfa45e96625b43e990fb8d8d463e4fc2f6751f2d253bfde" dependencies = [ "embedded-graphics", "embedded-hal", diff --git a/b1display/Cargo.toml b/b1display/Cargo.toml index 3e6bb3a6..c543556a 100644 --- a/b1display/Cargo.toml +++ b/b1display/Cargo.toml @@ -26,7 +26,7 @@ usbd-serial = "0.1.1" usbd-hid = "0.5.1" fugit = "0.3.6" -st7306-lcd = { git = "ssh://git@github.com/FrameworkComputer/st7306.git" } +st7306 = "0.8.2" embedded-graphics = "0.7" tinybmp = "0.4.0" diff --git a/b1display/src/main.rs b/b1display/src/main.rs index d789f6bc..de283b9b 100644 --- a/b1display/src/main.rs +++ b/b1display/src/main.rs @@ -18,7 +18,7 @@ use embedded_graphics::pixelcolor::Rgb565; use embedded_graphics::prelude::*; use embedded_graphics::primitives::*; use embedded_hal::blocking::spi; -use st7306_lcd::{FpsConfig, HpmFps, LpmFps, PowerMode, ST7306}; +use st7306::{FpsConfig, HpmFps, LpmFps, PowerMode, ST7306}; // Provide an alias for our BSP so we can switch targets quickly. // Uncomment the BSP you included in Cargo.toml, the rest of the code does not need to change. diff --git a/fl16-inputmodules/Cargo.toml b/fl16-inputmodules/Cargo.toml index be9ed181..9cca3a3f 100644 --- a/fl16-inputmodules/Cargo.toml +++ b/fl16-inputmodules/Cargo.toml @@ -33,7 +33,7 @@ num-traits = { version = "0.2", default-features = false } is31fl3741 = { git = "https://github.com/JohnAZoidberg/is31fl3741", branch = "all-at-once", optional = true } # B1 Display -st7306-lcd = { git = "ssh://git@github.com/FrameworkComputer/st7306.git", optional = true } +st7306 = { version = "0.8.2", optional = true } embedded-graphics = { version = "0.7", optional = true } tinybmp = { version = "0.4.0", optional = true } @@ -44,5 +44,5 @@ ws2812-pio = { version = "0.5.0", optional = true } [features] default = [] ledmatrix = [ "is31fl3741" ] -b1display = [ "st7306-lcd", "embedded-graphics", "tinybmp" ] +b1display = [ "st7306", "embedded-graphics", "tinybmp" ] c1minimal = ["smart-leds", "ws2812-pio" ] diff --git a/fl16-inputmodules/src/control.rs b/fl16-inputmodules/src/control.rs index b08f7fd3..45fda3a5 100644 --- a/fl16-inputmodules/src/control.rs +++ b/fl16-inputmodules/src/control.rs @@ -22,7 +22,7 @@ use embedded_hal::digital::v2::OutputPin; #[cfg(feature = "b1display")] use heapless::String; #[cfg(feature = "b1display")] -use st7306_lcd::ST7306; +use st7306::ST7306; #[cfg(feature = "ledmatrix")] use crate::games::pong;