From b273165a0c346b00665256fa5a818b697b9ac168 Mon Sep 17 00:00:00 2001 From: zxkmm Date: Sat, 14 Mar 2026 00:51:15 +0800 Subject: [PATCH] fix warning and ub (#3089) --- firmware/application/ui/ui_btngrid.cpp | 4 ++-- .../boards/PORTAPACK_APPLICATION/fpga_bridge.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/application/ui/ui_btngrid.cpp b/firmware/application/ui/ui_btngrid.cpp index 0fec36e8b..4dba58a54 100644 --- a/firmware/application/ui/ui_btngrid.cpp +++ b/firmware/application/ui/ui_btngrid.cpp @@ -294,8 +294,8 @@ bool BtnGridView::set_highlighted(int32_t new_value, bool force_update) { } // Normalize offset to show maximum items when count decreased - if (offset + displayed_max > item_count && item_count > 0) { - if (item_count >= displayed_max) { + if (item_count > 0 && offset + displayed_max > static_cast(item_count)) { + if (static_cast(item_count) >= displayed_max) { offset = item_count - displayed_max; } else { offset = 0; diff --git a/firmware/chibios-portapack/boards/PORTAPACK_APPLICATION/fpga_bridge.c b/firmware/chibios-portapack/boards/PORTAPACK_APPLICATION/fpga_bridge.c index b64e0dacd..d11c2ee40 100644 --- a/firmware/chibios-portapack/boards/PORTAPACK_APPLICATION/fpga_bridge.c +++ b/firmware/chibios-portapack/boards/PORTAPACK_APPLICATION/fpga_bridge.c @@ -342,7 +342,7 @@ // ============================================================================ uint8_t fpga_register_read(uint8_t reg) { - if (reg == 0 || reg > 5) return; + if (reg == 0 || reg > 5) return 0xFF; ssp1_set_mode_ice40(); uint8_t val = fpga_spi_read(reg);