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

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse source 
Conflicts:
	client/util.c
This commit is contained in:
iceman1001 2015-02-14 12:30:08 +01:00
commit 6af88242eb
2 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/cmdlf.c
View file

@ -414,7 +414,6 @@ int CmdLFSetConfig(const char *Cmd)
uint8_t cmdp =0; uint8_t cmdp =0;
while(param_getchar(Cmd, cmdp) != 0x00) while(param_getchar(Cmd, cmdp) != 0x00)
{ {
PrintAndLog("working %c", param_getchar(Cmd, cmdp));
switch(param_getchar(Cmd, cmdp)) switch(param_getchar(Cmd, cmdp))
{ {
case 'h': case 'h':

1
client/util.c
View file

@ -237,7 +237,6 @@ uint8_t param_get8(const char *line, int paramnum)
uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination) uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
{ {
uint8_t val = param_get8ex(line, paramnum, 255, 10); uint8_t val = param_get8ex(line, paramnum, 255, 10);
printf("read %i\n", (int8_t ) val);
if( (int8_t) val == -1) return 1; if( (int8_t) val == -1) return 1;
(*destination) = val; (*destination) = val;
return 0; return 0;