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

Conflicts:
	client/util.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 8dd944cb06859e213d92f17180f1a8fbf1924e44..849b96efdabff4deecb7d9f8cfd20a2025c63c80 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -414,7 +414,6 @@ int CmdLFSetConfig(const char *Cmd)
        uint8_t cmdp =0;
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
-               PrintAndLog("working %c", param_getchar(Cmd, cmdp));
                switch(param_getchar(Cmd, cmdp))
                {
                case 'h':

diff --git a/client/util.c b/client/util.c
index c55d3f66acafbb07f895a94d76fbb46f48b6c421..edd9aebce96dec0a3de08dc7ad68798a9a8a0aaf 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -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 val =  param_get8ex(line, paramnum, 255, 10);
-       printf("read %i\n", (int8_t ) val);
        if( (int8_t) val == -1) return 1;
        (*destination) = val;
        return 0;