nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 19:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 6fc1fea1b2 into 3250b2e32a

Browse source
This commit is contained in:
Souldbminer 2024-12-15 11:29:56 +05:30 committed by GitHub
commit 5423fa0f07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 74 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
nyx/nyx_gui/frontend/gui_info.c
View file

@ -249,7 +249,7 @@ static lv_res_t _create_mbox_cal0(lv_obj_t *btn)
// Check result. Don't error if hash doesn't match. // Check result. Don't error if hash doesn't match.
if (cal0_res == 1) if (cal0_res == 1)
{ {
lv_label_set_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); lv_label_set_text(lb_desc, "#FFDD00 Failed to init the eMMC!#");
goto out; goto out;
} }
@ -424,7 +424,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
sku = "Aula - Fric"; sku = "Aula - Fric";
break; break;
default: default:
sku = "#FF8000 Unknown#"; sku = "#FF8000 Unknown. This should not happen#";
break; break;
} }
@ -450,7 +450,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
strcpy(dram_man, "Samsung K4FBE3D4HM-MGXX 8GB"); strcpy(dram_man, "Samsung K4FBE3D4HM-MGXX 8GB");
break; break;
default: default:
strcpy(dram_man, "#FF8000 Unknown#"); strcpy(dram_man, "#FF8000 Unknown. This should not happen#");
break; break;
} }
} }
@ -514,7 +514,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
break; break;
default: default:
strcpy(dram_man, "#FF8000 Contact me!#"); strcpy(dram_man, "#FF8000 Open an issue on GitHub#");
break; break;
} }
} }
@ -530,22 +530,22 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
switch (burnt_fuses_hos) switch (burnt_fuses_hos)
{ {
case 0: case 0:
strcpy(fuses_hos_version, "#96FF00 Golden sample#"); strcpy(fuses_hos_version, "#96FF00 Rare Sample Firmware#");
break; break;
case 1: case 1:
strcpy(fuses_hos_version, "1.0.0"); strcpy(fuses_hos_version, "1.0.0 - Exploitable");
break; break;
case 2: case 2:
strcpy(fuses_hos_version, "2.0.0 - 2.3.0"); strcpy(fuses_hos_version, "2.0.0 - 2.3.0 - Exploitable");
break; break;
case 3: case 3:
strcpy(fuses_hos_version, "3.0.0"); strcpy(fuses_hos_version, "3.0.0 - Exploitable");
break; break;
case 4: case 4:
strcpy(fuses_hos_version, "3.0.1 - 3.0.2"); strcpy(fuses_hos_version, "3.0.1 - 3.0.2 - Exploitable");
break; break;
case 5: case 5:
strcpy(fuses_hos_version, "4.0.0 - 4.1.0"); strcpy(fuses_hos_version, "4.0.0 - 4.1.0 - Exploitable");
break; break;
case 6: case 6:
strcpy(fuses_hos_version, "5.0.0 - 5.1.0"); strcpy(fuses_hos_version, "5.0.0 - 5.1.0");
@ -593,10 +593,10 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
strcpy(fuses_hos_version, "19.0.0+"); strcpy(fuses_hos_version, "19.0.0+");
break; break;
case 255: case 255:
strcpy(fuses_hos_version, "#FFD000 Overburnt#"); strcpy(fuses_hos_version, "#FFD000 Fuses overburnt#");
break; break;
default: default:
strcpy(fuses_hos_version, "#FF8000 Unknown#"); strcpy(fuses_hos_version, "#FF8000 Unknown. This should not happen#");
break; break;
} }
@ -732,7 +732,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
strcat(txt_buf, "Micron"); strcat(txt_buf, "Micron");
break; break;
default: default:
s_printf(txt_buf + strlen(txt_buf), "#FF8000 Unknown# (%d)", ram_vendor.chip1.rank0_ch0); s_printf(txt_buf + strlen(txt_buf), "#FF8000 Unknown. This should not happen# (%d)", ram_vendor.chip1.rank0_ch0);
break; break;
} }
s_printf(txt_buf + strlen(txt_buf), "\n#FF8000 Rev ID:# %X.%02X #FF8000 |# %X.%02X\n#FF8000 Density:# %d", s_printf(txt_buf + strlen(txt_buf), "\n#FF8000 Rev ID:# %X.%02X #FF8000 |# %X.%02X\n#FF8000 Density:# %d",
@ -740,19 +740,19 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
switch ((ram_density.chip0.rank0_ch0 & 0x3C) >> 2) switch ((ram_density.chip0.rank0_ch0 & 0x3C) >> 2)
{ {
case 2: case 2:
strcat(txt_buf, " x 512MB"); strcat(txt_buf, " x 512MB. This should not happen");
break; break;
case 3: case 3:
strcat(txt_buf, " x 768MB"); strcat(txt_buf, " x 768MB. This should not happen");
break; break;
case 4: case 4:
strcat(txt_buf, " x 1GB"); strcat(txt_buf, " x 1GB");
break; break;
case 5: case 5:
strcat(txt_buf, " x 1.5GB"); strcat(txt_buf, " x 1.5GB. This should not happen");
break; break;
case 6: case 6:
strcat(txt_buf, " x 2GB"); strcat(txt_buf, " x 2GB. This should not happen");
break; break;
default: default:
s_printf(txt_buf + strlen(txt_buf), " x Unk (%d)", (ram_density.chip0.rank0_ch0 & 0x3C) >> 2); s_printf(txt_buf + strlen(txt_buf), " x Unk (%d)", (ram_density.chip0.rank0_ch0 & 0x3C) >> 2);
@ -762,19 +762,19 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
switch ((ram_density.chip1.rank0_ch0 & 0x3C) >> 2) switch ((ram_density.chip1.rank0_ch0 & 0x3C) >> 2)
{ {
case 2: case 2:
strcat(txt_buf, " x 512MB"); strcat(txt_buf, " x 512MB. This should not happen");
break; break;
case 3: case 3:
strcat(txt_buf, " x 768MB"); strcat(txt_buf, " x 768MB. This should not happen");
break; break;
case 4: case 4:
strcat(txt_buf, " x 1GB"); strcat(txt_buf, " x 1GB");
break; break;
case 5: case 5:
strcat(txt_buf, " x 1.5GB"); strcat(txt_buf, " x 1.5GB. This should not happen");
break; break;
case 6: case 6:
strcat(txt_buf, " x 2GB"); strcat(txt_buf, " x 2GB. This should not happen");
break; break;
default: default:
s_printf(txt_buf + strlen(txt_buf), " x Unk (%d)", (ram_density.chip1.rank0_ch0 & 0x3C) >> 2); s_printf(txt_buf + strlen(txt_buf), " x Unk (%d)", (ram_density.chip1.rank0_ch0 & 0x3C) >> 2);
@ -864,13 +864,13 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
strcat(txt_buf, "Samsung AMS699VC01"); strcat(txt_buf, "Samsung AMS699VC01");
break; break;
case PANEL_OEM_CLONE_6_2: case PANEL_OEM_CLONE_6_2:
strcat(txt_buf, "#FFDD00 OEM Clone 6.2\"#"); strcat(txt_buf, "#FFDD00 Clone Display 6.2in\"#");
break; break;
case PANEL_OEM_CLONE_5_5: case PANEL_OEM_CLONE_5_5:
strcat(txt_buf, "#FFDD00 OEM Clone 5.5\"#"); strcat(txt_buf, "#FFDD00 Clone Display 5.5in\"#");
break; break;
case PANEL_OEM_CLONE: case PANEL_OEM_CLONE:
strcat(txt_buf, "#FFDD00 OEM Clone#"); strcat(txt_buf, "#FFDD00 Clone Display#");
break; break;
case 0xCCCC: case 0xCCCC:
strcat(txt_buf, "#FFDD00 Failed to get info!#"); strcat(txt_buf, "#FFDD00 Failed to get info!#");
@ -988,9 +988,9 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
// Check if patched unit. // Check if patched unit.
if (!fuse_check_patched_rcm()) if (!fuse_check_patched_rcm())
strcat(txt_buf, "\n\n#96FF00 This unit is exploitable#\n#96FF00 to the RCM bug!#"); strcat(txt_buf, "\n\n#96FF00 This unit is exploitable#\n#96FF00 with the RCM bug!#");
else else
strcat(txt_buf, "\n\n#FF8000 This unit is patched#\n#FF8000 to the RCM bug!#"); strcat(txt_buf, "\n\n#FF8000 This unit is patched#\n#FF8000 against the RCM bug!#");
lv_label_set_text(lb_desc2, txt_buf); lv_label_set_text(lb_desc2, txt_buf);
@ -1044,7 +1044,7 @@ static lv_res_t _create_window_bootrom_info_status(lv_obj_t *btn)
u32 res = fuse_read_ipatch(_ipatch_process); u32 res = fuse_read_ipatch(_ipatch_process);
if (res != 0) if (res != 0)
s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Failed to read ipatches. Error: %d#", res); s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Failed to read the ipatches. Error: %d#", res);
lv_label_set_text(lb_desc, txt_buf); lv_label_set_text(lb_desc, txt_buf);
@ -1087,7 +1087,7 @@ static lv_res_t _create_mbox_lockpick(lv_obj_t *btn)
lv_mbox_set_recolor_text(mbox, true); lv_mbox_set_recolor_text(mbox, true);
lv_mbox_set_text(mbox, "#FF8000 Lockpick RCM#\n\nThis will launch Lockpick RCM.\nDo you want to continue?\n\n" lv_mbox_set_text(mbox, "#FF8000 Lockpick RCM#\n\nThis will launch Lockpick RCM.\nDo you want to continue?\n\n"
"To return back from lockpick use\n#96FF00 Reboot to hekate#."); "To return back from Lockpick use the \n#96FF00 Reboot to hekate# option.");
lv_mbox_add_btns(mbox, mbox_btn_map, _launch_lockpick_action); lv_mbox_add_btns(mbox, mbox_btn_map, _launch_lockpick_action);
lv_obj_set_width(mbox, LV_HOR_RES / 9 * 5); lv_obj_set_width(mbox, LV_HOR_RES / 9 * 5);
@ -1594,7 +1594,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)
if (!emmc_initialize(false)) if (!emmc_initialize(false))
{ {
lv_label_set_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); lv_label_set_text(lb_desc, "#FFDD00 Failed to init eMMC chip!#");
lv_obj_set_width(lb_desc, lv_obj_get_width(desc)); lv_obj_set_width(lb_desc, lv_obj_get_width(desc));
emmc_errors = emmc_get_error_count(); emmc_errors = emmc_get_error_count();
@ -1622,9 +1622,12 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)
strcat(txt_buf, "Samsung "); strcat(txt_buf, "Samsung ");
break; break;
case 0x45: // Unofficial. case 0x45: // Unofficial.
strcat(txt_buf, "SanDisk "); strcat(txt_buf, "SanDisk (Unofficial) ");
lv_win_add_btn(win, NULL, SYMBOL_FILE_ALT" Device Report", _create_mbox_emmc_sandisk_report); lv_win_add_btn(win, NULL, SYMBOL_FILE_ALT" Device Report", _create_mbox_emmc_sandisk_report);
break; break;
case 0x89:
strcat(txt_buf, "Silicon Motion (Unofficial) ");
break;
case 0x90: case 0x90:
strcat(txt_buf, "SK Hynix "); strcat(txt_buf, "SK Hynix ");
break; break;
@ -1787,7 +1790,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)
idx++; idx++;
} }
if (!idx) if (!idx)
strcat(txt_buf, "#FFDD00 Partition table is empty!#"); strcat(txt_buf, "#FFDD00 GPP Partition table is empty!#");
emmc_gpt_free(&gpt); emmc_gpt_free(&gpt);
@ -1811,10 +1814,10 @@ out_error:
lv_mbox_set_recolor_text(mbox, true); lv_mbox_set_recolor_text(mbox, true);
s_printf(txt_buf, s_printf(txt_buf,
"#FF8000 eMMC Issues Check#\n\n" "#FF8000 eMMC Issue Detected#\n\n"
"#FFDD00 Your eMMC is initialized in slower mode,#\n" "#FFDD00 Your eMMC is initialized in a slower mode,#\n"
"#FFDD00 or init/read/write errors occurred!#\n" "#FFDD00 or an init/read/write error occurred!#\n"
"#FFDD00 This might mean hardware issues!#\n\n" "#FFDD00 This might be a hardware issue!#\n\n"
"#00DDFF Bus Speed:# %d MB/s\n\n" "#00DDFF Bus Speed:# %d MB/s\n\n"
"#00DDFF SDMMC4 Errors:#\n" "#00DDFF SDMMC4 Errors:#\n"
"Init fails: %d\n" "Init fails: %d\n"
@ -1890,7 +1893,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
switch (sd_storage.cid.manfid) switch (sd_storage.cid.manfid)
{ {
case 0x00: case 0x00:
strcat(txt_buf, "Fake "); strcat(txt_buf, "Fake SD Card");
break; break;
case 0x01: case 0x01:
strcat(txt_buf, "Panasonic "); strcat(txt_buf, "Panasonic ");
@ -2309,9 +2312,9 @@ static lv_res_t _create_window_battery_status(lv_obj_t *btn)
"#00DDFF Battery Charger IC Info:#\n" "#00DDFF Battery Charger IC Info:#\n"
"Input current limit:\n" "Input current limit:\n"
"System voltage limit:\n" "System voltage limit:\n"
"Charge current limit:\n" "Charging current limit:\n"
"Charge voltage limit:\n" "Charging voltage limit:\n"
"Charge status:\n" "Charging status:\n"
"Temperature status:\n\n" "Temperature status:\n\n"
"#00DDFF USB-PD IC Info:#\n" "#00DDFF USB-PD IC Info:#\n"
"Connection status:\n" "Connection status:\n"
@ -2353,7 +2356,7 @@ static lv_res_t _create_window_battery_status(lv_obj_t *btn)
strcat(txt_buf, "Fast charging\n"); strcat(txt_buf, "Fast charging\n");
break; break;
case 3: case 3:
strcat(txt_buf, "Charge terminated\n"); strcat(txt_buf, "Charging terminated\n");
break; break;
default: default:
s_printf(txt_buf + strlen(txt_buf), "Unknown (%d)\n", value); s_printf(txt_buf + strlen(txt_buf), "Unknown (%d)\n", value);
@ -2524,8 +2527,8 @@ void create_tab_info(lv_theme_t *th, lv_obj_t *parent)
if (lockpick_found) if (lockpick_found)
{ {
lv_label_set_static_text(label_txt2, lv_label_set_static_text(label_txt2,
"View Ipatches and dump the unpatched and patched versions\nof BootROM.\n" "View the Ipatches and dump the unpatched and patched versions the \nof BootROM,\n"
"Or dump every single key via #C7EA46 Lockpick RCM#.\n"); "Or dump every single key with #C7EA46 Lockpick RCM#.\n");
} }
else else
{ {
@ -2564,8 +2567,8 @@ void create_tab_info(lv_theme_t *th, lv_obj_t *parent)
lv_label_set_recolor(label_txt4, true); lv_label_set_recolor(label_txt4, true);
lv_label_set_static_text(label_txt4, lv_label_set_static_text(label_txt4,
"View and dump the cached #C7EA46 Fuses# and #C7EA46 KFuses#.\n" "View and dump the cached #C7EA46 Fuses# and #C7EA46 KFuses#.\n"
"Fuses contain info about the SoC/SKU and KFuses HDCP keys.\n" "Fuses contain information about the SoC/SKU and KFuses HDCP keys.\n"
"You can also see info about #C7EA46 DRAM#, #C7EA46 Screen# and #C7EA46 Touch panel#."); "You can also see information about #C7EA46 DRAM#, #C7EA46 Screen# and #C7EA46 Touch panel#.");
lv_obj_set_style(label_txt4, &hint_small_style); lv_obj_set_style(label_txt4, &hint_small_style);
lv_obj_align(label_txt4, btn3, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3); lv_obj_align(label_txt4, btn3, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3);
@ -2613,8 +2616,8 @@ void create_tab_info(lv_theme_t *th, lv_obj_t *parent)
lv_obj_t *label_txt5 = lv_label_create(h2, NULL); lv_obj_t *label_txt5 = lv_label_create(h2, NULL);
lv_label_set_recolor(label_txt5, true); lv_label_set_recolor(label_txt5, true);
lv_label_set_static_text(label_txt5, lv_label_set_static_text(label_txt5,
"View info about the eMMC or microSD and their partition list.\n" "View info about the eMMC chip or microSD cardand their partition list.\n"
"Additionally you can benchmark read speeds."); "Additionally you can benchmark their speeds.");
lv_obj_set_style(label_txt5, &hint_small_style); lv_obj_set_style(label_txt5, &hint_small_style);
lv_obj_align(label_txt5, btn5, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3); lv_obj_align(label_txt5, btn5, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3);
@ -2639,7 +2642,7 @@ void create_tab_info(lv_theme_t *th, lv_obj_t *parent)
lv_label_set_recolor(label_txt6, true); lv_label_set_recolor(label_txt6, true);
lv_label_set_static_text(label_txt6, lv_label_set_static_text(label_txt6,
"View battery and battery charger related info.\n" "View battery and battery charger related info.\n"
"Additionally you can dump battery charger's registers.\n"); "You can also dump the battery charger registers.\n");
lv_obj_set_style(label_txt6, &hint_small_style); lv_obj_set_style(label_txt6, &hint_small_style);
lv_obj_align(label_txt6, btn7, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3); lv_obj_align(label_txt6, btn7, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 3);
} }

48
nyx/nyx_gui/frontend/gui_options.c
View file

@ -25,7 +25,7 @@
#include <libs/lvgl/lvgl.h> #include <libs/lvgl/lvgl.h>
#define CLOCK_MIN_YEAR 2024 #define CLOCK_MIN_YEAR 2024
#define CLOCK_MAX_YEAR (CLOCK_MIN_YEAR + 10) #define CLOCK_MAX_YEAR (CLOCK_MIN_YEAR + 50)
#define CLOCK_YEARLIST "2024\n2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034" #define CLOCK_YEARLIST "2024\n2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034"
extern hekate_config h_cfg; extern hekate_config h_cfg;
@ -209,7 +209,7 @@ static void _create_autoboot_window()
lv_label_set_static_text(label_sep, ""); lv_label_set_static_text(label_sep, "");
lv_obj_t *label_txt = lv_label_create(h1, NULL); lv_obj_t *label_txt = lv_label_create(h1, NULL);
lv_label_set_static_text(label_txt, "Main configurations"); lv_label_set_static_text(label_txt, "Main configuration");
lv_obj_set_style(label_txt, lv_theme_get_current()->label.prim); lv_obj_set_style(label_txt, lv_theme_get_current()->label.prim);
lv_obj_align(label_txt, label_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, -(LV_DPI / 4)); lv_obj_align(label_txt, label_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, -(LV_DPI / 4));
@ -366,9 +366,9 @@ static lv_res_t _save_nyx_options_action(lv_obj_t *btn)
nyx_changes_made = false; nyx_changes_made = false;
if (res) if (res)
lv_mbox_set_text(mbox, "#FF8000 Nyx Configuration#\n\n#96FF00 The configuration was saved to sd card!#"); lv_mbox_set_text(mbox, "#FF8000 Nyx Configuration#\n\n#96FF00 The updated configuration has been saved to the microSD card!#");
else else
lv_mbox_set_text(mbox, "#FF8000 Nyx Configuration#\n\n#FFDD00 Failed to save the configuration#\n#FFDD00 to sd card!#"); lv_mbox_set_text(mbox, "#FF8000 Nyx Configuration#\n\n#FFDD00 Failed to save the configuration#\n#FFDD00 to microSD card!#");
lv_mbox_add_btns(mbox, mbox_btn_map, NULL); lv_mbox_add_btns(mbox, mbox_btn_map, NULL);
lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0); lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_top(mbox, true); lv_obj_set_top(mbox, true);
@ -618,10 +618,9 @@ static lv_res_t _create_window_nyx_colors(lv_obj_t *btn)
lv_obj_t *lbl_test = lv_label_create(h2, NULL); lv_obj_t *lbl_test = lv_label_create(h2, NULL);
lv_label_set_long_mode(lbl_test, LV_LABEL_LONG_BREAK); lv_label_set_long_mode(lbl_test, LV_LABEL_LONG_BREAK);
lv_label_set_static_text(lbl_test, lv_label_set_static_text(lbl_test,
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, " "This is a test message to show text colors, "
"sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " "The quick brown fox jumped over the lazy dog. "
"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris " "123456789 !@#$%^&*()-_=+[]\;'./,{}|:"<>? ");
"nisi ut aliquip ex ea commodo consequat.");
lv_obj_set_width(lbl_test, lv_obj_get_width(h2) - LV_DPI * 6 / 10); lv_obj_set_width(lbl_test, lv_obj_get_width(h2) - LV_DPI * 6 / 10);
lv_obj_align(lbl_test, lbl_sample, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 5); lv_obj_align(lbl_test, lbl_sample, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 5);
color_test.label = lbl_test; color_test.label = lbl_test;
@ -745,7 +744,7 @@ static lv_res_t _create_mbox_clock_edit(lv_obj_t *btn)
lv_mbox_set_recolor_text(mbox, true); lv_mbox_set_recolor_text(mbox, true);
lv_obj_set_width(mbox, LV_HOR_RES / 9 * 6); lv_obj_set_width(mbox, LV_HOR_RES / 9 * 6);
lv_mbox_set_text(mbox, "Enter #C7EA46 Date# and #C7EA46 Time# for Nyx\nThis will not alter the actual HW clock!"); lv_mbox_set_text(mbox, "Enter #C7EA46 Date# and #C7EA46 Time# for Nyx\nThis will not alter the clock outside of Nyx!");
// Get current time. // Get current time.
rtc_time_t time; rtc_time_t time;
@ -892,6 +891,7 @@ save_data:
if (!nx_hoag) if (!nx_hoag)
{ {
// Save binary dump. // Save binary dump.
memcpy(data, &jc_pad->bt_conn_l, sizeof(jc_bt_conn_t)); memcpy(data, &jc_pad->bt_conn_l, sizeof(jc_bt_conn_t));
memcpy(data + sizeof(jc_bt_conn_t), &jc_pad->bt_conn_r, sizeof(jc_bt_conn_t)); memcpy(data + sizeof(jc_bt_conn_t), &jc_pad->bt_conn_r, sizeof(jc_bt_conn_t));
@ -1049,7 +1049,7 @@ disabled_or_cal0_issue:;
// Check if pairing info was found. // Check if pairing info was found.
if (joycon_found == 2) if (joycon_found == 2)
strcat(txt_buf, "#C7EA46 Success!#\n#C7EA46 Found 2 out of 2 Joy-Con pairing data!#\n"); strcat(txt_buf, "#C7EA46 Success!#\n#C7EA46 Found Joy-Con pairing data!#\n");
else else
{ {
s_printf(txt_buf + strlen(txt_buf), "#FF8000 Failed!#\n#FF8000 Warning:# Found #FFDD00 %d out of 2# pairing data!\n", joycon_found); s_printf(txt_buf + strlen(txt_buf), "#FF8000 Failed!#\n#FF8000 Warning:# Found #FFDD00 %d out of 2# pairing data!\n", joycon_found);
@ -1061,24 +1061,24 @@ disabled_or_cal0_issue:;
strcat(txt_buf, "#C7EA46 Both pairing data are HOS based!#"); strcat(txt_buf, "#C7EA46 Both pairing data are HOS based!#");
else if (!is_l_hos && is_r_hos) else if (!is_l_hos && is_r_hos)
{ {
strcat(txt_buf, "#FF8000 Warning:# #FFDD00 Left# pairing data is not HOS based!"); strcat(txt_buf, "#FF8000 Warning:# #FFDD00 Left# pairing data is not Horizon Os based! Re-pair Joy-Cons to fix");
success = false; success = false;
} }
else if (is_l_hos && !is_r_hos) else if (is_l_hos && !is_r_hos)
{ {
strcat(txt_buf, "#FF8000 Warning:# #FFDD00 Right# pairing data is not HOS based!"); strcat(txt_buf, "#FF8000 Warning:# #FFDD00 Right# pairing data is not Horizon OS based! Re-pair Joy-Cons to fix");
success = false; success = false;
} }
else else
{ {
strcat(txt_buf, "#FF8000 Warning:# #FFDD00 No# pairing data is HOS based!"); strcat(txt_buf, "#FF8000 Warning:# #FFDD00 No# pairing data is Horizon OS based! Re-pair Joy-Cons to fix.");
success = false; success = false;
} }
if (!success) if (!success)
strcat(txt_buf, strcat(txt_buf,
"\n\n#FFDD00 Make sure that both Joy-Con are connected,#\n" "\n\n#FFDD00 Make sure that both Joy-Cons are connected,#\n"
"#FFDD00 and that you paired them in HOS!#"); "#FFDD00 and that you have paired them in Horizon OS!#");
if (cal_error) if (cal_error)
s_printf(txt_buf + strlen(txt_buf), "\n\n#FF8000 Warning: Failed (%d) to get IMU calibration!#", cal_error); s_printf(txt_buf + strlen(txt_buf), "\n\n#FF8000 Warning: Failed (%d) to get IMU calibration!#", cal_error);
@ -1276,9 +1276,9 @@ lv_res_t create_win_nyx_options(lv_obj_t *parrent_btn)
label_txt2 = lv_label_create(sw_h2, NULL); label_txt2 = lv_label_create(sw_h2, NULL);
lv_label_set_recolor(label_txt2, true); lv_label_set_recolor(label_txt2, true);
lv_label_set_static_text(label_txt2, lv_label_set_static_text(label_txt2,
"Sets the boot entries per line to 5. (Default is 4)\n" "Sets the boot entries visible per line to 5. (Default is 4)\n"
"#C7EA46 This allows a total of 10 boot entries to be shown in Launch#\n" "#C7EA46 This allows a total of 10 boot entries to be shown in the Launch#\n"
"#C7EA46 and More Configs sections.#\n\n\n"); "#C7EA46 and More Configs menus.#\n\n\n");
lv_obj_set_style(label_txt2, &hint_small_style); lv_obj_set_style(label_txt2, &hint_small_style);
lv_obj_align(label_txt2, btn2, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12); lv_obj_align(label_txt2, btn2, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12);
@ -1325,7 +1325,7 @@ lv_res_t create_win_nyx_options(lv_obj_t *parrent_btn)
label_txt2 = lv_label_create(sw_h3, NULL); label_txt2 = lv_label_create(sw_h3, NULL);
lv_label_set_static_text(label_txt2, "Set the type of data verification done for backup and restore.\n" lv_label_set_static_text(label_txt2, "Set the type of data verification done for backup and restore.\n"
"Can be canceled without losing the backup/restore.\n"); "Can be changed without losing the backup/restore.\n");
lv_obj_set_style(label_txt2, &hint_small_style); lv_obj_set_style(label_txt2, &hint_small_style);
lv_obj_align(label_txt2, label_txt, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 4); lv_obj_align(label_txt2, label_txt, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 4);
@ -1461,8 +1461,8 @@ void create_tab_options(lv_theme_t *th, lv_obj_t *parent)
label_txt2 = lv_label_create(l_cont, NULL); label_txt2 = lv_label_create(l_cont, NULL);
lv_label_set_recolor(label_txt2, true); lv_label_set_recolor(label_txt2, true);
lv_label_set_static_text(label_txt2, lv_label_set_static_text(label_txt2,
"Set how long to show bootlogo when autoboot is enabled.\n" "Sets how long to show bootlogo when autoboot is enabled.\n"
"#C7EA46 You can press# #FF8000 VOL-# #C7EA46 during that time to enter hekate's menu.#\n"); "#C7EA46 You can press# #FF8000 VOL-# #C7EA46 during that time to enter the hekate menu.#\n");
lv_obj_set_style(label_txt2, &hint_small_style); lv_obj_set_style(label_txt2, &hint_small_style);
lv_obj_align(label_txt2, label_txt, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 4); lv_obj_align(label_txt2, label_txt, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 4);
@ -1477,8 +1477,8 @@ void create_tab_options(lv_theme_t *th, lv_obj_t *parent)
label_txt2 = lv_label_create(sw_h2, NULL); label_txt2 = lv_label_create(sw_h2, NULL);
lv_label_set_recolor(label_txt2, true); lv_label_set_recolor(label_txt2, true);
lv_label_set_static_text(label_txt2, lv_label_set_static_text(label_txt2,
"It checks fuses and applies the patch automatically\n" "This option checks fuses and applies the patch automatically\n"
"if higher firmware. It is now a global config and set\n" "if a higher firmwareis present. It is now a global config and set\n"
"at auto by default. (ON: Auto)\n\n\n"); "at auto by default. (ON: Auto)\n\n\n");
lv_obj_set_style(label_txt2, &hint_small_style); lv_obj_set_style(label_txt2, &hint_small_style);
lv_obj_align(label_txt2, btn2, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12); lv_obj_align(label_txt2, btn2, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12);
@ -1493,7 +1493,7 @@ void create_tab_options(lv_theme_t *th, lv_obj_t *parent)
label_txt2 = lv_label_create(sw_h3, NULL); label_txt2 = lv_label_create(sw_h3, NULL);
lv_label_set_static_text(label_txt2, lv_label_set_static_text(label_txt2,
"When Shutdown is used from HOS, the device wakes up after\n" "When Shutdown is used from Horizon OS, the device wakes up after\n"
"15s. Enable this to automatically power off on the next\npayload injection."); "15s. Enable this to automatically power off on the next\npayload injection.");
lv_obj_set_style(label_txt2, &hint_small_style); lv_obj_set_style(label_txt2, &hint_small_style);
lv_obj_align(label_txt2, btn3, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12); lv_obj_align(label_txt2, btn3, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 12);