menu/main: wire up multi-button handling

This commit is contained in:
Puck Meerburg
2026-02-06 17:58:08 +00:00
parent b5fb2372fb
commit 4eb0c6cdd2
2 changed files with 34 additions and 18 deletions

View File

@@ -11,6 +11,7 @@
#include "ble.h"
#include "cdc.h"
#include "wang.h"
#include "platform.h"
int anim_render(uint16_t *fb, int index, int frame);
@@ -25,10 +26,7 @@ enum usb_control_resp bl_handler(enum usb_control_state state) {
}
int btn1_was_pressed = 1;
int btn2_was_pressed = 0;
int btn1_hold = 0;
int btn2_hold = 0;
int button_was_pressed[BUTTON_COUNT] = {0};
int image_index = 0;
@@ -46,11 +44,11 @@ int main_handler(void) {
return 1;
}
if (button_pressed[0] && !btn1_was_pressed) {
if (button_pressed[0] && !button_was_pressed[0]) {
display_brightness = (display_brightness + 1) % 16;
}
if (button_pressed[1] && !btn2_was_pressed) {
if (button_pressed[1] && !button_was_pressed[1]) {
if (flash_header_valid) {
image_index++;
if (!flash_header.widths[image_index]) image_index = 0;
@@ -75,8 +73,9 @@ int main_handler(void) {
display_flip();
}
btn2_was_pressed = button_pressed[1];
btn1_was_pressed = button_pressed[0];
for (int i = 0; i < BUTTON_COUNT; i++) {
button_was_pressed[i] = button_pressed[i];
}
if (!flash_header_valid) return 1;
@@ -124,8 +123,9 @@ int main()
if (cur_handler) {
cur_handler = menu_handler();
if (!cur_handler) {
btn2_was_pressed = button_pressed[1];
btn1_was_pressed = button_pressed[0];
for (int i = 0; i < BUTTON_COUNT; i++) {
button_was_pressed[i] = button_pressed[i];
}
subframe = 99999;
}
} else