From 70995f0f1e70e3b3f74f3970ee5b469643d069c8 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 26 Apr 2019 08:29:48 +0200 Subject: [PATCH] use color macros --- client/cmdhw.c | 6 +----- client/mifare/mifarehost.c | 2 +- client/proxmark3.c | 12 ++++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/client/cmdhw.c b/client/cmdhw.c index bd013e706..a01b72dca 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -477,11 +477,7 @@ void pm3_version(bool verbose) { clearCommandBuffer(); SendCommand(&c); if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { -#ifdef __WIN32 - PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n"); -#else - PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n"); -#endif + PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n"); char s[60] = {0}; #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC) strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1); diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c index 211eaea02..5677a1849 100644 --- a/client/mifare/mifarehost.c +++ b/client/mifare/mifarehost.c @@ -935,7 +935,7 @@ int detect_classic_nackbug(bool verbose) { } else { printf( #if defined(__linux__) || (__APPLE__) - "\e[32m\e[s%c\e[u\e[0m", star[(staridx++ % 4) ] + _GREEN_("\e[s%c\e[u"), star[(staridx++ % 4) ] #else "." #endif diff --git a/client/proxmark3.c b/client/proxmark3.c index 267071c21..aef3c5979 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -32,12 +32,12 @@ static void showBanner(void) { printf("\n\n"); #if defined(__linux__) || (__APPLE__) - printf("\e[34m██████╗ ███╗ ███╗ ████╗\e[0m ...iceman fork\n"); - printf("\e[34m██╔══██╗████╗ ████║ ══█║\e[0m ...dedicated to \e[34mRDV40\e[0m\n"); - printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n"); - printf("\e[34m██╔═══╝ ██║╚██╔╝██║ ══█║\e[0m iceman@icesql.net\n"); - printf("\e[34m██║ ██║ ╚═╝ ██║ ████╔╝\e[0m https://github.com/rfidresearchgroup/proxmark3/\n"); - printf("\e[34m╚═╝ ╚═╝ ╚═╝ ╚═══╝\e[0m pre-release v4.0\n"); + printf(_BLUE_("██████╗ ███╗ ███╗ ████╗ ") " ...iceman fork\n"); + printf(_BLUE_("██╔══██╗████╗ ████║ ══█║") " ...dedicated to " _BLUE_("RDV40") "\n"); + printf(_BLUE_("██████╔╝██╔████╔██║ ████╔╝") "\n"); + printf(_BLUE_("██╔═══╝ ██║╚██╔╝██║ ══█║") " iceman@icesql.net\n"); + printf(_BLUE_("██║ ██║ ╚═╝ ██║ ████╔╝") " https://github.com/rfidresearchgroup/proxmark3/\n"); + printf(_BLUE_("╚═╝ ╚═╝ ╚═╝ ╚═══╝ ") "pre-release v4.0\n"); #else printf("======. ===. ===. ====. ...iceman fork\n"); printf("==...==.====. ====. ..=. ...dedicated to RDV40\n");