From 97c029fc55f5447795fa690b6315396452763cca Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 28 Feb 2018 08:12:21 +0100 Subject: [PATCH] textual output --- client/cmdlf.c | 4 +++- client/cmdlfem4x.c | 4 ++-- client/cmdlfhitag.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/cmdlf.c b/client/cmdlf.c index 6bfd10a41..affa71df6 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -865,7 +865,9 @@ int CmdLFfind(const char *Cmd) { signal_t *sp = getSignalProperties(); if (sp->isnoise) { - PrintAndLogEx(NORMAL, "Signal looks just like noise. Looking for Hitag signal now."); + PrintAndLogEx(NORMAL, "Signal looks just like noise. Looking for Hitag signal now."); + + // 26 === RHT2F_UID_ONLY if (CmdLFHitagReader("26") == 0) { PrintAndLogEx(NORMAL, "\nValid Hitag Found!"); return 1;} if (CmdCOTAGRead("") > 0) { PrintAndLogEx(NORMAL, "\nValid COTAG ID Found!"); return 1;} return 0; diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index 6698a2661..9393cdc44 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -1141,7 +1141,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) SendCommand(&c); UsbCommand resp; if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)){ - PrintAndLogEx(WARNING, "Command timed out"); + PrintAndLogEx(DEBUG, "Command timed out"); return -1; } if ( !downloadSamplesEM() ) { @@ -1150,7 +1150,7 @@ int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *word) int testLen = (GraphTraceLen < 1000) ? GraphTraceLen : 1000; if (justNoise_int(GraphBuffer, testLen)) { - PrintAndLogEx(WARNING, "No tag found"); + PrintAndLogEx(DEBUG, "No tag found"); return -1; } return demodEM4x05resp(word); diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c index 3e1bb08d1..8cf9c44fe 100644 --- a/client/cmdlfhitag.c +++ b/client/cmdlfhitag.c @@ -66,6 +66,7 @@ int CmdLFHitagList(const char *Cmd) { FILE* f = NULL; if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE; + memcpy(filename, Cmd, len); if (strlen(filename) > 0) {