diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf44efe..be28486 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,16 +6,9 @@ jobs: build: name: Build UEFI executable runs-on: ubuntu-24.04 - env: - CARGO_NET_GIT_FETCH_WITH_CLI: true steps: - uses: actions/checkout@v6 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_FRAMEWORK_SYSTEM_UEFI_INPUTMODULES }} - - name: Setup Rust toolchain run: rustup show @@ -34,19 +27,12 @@ jobs: lints: name: Lints runs-on: ubuntu-24.04 - env: - CARGO_NET_GIT_FETCH_WITH_CLI: true steps: - uses: actions/checkout@v6 - name: Setup Rust toolchain run: rustup show - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: | - ${{ secrets.PRIVKEY_FRAMEWORK_SYSTEM_UEFI_INPUTMODULES }} - - name: Run cargo fmt run: cargo fmt --all -- --check diff --git a/Cargo.lock b/Cargo.lock index 6f534b4..2f3e8c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -381,7 +381,7 @@ dependencies = [ [[package]] name = "inputmodules" -version = "0.4.7" +version = "0.4.8" dependencies = [ "built", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index 2f8e62a..7d2f145 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "inputmodules" -version = "0.4.7" +version = "0.4.8" edition = "2021" rust-version = "1.61" build = "build.rs" diff --git a/SUNFLOWER.README.md b/SUNFLOWER.README.md index fb4cd4e..edfafa5 100644 --- a/SUNFLOWER.README.md +++ b/SUNFLOWER.README.md @@ -166,9 +166,19 @@ Presence/Status detection ## Release Notes +### Version 0.4.8 + +- Unsigned binary SHA256: TBD +- Authenticode SHA256: TBD +- Unsigned Size: TBDKB +- Changes + - Move error message box up a bit to avoid it being cut off + ### Version 0.4.7 -- File size: ???K +- Unsigned binary SHA256: 7ca4fe16046442d9a8fe9210fc4c824e804557d85fe1fb7afe0f408fb7bd3f2b +- Authenticode SHA256: 9b532c0dbcd5c9a766f7d386d8b2180d36d173e3a1d506c6a00e95dd1ae75558 +- Unsigned Size: 401KB - Changes - Skip resolution update if already native - Add current resolution to ? debug info diff --git a/src/drawing_12in.rs b/src/drawing_12in.rs index 20b66a4..ce60f5c 100644 --- a/src/drawing_12in.rs +++ b/src/drawing_12in.rs @@ -35,7 +35,7 @@ pub const BACKGROUND_COLOR: Rgb888 = Rgb888::new(0xFF, 0xFF, 0xFF); //0xF3, 0xF2 pub const BLACK_BAR: Rgb888 = Rgb888::new(0x33, 0x33, 0x33); pub const WARN_X: i32 = 50 + WIDTH_I32 / 2; -pub const WARN_Y: i32 = HEIGHT_I32 - 250; +pub const WARN_Y: i32 = HEIGHT_I32 - 275; #[derive(Default)] pub struct StateBitmaps { diff --git a/src/state_machine_12in.rs b/src/state_machine_12in.rs index 0c62b1e..0ac4002 100644 --- a/src/state_machine_12in.rs +++ b/src/state_machine_12in.rs @@ -324,7 +324,7 @@ pub fn start( // Detect short press of power button // Short press (or ESC) will exit and boot (skip all further checks) - let short_press = (!button_pressed && state.prev_pressed && long_press == 1) + let short_press = (!button_pressed && state.prev_pressed) || state.keypress == Some(Key::Special(ScanCode::ESCAPE)); if let (true, _) = (short_press, state.frame) { // Just exit and continue