ADD: @pwpivi latest fixes.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 5cce16e423dfb85226be65f67302f15a737e275b..ebab14396f28f456ef128dafeb3b0ffa06b93552 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -392,7 +392,7 @@ int Cmdmandecoderaw(const char *Cmd)
        int errCnt=0;
        size_t size=0;
        int invert=0;
        int errCnt=0;
        size_t size=0;
        int invert=0;

-       size_t maxErr = 20;
+       int maxErr = 20;

        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') {
                PrintAndLog("Usage:  data manrawdecode [invert] [maxErr]");
        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') {
                PrintAndLog("Usage:  data manrawdecode [invert] [maxErr]");


@@ -498,18 +498,12 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
        //ask raw demod GraphBuffer first
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
        //ask raw demod GraphBuffer first

-       int offset=0, clk=0, invert=0, maxErr=0, ans=0;
-       ans = sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
-
-       if ( ans < 1) {
-               if (g_debugMode || verbose) PrintAndLog("Error when reading input parameters: %d", ans);
-               return 0;
-       }
+       int offset=0, clk=0, invert=0, maxErr=0;
+       sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);

        
        uint8_t BitStream[MAX_DEMOD_BUF_LEN];
        size_t size = getFromGraphBuf(BitStream);         
        
        uint8_t BitStream[MAX_DEMOD_BUF_LEN];
        size_t size = getFromGraphBuf(BitStream);         

-
-       int errCnt = askdemod(BitStream, &size, &clk, 0, maxErr, 0, 0);  
+       int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);  

        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
                        return 0;  
        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
                        return 0;