From d6026c38ff1317e1f993d01c51dee544ba1c8d13 Mon Sep 17 00:00:00 2001 From: true Date: Fri, 25 Oct 2024 23:15:08 -0700 Subject: [PATCH] update menus --- nametag8_CH592/user/ui/menu_base.c | 10 +++++----- nametag8_CH592/user/ui/menu_entry_3.c | 4 ++-- nametag8_CH592/user/ui/menu_entry_6.c | 10 +++++++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/nametag8_CH592/user/ui/menu_base.c b/nametag8_CH592/user/ui/menu_base.c index c3cae35..ab94f71 100644 --- a/nametag8_CH592/user/ui/menu_base.c +++ b/nametag8_CH592/user/ui/menu_base.c @@ -114,8 +114,8 @@ void menu_btn_use_std() btn[0].cb_push = &menu_btn_next; btn[0].cb_hold = &menu_btn_next; btn[0].cb_release = 0; - btn[0].hold = 300 / HOLD_PERIOD; - btn[0].repeat = 150 / HOLD_PERIOD; + btn[0].hold = 400 / HOLD_PERIOD; + btn[0].repeat = 180 / HOLD_PERIOD; btn[1].cb_push = &menu_btn_exit; btn[1].cb_hold = 0; @@ -132,8 +132,8 @@ void menu_btn_use_std() btn[3].cb_push = &menu_btn_prev; btn[3].cb_hold = &menu_btn_prev; btn[3].cb_release = 0; - btn[3].hold = 300 / HOLD_PERIOD; - btn[3].repeat = 150 / HOLD_PERIOD; + btn[3].hold = btn[0].hold; + btn[3].repeat = btn[0].repeat; btn_commit_hold(); } @@ -142,7 +142,7 @@ void menu_btn_use_none() { uint8_t i; - for (i = 0; i < BTN_COUNT; i++) { + for (i = 0; i < MENU_BTN_COUNT; i++) { btn[i].cb_push = &menu_btn_enter; btn[i].hold = 0; btn[i].repeat = 0; diff --git a/nametag8_CH592/user/ui/menu_entry_3.c b/nametag8_CH592/user/ui/menu_entry_3.c index 7913c90..637dfb4 100644 --- a/nametag8_CH592/user/ui/menu_entry_3.c +++ b/nametag8_CH592/user/ui/menu_entry_3.c @@ -287,8 +287,8 @@ void snek_btn_use() btn[0].cb_push = &snek_btn_prev; btn[0].cb_hold = &snek_btn_prev; btn[0].cb_release = 0; - btn[0].hold = 200 / HOLD_PERIOD; - btn[0].repeat = 40 / HOLD_PERIOD; + btn[0].hold = 300 / HOLD_PERIOD; + btn[0].repeat = 80 / HOLD_PERIOD; btn[1].cb_push = &snek_btn_exit; btn[1].cb_hold = 0; diff --git a/nametag8_CH592/user/ui/menu_entry_6.c b/nametag8_CH592/user/ui/menu_entry_6.c index fa05b4d..59c0378 100644 --- a/nametag8_CH592/user/ui/menu_entry_6.c +++ b/nametag8_CH592/user/ui/menu_entry_6.c @@ -178,12 +178,16 @@ void menu_6_disp(uint8_t idx) case 3: { ssd1306fb_set_cursor(54, 4); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "LED", 1); - ssd1306fb_set_cursor(54, 15); - ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "9-12", 1); + ssd1306fb_set_cursor(53, 15); + ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "9", 1); + ssd1306fb_set_cursor(58, 15); + ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "-", 1); + ssd1306fb_set_cursor(63, 15); + ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "12", 1); for (i = 0; i < 4; i++) { ssd1306fb_set_cursor(led_pos[i][0], led_pos[i][1]); - sprintf(txt, "R%d h%03X", i + 5, hsv_out[rgb_map[i + 8]].h); + sprintf(txt, "R%1X h%03X", i + 9, hsv_out[rgb_map[i + 8]].h); ssd1306fb_draw_str(font_Dialog_plain_8, txt, 1); sprintf(txt, "s%02X v%02X", hsv_out[rgb_map[i + 8]].s, hsv_out[rgb_map[i + 8]].v); oled.cursor_x = led_pos[i][0];