upversion, small improvements for FreeBSD and Windows

Signed-off-by: Martin <[email protected]>
OpenHantek · Jul 29, 2020 · 95ff65f · 95ff65f
1 parent 77c3551
commit 95ff65f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+3.1.2
+2020-07-29
+Small improvements for FreeBSD
+Hide Windows console
+
 3.1.1
 2020-06-30
 Refresh button to restart roll mode trace

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 "20200724 build 725"
+#define OH_BUILD "20200729 build 726"
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.1.2-rc1"
+#define OH_VERSION "3.1.2"
 
 #ifdef OH_VERSION
 #undef VERSION

diff --git a/openhantek/src/viewconstants.h b/openhantek/src/viewconstants.h
@@ -17,5 +17,10 @@
 #define DOCK_LAYOUT_SPACING 4
 
 // where are the (local) documents?
+#ifdef __FreeBSD__
+#define USR_MANUAL_PATH "/usr/local/share/doc/openhantek/OpenHantek6022_User_Manual.pdf"
+#define AC_MODIFICATION_PATH "/usr/local/share/doc/openhantek/HANTEK6022_AC_Modification.pdf"
+#else
 #define USR_MANUAL_PATH "/usr/share/doc/openhantek/OpenHantek6022_User_Manual.pdf"
 #define AC_MODIFICATION_PATH "/usr/share/doc/openhantek/HANTEK6022_AC_Modification.pdf"
+#endif