diff --git a/include/arm11/menu/menu_color.h b/include/arm11/menu/menu_color.h index 82abb22..c53ae9a 100644 --- a/include/arm11/menu/menu_color.h +++ b/include/arm11/menu/menu_color.h @@ -33,6 +33,7 @@ // colors for color scheme #define ESC_SCHEME_STD ESC_RESET ESC_FGCOLOR(7) ESC_BGCOLOR(0) +#define ESC_SCHEME_GOOD ESC_RESET ESC_FGCOLOR(2) ESC_BGCOLOR(0) ESC_BOLD #define ESC_SCHEME_WEAK ESC_RESET ESC_FGCOLOR(7) ESC_BGCOLOR(0) ESC_BOLD #define ESC_SCHEME_ACCENT0 ESC_RESET ESC_FGCOLOR(4) ESC_BGCOLOR(0) ESC_BOLD #define ESC_SCHEME_ACCENT1 ESC_RESET ESC_FGCOLOR(3) ESC_BGCOLOR(0) ESC_BOLD diff --git a/source/arm11/console.c b/source/arm11/console.c index 9d60536..2ad6be7 100644 --- a/source/arm11/console.c +++ b/source/arm11/console.c @@ -25,8 +25,8 @@ RGB8_to_565( 64, 64, 64), // almost black RGB8_to_565(255, 0, 0), // bright red - RGB8_to_565( 0,255, 0), // bright green - RGB8_to_565(255,255, 32), // acccent yellow + RGB8_to_565( 64,255, 64), // accent green + RGB8_to_565(255,255, 32), // accent yellow RGB8_to_565( 64, 64,255), // accent blue RGB8_to_565(255, 0,255), // bright magenta RGB8_to_565( 0,255,255), // bright cyan diff --git a/source/arm11/menu/menu_func.c b/source/arm11/menu/menu_func.c index 1f88e6d..a643273 100644 --- a/source/arm11/menu/menu_func.c +++ b/source/arm11/menu/menu_func.c @@ -267,7 +267,6 @@ if (param < 3) // loading from bootslot { // check if bootslot exists - ee_printf("Checking bootslot...\n"); if (!configDataExist(KBootOption1 + param)) { ee_printf("Bootslot does not exist!\n"); @@ -368,7 +367,7 @@ ee_snprintf(fpath, 64, NAND_BACKUP_PATH "/%02X%02X%02X%02X%02X%02X_%s_nand.bin", rtc[6], rtc[5], rtc[4], rtc[2], rtc[1], rtc[0], serial); - ee_printf("Creating NAND backup:\n%s\n\nPreparing NAND backup...\n", fpath); + ee_printf(ESC_SCHEME_ACCENT1 "Creating NAND backup:\n%s\n" ESC_RESET "\nPreparing NAND backup...\n", fpath); updateScreens(); @@ -445,7 +444,7 @@ // NAND access finalized ee_printf_progress("NAND backup", PROGRESS_WIDTH, nand_size, nand_size); - ee_printf("\n\nNAND backup finished.\n"); + ee_printf("\n" ESC_SCHEME_GOOD "NAND backup finished.\n" ESC_RESET); result = 0; @@ -464,6 +463,7 @@ if (result != 0) fUnlink(fpath); + hidScanInput(); // throw away any input from impatient users return result; } @@ -514,7 +514,7 @@ goto fail; } - ee_printf("Restoring NAND backup:\n%s\n\nPreparing NAND restore...\n", fpath); + ee_printf(ESC_SCHEME_ACCENT1 "Restoring NAND backup:\n%s\n" ESC_RESET "\nPreparing NAND restore...\n", fpath); updateScreens(); @@ -590,8 +590,8 @@ } // NAND access finalized - ee_printf_progress("NAND restore", PROGRESS_WIDTH, nand_size, nand_size); - ee_printf("\n\nNAND restore finished.\n"); + ee_printf_progress("NAND restore", PROGRESS_WIDTH, file_size, file_size); + ee_printf("\n" ESC_SCHEME_GOOD "NAND restore finished.\n" ESC_RESET); result = 0; diff --git a/source/arm11/menu/menu_util.c b/source/arm11/menu/menu_util.c index 80fef90..95c2ff1 100644 --- a/source/arm11/menu/menu_util.c +++ b/source/arm11/menu/menu_util.c @@ -195,7 +195,9 @@ for (; i < w; i++) res += ee_printf("\xB1"); ee_printf(ESC_RESET); - res += ee_printf(" | %lu%% || %llu / %llu MiB\r", prog_p, curr / 0x100000, max / 0x100000); + res += ee_printf(" | %s%lu%%%s | %s%llu / %llu MiB%s\r", + (curr == max) ? ESC_SCHEME_GOOD : "", prog_p, (curr == max) ? ESC_RESET : "", + (curr == max) ? ESC_SCHEME_GOOD : "", curr / 0x100000, max / 0x100000, (curr == max) ? ESC_RESET : ""); return res;