Update CHANGELOG for 3.1.0 release

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 9bfe58f9652fe3ca41a2ceed16e3645aeb95d58a..c4f0e8a353bcb3b93c3b02133bb06319b27268f3 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -8,15 +8,15 @@
 // Data and Graph commands
 //-----------------------------------------------------------------------------
 
 // Data and Graph commands
 //-----------------------------------------------------------------------------
 

+#include "cmddata.h"
+

 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
 #include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
 #include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX

-#include "data.h"     // also included in util.h
-#include "cmddata.h"

 #include "util.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdmain.h"

-#include "proxmark3.h"
+#include "comms.h"

 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "cmdparser.h"// already included in cmdmain.h
 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "cmdparser.h"// already included in cmdmain.h


@@ -591,8 +591,7 @@ int CmdBitsamples(const char *Cmd)
        int cnt = 0;
        uint8_t got[12288];
 
        int cnt = 0;
        uint8_t got[12288];
 

-       GetFromBigBuf(got,sizeof(got),0);
-       WaitForResponse(CMD_ACK,NULL);
+       GetFromBigBuf(got, sizeof(got), 0 , NULL, -1, false);

 
                for (int j = 0; j < sizeof(got); j++) {
                        for (int k = 0; k < 8; k++) {
 
                for (int j = 0; j < sizeof(got); j++) {
                        for (int k = 0; k < 8; k++) {


@@ -1131,8 +1130,7 @@ int CmdHexsamples(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       GetFromBigBuf(got,requested,offset);
-       WaitForResponse(CMD_ACK,NULL);
+       GetFromBigBuf(got, requested, offset, NULL, -1, false);

 
        i = 0;
        for (j = 0; j < requested; j++) {
 
        i = 0;
        for (j = 0; j < requested; j++) {


@@ -1200,10 +1198,9 @@ int getSamples(int n, bool silent)
                n = sizeof(got);
 
        if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);
                n = sizeof(got);
 
        if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);

-       GetFromBigBuf(got,n,0);
-       if (!silent) PrintAndLog("Data fetched");

        UsbCommand response;
        UsbCommand response;

-       WaitForResponse(CMD_ACK, &response);
+       GetFromBigBuf(got, n, 0, &response, -1, false);
+       if (!silent) PrintAndLog("Data fetched");

        uint8_t bits_per_sample = 8;
 
        //Old devices without this feature would send 0 at arg[0]
        uint8_t bits_per_sample = 8;
 
        //Old devices without this feature would send 0 at arg[0]