From 0dd75a1423967b60e4b0a9fc6741ad63057c32dc Mon Sep 17 00:00:00 2001 From: oliverhaag Date: Mon, 5 Nov 2012 19:38:46 +0000 Subject: [PATCH] Small DSO-2250 fix --- openhantek/ChangeLog | 3 +++ openhantek/src/hantek/control.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog index 47412b4..67b7da5 100644 --- a/openhantek/ChangeLog +++ b/openhantek/ChangeLog @@ -173,3 +173,6 @@ 2012-10-28 Oliver Haag * Bugfix: DSO-2250 support, thanks to Dmitry Kolyadintsev * Bugfix: Remove invalid divider for large buffers + +2012-11-05 Oliver Haag +* Bugfix: short instead of long int for DSO-2250 trigger offset diff --git a/openhantek/src/hantek/control.cpp b/openhantek/src/hantek/control.cpp index 591d592..887cbeb 100644 --- a/openhantek/src/hantek/control.cpp +++ b/openhantek/src/hantek/control.cpp @@ -1176,8 +1176,8 @@ namespace Hantek { } case BULK_FSETBUFFER: { // Calculate the position values (Inverse, maximum is 0x7ffff) - unsigned short int positionPre = 0x7ffff - this->specification.recordLengths[this->settings.recordLengthId] + positionSamples; - unsigned short int positionPost = 0x7ffff - positionSamples; + unsigned long int positionPre = 0x7fffful - this->specification.recordLengths[this->settings.recordLengthId] + positionSamples; + unsigned long int positionPost = 0x7fffful - positionSamples; // SetBuffer2250 bulk command for trigger position BulkSetBuffer2250 *commandSetBuffer2250 = static_cast(this->command[BULK_FSETBUFFER]); -- libgit2 0.21.4