diff --git a/client/src/flash.c b/client/src/flash.c index 278aa34d9..249f7d826 100644 --- a/client/src/flash.c +++ b/client/src/flash.c @@ -240,7 +240,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl, int flash_ goto fail; } - PrintAndLogEx(SUCCESS, _BLUE_("Loading ELF file") _YELLOW_(" %s"), name); + PrintAndLogEx(SUCCESS, _CYAN_("Loading ELF file") _YELLOW_(" %s"), name); if (fread(&ehdr, sizeof(ehdr), 1, fd) != 1) { PrintAndLogEx(ERR, "Error while reading ELF file header"); @@ -356,7 +356,7 @@ static int enter_bootloader(char *serial_port_name) { return PM3_SUCCESS; if (state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) { - PrintAndLogEx(SUCCESS, _BLUE_("Entering bootloader...")); + PrintAndLogEx(SUCCESS, _CYAN_("Entering bootloader...")); if ((state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) { @@ -375,7 +375,7 @@ static int enter_bootloader(char *serial_port_name) { msleep(1000); if (OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) { - PrintAndLogEx(NORMAL, " " _GREEN_("Found")); + PrintAndLogEx(NORMAL, _GREEN_(" found")); return PM3_SUCCESS; } else { PrintAndLogEx(ERR, _RED_("Error:") " Proxmark3 not found."); diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c index 0a0e99024..a592503de 100644 --- a/client/src/proxmark3.c +++ b/client/src/proxmark3.c @@ -549,11 +549,11 @@ static int flash_pm3(char *serial_port_name, uint8_t num_files, char *filenames[ PrintAndLogEx(SUCCESS, "About to use the following file%s:", num_files > 1 ? "s" : ""); for (int i = 0 ; i < num_files; ++i) { - PrintAndLogEx(SUCCESS, " %s", filepaths[i]); + PrintAndLogEx(SUCCESS, " "_YELLOW_("%s"), filepaths[i]); } if (OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) { - PrintAndLogEx(NORMAL, _GREEN_("Found")); + PrintAndLogEx(NORMAL, _GREEN_(" found")); } else { PrintAndLogEx(ERR, "Could not find Proxmark3 on " _RED_("%s") ".\n", serial_port_name); ret = PM3_ETIMEOUT; @@ -577,7 +577,7 @@ static int flash_pm3(char *serial_port_name, uint8_t num_files, char *filenames[ PrintAndLogEx(NORMAL, ""); } - PrintAndLogEx(SUCCESS, "\n" _BLUE_("Flashing...")); + PrintAndLogEx(SUCCESS, _CYAN_("Flashing...")); for (int i = 0; i < num_files; i++) { ret = flash_write(&files[i]); @@ -585,7 +585,7 @@ static int flash_pm3(char *serial_port_name, uint8_t num_files, char *filenames[ goto finish; } flash_free(&files[i]); - PrintAndLogEx(NORMAL, "\n"); + PrintAndLogEx(NORMAL, ""); } finish: @@ -597,9 +597,9 @@ finish2: free(filepaths[i]); } if (ret == PM3_SUCCESS) - PrintAndLogEx(SUCCESS, _BLUE_("All done.")); + PrintAndLogEx(SUCCESS, _CYAN_("All done")); else - PrintAndLogEx(ERR, "Aborted on error."); + PrintAndLogEx(ERR, "Aborted on error"); PrintAndLogEx(NORMAL, "\nHave a nice day!"); return ret; }