Skip to content

Commit e77f2b6

Browse files
committed
updating the docs with media layer design
1 parent 61d7a4c commit e77f2b6

File tree

14 files changed

+61367
-46
lines changed

14 files changed

+61367
-46
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ create_dsdl_target(dsdl-regulated
8686
#
8787
apply_flag_set(${LIBUAVCAN_FLAG_SET})
8888

89-
# +---------------------------------------------------------------------------+
90-
# | CONFIGURABLE DEFINITIONS
91-
# +---------------------------------------------------------------------------+
92-
if(DEFINED LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT)
93-
add_compile_definitions(LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT=${LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT})
94-
endif()
95-
9689
# +---------------------------------------------------------------------------+
9790
# | STYLE
9891
# +---------------------------------------------------------------------------+

cmake/common.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,20 @@ function(apply_flag_set ARG_FLAG_SET)
3131
set(LOCAL_CMAKE_ASM_FLAGS "${LOCAL_CMAKE_ASM_FLAGS} ${ITEM}")
3232
endforeach()
3333

34+
# +-----------------------------------------------------------------------+
35+
# | CONFIGURABLE DEFINITIONS
36+
# +-----------------------------------------------------------------------+
37+
if(DEFINED LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT)
38+
set(LOCAL_CMAKE_C_FLAGS "${LOCAL_CMAKE_C_FLAGS} -DLIBUAVCAN_INTROSPECTION_ENABLE_ASSERT=${LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT}")
39+
set(LOCAL_CMAKE_CXX_FLAGS "${LOCAL_CMAKE_CXX_FLAGS} -DLIBUAVCAN_INTROSPECTION_ENABLE_ASSERT=${LIBUAVCAN_INTROSPECTION_ENABLE_ASSERT}")
40+
endif()
41+
# +-----------------------------------------------------------------------+
42+
3443
set(CMAKE_C_FLAGS ${LOCAL_CMAKE_C_FLAGS} PARENT_SCOPE)
3544
set(CMAKE_CXX_FLAGS ${LOCAL_CMAKE_CXX_FLAGS} PARENT_SCOPE)
3645
set(CMAKE_EXE_LINKER_FLAGS ${LOCAL_CMAKE_EXE_LINKER_FLAGS} PARENT_SCOPE)
3746
set(CMAKE_ASM_FLAGS ${LOCAL_CMAKE_ASM_FLAGS} PARENT_SCOPE)
3847

3948
add_definitions(${DEFINITIONS_SET})
49+
4050
endfunction()

cmake/compiler_flag_sets/native.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ list(APPEND CXX_FLAG_SET
6565

6666
set(EXE_LINKER_FLAG_SET )
6767
set(DEFINITIONS_SET )
68+

cmake/modules/Findlibuavcan_docs.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function (create_docs_target ARG_DOCS_TARGET_NAME ARG_ADD_TO_ALL)
3030
set(DOXYGEN_RDOMAIN_W_PROJECT org.uavcan.libuavcan)
3131
set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/docs)
3232
set(DOXYGEN_CONFIG_FILE ${DOXYGEN_OUTPUT_DIRECTORY}/doxygen.config)
33-
set(DOXYGEN_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libuavcan/include\" \"${CMAKE_CURRENT_SOURCE_DIR}/README.md\"")
33+
set(DOXYGEN_INPUT "\"${CMAKE_CURRENT_SOURCE_DIR}/libuavcan/include\" \"${CMAKE_CURRENT_SOURCE_DIR}/README.md\" \"${CMAKE_CURRENT_SOURCE_DIR}/doc_source/media.md\"")
3434
set(DOXYGEN_MAINPAGE "\"${CMAKE_CURRENT_SOURCE_DIR}/README.md\"")
3535

3636
# +-----------------------------------------------------------------------+
@@ -40,6 +40,10 @@ function (create_docs_target ARG_DOCS_TARGET_NAME ARG_ADD_TO_ALL)
4040
set(DOXYGEN_HTML_STYLESHEET ${DOXYGEN_OUTPUT_DIRECTORY}/customdoxygen.css)
4141
set(DOXYGEN_HTML_HEADER ${DOXYGEN_OUTPUT_DIRECTORY}/header.html)
4242
set(DOXYGEN_HTML_FOOTER ${DOXYGEN_OUTPUT_DIRECTORY}/footer.html)
43+
set(DOXYGEN_IMAGE_PATH ${DOXYGEN_OUTPUT_DIRECTORY}/images)
44+
set(DOXYGEN_LOGO ${DOXYGEN_OUTPUT_DIRECTORY}/images/html/uavcan_logo_icon.png)
45+
46+
file(COPY ${DOXYGEN_SOURCE}/images DESTINATION ${DOXYGEN_OUTPUT_DIRECTORY})
4347

4448
configure_file(${DOXYGEN_SOURCE}/header.html
4549
${DOXYGEN_OUTPUT_DIRECTORY}/header.html

doc_source/doxygen.ini

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ PROJECT_NUMBER =
4444
# for a project that appears at the top of each page and should give viewer a
4545
# quick idea about the purpose of the project. Keep the description short.
4646

47-
PROJECT_BRIEF =
47+
PROJECT_BRIEF = Portable reference implementation of the UAVCAN protocol stack written in C++ for embedded systems, Linux, and POSIX-compliant RTOSs.
4848

4949
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
5050
# in the documentation. The maximum height of the logo should not exceed 55
5151
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
5252
# the logo to the output directory.
5353

54-
PROJECT_LOGO =
54+
PROJECT_LOGO = @DOXYGEN_LOGO@
5555

5656
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
5757
# into which the generated documentation will be written. If a relative path is
@@ -98,7 +98,7 @@ OUTPUT_LANGUAGE = English
9898
# documentation (similar to Javadoc). Set to NO to disable this.
9999
# The default value is: YES.
100100

101-
BRIEF_MEMBER_DESC = YES
101+
BRIEF_MEMBER_DESC = NO
102102

103103
# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
104104
# description of a member or function before the detailed description
@@ -135,7 +135,7 @@ ABBREVIATE_BRIEF = "The $name class" \
135135
# description.
136136
# The default value is: NO.
137137

138-
ALWAYS_DETAILED_SEC = NO
138+
ALWAYS_DETAILED_SEC = YES
139139

140140
# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
141141
# inherited members of a class in the documentation of that class as if those
@@ -187,7 +187,7 @@ SHORT_NAMES = NO
187187
# description.)
188188
# The default value is: NO.
189189

190-
JAVADOC_AUTOBRIEF = YES
190+
JAVADOC_AUTOBRIEF = NO
191191

192192
# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
193193
# line (until the first dot) of a Qt-style comment as the brief description. If
@@ -253,7 +253,7 @@ TCL_SUBST =
253253
# members will be omitted, etc.
254254
# The default value is: NO.
255255

256-
OPTIMIZE_OUTPUT_FOR_C = NO
256+
OPTIMIZE_OUTPUT_FOR_C = YES
257257

258258
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
259259
# Python sources only. Doxygen will then generate output that is more tailored
@@ -927,7 +927,7 @@ EXAMPLE_RECURSIVE = NO
927927
# that contain images that are to be included in the documentation (see the
928928
# \image command).
929929

930-
IMAGE_PATH =
930+
IMAGE_PATH = @DOXYGEN_IMAGE_PATH@
931931

932932
# The INPUT_FILTER tag can be used to specify a program that doxygen should
933933
# invoke to filter for each input file. Doxygen will invoke the filter program
204 KB
Loading
38.8 KB
Loading
1.26 KB
Loading

0 commit comments

Comments
 (0)