diff --git a/armsrc/Standalone/hf_aveful.c b/armsrc/Standalone/hf_aveful.c index 7363a952e..a7d96a44e 100644 --- a/armsrc/Standalone/hf_aveful.c +++ b/armsrc/Standalone/hf_aveful.c @@ -250,7 +250,7 @@ void RunMod(void) { } else if (state == STATE_EMUL) { uint16_t flags = FLAG_7B_UID_IN_DATA; - Dbprintf("Starting simulation, press pm3-button to stop and go back to search state."); + Dbprintf("Starting simulation, press " _GREEN_("pm3 button") " to stop and go back to search state."); SimulateIso14443aTag(7, flags, card.uid, 0); // Go back to search state if user presses pm3-button diff --git a/armsrc/Standalone/hf_craftbyte.c b/armsrc/Standalone/hf_craftbyte.c index 80733a3cc..41d9a3503 100644 --- a/armsrc/Standalone/hf_craftbyte.c +++ b/armsrc/Standalone/hf_craftbyte.c @@ -91,7 +91,7 @@ void RunMod(void) { continue; } - Dbprintf("Starting simulation, press pm3-button to stop and go back to search state."); + Dbprintf("Starting simulation, press " _GREEN_("pm3 button") " to stop and go back to search state."); if (card.sak == 0x08 && card.atqa[0] == 0x04 && card.atqa[1] == 0) { DbpString("Mifare Classic 1k"); SimulateIso14443aTag(1, flags, card.uid, 0); diff --git a/armsrc/Standalone/hf_tmudford.c b/armsrc/Standalone/hf_tmudford.c index a945a49ec..0f20a5b86 100644 --- a/armsrc/Standalone/hf_tmudford.c +++ b/armsrc/Standalone/hf_tmudford.c @@ -74,7 +74,7 @@ void RunMod(void) { } } else if (state == STATE_EMUL) { Iso15693InitTag(); - Dbprintf("Starting simulation, press pm3-button to stop and go back to search state."); + Dbprintf("Starting simulation, press " _GREEN_("pm3 button") " to stop and go back to search state."); // default block size is 4 SimTagIso15693(card.uid, 4); diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua index f49d587f2..894a0d8ef 100644 --- a/client/lualibs/hf_reader.lua +++ b/client/lualibs/hf_reader.lua @@ -15,7 +15,7 @@ local reader15693 = require('read15') -- @return if successful: an table containing card info -- @return if unsuccessful : nil, error local function waitForTag() - print("Waiting for card... press Enter to quit") + print("Waiting for card... press to quit") local readers = {reader14443A, reader14443B, reader15693} local i = 0; while not core.kbd_enter_pressed() do diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua index c4ef3caa7..782fca6d5 100644 --- a/client/lualibs/read14a.lua +++ b/client/lualibs/read14a.lua @@ -124,7 +124,7 @@ end -- @return if successful: an table containing card info -- @return if unsuccessful : nil, error local function waitFor14443a() - print('Waiting for card... press Enter to quit') + print('Waiting for card... press to quit') while not core.kbd_enter_pressed() do res, err = read14443a() if res then return res end diff --git a/client/lualibs/read15.lua b/client/lualibs/read15.lua index feb35d3eb..9d4ca589d 100644 --- a/client/lualibs/read15.lua +++ b/client/lualibs/read15.lua @@ -133,7 +133,7 @@ end -- @return if successful: an table containing card info -- @return if unsuccessful : nil, error local function waitFor15693() - print('Waiting for card... press Enter to quit') + print('Waiting for card... press to quit') while not core.kbd_enter_pressed() do res, err = read15693() if res then return res end diff --git a/client/src/cmdanalyse.c b/client/src/cmdanalyse.c index e8b925292..a6a4b737c 100644 --- a/client/src/cmdanalyse.c +++ b/client/src/cmdanalyse.c @@ -969,6 +969,11 @@ static int CmdAnalyseFreq(const char *Cmd) { PrintAndLogEx(INFO, " 134 kHz has %f m, rf range %f m", len_134, rf_range_134); PrintAndLogEx(INFO, " 13.56 mHz has %f m, rf range %f m", len_1356, rf_range_1356); + PrintAndLogEx(INFO, "Antenna lengths"); + PrintAndLogEx(INFO, " 125 kHz 1/2 = %f m, 1/4 = %f m", (len_125 / 2), (len_125 / 4) ); + PrintAndLogEx(INFO, " 134 kHz 1/2 = %f m, 1/4 = %f m", (len_134 / 2), (len_134 / 4) ); + PrintAndLogEx(INFO, " 13.56 mHz 1/2 = %f m, 1/4 = %f m", (len_1356 / 2), (len_1356 / 4)); + if (F == 0 && C == 0 && L == 0) return PM3_SUCCESS; diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c index ef94adf41..366ba219d 100644 --- a/client/src/cmdhf.c +++ b/client/src/cmdhf.c @@ -216,7 +216,7 @@ int CmdHFTune(const char *Cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "hf tune", "Continuously measure HF antenna tuning.\n" - "Press button or to interrupt.", + "Press pm3 button or to interrupt.", "hf tune\n" "hf tune --mix" ); @@ -249,7 +249,8 @@ int CmdHFTune(const char *Cmd) { if (is_value) style = STYLE_VALUE; - PrintAndLogEx(INFO, "Measuring HF antenna, click " _GREEN_("pm3 button") " or press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Measuring HF antenna"); + PrintAndLogEx(INFO, "click " _GREEN_("pm3 button") " or press " _GREEN_("") " to exit"); PacketResponseNG resp; clearCommandBuffer(); diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index a39092fe8..81bc89768 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -837,7 +837,7 @@ int CmdHF14ASim(const char *Cmd) { sector_t *k_sector = NULL; size_t k_sectors_cnt = MIFARE_4K_MAXSECTOR; - PrintAndLogEx(INFO, "Press pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to abort simulation"); bool keypress = kbd_enter_pressed(); while (keypress == false) { diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c index 5ddd150cb..a5b0ed00d 100644 --- a/client/src/cmdhf14b.c +++ b/client/src/cmdhf14b.c @@ -239,7 +239,7 @@ static int CmdHF14BSim(const char *Cmd) { } PrintAndLogEx(INFO, "Simulate with PUPI : " _GREEN_("%s"), sprint_hex_inrow(pupi, sizeof(pupi))); - PrintAndLogEx(INFO, "Press pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to abort simulation"); clearCommandBuffer(); SendCommandNG(CMD_HF_ISO14443B_SIMULATE, pupi, sizeof(pupi)); return PM3_SUCCESS; diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index 8769a6662..065f4e064 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -1024,7 +1024,7 @@ static int CmdHF15Reader(const char *Cmd) { CLIParserFree(ctx); if (cm) { - PrintAndLogEx(INFO, "press " _GREEN_("`Enter`") " to exit"); + PrintAndLogEx(INFO, "press " _GREEN_("") " to exit"); } readHF15Uid(cm, true); return PM3_SUCCESS; @@ -1321,7 +1321,7 @@ static int CmdHF15FindAfi(const char *Cmd) { CLIExecWithReturn(ctx, Cmd, argtable, true); CLIParserFree(ctx); - PrintAndLogEx(INFO, "click " _GREEN_("pm3 button") " or press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to exit"); clearCommandBuffer(); PacketResponseNG resp; SendCommandMIX(CMD_HF_ISO15693_FINDAFI, strtol(Cmd, NULL, 0), 0, 0, NULL, 0); diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index 230628c51..5ba3e8116 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -1783,7 +1783,7 @@ static int CmdHFFelicaSniff(const char *Cmd) { PrintAndLogEx(INFO, "Sniff Felica, getting first %" PRIu32 " frames, skipping after %" PRIu32 " triggers", payload.samples, payload.triggers); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort sniffing"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort sniffing"); clearCommandBuffer(); SendCommandNG(CMD_HF_FELICA_SNIFF, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; @@ -1830,7 +1830,7 @@ static int CmdHFFelicaSimLite(const char *Cmd) { CLIParserFree(ctx); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); clearCommandBuffer(); SendCommandNG(CMD_HF_FELICALITE_SIMULATE, payload.uid, sizeof(payload)); @@ -2035,7 +2035,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) { SendCommandNG(CMD_HF_FELICALITE_DUMP, NULL, 0); PacketResponseNG resp; - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort dumping"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort dumping"); uint8_t timeout = 0; while (WaitForResponseTimeout(CMD_ACK, &resp, 2000) == false) { diff --git a/client/src/cmdhfjooki.c b/client/src/cmdhfjooki.c index daf8530b0..261a6194a 100644 --- a/client/src/cmdhfjooki.c +++ b/client/src/cmdhfjooki.c @@ -575,7 +575,7 @@ static int CmdHF14AJookiSim(const char *Cmd) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(SUCCESS, "Starting simulating"); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); for (;;) { if (kbd_enter_pressed()) { SendCommandNG(CMD_BREAK_LOOP, NULL, 0); diff --git a/client/src/cmdhflegic.c b/client/src/cmdhflegic.c index 2b9101516..f7c44ecbc 100644 --- a/client/src/cmdhflegic.c +++ b/client/src/cmdhflegic.c @@ -556,7 +556,7 @@ static int CmdLegicSim(const char *Cmd) { SendCommandNG(CMD_HF_LEGIC_SIMULATE, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); for (;;) { if (kbd_enter_pressed()) { SendCommandNG(CMD_BREAK_LOOP, NULL, 0); diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index cf7339d5a..85ecd8033 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -3872,7 +3872,7 @@ static int CmdHF14AMfSim(const char *Cmd) { PacketResponseNG resp; if (flags & FLAG_INTERACTIVE) { - PrintAndLogEx(INFO, "Press pm3-button or send another cmd to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or send another cmd to abort simulation"); sector_t *k_sector = NULL; @@ -3896,7 +3896,7 @@ static int CmdHF14AMfSim(const char *Cmd) { showSectorTable(k_sector, k_sectors_cnt); } else { - PrintAndLogEx(INFO, "Press pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to abort simulation"); } return PM3_SUCCESS; } diff --git a/client/src/cmdhfthinfilm.c b/client/src/cmdhfthinfilm.c index 64b03a819..40e43519e 100644 --- a/client/src/cmdhfthinfilm.c +++ b/client/src/cmdhfthinfilm.c @@ -182,7 +182,7 @@ int CmdHfThinFilmSim(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_HF_THINFILM_SIMULATE, (uint8_t *)&data, data_len); PacketResponseNG resp; - PrintAndLogEx(SUCCESS, "press pm3-button to abort simulation"); + PrintAndLogEx(SUCCESS, "press " _GREEN_("pm3 button") " to abort simulation"); int ret; while (!(ret = kbd_enter_pressed())) { diff --git a/client/src/cmdhfvas.c b/client/src/cmdhfvas.c index 0c6cc5df8..9d4abbb6b 100644 --- a/client/src/cmdhfvas.c +++ b/client/src/cmdhfvas.c @@ -465,7 +465,7 @@ static int CmdVASReader(const char *Cmd) { PrintAndLogEx(INFO, "Requesting pass type id... " _GREEN_("%s"), sprint_ascii((uint8_t *) pid, pidlen)); if (continuous) { - PrintAndLogEx(INFO, "Press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Press " _GREEN_("") " to exit"); } uint8_t pidhash[32] = {0}; diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index 8533e7ac8..95e71f40b 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -74,7 +74,7 @@ static int CmdHelp(const char *Cmd); // if key event, send break loop cmd to Pm3 int lfsim_wait_check(uint32_t cmd) { PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); for (;;) { if (kbd_enter_pressed()) { @@ -159,7 +159,8 @@ static int CmdLFTune(const char *Cmd) { if (is_value) style = STYLE_VALUE; - PrintAndLogEx(INFO, "Measuring LF antenna at " _YELLOW_("%.2f") " kHz, click " _GREEN_("pm3 button") " or press " _GREEN_("Enter") " to exit", LF_DIV2FREQ(divisor)); + PrintAndLogEx(INFO, "Measuring LF antenna at " _YELLOW_("%.2f") " kHz", LF_DIV2FREQ(divisor)); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to exit"); uint8_t params[] = {1, 0}; params[1] = divisor; diff --git a/client/src/cmdlfawid.c b/client/src/cmdlfawid.c index 5d735a650..bdb8d008e 100644 --- a/client/src/cmdlfawid.c +++ b/client/src/cmdlfawid.c @@ -132,7 +132,7 @@ static int CmdAWIDWatch(const char *Cmd) { CLIParserFree(ctx); PrintAndLogEx(SUCCESS, "Watching for AWID cards - place tag on antenna"); - PrintAndLogEx(INFO, "Press pm3-button to stop reading cards"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to stop reading cards"); clearCommandBuffer(); SendCommandNG(CMD_LF_AWID_WATCH, NULL, 0); return lfsim_wait_check(CMD_LF_AWID_WATCH); @@ -524,7 +524,7 @@ static int CmdAWIDBrute(const char *Cmd) { } PrintAndLogEx(SUCCESS, "Bruteforceing AWID %d reader", fmtlen); - PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or press Enter"); + PrintAndLogEx(SUCCESS, "Press " _GREEN_("pm3 button") " to abort simulation or press " _GREEN_("")); uint16_t up = cn; uint16_t down = cn; diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c index b94acfcc5..fdcf48a99 100644 --- a/client/src/cmdlfem4x50.c +++ b/client/src/cmdlfem4x50.c @@ -1231,7 +1231,7 @@ int CmdEM4x50Sim(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_LF_EM4X50_SIM, (uint8_t *)&password, sizeof(password)); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); PacketResponseNG resp; // init to ZERO diff --git a/client/src/cmdlfem4x70.c b/client/src/cmdlfem4x70.c index c1e2aff03..574b30e20 100644 --- a/client/src/cmdlfem4x70.c +++ b/client/src/cmdlfem4x70.c @@ -282,7 +282,7 @@ int CmdEM4x70Brute(const char *Cmd) { return PM3_EINVARG; } - PrintAndLogEx(INFO, "click " _GREEN_("pm3 button") " or press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to exit"); clearCommandBuffer(); PacketResponseNG resp; SendCommandNG(CMD_LF_EM4X70_BRUTE, (uint8_t *)&etd, sizeof(etd)); diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 0526b16db..150df44c1 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -239,7 +239,7 @@ static int CmdHIDWatch(const char *Cmd) { CLIParserFree(ctx); PrintAndLogEx(SUCCESS, "Watching for HID Prox cards - place tag on antenna"); - PrintAndLogEx(INFO, "Press pm3-button to stop reading cards"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to stop reading cards"); clearCommandBuffer(); SendCommandNG(CMD_LF_HID_WATCH, NULL, 0); return lfsim_wait_check(CMD_LF_HID_WATCH); @@ -592,7 +592,7 @@ static int CmdHIDBrute(const char *Cmd) { } PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "Started bruteforcing HID Prox reader"); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); PrintAndLogEx(NORMAL, ""); // copy values to low. card_low = card_hi; diff --git a/client/src/cmdlfidteck.c b/client/src/cmdlfidteck.c index 3dae4f0d1..e39354ef8 100644 --- a/client/src/cmdlfidteck.c +++ b/client/src/cmdlfidteck.c @@ -214,7 +214,7 @@ static int CmdIdteckSim(const char *Cmd) { } PrintAndLogEx(SUCCESS, "Simulating Idteck - raw " _YELLOW_("%s"), sprint_hex_inrow(raw, raw_len)); - PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command"); + PrintAndLogEx(SUCCESS, "Press " _GREEN_("pm3 button") " to abort simulation or run another command"); PrintAndLogEx(NORMAL, ""); lf_psksim_t *payload = calloc(1, sizeof(lf_psksim_t) + sizeof(bs)); diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c index 5417bf158..ec61b938a 100644 --- a/client/src/cmdlfindala.c +++ b/client/src/cmdlfindala.c @@ -752,7 +752,7 @@ static int CmdIndalaSim(const char *Cmd) { // lf simpsk -1 -c 32 --fc 2 -d 0102030405060708 - PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command"); + PrintAndLogEx(SUCCESS, "Press " _GREEN_("pm3 button") " to abort simulation or run another command"); // indala PSK, clock 32, carrier 0 lf_psksim_t *payload = calloc(1, sizeof(lf_psksim_t) + sizeof(bs)); @@ -1015,7 +1015,7 @@ static int CmdIndalaBrute(const char *Cmd) { } PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "Started brute-forcing INDALA Prox reader"); - PrintAndLogEx(INFO, "Press " _GREEN_("") " or pm3-button to abort simulation"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or press " _GREEN_("") " to abort simulation"); PrintAndLogEx(NORMAL, ""); // main loop diff --git a/client/src/cmdlfio.c b/client/src/cmdlfio.c index 5ef0df99a..11027266b 100644 --- a/client/src/cmdlfio.c +++ b/client/src/cmdlfio.c @@ -55,7 +55,7 @@ static int CmdIOProxWatch(const char *Cmd) { CLIParserFree(ctx); PrintAndLogEx(SUCCESS, "Watching for IO Prox cards - place tag on antenna"); - PrintAndLogEx(INFO, "Press pm3-button to stop reading cards"); + PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to stop reading cards"); clearCommandBuffer(); SendCommandNG(CMD_LF_IO_WATCH, NULL, 0); return lfsim_wait_check(CMD_LF_IO_WATCH); @@ -237,7 +237,7 @@ static int CmdIOProxSim(const char *Cmd) { } PrintAndLogEx(SUCCESS, "Simulating ioProx version: " _YELLOW_("%u") " FC: " _YELLOW_("%u (0x%02x)") " CN: " _YELLOW_("%u"), version, fc, fc, cn); - PrintAndLogEx(SUCCESS, "Press pm3-button to abort simulation or run another command"); + PrintAndLogEx(SUCCESS, "Press " _GREEN_("pm3 button") " to abort simulation or run another command"); uint8_t bs[64]; memset(bs, 0x00, sizeof(bs)); diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c index 933d34a4f..46a5a9448 100644 --- a/client/src/cmdsmartcard.c +++ b/client/src/cmdsmartcard.c @@ -1264,7 +1264,8 @@ static int CmdRelay(const char *Cmd) { mbedtls_net_context netCtx; mbedtls_net_init(&netCtx); - PrintAndLogEx(INFO, "Relaying pm3 to host OS pcsc daemon. Press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Relaying PM3 to host OS pcsc daemon"); + PrintAndLogEx(INFO, "Press " _GREEN_("") " to exit"); uint8_t cmdbuf[512] = {0}; iso14a_card_select_t selectedCard14a; diff --git a/client/src/emv/cmdemv.c b/client/src/emv/cmdemv.c index 47cd6de55..56a07386f 100644 --- a/client/src/emv/cmdemv.c +++ b/client/src/emv/cmdemv.c @@ -2716,7 +2716,7 @@ static int CmdEMVReader(const char *Cmd) { CLIParserFree(ctx); if (continuous) { - PrintAndLogEx(INFO, "Press " _GREEN_("Enter") " to exit"); + PrintAndLogEx(INFO, "Press " _GREEN_("") " to exit"); } uint8_t AID[APDU_AID_LEN] = {0};