github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 'lfsamples' and 'hfsamples' into 'samples'

Browse source
This commit is contained in:
adam@algroup.co.uk 2010-02-06 18:06:31 +00:00
commit 8d183c53b6
2 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/cmddata.c
View file

@ -429,30 +429,6 @@ int CmdHexsamples(const char *Cmd)
return 0; return 0;
} }
int CmdHFSamples(const char *Cmd)
{
int cnt = 0;
int n = strtol(Cmd, NULL, 0);
if(n == 0) {
n = 1000;
} else {
n/= 4;
}
for (int i = 0; i < n; i += 12) {
UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
SendCommand(&c);
WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
for (int j = 0; j < 48; ++j) {
GraphBuffer[cnt++] = (int)(sample_buf[j]);
}
}
GraphTraceLen = cnt;
RepaintGraphWindow();
return 0;
}
int CmdHide(const char *Cmd) int CmdHide(const char *Cmd)
{ {
HideGraphWindow(); HideGraphWindow();
@ -474,7 +450,7 @@ int CmdHpf(const char *Cmd)
return 0; return 0;
} }
int CmdLFSamples(const char *Cmd) int CmdSamples(const char *Cmd)
{ {
int cnt = 0; int cnt = 0;
int n; int n;
@ -880,10 +856,9 @@ static command_t CommandTable[] =
{"fskdemod", CmdFSKdemod, 1, "Demodulate graph window as a HID FSK"}, {"fskdemod", CmdFSKdemod, 1, "Demodulate graph window as a HID FSK"},
{"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"}, {"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
{"hexsamples", CmdHexsamples, 0, "<blocks> [<offset>] -- Dump big buffer as hex bytes"}, {"hexsamples", CmdHexsamples, 0, "<blocks> [<offset>] -- Dump big buffer as hex bytes"},
{"hfsamples", CmdHFSamples, 0, "[nb of samples] Get raw samples for HF tag"},
{"hide", CmdHide, 1, "Hide graph window"}, {"hide", CmdHide, 1, "Hide graph window"},
{"hpf", CmdHpf, 1, "Remove DC offset from trace"}, {"hpf", CmdHpf, 1, "Remove DC offset from trace"},
{"lfsamples", CmdLFSamples, 0, "[128 - 16000] -- Get raw samples for LF tag"}, {"samples", CmdSamples, 0, "[128 - 16000] -- Get raw samples for graph window"},
{"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"}, {"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"},
{"ltrim", CmdLtrim, 1, "<samples> -- Trim samples from left of trace"}, {"ltrim", CmdLtrim, 1, "<samples> -- Trim samples from left of trace"},
{"mandemod", CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"}, {"mandemod", CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},

3
client/cmddata.h
View file

@ -14,10 +14,9 @@ int CmdDetectClockRate(const char *Cmd);
int CmdFSKdemod(const char *Cmd); int CmdFSKdemod(const char *Cmd);
int CmdGrid(const char *Cmd); int CmdGrid(const char *Cmd);
int CmdHexsamples(const char *Cmd); int CmdHexsamples(const char *Cmd);
int CmdHFSamples(const char *Cmd);
int CmdHide(const char *Cmd); int CmdHide(const char *Cmd);
int CmdHpf(const char *Cmd); int CmdHpf(const char *Cmd);
int CmdLFSamples(const char *Cmd); int CmdSamples(const char *Cmd);
int CmdLoad(const char *Cmd); int CmdLoad(const char *Cmd);
int CmdLtrim(const char *Cmd); int CmdLtrim(const char *Cmd);
int CmdManchesterDemod(const char *Cmd); int CmdManchesterDemod(const char *Cmd);