From 6bd4c31965bd5007229db8d0a675ac9c96359b16 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Fri, 17 Sep 2021 23:37:43 +0300 Subject: [PATCH] nyx: add info for new touch panels New 6.2" touch panel and a new firmware for 7.0" --- README.md | 2 +- nyx/nyx_gui/frontend/gui_info.c | 10 ++++++++-- nyx/nyx_gui/frontend/gui_tools.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 966f77b..761d0ef 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Custom Graphical Nintendo Switch bootloader, firmware patcher, tools, and many m | Folder/File | Description | | ------------------------ | --------------------------------------------------------------------- | | bootloader | Main folder. | -| \|__ bootlogo.bmp | It is if no `logopath` key is found. User provided. Can be skipped. | +| \|__ bootlogo.bmp | It is used if no `logopath` key is found. User provided. Can be skipped. | | \|__ hekate_ipl.ini | Main bootloader configuration and boot entries in `Launch` menu. | | \|__ nyx.ini | Nyx GUI configuration | | \|__ patches.ini | Add external patches. Can be skipped. A template can be found [here](./res/patches_template.ini) | diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index d866724..8f84fa5 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -590,7 +590,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) case LPDDR4X_IOWA_8GB_SAMSUNG_1Y_Y: strcpy(dram_man, "Samsung 1y Y 8GB"); break; - // case LPDDR4X_AULA_4GB_SAMSUNG_1Y_A: // Unused. + // case LPDDR4X_AULA_8GB_SAMSUNG_1Y_A: // Unused. // strcpy(dram_man, "Samsung 1y A 4GB"); // break; case LPDDR4X_IOWA_4GB_MICRON_1Y_A: @@ -951,6 +951,11 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) if (touch_panel) panel_ic_paired = touch_panel->idx == 0; // NISSHA NFT-K12D. break; + case 0x98000004: // New 6.2" panel? + strcat(txt_buf, "FST2 UNK"); + if (touch_panel) + panel_ic_paired = touch_panel->idx == 0; + break; case 0x001A0300: case 0x32000102: strcat(txt_buf, "4CD 2602"); @@ -972,9 +977,10 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) case 0x32000501: case 0x33000502: case 0x33000503: + case 0x33000510: strcat(txt_buf, "4CD UNKN"); if (touch_panel) - panel_ic_paired = touch_panel->idx == 4; // Unknown Aula 6.2". + panel_ic_paired = touch_panel->idx == 4; // Unknown Aula 7.0". break; default: strcat(txt_buf, "#FF8000 Unknown#"); diff --git a/nyx/nyx_gui/frontend/gui_tools.c b/nyx/nyx_gui/frontend/gui_tools.c index acc4688..7a50fa4 100644 --- a/nyx/nyx_gui/frontend/gui_tools.c +++ b/nyx/nyx_gui/frontend/gui_tools.c @@ -1273,7 +1273,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn) strcat(txt_buf, "#FFDD00 Pkg2 decryption failed!#"); lv_label_set_text(lb_desc, txt_buf); manual_system_maintenance(true); - + if (!res) { strcat(txt_buf, "\npkg2 encrypted dumped to pkg2_encr.bin\n");