From 57e0bebcc1d4cf99d70071eae48604149332abd3 Mon Sep 17 00:00:00 2001
From: Winged Unicorn <dw5py29ybgo@gmail.com>
Date: Mon, 16 Jul 2018 01:40:24 +1200
Subject: [PATCH] Use actual data returned from the cmdGetLimits.

---
 openhantek/src/hantekdso/hantekdsocontrol.cpp    | 2 +-
 openhantek/src/hantekprotocol/controlStructs.cpp | 2 +-
 openhantek/src/hantekprotocol/controlStructs.h   | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp
index a315de6..2743900 100644
--- a/openhantek/src/hantekdso/hantekdsocontrol.cpp
+++ b/openhantek/src/hantekdso/hantekdsocontrol.cpp
@@ -135,7 +135,7 @@ Dso::ErrorCode HantekDsoControl::retrieveChannelLevelData() {
         return Dso::ErrorCode::CONNECTION;
     }
 
-    memcpy(controlsettings.offsetLimit, controlsettings.cmdGetLimits.offsetLimitData(),
+    memcpy(controlsettings.offsetLimit, controlsettings.cmdGetLimits.data(),
            sizeof(OffsetsPerGainStep) * specification->channels);
 
     return Dso::ErrorCode::NONE;
diff --git a/openhantek/src/hantekprotocol/controlStructs.cpp b/openhantek/src/hantekprotocol/controlStructs.cpp
index 23164d1..d4f130a 100644
--- a/openhantek/src/hantekprotocol/controlStructs.cpp
+++ b/openhantek/src/hantekprotocol/controlStructs.cpp
@@ -130,7 +130,7 @@ ControlAcquireHardData::ControlAcquireHardData() : ControlCommand(ControlCode::C
 }
 
 ControlGetLimits::ControlGetLimits(size_t channels)
-    : ControlCommand(ControlCode::CONTROL_VALUE, 1), offsetLimit(new OffsetsPerGainStep[channels]) {
+    : ControlCommand(ControlCode::CONTROL_VALUE, sizeof(OffsetsPerGainStep)*channels) {
     value = (uint8_t)ControlValue::VALUE_OFFSETLIMITS;
     data()[0] = 0x01;
 }
diff --git a/openhantek/src/hantekprotocol/controlStructs.h b/openhantek/src/hantekprotocol/controlStructs.h
index fe12d0f..55aab56 100644
--- a/openhantek/src/hantekprotocol/controlStructs.h
+++ b/openhantek/src/hantekprotocol/controlStructs.h
@@ -129,8 +129,6 @@ struct ControlAcquireHardData : public ControlCommand {
 };
 
 struct ControlGetLimits : public ControlCommand {
-    std::unique_ptr<OffsetsPerGainStep[]> offsetLimit;
     ControlGetLimits(size_t channels);
-    inline uint8_t *offsetLimitData() { return (uint8_t *)offsetLimit.get(); }
 };
 }
--
libgit2 0.21.4