From 65b2040cdf9799b8f29acb0c89f900e0551a693f Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 30 Mar 2026 23:59:31 +0800 Subject: [PATCH] fix bootloader regressions --- bao1x-boot/boot1/src/main.rs | 6 +++--- bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bao1x-boot/boot1/src/main.rs b/bao1x-boot/boot1/src/main.rs index fba0cd919..706684cb2 100644 --- a/bao1x-boot/boot1/src/main.rs +++ b/bao1x-boot/boot1/src/main.rs @@ -219,10 +219,10 @@ pub unsafe extern "C" fn rust_entry() -> ! { // needed after reset for the display to initialize if let Some(ref mut sh1107) = oled { // show the boot logo - sh1107.init(); + sh1107.init().ok(); delay(100); sh1107.blit_screen(&ux_api::bitmaps::baochip128x128::BITMAP); - sh1107.draw(); + sh1107.draw().ok(); delay(150); } else { delay(250); @@ -450,5 +450,5 @@ pub fn marquee(sh1107: &mut Oled128x128, msg: &str) { bao1x_hal::sh1107::Mono::White.into(), bao1x_hal::sh1107::Mono::Black.into(), ); - sh1107.draw(); + sh1107.draw().ok(); } diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs index 8b1d378bd..5d92be8a7 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs @@ -364,6 +364,7 @@ pub fn usb_ep1_bulk_out_complete( None, ), false, + ((100_000_000 / 2) / 2_000_000) as u8, ), &iox, )