From 6051268f1a1f47ffc4de2f01d8fb48e5763cee17 Mon Sep 17 00:00:00 2001 From: oliverhaag Date: Tue, 27 Nov 2012 17:16:41 +0000 Subject: [PATCH] DSO-2250 channel 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 06e44a3..0e1615c 100644 --- a/openhantek/ChangeLog +++ b/openhantek/ChangeLog @@ -196,3 +196,6 @@ 2012-11-26 Oliver Haag * Bugfix: Roll mode caused crash or hanging * Bugfix: DSO-2150 samplerate maximum was 100 MS/s + +2012-11-27 Oliver Haag +* Bugfix: Hantek::Control::setChannelUsed used setTrigger instead of setChannels diff --git a/openhantek/src/hantek/control.cpp b/openhantek/src/hantek/control.cpp index 6488b07..2c17c7c 100644 --- a/openhantek/src/hantek/control.cpp +++ b/openhantek/src/hantek/control.cpp @@ -1121,14 +1121,14 @@ namespace Hantek { } else { // DSO-2250 uses a different value for channel 2 - if(this->specification.command.bulk.setTrigger == BULK_BSETCHANNELS) + if(this->specification.command.bulk.setChannels == BULK_BSETCHANNELS) usedChannels = BUSED_CH2; else usedChannels = USED_CH2; } } - switch(this->specification.command.bulk.setTrigger) { + switch(this->specification.command.bulk.setChannels) { case BULK_SETTRIGGERANDSAMPLERATE: { // SetTriggerAndSamplerate bulk command for trigger source static_cast(this->command[BULK_SETTRIGGERANDSAMPLERATE])->setUsedChannels(usedChannels); -- libgit2 0.21.4