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

data fsktonrz - now uses cliparser

Browse source
This commit is contained in:
iceman1001 2021-03-11 09:26:02 +01:00
commit c5c689f50f
1 changed files with 22 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

63
client/src/cmddata.c
View file

@ -251,15 +251,7 @@ static int usage_data_buffclear(void) {
PrintAndLogEx(NORMAL, " h This help"); PrintAndLogEx(NORMAL, " h This help");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_data_fsktonrz(void) {
PrintAndLogEx(NORMAL, "Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help");
PrintAndLogEx(NORMAL, " c <clock> enter the a clock (omit to autodetect)");
PrintAndLogEx(NORMAL, " l <fc_low> enter a field clock (omit to autodetect)");
PrintAndLogEx(NORMAL, " f <fc_high> enter a field clock (omit to autodetect)");
return PM3_SUCCESS;
}
//set the demod buffer with given array of binary (one bit per byte) //set the demod buffer with given array of binary (one bit per byte)
//by marshmellow //by marshmellow
@ -2295,36 +2287,27 @@ static int FSKToNRZ(int *data, size_t *dataLen, uint8_t clk, uint8_t LowToneFC,
} }
static int CmdFSKToNRZ(const char *Cmd) { static int CmdFSKToNRZ(const char *Cmd) {
// take clk, fc_low, fc_high
// blank = auto; CLIParserContext *ctx;
bool errors = false; CLIParserInit(&ctx, "data fsktonrz",
char cmdp = 0; "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)\n"
int clk = 0, fc_low = 10, fc_high = 8; "Omitted values are autodetect instead",
while (param_getchar(Cmd, cmdp) != 0x00) { "data fsktonrz\n"
switch (tolower(param_getchar(Cmd, cmdp))) { "data fsktonrz -c 32 --low 8 --hi 10");
case 'h':
return usage_data_fsktonrz(); void *argtable[] = {
case 'c': arg_param_begin,
clk = param_get32ex(Cmd, cmdp + 1, 0, 10); arg_int0("c", "clk", "<dec>", "clock"),
cmdp += 2; arg_int0(NULL, "low", "<dec>", "low field clock"),
break; arg_int0(NULL, "hi", "<dec>", "high field clock"),
case 'f': arg_param_end
fc_high = param_get32ex(Cmd, cmdp + 1, 0, 10); };
cmdp += 2; CLIExecWithReturn(ctx, Cmd, argtable, true);
break;
case 'l': int clk = arg_get_int_def(ctx, 1, 0);
fc_low = param_get32ex(Cmd, cmdp + 1, 0, 10); int fc_low = arg_get_int_def(ctx, 2, 0);
cmdp += 2; int fc_high = arg_get_int_def(ctx, 3, 0);
break; CLIParserFree(ctx);
default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
if (errors) break;
}
//Validations
if (errors) return usage_data_fsktonrz();
setClockGrid(0, 0); setClockGrid(0, 0);
DemodBufferLen = 0; DemodBufferLen = 0;
@ -2567,11 +2550,9 @@ static command_t CommandTable[] = {
{"shiftgraphzero", CmdGraphShiftZero, AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"}, {"shiftgraphzero", CmdGraphShiftZero, AlwaysAvailable, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
{"timescale", CmdTimeScale, AlwaysAvailable, "Set a timescale to get a differential reading between the yellow and purple markers as time duration\n"}, {"timescale", CmdTimeScale, AlwaysAvailable, "Set a timescale to get a differential reading between the yellow and purple markers as time duration\n"},
{"zerocrossings", CmdZerocrossings, AlwaysAvailable, "Count time between zero-crossings"}, {"zerocrossings", CmdZerocrossings, AlwaysAvailable, "Count time between zero-crossings"},
{"convertbitstream", CmdConvertBitStream, AlwaysAvailable, "Convert GraphBuffer's 0/1 values to 127 / -127"}, {"convertbitstream", CmdConvertBitStream, AlwaysAvailable, "Convert GraphBuffer's 0/1 values to 127 / -127"},
{"getbitstream", CmdGetBitStream, AlwaysAvailable, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"}, {"getbitstream", CmdGetBitStream, AlwaysAvailable, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
{"-----------", CmdHelp, AlwaysAvailable, "------------------------- " _CYAN_("General") "-------------------------"}, {"-----------", CmdHelp, AlwaysAvailable, "------------------------- " _CYAN_("General") "-------------------------"},
{"bin2hex", Cmdbin2hex, AlwaysAvailable, "Converts binary to hexadecimal"}, {"bin2hex", Cmdbin2hex, AlwaysAvailable, "Converts binary to hexadecimal"},
{"bitsamples", CmdBitsamples, IfPm3Present, "Get raw samples as bitstring"}, {"bitsamples", CmdBitsamples, IfPm3Present, "Get raw samples as bitstring"},