Skip to content

Commit e00ebea

Browse files
committed
Merged 'main' branch with 'v0.4' branch
2 parents 79116ff + 0cd13eb commit e00ebea

File tree

244 files changed

+9759
-2312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+9759
-2312
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ TODO
88

99
#ignore only cmake presets in root folder
1010
/CMakePresets.json
11+
12+
# Python Byte-compiled / optimized / DLL files
13+
__pycache__/
14+
*.py[cod]
15+
*$py.class

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
1+
cmake_minimum_required(VERSION 3.13) # 2.2 - case insensitive syntax
2+
# 3.13 included policy CMP0077
23

3-
project(ModbusTools VERSION 0.3.10 LANGUAGES CXX)
4+
project(ModbusTools VERSION 0.4.0 LANGUAGES CXX)
45

56
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
67
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

README.md

Lines changed: 96 additions & 0 deletions

changelog.md

Lines changed: 17 additions & 1 deletion

doc/DoxyfileServer

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ INLINE_INHERITED_MEMB = NO
178178
# shortest path that makes the file name unique will be used
179179
# The default value is: YES.
180180

181-
FULL_PATH_NAMES = YES
181+
FULL_PATH_NAMES = NO
182182

183183
# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
184184
# Stripping is only done if one of the specified strings matches the left-hand
@@ -949,7 +949,8 @@ WARN_LOGFILE =
949949
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
950950
# Note: If this tag is empty the current directory is searched.
951951

952-
INPUT = input
952+
INPUT = input \
953+
../src/server/python
953954

954955
# This tag can be used to specify the character encoding of the source files
955956
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1259,7 +1260,7 @@ USE_HTAGS = NO
12591260
# See also: Section \class.
12601261
# The default value is: YES.
12611262

1262-
VERBATIM_HEADERS = YES
1263+
VERBATIM_HEADERS = NO
12631264

12641265
# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
12651266
# clang parser (see:
@@ -1403,7 +1404,7 @@ HTML_STYLESHEET =
14031404
# documentation.
14041405
# This tag requires that the tag GENERATE_HTML is set to YES.
14051406

1406-
HTML_EXTRA_STYLESHEET =
1407+
HTML_EXTRA_STYLESHEET = qdoc.css
14071408

14081409
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
14091410
# other source files which should be copied to the HTML output directory. Note
@@ -2540,7 +2541,7 @@ HIDE_UNDOC_RELATIONS = YES
25402541
# set to NO
25412542
# The default value is: NO.
25422543

2543-
HAVE_DOT = NO
2544+
HAVE_DOT = YES
25442545

25452546
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
25462547
# to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2634,7 +2635,7 @@ GROUP_GRAPHS = YES
26342635
# The default value is: NO.
26352636
# This tag requires that the tag HAVE_DOT is set to YES.
26362637

2637-
UML_LOOK = NO
2638+
UML_LOOK = YES
26382639

26392640
# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
26402641
# class node. If there are many fields or methods and many nodes the graph may

doc/README.md

Lines changed: 7 additions & 2 deletions
2.37 KB
884 Bytes
4.52 KB

doc/images/client_gui_schema.png

1.15 KB

0 commit comments

Comments
 (0)