https://github.com/OpenHantek/openhantek/pull/286

dpavlin · Jun 1, 2019 · b75cc90 · b75cc90
1 parent eb33325
commit b75cc90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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",

diff --git 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) {