Upversion to 3.2.4

Signed-off-by: Martin <[email protected]>
OpenHantek · Jul 14, 2021 · 7483fb2 · 7483fb2
1 parent e622508
commit 7483fb2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+3.2.4
+2021-07-14
+Possibility to select Fusion style in options menu (fits on 1280x720 screen)
+Select calibration frequency faster from ComboBox
+Chinese translation
+
 3.2.3
 2021-05-24
 Auto detect OpenGL version to better support (especially) Windows installs (fix #184)

diff --git a/docs/OpenHantek6022_User_Manual.odt b/docs/OpenHantek6022_User_Manual.odt
diff --git a/docs/OpenHantek6022_User_Manual.pdf b/docs/OpenHantek6022_User_Manual.pdf
diff --git a/docs/images/screenshot_mainwindow.png b/docs/images/screenshot_mainwindow.png
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 "20210623 - commit 916"
+#define OH_BUILD "20210714 - commit 917"
diff --git a/openhantek/src/OH_VERSION.h b/openhantek/src/OH_VERSION.h
@@ -7,7 +7,7 @@
 
 // next line shall define either OH_VERSION or LAST_OH_VERSION
 //
-#define LAST_OH_VERSION "3.2.3"
+#define OH_VERSION "3.2.4"
 
 
 // do not edit below

diff --git a/openhantek/src/dsosettings.cpp b/openhantek/src/dsosettings.cpp
@@ -11,8 +11,8 @@
 /// \param channels The new channel count, that will be applied to lists.
 DsoSettings::DsoSettings( const ScopeDevice *scopeDevice, bool resetSettings )
     : deviceName( scopeDevice->getModel()->name ), deviceID( scopeDevice->getSerialNumber() ),
-      deviceSpecification( scopeDevice->getModel()->spec() ), resetSettings( resetSettings ) {
-
+      deviceFW( scopeDevice->getFwVersion() ), deviceSpecification( scopeDevice->getModel()->spec() ),
+      resetSettings( resetSettings ) {
     // Add new channels to the list
     int voltage_hue[] = {60, 210, 0, 120};   // yellow, lightblue, red, green
     int spectrum_hue[] = {30, 240, 330, 90}; // orange, blue, purple, green

diff --git a/openhantek/src/dsosettings.h b/openhantek/src/dsosettings.h
@@ -33,6 +33,7 @@ class DsoSettings {
     unsigned configVersion = CONFIG_VERSION; ///< Handle incompatible changes
     const QString deviceName;
     const QString deviceID;
+    const unsigned deviceFW;
 
     QByteArray mainWindowGeometry; ///< Geometry of the main window
     QByteArray mainWindowState;    ///< State of docking windows and toolbars

diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp
@@ -430,10 +430,10 @@ MainWindow::MainWindow( HantekDsoControl *dsoControl, DsoSettings *settings, Exp
                      "<a href='https://github.com/OpenHantek'>https://github.com/OpenHantek</a></p>"
                      "<p>Open source firmware copyright &copy; 2019-2021 Ho-Ro<br/>"
                      "<a href='https://github.com/Ho-Ro/Hantek6022API'>https://github.com/Ho-Ro/Hantek6022API</a></p>"
-                     "<p>Device: %1 (%2)</p>"
-                     "<p>Graphic: %3 - GLSL version %4</p>" )
-                    .arg( this->dsoSettings->deviceName, this->dsoSettings->deviceID, GlScope::getOpenGLversion(),
-                          GlScope::getGLSLversion() ) +
+                     "<p>Device: %1 (%2), FW%3</p><p>Graphic: %4 - GLSL version %5</p>" )
+                    .arg( this->dsoSettings->deviceName, this->dsoSettings->deviceID ) // device type, ser. num
+                    .arg( this->dsoSettings->deviceFW, 4, 16, QChar( '0' ) )           // FW version
+                    .arg( GlScope::getOpenGLversion(), GlScope::getGLSLversion() ) +   // graphic info
                 tr( "<p>Running since %1 seconds.</p>" ).arg( elapsedTime.elapsed() / 1000 ) );
     } );