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

CHG: 'hw tune' adhjusted the NON_VOLTAGE limit to 0.999v, below this value the antenna is considered not connected.

Browse source
This commit is contained in:
iceman1001 2017-01-18 13:18:03 +01:00
commit bb52291837
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/cmddata.c
View file

@ -2238,6 +2238,12 @@ int CmdTuneSamples(const char *Cmd)
} }
} }
#define NON_VOLTAGE 999
#define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
#define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
#define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
#define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
int peakv, peakf; int peakv, peakf;
int vLf125, vLf134, vHf; int vLf125, vLf134, vHf;
vLf125 = resp.arg[0] & 0xffff; vLf125 = resp.arg[0] & 0xffff;
@ -2246,19 +2252,16 @@ int CmdTuneSamples(const char *Cmd)
peakf = resp.arg[2] & 0xffff; peakf = resp.arg[2] & 0xffff;
peakv = resp.arg[2] >> 16; peakv = resp.arg[2] >> 16;
PrintAndLog(""); PrintAndLog("");
if ( vLf125 > 0 ) if ( vLf125 > NON_VOLTAGE )
PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0);
if ( vLf134 > 0 ) if ( vLf134 > NON_VOLTAGE )
PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0);
if ( peakv > 0 && peakf > 0 ) if ( peakv > NON_VOLTAGE && peakf > NON_VOLTAGE )
PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
if ( vHf > 0 ) if ( vHf > NON_VOLTAGE )
PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0); PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0);
#define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
#define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
#define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
#define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
if (peakv < LF_UNUSABLE_V) if (peakv < LF_UNUSABLE_V)
PrintAndLog("# Your LF antenna is unusable."); PrintAndLog("# Your LF antenna is unusable.");