Merge branch 'master' of https://github.com/crapp/labpowerqt

CMakeLists.txt

@@ -8,7 +8,7 @@ project(labpowerqt)
 #The version number
 set (labpowerqt_VERSION_MAJOR 0)
 set (labpowerqt_VERSION_MINOR 1)
-set (labpowerqt_VERSION_PATCH 0)
+set (labpowerqt_VERSION_PATCH 1)
 
 option (EALOGGER_EXTERNAL "Download and build ealogger" ON)
 option (SANITIZER "Use AddressSanitizer (ASan) compiler flags" OFF)

README.md

@@ -13,6 +13,7 @@ The application is in an early stage of development make sure to read the **know
 issues** section.
 
 ![LabPowerQt main screen](https://crapp.github.io/labpowerqt/labpowerqt.png)
+*LabPowerQt running on archlinux and Gnome 3.20*
 
 ## Features
 
@@ -69,7 +70,7 @@ sudo make install
 
 There are packages for the following Linux distributions:
 
-* Archlinux (AUR)
+* [Archlinux (AUR)](https://aur.archlinux.org/packages/labpowerqt)
 
 #### Windows
 
@@ -89,6 +90,9 @@ You may now open the solution file with visual studio and compile the applicatio
 
 Other possibilities are cmake's NMake Generator or mingw.
 
+I am providing an InnoSetup based installer for x86 and amd64 containing all
+dependencies. It is downloadable from [github.com](https://github.com/crapp/labpowerqt/releases)
+
 ### Supported Hardware
 
 Currently we only support Devices using the [Korad SCPI Protocol](http://sigrok.org/wiki/Velleman_PS3005D)
@@ -116,7 +120,14 @@ add a device. Other things can be set there as well.
 
 ## Screenshots
 
+![LabPowerQt running on Windows 8.1](https://crapp.github.io/labpowerqt/labpowerqt_about_win_border.png)
+*LabPowerQt running on Windows 8.1 32bit*
+
+![LabPowerQt recordings history](https://crapp.github.io/labpowerqt/labpowerqt_history.png)
+*Recordings listed in a table*
 
+![LabPowerQt example Plot export image](https://crapp.github.io/labpowerqt/labpowerqt_plot_example_export.jpg)
+*Exported image of the Plot in LabPowerQt*
 
 ## Development
 
@@ -182,7 +193,7 @@ to submit bugs or feature requests
   Currently this is not working correctly with QCustomPlot and there is nothing I
   can do about it as I believe it is because of a bug in their code.
 
-* Polling frequencies higher than 1Hz seem work unreliable on OSX and Windows.
+* Polling frequencies higher than 1Hz seem to work unreliable on OSX and Windows.
 	I have no idea if this is a problem with QtSerialport or the underlying driver
 	implementation or system layer.
 

src/CMakeLists.txt

@@ -51,7 +51,7 @@ if (EALOGGER_EXTERNAL)
     # library we can link it directly
     ExternalProject_Add(
         ealogger_external
-        URL https://github.com/crapp/ealogger/archive/v0.8.tar.gz
+        URL https://github.com/crapp/ealogger/archive/v0.8.1.tar.gz
         PREFIX "${CMAKE_CURRENT_BINARY_DIR}/ealogger"
         INSTALL_DIR install
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>