Use actual data returned from the cmdGetLimits.

Fixes #158

Use actual data returned from the cmdGetLimits.
Fixes #158
Winged Unicorn · David Gräff
1 parent 9935f0a6
Showing 3 changed files with 2 additions and 4 deletions
openhantek/src/hantekdso/hantekdsocontrol.cpp
openhantek/src/hantekprotocol/controlStructs.cpp
openhantek/src/hantekprotocol/controlStructs.h
@@ -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;
@@ -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;
 }
@@ -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(); }
 };
 }