From: rkblackfire Date: Mon, 22 Jan 2018 17:59:48 +0000 (+0100) Subject: chg: print only valid tuning data X-Git-Tag: v3.1.0~83^2~1 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/095173f72d354f7fee70cdc84115302e633f3cb0 chg: print only valid tuning data only print the ranges which were tuned, thus not showing an error for 'lf antenna' when called 'hw tune hf' and vice versa --- diff --git a/client/cmddata.c b/client/cmddata.c index 9b960de9..9bfe58f9 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1281,24 +1281,34 @@ int CmdTuneSamples(const char *Cmd) peakf = resp.arg[2] & 0xffff; peakv = resp.arg[2] >> 16; PrintAndLog(""); - PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/500.0); - PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/500.0); - PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/500.0, 12000.0/(peakf+1)); - PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); + if (arg & FLAG_TUNE_LF) + { + PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/500.0); + PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/500.0); + PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/500.0, 12000.0/(peakf+1)); + } + if (arg & FLAG_TUNE_HF) + PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); #define LF_UNUSABLE_V 3000 #define LF_MARGINAL_V 15000 #define HF_UNUSABLE_V 3200 #define HF_MARGINAL_V 8000 - if (peakv<<1 < LF_UNUSABLE_V) - PrintAndLog("# Your LF antenna is unusable."); - else if (peakv<<1 < LF_MARGINAL_V) - PrintAndLog("# Your LF antenna is marginal."); - if (vHf < HF_UNUSABLE_V) - PrintAndLog("# Your HF antenna is unusable."); - else if (vHf < HF_MARGINAL_V) - PrintAndLog("# Your HF antenna is marginal."); + if (arg & FLAG_TUNE_LF) + { + if (peakv<<1 < LF_UNUSABLE_V) + PrintAndLog("# Your LF antenna is unusable."); + else if (peakv<<1 < LF_MARGINAL_V) + PrintAndLog("# Your LF antenna is marginal."); + } + if (arg & FLAG_TUNE_HF) + { + if (vHf < HF_UNUSABLE_V) + PrintAndLog("# Your HF antenna is unusable."); + else if (vHf < HF_MARGINAL_V) + PrintAndLog("# Your HF antenna is marginal."); + } if (peakv<<1 >= LF_UNUSABLE_V) { for (int i = 0; i < 256; i++) {