Skip to content

Commit ce5056d

Browse files
authored
Update documentation (#132)
- convert to Markdown format - update style template
1 parent bb1d124 commit ce5056d

31 files changed

Lines changed: 3984 additions & 2912 deletions

ARM.CMSIS-FreeRTOS.pdsc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@
12951295
#define RTE_RTOS_FreeRTOS_CONFIG_RTOS2 /* RTOS FreeRTOS Config for CMSIS RTOS2 API */
12961296
</RTE_Components_h>
12971297
<files>
1298-
<file category="doc" name="Documentation/html/cre_freertos_proj.html#cmsis_freertos_config"/>
1298+
<file category="doc" name="Documentation/html/page_create_project.html#configure_cmsis_freertos"/>
12991299
<file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/FreeRTOSConfig.h" version="10.6.0"/>
13001300
</files>
13011301
</component>
@@ -1306,7 +1306,7 @@
13061306
#define RTE_RTOS_FreeRTOS_CONFIG /* RTOS FreeRTOS Config for FreeRTOS API */
13071307
</RTE_Components_h>
13081308
<files>
1309-
<file category="doc" name="Documentation/html/cre_freertos_proj.html#native_freertos_config"/>
1309+
<file category="doc" name="Documentation/html/page_create_project.html#configure_native_freertos"/>
13101310
<file category="header" attr="config" name="Source/examples/template_configuration/FreeRTOSConfig.h" version="11.2.0"/>
13111311
</files>
13121312
</component>

Documentation/Doxygen/freertos.dxy.in

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ PROJECT_BRIEF = "CMSIS-RTOS2 compliant FreeRTOS Implementation"
6161
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
6262
# the logo to the output directory.
6363

64-
PROJECT_LOGO = ./templates/cmsis_logo_white_small.png
64+
PROJECT_LOGO = ./style_template/cmsis_logo_white_small.png
6565

6666
# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
6767
# when the HTML document is shown. Doxygen will copy the logo to the output
@@ -290,7 +290,12 @@ TAB_SIZE = 2
290290
# with the commands \{ and \} for these it is advised to use the version @{ and
291291
# @} or use a double escape (\\{ and \\})
292292

293-
ALIASES = "token{1}=<span class=\"XML-Token\">\1</span>"
293+
ALIASES = "token{1}=<span class=\"XML-Token\">\1</span>" \
294+
"div{1}=<hr><div class=\"\1\">" \
295+
"enddiv= </div>" \
296+
"func{1}=<kbd>\1</kbd> <br>" \
297+
"copybrief{1}=<br> \copybrief \1 <br>" \
298+
"none=\em none <br>"
294299

295300
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
296301
# only. Doxygen will then generate output that is more tailored for C. For
@@ -368,7 +373,7 @@ MARKDOWN_SUPPORT = YES
368373
# Minimum value: 0, maximum value: 99, default value: 6.
369374
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
370375

371-
TOC_INCLUDE_HEADINGS = 5
376+
TOC_INCLUDE_HEADINGS = 3
372377

373378
# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
374379
# generate identifiers for the Markdown headings. Note: Every identifier is
@@ -839,7 +844,7 @@ FILE_VERSION_FILTER =
839844
# DoxygenLayout.xml, Doxygen will parse it automatically even if the LAYOUT_FILE
840845
# tag is left empty.
841846

842-
LAYOUT_FILE = ./templates/Layout_forUser.xml
847+
LAYOUT_FILE = ./style_template/layout.xml
843848

844849
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
845850
# the reference definitions. This must be a list of .bib files. The .bib
@@ -991,10 +996,14 @@ WARN_LOGFILE =
991996
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
992997
# Note: If this tag is empty the current directory is searched.
993998

994-
INPUT = ./src/cmsis_freertos.txt \
999+
INPUT = ./src/mainpage.md \
1000+
./src/history.txt \
1001+
./src/create_project.md \
1002+
./src/example_projects.md \
1003+
./src/technical_data.md \
1004+
./src/function_overview.md \
9951005
./src/cmsis_rtos2_validation.txt \
9961006
./src/freertos_evr.txt \
997-
./src/history.txt \
9981007
../../CMSIS/RTOS2/FreeRTOS/Include/freertos_evr.h
9991008

10001009
# This tag can be used to specify the character encoding of the source files
@@ -1416,7 +1425,7 @@ HTML_FILE_EXTENSION = .html
14161425
# of the possible markers and block names see the documentation.
14171426
# This tag requires that the tag GENERATE_HTML is set to YES.
14181427

1419-
HTML_HEADER = ./templates/header.html
1428+
HTML_HEADER = ./style_template/header.html
14201429

14211430
# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
14221431
# generated HTML page. If the tag is left blank Doxygen will generate a standard
@@ -1426,7 +1435,7 @@ HTML_HEADER = ./templates/header.html
14261435
# that Doxygen normally uses.
14271436
# This tag requires that the tag GENERATE_HTML is set to YES.
14281437

1429-
HTML_FOOTER = ./templates/footer.html
1438+
HTML_FOOTER = ./style_template/footer.html
14301439

14311440
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
14321441
# sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1456,8 +1465,11 @@ HTML_STYLESHEET =
14561465
# documentation.
14571466
# This tag requires that the tag GENERATE_HTML is set to YES.
14581467

1459-
HTML_EXTRA_STYLESHEET = ./templates/extra_stylesheet.css \
1460-
./templates/extra_search.css
1468+
HTML_EXTRA_STYLESHEET = ./style_template/extra_stylesheet.css \
1469+
./style_template/extra_navtree.css \
1470+
./style_template/extra_search.css \
1471+
./style_template/extra_tabs.css \
1472+
./style_template/version.css
14611473

14621474
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
14631475
# other source files which should be copied to the HTML output directory. Note
@@ -1467,15 +1479,11 @@ HTML_EXTRA_STYLESHEET = ./templates/extra_stylesheet.css \
14671479
# files will be copied as-is; there are no commands or markers available.
14681480
# This tag requires that the tag GENERATE_HTML is set to YES.
14691481

1470-
HTML_EXTRA_FILES = ./templates/tabs.css \
1471-
./templates/search.css \
1472-
./templates/navtree.css \
1473-
./templates/tab_b.png \
1474-
./templates/navtree.js \
1475-
./templates/version.css \
1476-
./templates/dropdown.png \
1477-
../../LICENSE \
1478-
../../Source/LICENSE.md \
1482+
HTML_EXTRA_FILES = ./style_template/tab_b.png \
1483+
./style_template/tabs.js \
1484+
./style_template/darkmode_toggle.js \
1485+
./style_template/navtree.js \
1486+
./style_template/dropdown.png \
14791487
./src/cmsis_rtos2_validation.txt
14801488

14811489
# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
@@ -1489,7 +1497,7 @@ HTML_EXTRA_FILES = ./templates/tabs.css \
14891497
# The default value is: AUTO_LIGHT.
14901498
# This tag requires that the tag GENERATE_HTML is set to YES.
14911499

1492-
HTML_COLORSTYLE = AUTO_LIGHT
1500+
HTML_COLORSTYLE = TOGGLE
14931501

14941502
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
14951503
# will adjust the colors in the style sheet and background images according to

Documentation/Doxygen/gen_doc.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ fi
7272

7373
pushd "${DIRNAME}" > /dev/null
7474

75-
echo "Generating documentation ..."
75+
echo_log "Generating documentation ..."
7676

77-
projectName=$(grep -E "PROJECT_NAME\s+=" freertos.dxy.in | sed -r -e 's/[^"]*"([^"]+)".*/\1/')
77+
projectName=$(grep -E "PROJECT_NAME\s+=" freertos.dxy.in | sed -r -e 's/^PROJECT_NAME\s*=\s*"?([^"]*)"?/\1/')
7878
projectNumberFull="${VERSION_FULL}"
7979
projectNumber="${projectNumberFull%+*}"
8080
datetime=$(date -u +'%a %b %e %Y %H:%M:%S')
@@ -84,23 +84,24 @@ sed -e "s/{projectNumber}/${projectNumber}/" freertos.dxy.in > freertos.dxy
8484

8585
git_changelog -f html -p "v" > src/history.txt
8686

87-
echo "\"${UTILITY_DOXYGEN}\" freertos.dxy"
87+
echo_log "\"${UTILITY_DOXYGEN}\" freertos.dxy"
8888
"${UTILITY_DOXYGEN}" freertos.dxy
8989

9090
mkdir -p "${DIRNAME}/${GENDIR}/search/"
91-
cp -f "${DIRNAME}/templates/search.css" "${DIRNAME}/${GENDIR}/search/"
92-
cp -f "${DIRNAME}/templates/navtree.js" "${DIRNAME}/${GENDIR}/"
91+
cp -f "${DIRNAME}/style_template/search.css" "${DIRNAME}/${GENDIR}/search/"
92+
cp -f "${DIRNAME}/style_template/search.js" "${DIRNAME}/${GENDIR}/search/"
93+
cp -f "${DIRNAME}/style_template/navtree.js" "${DIRNAME}/${GENDIR}"
94+
cp -f "${DIRNAME}/style_template/resize.js" "${DIRNAME}/${GENDIR}"
9395

94-
sed -e "s/{datetime}/${datetime}/" "${DIRNAME}/templates/footer.js.in" \
96+
sed -e "s/{datetime}/${datetime}/" "${DIRNAME}/style_template/footer.js.in" \
9597
| sed -e "s/{year}/${year}/" \
9698
| sed -e "s/{projectName}/${projectName}/" \
9799
| sed -e "s/{projectNumber}/${projectNumber}/" \
98100
| sed -e "s/{projectNumberFull}/${projectNumberFull}/" \
99101
> "${DIRNAME}/${GENDIR}/footer.js"
100102

101-
popd > /dev/null
102-
103-
[[ ${RUN_LINKCHECKER} != 0 ]] && check_links "${DIRNAME}/../html/index.html" "${DIRNAME}"
103+
popd > /dev/null || exit 1
104104

105+
[[ ${RUN_LINKCHECKER} != 0 ]] && check_links "${DIRNAME}/${GENDIR}/index.html" "${DIRNAME}"
105106

106107
exit 0

Documentation/Doxygen/linkchecker.rc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ ignoreerrors=
66
mag_seld.svg
77
../tab_a.png
88
../tab_ad.png
9+
minus.svg
10+
plus.svg
11+
minusd.svg
12+
plusd.svg
913

1014
[filtering]
1115
ignorewarnings=

0 commit comments

Comments
 (0)