Skip to content

Commit cd3f104

Browse files
Merge pull request #1 from FrameworkComputer/sunflower-move-up
laptop12: Move error message box up a bit
2 parents 27ef35f + 0921c9e commit cd3f104

6 files changed

Lines changed: 15 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,9 @@ jobs:
66
build:
77
name: Build UEFI executable
88
runs-on: ubuntu-24.04
9-
env:
10-
CARGO_NET_GIT_FETCH_WITH_CLI: true
119
steps:
1210
- uses: actions/checkout@v6
1311

14-
- uses: webfactory/ssh-agent@v0.7.0
15-
with:
16-
ssh-private-key: |
17-
${{ secrets.PRIVKEY_FRAMEWORK_SYSTEM_UEFI_INPUTMODULES }}
18-
1912
- name: Setup Rust toolchain
2013
run: rustup show
2114

@@ -34,19 +27,12 @@ jobs:
3427
lints:
3528
name: Lints
3629
runs-on: ubuntu-24.04
37-
env:
38-
CARGO_NET_GIT_FETCH_WITH_CLI: true
3930
steps:
4031
- uses: actions/checkout@v6
4132

4233
- name: Setup Rust toolchain
4334
run: rustup show
4435

45-
- uses: webfactory/ssh-agent@v0.7.0
46-
with:
47-
ssh-private-key: |
48-
${{ secrets.PRIVKEY_FRAMEWORK_SYSTEM_UEFI_INPUTMODULES }}
49-
5036
- name: Run cargo fmt
5137
run: cargo fmt --all -- --check
5238

Cargo.lock

Lines changed: 1 addition & 1 deletion
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
@@ -1,6 +1,6 @@
11
[package]
22
name = "inputmodules"
3-
version = "0.4.7"
3+
version = "0.4.8"
44
edition = "2021"
55
rust-version = "1.61"
66
build = "build.rs"

SUNFLOWER.README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,19 @@ Presence/Status detection
166166

167167
## Release Notes
168168

169+
### Version 0.4.8
170+
171+
- Unsigned binary SHA256: TBD
172+
- Authenticode SHA256: TBD
173+
- Unsigned Size: TBDKB
174+
- Changes
175+
- Move error message box up a bit to avoid it being cut off
176+
169177
### Version 0.4.7
170178

171-
- File size: ???K
179+
- Unsigned binary SHA256: 7ca4fe16046442d9a8fe9210fc4c824e804557d85fe1fb7afe0f408fb7bd3f2b
180+
- Authenticode SHA256: 9b532c0dbcd5c9a766f7d386d8b2180d36d173e3a1d506c6a00e95dd1ae75558
181+
- Unsigned Size: 401KB
172182
- Changes
173183
- Skip resolution update if already native
174184
- Add current resolution to ? debug info

src/drawing_12in.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub const BACKGROUND_COLOR: Rgb888 = Rgb888::new(0xFF, 0xFF, 0xFF); //0xF3, 0xF2
3535
pub const BLACK_BAR: Rgb888 = Rgb888::new(0x33, 0x33, 0x33);
3636

3737
pub const WARN_X: i32 = 50 + WIDTH_I32 / 2;
38-
pub const WARN_Y: i32 = HEIGHT_I32 - 250;
38+
pub const WARN_Y: i32 = HEIGHT_I32 - 275;
3939

4040
#[derive(Default)]
4141
pub struct StateBitmaps {

src/state_machine_12in.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ pub fn start(
324324

325325
// Detect short press of power button
326326
// Short press (or ESC) will exit and boot (skip all further checks)
327-
let short_press = (!button_pressed && state.prev_pressed && long_press == 1)
327+
let short_press = (!button_pressed && state.prev_pressed)
328328
|| state.keypress == Some(Key::Special(ScanCode::ESCAPE));
329329
if let (true, _) = (short_press, state.frame) {
330330
// Just exit and continue

0 commit comments

Comments
 (0)