diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index 0ca1198..3a12520 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -864,6 +864,9 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) case PANEL_SAM_AMS699VC01: strcat(txt_buf, "Samsung AMS699VC01"); break; + case 0xCCCC: + strcat(txt_buf, "#FFDD00 Failed to get info!#"); + break; default: switch (display_id & 0xFF) { @@ -1838,7 +1841,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) "FW rev:\n" "S/N:\n" "Month/Year:\n\n" - "Card Power:\n" + "Max Power:\n" "Bootloader bus:" ); @@ -1949,14 +1952,17 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) break; } - s_printf(txt_buf + strlen(txt_buf), "(%02X)\n%c%c%c%c%c\n%c%c (%04X)\n%X\n%X\n%08x\n%02d/%04d\n\n%d mW\n", + // UHS-I max power limit is 400mA, no matter what the card says. + u32 card_power_limit_nominal = sd_storage.card_power_limit > 400 ? 400 : sd_storage.card_power_limit; + + s_printf(txt_buf + strlen(txt_buf), "(%02X)\n%c%c%c%c%c\n%c%c (%04X)\n%X\n%X\n%08x\n%02d/%04d\n\n%d mW (%d mA)\n", sd_storage.cid.manfid, sd_storage.cid.prod_name[0], sd_storage.cid.prod_name[1], sd_storage.cid.prod_name[2], sd_storage.cid.prod_name[3], sd_storage.cid.prod_name[4], (sd_storage.cid.oemid >> 8) & 0xFF, sd_storage.cid.oemid & 0xFF, sd_storage.cid.oemid, sd_storage.cid.hwrev, sd_storage.cid.fwrev, sd_storage.cid.serial, sd_storage.cid.month, sd_storage.cid.year, - sd_storage.card_power_limit * 3600 / 1000); + card_power_limit_nominal * 3600 / 1000, sd_storage.card_power_limit); switch (nyx_str->info.sd_init) {