From be9a5920d8fd12d36ea3f9f0b681caf27f232d02 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 18 Jun 2020 11:05:21 +0200
Subject: [PATCH] chg: downloading samples more fine grained

---
 client/src/cmddata.c | 21 +++++++++++++++++----
 client/src/cmddata.h |  3 +++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/client/src/cmddata.c b/client/src/cmddata.c
index 007c32c8a..ce767da09 100644
--- a/client/src/cmddata.c
+++ b/client/src/cmddata.c
@@ -1593,6 +1593,16 @@ static uint8_t getByte(uint8_t bits_per_sample, BitstreamOut *b) {
 }
 
 int getSamples(uint32_t n, bool verbose) {
+    return getSamplesEx(0, n, verbose);
+}
+
+int getSamplesEx(uint32_t start, uint32_t end, bool verbose) {
+
+    if (end < start) {
+        PrintAndLogEx(WARNING, "error, end (%u) is smaller than start (%u)", end, start);
+        return PM3_EINVARG;
+    }
+
     //If we get all but the last byte in bigbuf,
     // we don't have to worry about remaining trash
     // in the last byte in case the bits-per-sample
@@ -1600,13 +1610,16 @@ int getSamples(uint32_t n, bool verbose) {
     uint8_t got[pm3_capabilities.bigbuf_size - 1];
     memset(got, 0x00, sizeof(got));
 
-    if (n == 0 || n > pm3_capabilities.bigbuf_size - 1)
+    uint32_t n = end - start;
+
+    if (n <= 0 || n > pm3_capabilities.bigbuf_size - 1)
         n = pm3_capabilities.bigbuf_size - 1;
 
-    if (verbose) PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") " bytes from device memory", n);
+    if (verbose)
+        PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") " bytes from device memory", n);
 
     PacketResponseNG response;
-    if (!GetFromDevice(BIG_BUF, got, n, 0, NULL, 0, &response, 10000, true)) {
+    if (!GetFromDevice(BIG_BUF, got, n, start, NULL, 0, &response, 10000, true)) {
         PrintAndLogEx(WARNING, "timeout while waiting for reply.");
         return PM3_ETIMEOUT;
     }
@@ -2305,7 +2318,7 @@ static int CmdDataNDEF(const char *Cmd) {
         arg_strx0("dD",  "data", "<hex>", "NDEF data to decode"),
         arg_param_end
     };
-    CLIExecWithReturn(ctx, Cmd, argtable, true);
+    CLIExecWithReturn(ctx, Cmd, argtable, false);
 
     int datalen = 0;
     uint8_t data[MAX_NDEF_LEN] = {0};
diff --git a/client/src/cmddata.h b/client/src/cmddata.h
index abef8fde8..acda950a5 100644
--- a/client/src/cmddata.h
+++ b/client/src/cmddata.h
@@ -72,7 +72,10 @@ void setDemodBuff(uint8_t *buff, size_t size, size_t start_idx);
 bool getDemodBuff(uint8_t *buff, size_t *size);
 void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
 int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveGrph, bool verbose);
+
 int getSamples(uint32_t n, bool verbose);
+int getSamplesEx(uint32_t start, uint32_t end, bool verbose);
+
 void setClockGrid(uint32_t clk, int offset);
 int directionalThreshold(const int *in, int *out, size_t len, int8_t up, int8_t down);
 int AskEdgeDetect(const int *in, int *out, int len, int threshold);