make calibration frequency setting persistent

Signed-off-by: Martin <[email protected]>
OpenHantek · Mar 30, 2020 · 26c1a49 · 26c1a49
1 parent 43cd7f4
commit 26c1a49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h
@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20200325 build 620"
+#define OH_BUILD "20200330 build 621"
diff --git a/openhantek/src/dsosettings.cpp b/openhantek/src/dsosettings.cpp
@@ -86,6 +86,7 @@ void DsoSettings::load() {
     if (store->contains("timebase")) scope.horizontal.timebase = store->value("timebase").toDouble();
     if (store->contains("recordLength")) scope.horizontal.recordLength = store->value("recordLength").toUInt();
     if (store->contains("samplerate")) scope.horizontal.samplerate = store->value("samplerate").toDouble();
+    if (store->contains("calfreq")) scope.horizontal.calfreq = store->value("calfreq").toDouble();
     store->endGroup();
     // Trigger
     store->beginGroup("trigger");
@@ -225,6 +226,7 @@ void DsoSettings::save() {
     store->setValue("timebase", scope.horizontal.timebase);
     store->setValue("recordLength", scope.horizontal.recordLength);
     store->setValue("samplerate", scope.horizontal.samplerate);
+    store->setValue("calfreq", scope.horizontal.calfreq);
     store->endGroup(); // horizontal
     // Trigger
     store->beginGroup("trigger");

diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp
@@ -351,6 +351,7 @@ void HantekDsoControl::applySettings(DsoSettingsScope *scope) {
     }
 
     setRecordTime(scope->horizontal.timebase * DIVS_TIME);
+    setCalFreq(scope->horizontal.calfreq);
     setTriggerMode(scope->trigger.mode);
     setTriggerOffset (scope->trigger.offset);
     setTriggerSlope(scope->trigger.slope);