upversion to 3.2.1

Signed-off-by: Martin <[email protected]>
OpenHantek · Apr 5, 2021 · 82a7e1a · 82a7e1a
1 parent db23aae
commit 82a7e1a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+3.2.1
+2021-04-05
+Two new interpolation modes: step and sinc
+Fix Windows issue with cyrillic user names
+
 3.2
 2021-02-28
 Simultaneous use of more than one device is possible

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/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 "20210330 build 837"
+#define OH_BUILD "20210405 build 838"
diff --git a/openhantek/src/OH_VERSION.h b/openhantek/src/OH_VERSION.h
@@ -1,7 +1,7 @@
 // define the version that is shown on top of the program
 // if undefined (for development commits) the build will be shown by OpenHantek
 
-// #define OH_VERSION "3.2.1-rc1"
+#define OH_VERSION "3.2.1"
 
 #ifdef OH_VERSION
 #undef VERSION

diff --git a/openhantek/src/usb/uploadFirmware.cpp b/openhantek/src/usb/uploadFirmware.cpp
@@ -58,8 +58,7 @@ bool UploadFirmware::startUpload( ScopeDevice *scopeDevice ) {
     }
 
     // Write firmware into internal RAM using first stage loader built into EZ-USB hardware
-    // HACK: check if #175 (cyrillic username) can be solved by 'toLocal8Bit()' instead of 'toUtf8()'
-    // status = ezusb_load_ram( handle, temp_firmware_path->fileName().toUtf8().constData(), FX_TYPE_FX2LP, 0 );
+    // use local 8bit encoding (utf8 for Linux, iso-8859-x for Windows)
     status = ezusb_load_ram( handle, temp_firmware_path->fileName().toLocal8Bit().constData(), FX_TYPE_FX2LP, 0 );
     if ( status != LIBUSB_SUCCESS ) {
         errorMessage = TR( "Writing the main firmware failed: %1" ).arg( libusb_error_name( status ) );