diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index ace50f2d7..0d3703808 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -1274,6 +1274,7 @@ int CmdLFfind(const char *Cmd) { if (demodHID() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("HID Prox ID") " found!"); goto out;} if (demodAWID() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("AWID ID") " found!"); goto out;} + if (demodIOProx() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;} if (demodParadox() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paradox ID") " found!"); goto out;} if (demodEM410x() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!"); goto out;} @@ -1281,7 +1282,7 @@ int CmdLFfind(const char *Cmd) { if (demodGuard() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Guardall G-Prox II ID") " found!"); goto out; } if (demodIdteck() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Idteck ID") " found!"); goto out;} if (demodIndala() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Indala ID") " found!"); goto out;} - if (demodIOProx() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("IO Prox ID") " found!"); goto out;} + if (demodJablotron() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Jablotron ID") " found!"); goto out;} if (demodNedap() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NEDAP ID") " found!"); goto out;} if (demodNexWatch() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("NexWatch ID") " found!"); goto out;} diff --git a/client/src/cmdlffdx.c b/client/src/cmdlffdx.c index 98f93baed..28d3ff12c 100644 --- a/client/src/cmdlffdx.c +++ b/client/src/cmdlffdx.c @@ -247,7 +247,7 @@ int demodFDX(void) { uint8_t raw[8]; num_to_bytes(rawid, 8, raw); - PrintAndLogEx(SUCCESS, "\nFDX-B / ISO 11784/5 Animal Tag ID Found: Raw : %s", sprint_hex(raw, 8)); + PrintAndLogEx(SUCCESS, "FDX-B / ISO 11784/5 Animal"); PrintAndLogEx(SUCCESS, "Animal ID " _GREEN_("%04u-%012"PRIu64), countryCode, NationalCode); PrintAndLogEx(SUCCESS, "National Code " _GREEN_("%012" PRIu64) " (0x%" PRIx64 ")", NationalCode, NationalCode); PrintAndLogEx(SUCCESS, "Country Code %04u", countryCode); @@ -259,6 +259,8 @@ int demodFDX(void) { compute_crc(CRC_11784, raw, sizeof(raw), &c[0], &c[1]); PrintAndLogEx(SUCCESS, "CRC-16 0x%04X (%s) ", crc, (crc == (c[1] << 8 | c[0])) ? _GREEN_("ok") : _RED_("fail")); + PrintAndLogEx(SUCCESS, "Raw " _GREEN_("%s"), sprint_hex(raw, 8)); + if (g_debugMode) { PrintAndLogEx(DEBUG, "Start marker %d; Size %zu", preambleIndex, size); char *bin = sprint_bin_break(DemodBuffer, size, 16); diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 35a00ab11..be34148a6 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -51,6 +51,7 @@ static int usage_lf_hid_watch(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid watch")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } static int usage_lf_hid_sim(void) { @@ -63,6 +64,7 @@ static int usage_lf_hid_sim(void) { PrintAndLogEx(NORMAL, " ID - HID id"); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid sim 2006ec0c86")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } static int usage_lf_hid_clone(void) { @@ -76,6 +78,7 @@ static int usage_lf_hid_clone(void) { PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid clone 2006ec0c86")); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid clone l 2006ec0c86")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } static int usage_lf_hid_brute(void) { @@ -100,6 +103,7 @@ static int usage_lf_hid_brute(void) { PrintAndLogEx(NORMAL, _YELLOW_(" lf hid brute w H10301 f 224")); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid brute w H10301 f 21 d 2000")); PrintAndLogEx(NORMAL, _YELLOW_(" lf hid brute v w H10301 f 21 c 200 d 2000")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c index 919c914b2..421c3001a 100644 --- a/client/src/cmdlfindala.c +++ b/client/src/cmdlfindala.c @@ -52,8 +52,9 @@ static int usage_lf_indala_demod(void) { PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf indala demod")); PrintAndLogEx(NORMAL, _YELLOW_(" lf indala demod 32") " = demod a Indala tag from GraphBuffer using a clock of RF/32"); - PrintAndLogEx(NORMAL, _YELLOW_(" lf indala demod 32 1") " = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data"); + PrintAndLogEx(NORMAL, _YELLOW_(" lf indala demod 32 1") " = demod a Indala tag from GraphBuffer using a clock of RF/32 and inverting data"); PrintAndLogEx(NORMAL, _YELLOW_(" lf indala demod 64 1 0") " = demod a Indala tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -69,6 +70,7 @@ static int usage_lf_indala_sim(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf indala sim deadc0de")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -260,7 +262,7 @@ static int CmdIndalaDemod(const char *Cmd) { uint32_t uid7 = bytebits_to_byte(DemodBuffer + 192, 32); PrintAndLogEx( SUCCESS - , "Indala - len %zu, Raw: 0x%x%08x%08x%08x%08x%08x%08x" + , "Indala - len %zu, Raw: %x%08x%08x%08x%08x%08x%08x" , DemodBufferLen , uid1 , uid2 diff --git a/client/src/cmdlfio.c b/client/src/cmdlfio.c index 10a4b5419..e9a0b25ae 100644 --- a/client/src/cmdlfio.c +++ b/client/src/cmdlfio.c @@ -37,6 +37,7 @@ static int usage_lf_io_watch(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf io watch")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -53,6 +54,7 @@ static int usage_lf_io_sim(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf io sim 01 101 1337")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -70,6 +72,7 @@ static int usage_lf_io_clone(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, _YELLOW_(" lf io clone 01 101 1337")); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; }