Peter M. Groen / openhantek

Commit 6051268f1a1f47ffc4de2f01d8fb48e5763cee17

Authored by oliverhaag
1 parent db76656c

DSO-2250 channel fix

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
openhantek/ChangeLog
  View file @6051268
@@ -196,3 +196,6 @@ @@ -196,3 +196,6 @@
196 2012-11-26 Oliver Haag <oliver.haag@gmail.com> 196 2012-11-26 Oliver Haag <oliver.haag@gmail.com>
197 * Bugfix: Roll mode caused crash or hanging 197 * Bugfix: Roll mode caused crash or hanging
198 * Bugfix: DSO-2150 samplerate maximum was 100 MS/s 198 * Bugfix: DSO-2150 samplerate maximum was 100 MS/s
  199 +
  200 +2012-11-27 Oliver Haag <oliver.haag@gmail.com>
  201 +* Bugfix: Hantek::Control::setChannelUsed used setTrigger instead of setChannels
openhantek/src/hantek/control.cpp
  View file @6051268
@@ -1121,14 +1121,14 @@ namespace Hantek { @@ -1121,14 +1121,14 @@ namespace Hantek {
1121 } 1121 }
1122 else { 1122 else {
1123 // DSO-2250 uses a different value for channel 2 1123 // DSO-2250 uses a different value for channel 2
1124 - if(this->specification.command.bulk.setTrigger == BULK_BSETCHANNELS) 1124 + if(this->specification.command.bulk.setChannels == BULK_BSETCHANNELS)
1125 usedChannels = BUSED_CH2; 1125 usedChannels = BUSED_CH2;
1126 else 1126 else
1127 usedChannels = USED_CH2; 1127 usedChannels = USED_CH2;
1128 } 1128 }
1129 } 1129 }
1130 1130
1131 - switch(this->specification.command.bulk.setTrigger) { 1131 + switch(this->specification.command.bulk.setChannels) {
1132 case BULK_SETTRIGGERANDSAMPLERATE: { 1132 case BULK_SETTRIGGERANDSAMPLERATE: {
1133 // SetTriggerAndSamplerate bulk command for trigger source 1133 // SetTriggerAndSamplerate bulk command for trigger source
1134 static_cast<BulkSetTriggerAndSamplerate *>(this->command[BULK_SETTRIGGERANDSAMPLERATE])->setUsedChannels(usedChannels); 1134 static_cast<BulkSetTriggerAndSamplerate *>(this->command[BULK_SETTRIGGERANDSAMPLERATE])->setUsedChannels(usedChannels);