github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

unify texts

Browse source
This commit is contained in:
iceman1001 2024-02-03 11:14:51 +01:00
commit c03e15b553
24 changed files with 72 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdhf14a.c
View file

@ -879,7 +879,7 @@ int CmdHF14ASim(const char *Cmd) {
}
}
PrintAndLogEx(INFO, "Done");
PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS;
}

4
client/src/cmdhffelica.c
View file

@ -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;
}

2
client/src/cmdhfjooki.c
View file

@ -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;
}

2
client/src/cmdhflegic.c
View file

@ -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;
}

18
client/src/cmdlf.c
View file

@ -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_("<Enter>") " 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);

2
client/src/cmdlfem4x05.c
View file

@ -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",

6
client/src/cmdlffdxb.c
View file

@ -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;
}

5
client/src/cmdlfguard.c
View file

@ -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;
}

13
client/src/cmdlfhid.c
View file

@ -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");
} else {
PrintAndLogEx(FAILED, "Failed cloning");
return resp.status;
}
PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hid reader`") " to verify");
return PM3_SUCCESS;
PrintAndLogEx(INFO, "Done!");
} else {
PrintAndLogEx(FAILED, "cloning ( " _RED_("fail") " )");
}
return resp.status;
}
/*

5
client/src/cmdlfidteck.c
View file

@ -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;
}

2
client/src/cmdlfindala.c
View file

@ -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;
}

5
client/src/cmdlfio.c
View file

@ -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;
}

5
client/src/cmdlfjablotron.c
View file

@ -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;
}

5
client/src/cmdlfkeri.c
View file

@ -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;
}

6
client/src/cmdlfnedap.c
View file

@ -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;
}

6
client/src/cmdlfnexwatch.c
View file

@ -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;
}

6
client/src/cmdlfnoralsy.c
View file

@ -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;
}

6
client/src/cmdlfpac.c
View file

@ -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;
}

6
client/src/cmdlfparadox.c
View file

@ -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;
}

5
client/src/cmdlfpresco.c
View file

@ -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;
}

6
client/src/cmdlfsecurakey.c
View file

@ -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;
}

2
client/src/cmdlft55xx.c
View file

@ -2897,7 +2897,7 @@ static int CmdResetRead(const char *Cmd) {
free(got);
}
PrintAndLogEx(INFO, "Done");
PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS;
}

5
client/src/cmdlfviking.c
View file

@ -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;
}

5
client/src/cmdlfvisa2000.c
View file

@ -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;
}