RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-12 02:58:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

data clear, hex2bin - now uses cliparser

Browse source
This commit is contained in:
iceman1001 2021-03-22 21:46:48 +01:00
parent b02d076928
commit 22dac2d098
1 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
client/src/cmddata.c
View file

@ -223,24 +223,12 @@ static int usage_data_detectclock(void) {
PrintAndLogEx(NORMAL, " data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer"); PrintAndLogEx(NORMAL, " data detectclock n = detect the clock of an nrz/direct modulated wave in the GraphBuffer");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_data_hex2bin(void) {
PrintAndLogEx(NORMAL, "Usage: data hex2bin <hex_digits>");
PrintAndLogEx(NORMAL, " This function will ignore all non-hexadecimal characters (but stop reading on whitespace)");
return PM3_SUCCESS;
}
static int usage_data_bin2hex(void) { static int usage_data_bin2hex(void) {
PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>"); PrintAndLogEx(NORMAL, "Usage: data bin2hex <binary_digits>");
PrintAndLogEx(NORMAL, " This function will ignore all characters not 1 or 0 (but stop reading on whitespace)"); PrintAndLogEx(NORMAL, " This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_data_buffclear(void) {
PrintAndLogEx(NORMAL, "This function clears the bigbuff on deviceside");
PrintAndLogEx(NORMAL, "Usage: data clear [h]");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help");
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
@ -971,7 +959,19 @@ static int CmdAutoCorr(const char *Cmd) {
} }
static int CmdBitsamples(const char *Cmd) { static int CmdBitsamples(const char *Cmd) {
(void)Cmd; // Cmd is not used so far
CLIParserContext *ctx;
CLIParserInit(&ctx, "data bitsamples",
"Get raw samples from device as bitstring",
"data bitsamples"
);
void *argtable[] = {
arg_param_begin,
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx);
int cnt = 0; int cnt = 0;
uint8_t got[12288]; uint8_t got[12288];
@ -994,9 +994,18 @@ static int CmdBitsamples(const char *Cmd) {
} }
static int CmdBuffClear(const char *Cmd) { static int CmdBuffClear(const char *Cmd) {
char cmdp = tolower(param_getchar(Cmd, 0)); CLIParserContext *ctx;
if (cmdp == 'h') return usage_data_buffclear(); CLIParserInit(&ctx, "data clear",
"This function clears the bigbuff on deviceside\n"
"and graph window",
"data clear"
);
void *argtable[] = {
arg_param_begin,
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx);
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_BUFF_CLEAR, NULL, 0); SendCommandNG(CMD_BUFF_CLEAR, NULL, 0);
ClearGraph(true); ClearGraph(true);
@ -2245,24 +2254,34 @@ static int Cmdbin2hex(const char *Cmd) {
} }
static int Cmdhex2bin(const char *Cmd) { static int Cmdhex2bin(const char *Cmd) {
int bg = 0, en = 0; CLIParserContext *ctx;
if (param_getptr(Cmd, &bg, &en, 0)) return usage_data_hex2bin(); CLIParserInit(&ctx, "data hex2bin",
"This function will ignore all non-hexadecimal characters\n"
"but stop reading on whitespace",
"data hex2bin -d 01020304"
);
void *argtable[] = {
arg_param_begin,
arg_str0("d", "data", "<hex>", "bytes to convert"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, false);
int dlen = 0;
uint8_t data[200] = {0x00};
int res = CLIParamHexToBuf(arg_get_str(ctx, 1), data, sizeof(data), &dlen);
CLIParserFree(ctx);
while (bg <= en) { if (res) {
char x = Cmd[bg++]; PrintAndLogEx(FAILED, "Error parsing bytes");
// capitalize return PM3_EINVARG;
if (x >= 'a' && x <= 'f') }
x -= 32;
// convert to numeric value
if (x >= '0' && x <= '9')
x -= '0';
else if (x >= 'A' && x <= 'F')
x -= 'A' - 10;
else
continue;
for (int i = 0 ; i < 4 ; ++i) PrintAndLogEx(SUCCESS, "" NOLF);
PrintAndLogEx(NORMAL, "%d" NOLF, (x >> (3 - i)) & 1); for (int i = 0; i < dlen; i++) {
char x = data[i];
for (int j = 0 ; j < 4 ; ++j) {
PrintAndLogEx(NORMAL, "%d" NOLF, (x >> (3 - j)) & 1);
}
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;