DDS120 EEPROM contains no calibration data but factory fimware

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
OpenHantek · Apr 6, 2020 · b2c5492 · b2c5492
1 parent 0e8583f
commit b2c5492
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 26 deletions.
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 "20200405 build 635"
+#define OH_BUILD "20200406 build 636"
diff --git a/openhantek/src/hantekdso/controlspecification.h b/openhantek/src/hantekdso/controlspecification.h
@@ -51,7 +51,8 @@ struct ControlSpecification {
     std::vector<FixedSampleRate> fixedSampleRates;
 
     // Calibration
-
+    /// DSO6022 has calibration in small EEPROM, DDS120 has big fw EEPROM
+    bool hasCalibrationStorage = true;
     /// The sample values at the top of the screen
     typedef std::vector<int> VoltageScale;
     std::vector<VoltageScale> voltageScale; // Per channel

diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp
@@ -376,11 +376,15 @@ unsigned HantekDsoControl::getRecordLength() const {
 Dso::ErrorCode HantekDsoControl::retrieveChannelLevelData() {
     // Get calibration data from EEPROM
     //printf( "retrieveChannelLevelData()\n" );
-    int errorCode = device->controlRead(&controlsettings.cmdGetLimits);
+    int errorCode = -1;
+    if ( specification->hasCalibrationStorage )
+        errorCode = device->controlRead(&controlsettings.cmdGetLimits);
     if ( errorCode < 0) {
+        // invalidate the calibration values.
         memset(controlsettings.calibrationValues, 0xFF, sizeof( CalibrationValues ) );
-        qWarning() << tr("Couldn't get calibration data from oscilloscope");
-        emit statusMessage(tr("Couldn't get calibration data from oscilloscope"), 0);
+        QString message = tr("Couldn't get calibration data from oscilloscope's EEPROM. Use a config file for calibration!");
+        qWarning() << message;
+        emit statusMessage( message , 0);
         emit communicationError();
         return Dso::ErrorCode::CONNECTION;
     }

diff --git a/openhantek/src/hantekdso/models/modelDDS120.cpp b/openhantek/src/hantekdso/models/modelDDS120.cpp
@@ -136,6 +136,7 @@ static void initSpecifications(Dso::ControlSpecification& specification) {
     specification.fixedUSBinLength = 0;
     // calibration frequency (requires >FW0206)
     specification.calfreqSteps = { 50, 60, 100, 200, 500, 1e3, 2e3, 5e3, 10e3, 20e3, 50e3, 100e3 };
+    specification.hasCalibrationStorage = false;
 }
 
 static void applyRequirements_(HantekDsoControl *dsoControl) {

diff --git a/openhantek/src/hantekdso/models/modelDSO6022.cpp b/openhantek/src/hantekdso/models/modelDSO6022.cpp
@@ -138,6 +138,7 @@ static void initSpecifications(Dso::ControlSpecification& specification) {
 
     // calibration frequency (requires >FW0206)
     specification.calfreqSteps = { 50, 60, 100, 200, 500, 1e3, 2e3, 5e3, 10e3, 20e3, 50e3, 100e3 };
+    specification.hasCalibrationStorage = true;
 }
 
 static void applyRequirements_(HantekDsoControl *dsoControl) {

diff --git a/openhantek/translations/openhantek_de.ts b/openhantek/translations/openhantek_de.ts
@@ -428,15 +428,18 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="382"/>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="383"/>
         <source>Couldn&apos;t get calibration data from oscilloscope</source>
-        <translation>Konnte Kalibrierdaten des Oszilloskops nicht lesen</translation>
+        <translation type="vanished">Konnte Kalibrierdaten des Oszilloskops nicht lesen</translation>
     </message>
     <message>
         <source>Couldn&apos;t get channel level data from oscilloscope</source>
         <translation type="vanished">Konnte Kanalpegeldaten des Oszilloskops nicht lesen</translation>
     </message>
+    <message>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="385"/>
+        <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
+        <translation>Konnte Kalibrierdaten des Oszilloskops nicht lesen, benutze eine config-Datei für die Kalibrierung!</translation>
+    </message>
 </context>
 <context>
     <name>HorizontalDock</name>

diff --git a/openhantek/translations/openhantek_es.ts b/openhantek/translations/openhantek_es.ts
@@ -428,10 +428,13 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="382"/>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="383"/>
         <source>Couldn&apos;t get calibration data from oscilloscope</source>
-        <translation>No se pudieron obtener los datos de calibración del osciloscopio</translation>
+        <translation type="vanished">No se pudieron obtener los datos de calibración del osciloscopio</translation>
+    </message>
+    <message>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="385"/>
+        <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
+        <translation>No se pudieron obtener los datos de calibración del osciloscopio. ¡Usa un archivo de configuración para la calibración!</translation>
     </message>
 </context>
 <context>

diff --git a/openhantek/translations/openhantek_fr.ts b/openhantek/translations/openhantek_fr.ts
@@ -429,16 +429,15 @@
 </context>
 <context>
     <name>HantekDsoControl</name>
-    <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="382"/>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="383"/>
-        <source>Couldn&apos;t get calibration data from oscilloscope</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t get channel level data from oscilloscope</source>
         <translation type="vanished">Impossible d&apos;obtenir les données de niveau du canal depuis l&apos;oscilloscope</translation>
     </message>
+    <message>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="385"/>
+        <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
+        <translation>Impossible d&apos;obtenir les données de niveau du canal depuis l&apos;oscilloscope. Utilisez un fichier de configuration pour la calibration !</translation>
+    </message>
 </context>
 <context>
     <name>HorizontalDock</name>

diff --git a/openhantek/translations/openhantek_it.ts b/openhantek/translations/openhantek_it.ts
@@ -428,9 +428,8 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="382"/>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="383"/>
-        <source>Couldn&apos;t get calibration data from oscilloscope</source>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="385"/>
+        <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/openhantek/translations/openhantek_pt.ts b/openhantek/translations/openhantek_pt.ts
@@ -451,16 +451,15 @@
 </context>
 <context>
     <name>HantekDsoControl</name>
-    <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="382"/>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="383"/>
-        <source>Couldn&apos;t get calibration data from oscilloscope</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Couldn&apos;t get channel level data from oscilloscope</source>
         <translation type="vanished">Não foi possível obter dados do canal do osciloscópio</translation>
     </message>
+    <message>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="385"/>
+        <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
+        <translation>Não foi possível obter dados de calibração a partir da EEPROM do osciloscópio. Use um arquivo de configuração para a calibração!</translation>
+    </message>
 </context>
 <context>
     <name>HorizontalDock</name>