From 3bc60881d072408fb1730243e646f4f24bb76820 Mon Sep 17 00:00:00 2001 From: "tom.wimmenhove@gmail.com" Date: Thu, 7 Feb 2019 17:10:09 -0500 Subject: [PATCH 1/2] Fixed DSO2090 external trigger ID. Fixes #285 --- openhantek/src/hantekdso/models/modelDSO2090.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhantek/src/hantekdso/models/modelDSO2090.cpp b/openhantek/src/hantekdso/models/modelDSO2090.cpp index cb81bb42..21b8e4d7 100644 --- a/openhantek/src/hantekdso/models/modelDSO2090.cpp +++ b/openhantek/src/hantekdso/models/modelDSO2090.cpp @@ -42,7 +42,7 @@ void initSpecifications(Dso::ControlSpecification& specification) { specification.gain = { {0,0.08} , {1,0.16} , {2,0.40} , {0,0.80} , {1,1.60} , {2,4.00} , {0,8.00} , {1,16.00} , {2,40.00} }; specification.sampleSize = 8; - specification.specialTriggerChannels = {{"EXT", -2}, {"EXT/10", -3}}; + specification.specialTriggerChannels = {{"EXT", -1}}; } ModelDSO2090::ModelDSO2090() : DSOModel(ID, 0x04b5, 0x2090, 0x04b4, 0x2090, "dso2090x86", "DSO-2090", From 71ecb2e6ffc9b3a2095477c55b2c00b33c4a33ec Mon Sep 17 00:00:00 2001 From: "tom.wimmenhove@gmail.com" Date: Fri, 8 Feb 2019 18:51:53 -0500 Subject: [PATCH 2/2] trigger\special setting was loaded as toInt() instead of toBool() --- openhantek/src/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhantek/src/settings.cpp b/openhantek/src/settings.cpp index d7f1d476..ac8a315e 100644 --- a/openhantek/src/settings.cpp +++ b/openhantek/src/settings.cpp @@ -91,7 +91,7 @@ void DsoSettings::load() { if (store->contains("position")) scope.trigger.position = store->value("position").toDouble(); if (store->contains("slope")) scope.trigger.slope = (Dso::Slope)store->value("slope").toUInt(); if (store->contains("source")) scope.trigger.source = store->value("source").toUInt(); - if (store->contains("special")) scope.trigger.special = store->value("special").toInt(); + if (store->contains("special")) scope.trigger.special = store->value("special").toBool(); store->endGroup(); // Spectrum for (ChannelID channel = 0; channel < scope.spectrum.size(); ++channel) {