From c03e15b553dff67d5acde3f4056bdf3e6180f8ca Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 3 Feb 2024 11:14:51 +0100 Subject: [PATCH] unify texts --- client/src/cmdhf14a.c | 2 +- client/src/cmdhffelica.c | 4 ++-- client/src/cmdhfjooki.c | 2 +- client/src/cmdhflegic.c | 2 +- client/src/cmdlf.c | 24 ++++++++++++++---------- client/src/cmdlfem4x05.c | 2 +- client/src/cmdlffdxb.c | 6 +++--- client/src/cmdlfguard.c | 5 +++-- client/src/cmdlfhid.c | 11 +++++------ client/src/cmdlfidteck.c | 5 +++-- client/src/cmdlfindala.c | 2 +- client/src/cmdlfio.c | 5 +++-- client/src/cmdlfjablotron.c | 5 +++-- client/src/cmdlfkeri.c | 5 +++-- client/src/cmdlfnedap.c | 6 +++--- client/src/cmdlfnexwatch.c | 6 +++--- client/src/cmdlfnoralsy.c | 6 +++--- client/src/cmdlfpac.c | 6 +++--- client/src/cmdlfparadox.c | 6 +++--- client/src/cmdlfpresco.c | 5 +++-- client/src/cmdlfsecurakey.c | 6 +++--- client/src/cmdlft55xx.c | 2 +- client/src/cmdlfviking.c | 5 +++-- client/src/cmdlfvisa2000.c | 5 +++-- 24 files changed, 72 insertions(+), 61 deletions(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 63c0cbcff..684f5e1c1 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -879,7 +879,7 @@ int CmdHF14ASim(const char *Cmd) { } } - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index 6b077af8f..a23eacad1 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -1809,7 +1809,7 @@ static int CmdHFFelicaSniff(const char *Cmd) { } PrintAndLogEx(HINT, "try `" _YELLOW_("hf felica list") "` to view"); - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -1856,7 +1856,7 @@ static int CmdHFFelicaSimLite(const char *Cmd) { } } - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhfjooki.c b/client/src/cmdhfjooki.c index 8538bfc4d..41cd9b7b9 100644 --- a/client/src/cmdhfjooki.c +++ b/client/src/cmdhfjooki.c @@ -668,8 +668,8 @@ static int CmdHF14AJookiClone(const char *Cmd) { i++; } - PrintAndLogEx(INFO, "Done"); PrintAndLogEx(HINT, "Try `" _YELLOW_("hf mfu ndefread") "` to view"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhflegic.c b/client/src/cmdhflegic.c index 0df73a2c1..b12ac869a 100644 --- a/client/src/cmdhflegic.c +++ b/client/src/cmdhflegic.c @@ -569,8 +569,8 @@ static int CmdLegicSim(const char *Cmd) { } } - PrintAndLogEx(INFO, "Done"); PrintAndLogEx(HINT, "Try `" _YELLOW_("hf legic list") "` to view trace log"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index ac3985ae0..2f4dbe726 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -92,7 +92,7 @@ int lfsim_wait_check(uint32_t cmd) { } } } - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -145,9 +145,9 @@ static int CmdLFTune(const char *Cmd) { return PM3_EINVARG; } - if (freq != 125) + if (freq != 125) { divisor = LF_FREQ2DIV(freq); - + } if ((is_bar + is_mix + is_value) > 1) { PrintAndLogEx(ERR, "Select only one output style"); @@ -155,12 +155,15 @@ static int CmdLFTune(const char *Cmd) { } barMode_t style = g_session.bar_mode; - if (is_bar) + if (is_bar) { style = STYLE_BAR; - if (is_mix) + } + if (is_mix) { style = STYLE_MIXED; - if (is_value) + } + if (is_value) { style = STYLE_VALUE; + } PrintAndLogEx(INFO, "Measuring LF antenna at " _YELLOW_("%.2f") " kHz", LF_DIV2FREQ(divisor)); PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or " _GREEN_("") " to exit"); @@ -222,10 +225,11 @@ static int CmdLFTune(const char *Cmd) { params[0] = 3; SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_LF, params, sizeof(params)); - if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_LF, &resp, 1000)) { + if (WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_LF, &resp, 1000) == false) { PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark LF shutdown, aborting"); return PM3_ETIMEOUT; } + PrintAndLogEx(NORMAL, "\x1b%c[2K\r", 30); if (verbose) { PrintAndLogEx(INFO, "Min....... %u mV", v_min); @@ -242,9 +246,9 @@ int CmdLFCommandRead(const char *Cmd) { CLIParserInit(&ctx, "lf cmdread", "Modulate LF reader field to send command before read. All periods in microseconds.\n" " - use " _YELLOW_("`lf config`") _CYAN_(" to set parameters"), - "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W00110 --> probing for Hitag 1/S\n" - "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 --> probing for Hitag 2\n" - "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 -s 2000 -@ --> probing for Hitag 2, oscilloscope style\n" + "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W00110 --> probing for Hitag1/S\n" + "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 --> probing for Hitag2\n" + "lf cmdread -d 50 -z 116 -o 166 -e W3000 -c W11000 -s 2000 -@ --> probing for Hitag2, oscilloscope style\n" "lf cmdread -d 48 -z 112 -o 176 -e W3000 -e S240 -e E336 -c W0S00000010000E --> probing for Hitag (us)\n" ); diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c index 6398275a3..ecd36b2fc 100644 --- a/client/src/cmdlfem4x05.c +++ b/client/src/cmdlfem4x05.c @@ -2497,7 +2497,7 @@ int CmdEM4x05Sniff(const char *Cmd) { static int CmdEM4x05View(const char *Cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "lf em ex05 view", - "Print a EM4205/4305/4369/4469 dump file (bin/eml/json)\n" + "Print a EM4205/4305/4369/4469 dump file\n" "note:\n" "We don't track if password is known in current dump file formats.\n" "All zeros password block might be filler data", diff --git a/client/src/cmdlffdxb.c b/client/src/cmdlffdxb.c index 0c3330739..88f109fdd 100644 --- a/client/src/cmdlffdxb.c +++ b/client/src/cmdlffdxb.c @@ -878,10 +878,10 @@ static int CmdFdxBSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfguard.c b/client/src/cmdlfguard.c index 5beb4896c..fcf1f2c6c 100644 --- a/client/src/cmdlfguard.c +++ b/client/src/cmdlfguard.c @@ -396,9 +396,10 @@ static int CmdGuardSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 39c2b84a4..87680635c 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -473,14 +473,13 @@ static int CmdHIDClone(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_HID_CLONE, &resp); if (resp.status == PM3_SUCCESS) { - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hid reader`") " to verify"); + PrintAndLogEx(INFO, "Done!"); } else { - PrintAndLogEx(FAILED, "Failed cloning"); - return resp.status; - } + PrintAndLogEx(FAILED, "cloning ( " _RED_("fail") " )"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hid reader`") " to verify"); - return PM3_SUCCESS; + } + return resp.status; } /* diff --git a/client/src/cmdlfidteck.c b/client/src/cmdlfidteck.c index b8623a1c7..6ac9c0695 100644 --- a/client/src/cmdlfidteck.c +++ b/client/src/cmdlfidteck.c @@ -285,9 +285,10 @@ static int CmdIdteckSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_PSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c index a0a997577..9abcf90c9 100644 --- a/client/src/cmdlfindala.c +++ b/client/src/cmdlfindala.c @@ -768,7 +768,7 @@ static int CmdIndalaSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_PSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); if (resp.status != PM3_EOPABORTED) { return resp.status; } diff --git a/client/src/cmdlfio.c b/client/src/cmdlfio.c index 11027266b..7c106dee7 100644 --- a/client/src/cmdlfio.c +++ b/client/src/cmdlfio.c @@ -262,9 +262,10 @@ static int CmdIOProxSim(const char *Cmd) { free(payload); PacketResponseNG resp; WaitForResponse(CMD_LF_FSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfjablotron.c b/client/src/cmdlfjablotron.c index 2474bb2db..2f873e2bf 100644 --- a/client/src/cmdlfjablotron.c +++ b/client/src/cmdlfjablotron.c @@ -299,9 +299,10 @@ static int CmdJablotronSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfkeri.c b/client/src/cmdlfkeri.c index a2144e1dd..bd8b1b220 100644 --- a/client/src/cmdlfkeri.c +++ b/client/src/cmdlfkeri.c @@ -358,9 +358,10 @@ static int CmdKeriSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_PSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfnedap.c b/client/src/cmdlfnedap.c index acb68c406..600f55fc1 100644 --- a/client/src/cmdlfnedap.c +++ b/client/src/cmdlfnedap.c @@ -552,10 +552,10 @@ static int CmdLFNedapSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfnexwatch.c b/client/src/cmdlfnexwatch.c index 9f24a87b4..b943db9c3 100644 --- a/client/src/cmdlfnexwatch.c +++ b/client/src/cmdlfnexwatch.c @@ -558,10 +558,10 @@ static int CmdNexWatchSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_PSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfnoralsy.c b/client/src/cmdlfnoralsy.c index ec493f3fc..f05c1a286 100644 --- a/client/src/cmdlfnoralsy.c +++ b/client/src/cmdlfnoralsy.c @@ -270,10 +270,10 @@ static int CmdNoralsySim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfpac.c b/client/src/cmdlfpac.c index 14ae63f23..2f9267e92 100644 --- a/client/src/cmdlfpac.c +++ b/client/src/cmdlfpac.c @@ -380,10 +380,10 @@ static int CmdPacSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_NRZ_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfparadox.c b/client/src/cmdlfparadox.c index daa8a350c..85832408b 100644 --- a/client/src/cmdlfparadox.c +++ b/client/src/cmdlfparadox.c @@ -459,10 +459,10 @@ static int CmdParadoxSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_FSK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfpresco.c b/client/src/cmdlfpresco.c index dbba81935..f256726ca 100644 --- a/client/src/cmdlfpresco.c +++ b/client/src/cmdlfpresco.c @@ -346,9 +346,10 @@ static int CmdPrescoSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfsecurakey.c b/client/src/cmdlfsecurakey.c index 5c0b12666..3c3983005 100644 --- a/client/src/cmdlfsecurakey.c +++ b/client/src/cmdlfsecurakey.c @@ -283,10 +283,10 @@ static int CmdSecurakeySim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; - + } return PM3_SUCCESS; } diff --git a/client/src/cmdlft55xx.c b/client/src/cmdlft55xx.c index 94734d9af..7a457fc21 100644 --- a/client/src/cmdlft55xx.c +++ b/client/src/cmdlft55xx.c @@ -2897,7 +2897,7 @@ static int CmdResetRead(const char *Cmd) { free(got); } - PrintAndLogEx(INFO, "Done"); + PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdlfviking.c b/client/src/cmdlfviking.c index c58994eef..50facc9b7 100644 --- a/client/src/cmdlfviking.c +++ b/client/src/cmdlfviking.c @@ -231,9 +231,10 @@ static int CmdVikingSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; } diff --git a/client/src/cmdlfvisa2000.c b/client/src/cmdlfvisa2000.c index 67339f838..2c77fa1d3 100644 --- a/client/src/cmdlfvisa2000.c +++ b/client/src/cmdlfvisa2000.c @@ -284,9 +284,10 @@ static int CmdVisa2kSim(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_LF_ASK_SIMULATE, &resp); - PrintAndLogEx(INFO, "Done"); - if (resp.status != PM3_EOPABORTED) + PrintAndLogEx(INFO, "Done!"); + if (resp.status != PM3_EOPABORTED) { return resp.status; + } return PM3_SUCCESS; }