Merge pull request #32 from FrameworkComputer/remove-ssh-key

Author: JohnAZoidberg

.github/workflows/firmware.yml

@@ -30,10 +30,6 @@ jobs:
     runs-on: [ubuntu-latest] #${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: webfactory/[email protected]
-        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/[email protected]
-        with:
-          ssh-private-key: |
-              ${{ secrets.PRIVKEY_ST7306 }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy

.github/workflows/software.yml

@@ -35,11 +35,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: webfactory/[email protected]
-      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/[email protected]
-      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/[email protected]
-      with:
-        ssh-private-key: |
-            ${{ secrets.PRIVKEY_ST7306 }}
-
     - name: Install dependencies
       run: |
         sudo apt-get update

Cargo.lock

@@ -26,7 +26,7 @@ usbd-serial = "0.1.1"
 usbd-hid = "0.5.1"
 fugit = "0.3.6"
 
-st7306-lcd = { git = "ssh://[email protected]/FrameworkComputer/st7306.git" }
+st7306 = "0.8.2"
 embedded-graphics = "0.7"
 tinybmp = "0.4.0"
 

b1display/Cargo.toml

@@ -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.

b1display/src/main.rs

@@ -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://[email protected]/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" ]

fl16-inputmodules/Cargo.toml

@@ -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;