Fixed WriteSingleCoil offset for client SendMessage window, added some icons, fixed Server help files

Author: serhmarch

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/modbus"]
-	path = src/modbus
-	url = https://github.com/serhmarch/ModbusLib
+[submodule "modbus"]
+	path = modbus
+	url = https://github.com/serhmarch/ModbusLib.git

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.9 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.10 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
@@ -21,4 +21,7 @@ if (NOT WIN32)
     #set(CMAKE_INSTALL_RPATH "\${ORIGIN}")
 endif()
 
+set(MB_QT_ENABLED ON)
+add_subdirectory(modbus/src)
+
 add_subdirectory(src)

src/ModbusTools.pro renamed to ModbusTools.pro

@@ -16,12 +16,7 @@ INSTALLS += help
 
 CONFIG += ordered
 
-SUBDIRS += modbus
-SUBDIRS += core
-SUBDIRS += client
-SUBDIRS += server
-
-modbus.file = modbus/src/modbus.pro
-core.depends = modbus
-client.depends = modbus core
-server.depends = modbus core
+SUBDIRS += modbus/src/modbus.pro
+SUBDIRS += src/core
+SUBDIRS += src/client
+SUBDIRS += src/server

doc/README.md

@@ -42,8 +42,14 @@ Must be created project collection file `ModbusClient.qhcp`:
 Then `qhelpgenerator` must be executed, compiled help `*.qch` and compiled collection `*.qhc` files must be created:
 
 ```console
-c:\Qt\5.15.2\msvc2019_64\bin>qhelpgenerator "path\to\ModbusTools\doc\output\ModbusClient.qhcp"
-c:\Qt\5.15.2\msvc2019_64\bin>qhelpgenerator "path\to\ModbusTools\doc\output\ModbusServer.qhcp"
+c:\Qt\5.15.2\msvc2019_64\bin\qhelpgenerator.exe "output/ModbusClient.qhcp"
+c:\Qt\5.15.2\msvc2019_64\bin\qhelpgenerator.exe "output/ModbusServer.qhcp"
+```
+
+To check correctness of help generation Qt assistant can be used:
+```console
+c:\Qt\5.15.2\msvc2019_64\bin>assistant.exe -collectionFile ModbusClient.qhc
+c:\Qt\5.15.2\msvc2019_64\bin>assistant.exe -collectionFile ModbusServer.qhc
 ```
 
 # File System with help
@@ -55,4 +61,4 @@ Assumed application dir view:
     * ModbusClient.qch
     * ModbusClient.qhc
     * ModbusServer.qch
-    * ModbusServer.qhc
+    * ModbusServer.qhc

doc/output/ModbusServer.chm

@@ -8,7 +8,7 @@
             </file>
         </generate>
         <register>
-            <file>output/ModbusServer.qch</file>
+            <file>ModbusServer.qch</file>
         </register>
     </docFiles>
 </QHelpCollectionProject>

doc/output/ModbusServer.qhc

@@ -66,7 +66,7 @@
             "name": "Linux-Debug",
             "displayName": "Linux GCC Config Debug",
             "inherits": "Linux-Base",
-            "binaryDir": "~/tmp/cmake/ModbusTools/Linux/Debug",
+            "binaryDir": "env{HOME}/tmp/cmake/ModbusTools/Linux/Debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug"
             }
@@ -75,7 +75,7 @@
             "name": "Linux-Release",
             "displayName": "Linux GCC Config Release",
             "inherits": "Linux-Base",
-            "binaryDir": "~/tmp/cmake/ModbusTools/Linux/Release",
+            "binaryDir": "env{HOME}/tmp/cmake/ModbusTools/Linux/Release",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release"
             }

doc/output/ModbusServer.qhcp

@@ -1,6 +1,3 @@
-set(MB_QT_ENABLED ON)
-add_subdirectory(modbus/src)
-
 add_subdirectory(core)
 
 add_subdirectory(client)