diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c index c119a79..5fb368a 100644 --- a/bootloader/hos/hos.c +++ b/bootloader/hos/hos.c @@ -52,10 +52,6 @@ extern bool sd_mount(); //#define DPRINTF(...) gfx_printf(__VA_ARGS__) #define DPRINTF(...) -#define EHPRINTF(text) \ - ({ display_backlight_brightness(h_cfg.backlight, 1000); \ - gfx_con.mute = false; \ - gfx_printf("%k"text"%k\n", 0xFFFF0000, 0xFFCCCCCC); }) #define EHPRINTFARGS(text, args...) \ ({ display_backlight_brightness(h_cfg.backlight, 1000); \ gfx_con.mute = false; \ diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c index 2d74a81..effb989 100644 --- a/nyx/nyx_gui/frontend/gui.c +++ b/nyx/nyx_gui/frontend/gui.c @@ -1012,6 +1012,10 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn) btn_home_transp_pr.body.grad_color = btn_home_transp_pr.body.main_color; btn_home_transp_pr.body.opa = LV_OPA_30; + static lv_style_t btn_label_home_transp; + lv_style_copy(&btn_label_home_transp, lv_theme_get_current()->cont); + btn_label_home_transp.body.opa = LV_OPA_TRANSP; + lv_obj_t *win; bool more_cfg = false; @@ -1059,6 +1063,7 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn) lv_cont_set_layout(boot_entry_lbl_cont, LV_LAYOUT_CENTER); lv_obj_set_size(boot_entry_lbl_cont, 238, 20); lv_obj_set_pos(boot_entry_lbl_cont, launch_button_pos[0].lbl_x, launch_button_pos[0].lbl_y); + lv_obj_set_style(boot_entry_lbl_cont, &btn_label_home_transp); // Create the rest of the buttons. for (u32 btn_idx = 2; btn_idx < 16; btn_idx += 2) @@ -1148,10 +1153,10 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn) lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, 0); // Set autoboot index. - ext = lv_obj_get_ext_attr(launch_ctxt[x]); - ext->idx = i; ext = lv_obj_get_ext_attr(btn); ext->idx = i; + ext = lv_obj_get_ext_attr(launch_ctxt[x]); // Redundancy. + ext->idx = i; // Set action. if (!more_cfg) @@ -1589,7 +1594,7 @@ static void _nyx_main_menu(lv_theme_t * th) if (nyx_str->cfg & NYX_CFG_DUMP) { nyx_str->cfg &= ~(NYX_CFG_DUMP); - lv_task_t *task_run_dump = lv_task_create(sept_run_dump, 0, LV_TASK_PRIO_MID, NULL); + lv_task_t *task_run_dump = lv_task_create(sept_run_dump, LV_TASK_ONESHOT, LV_TASK_PRIO_MID, NULL); lv_task_once(task_run_dump); } } diff --git a/nyx/nyx_gui/input/touch.c b/nyx/nyx_gui/input/touch.c index 5d2d22e..2e0f608 100644 --- a/nyx/nyx_gui/input/touch.c +++ b/nyx/nyx_gui/input/touch.c @@ -137,7 +137,7 @@ touch_info touch_get_info() int touch_power_on() { // Configure touchscreen GPIO. - PINMUX_AUX(PINMUX_AUX_DAP4_SCLK) = PINMUX_PULL_DOWN | 3; + PINMUX_AUX(PINMUX_AUX_DAP4_SCLK) = PINMUX_PULL_DOWN | 1; gpio_config(GPIO_PORT_J, GPIO_PIN_7, GPIO_MODE_GPIO); gpio_output_enable(GPIO_PORT_J, GPIO_PIN_7, GPIO_OUTPUT_ENABLE); gpio_write(GPIO_PORT_J, GPIO_PIN_7, GPIO_HIGH);