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

data autocorr - now uses cliparser

Browse source
This commit is contained in:
iceman1001 2021-03-23 13:56:38 +01:00
commit d84837a12a
1 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

62
client/src/cmddata.c
View file

@ -202,15 +202,6 @@ static int usage_data_rawdemod_p2(void) {
PrintAndLogEx(NORMAL, " data rawdemod p2 64 1 0 = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors"); PrintAndLogEx(NORMAL, " data rawdemod p2 64 1 0 = demod a psk2 tag from GraphBuffer using a clock of RF/64, inverting output and allowing 0 demod errors");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_data_autocorr(void) {
PrintAndLogEx(NORMAL, "Autocorrelate is used to detect repeating sequences. We use it as detection of length in bits a message inside the signal is");
PrintAndLogEx(NORMAL, "Usage: data autocorr w <window> [g]");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help");
PrintAndLogEx(NORMAL, " w <window> window length for correlation - default = 4000");
PrintAndLogEx(NORMAL, " g save back to GraphBuffer (overwrite)");
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
@ -931,39 +922,38 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
} }
static int CmdAutoCorr(const char *Cmd) { static int CmdAutoCorr(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "data autocorr",
"Autocorrelate over window is used to detect repeating sequences.\n"
"We use it as detection of how long in bits a message inside the signal is",
"data autocorr -w 4000\n"
"data autocorr -w 4000 -g"
);
void *argtable[] = {
arg_param_begin,
arg_lit0("g", NULL, "save back to GraphBuffer (overwrite)"),
arg_u64_0("w", "win", "<dec>", "window length for correlation. def 4000"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
bool updateGrph = arg_get_lit(ctx, 1);
uint32_t window = arg_get_u32_def(ctx, 2, 4000);
CLIParserFree(ctx);
uint32_t window = 4000; PrintAndLogEx(INFO, "Using window size " _YELLOW_("%u"), window);
uint8_t cmdp = 0;
bool updateGrph = false; if (GraphTraceLen == 0) {
bool errors = false; PrintAndLogEx(WARNING, "GraphBuffer is empty");
PrintAndLogEx(HINT, "Try `" _YELLOW_("lf read") "` to collect samples");
return PM3_ESOFT;
}
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch (tolower(param_getchar(Cmd, cmdp))) {
case 'h':
return usage_data_autocorr();
case 'g':
updateGrph = true;
cmdp++;
break;
case 'w':
window = param_get32ex(Cmd, cmdp + 1, 4000, 10);
if (window >= GraphTraceLen) { if (window >= GraphTraceLen) {
PrintAndLogEx(WARNING, "window must be smaller than trace (%zu samples)", GraphTraceLen); PrintAndLogEx(WARNING, "window must be smaller than trace (" _YELLOW_("%zu") " samples)", GraphTraceLen);
errors = true; return PM3_EINVARG;
} }
cmdp += 2;
break;
default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
}
//Validations
if (errors || cmdp == 0) return usage_data_autocorr();
AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true); AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
return PM3_SUCCESS; return PM3_SUCCESS;
} }