diff options
author | Piotr Esden-Tempski <piotr@esden.net> | 2013-01-09 12:51:24 +0400 |
---|---|---|
committer | Piotr Esden-Tempski <piotr@esden.net> | 2013-01-09 13:05:37 +0400 |
commit | 204eb047b48d813c1b3b1c08ea1fb232d3bd89e7 (patch) | |
tree | e7d6b11fe1c419afa3182be1bd16fa954decd25f /doc | |
parent | cb2fd43666315888df3babcc758e406d93abc53b (diff) | |
parent | 85308f562a05db14a89a0335016a44634de072b0 (diff) |
Merging pull request #72 Doc
Merge remote-tracking branch 'ksarkies/doc'
Conflicts:
doc/stm32f1/Doxyfile
doc/stm32f2/Doxyfile
doc/stm32f4/Doxyfile
lib/stm32/f1/Makefile
lib/stm32/f2/Makefile
lib/stm32/f4/Makefile
Diffstat (limited to 'doc')
-rw-r--r-- | doc/stm32f1/Doxyfile_latex | 7 | ||||
-rw-r--r-- | doc/stm32f1/DoxygenLayout_stm32f1.xml | 2 | ||||
-rw-r--r-- | doc/stm32f2/Doxyfile | 2 | ||||
-rw-r--r-- | doc/stm32f2/Doxyfile_latex | 7 | ||||
-rw-r--r-- | doc/stm32f4/Doxyfile_latex | 7 | ||||
-rw-r--r-- | doc/stm32l1/Doxyfile | 25 | ||||
-rw-r--r-- | doc/stm32l1/Doxyfile_latex | 14 |
7 files changed, 40 insertions, 24 deletions
diff --git a/doc/stm32f1/Doxyfile_latex b/doc/stm32f1/Doxyfile_latex index 217b6f9b..97c32e77 100644 --- a/doc/stm32f1/Doxyfile_latex +++ b/doc/stm32f1/Doxyfile_latex @@ -18,9 +18,10 @@ WARN_LOGFILE = doxygen_stm32f1_latex.log INPUT = ../../include/libopencm3/docmain.dox \ ../../include/libopencm3/license.dox \ ../../include/libopencm3/stm32/f1 \ - ../../include/libopencm3/stm32/common \ - ../../lib/stm32/f1 \ - ../../lib/stm32/common + ../../include/libopencm3/stm32/common + +INPUT += ../../lib/stm32/f1 \ + ../../lib/stm32/common EXCLUDE = ../../include/libopencm3/stm32/f1/doc-stm32f1.h \ ../../include/libopencm3/stm32/f1/usb.h \ diff --git a/doc/stm32f1/DoxygenLayout_stm32f1.xml b/doc/stm32f1/DoxygenLayout_stm32f1.xml index c3dfdf22..3e435b3a 100644 --- a/doc/stm32f1/DoxygenLayout_stm32f1.xml +++ b/doc/stm32f1/DoxygenLayout_stm32f1.xml @@ -5,7 +5,7 @@ <tab type="pages" visible="yes" title="General Information" intro=""/> <tab type="user" visible="yes" url="../../html/index.html" title="Back to Top" intro=""/> <tab type="user" visible="yes" url="../../cm3/html/modules.html" title="CM3 Core" intro=""/> - <tab type="modules" visible="yes" title="STMF1" intro=""/> + <tab type="modules" visible="yes" title="STM32F1" intro=""/> <tab type="user" visible="yes" url="../../stm32f2/html/modules.html" title="STM32F2" intro=""/> <tab type="user" visible="yes" url="../../stm32f4/html/modules.html" title="STM32F4" intro=""/> <tab type="user" visible="yes" url="../../stm32l1/html/modules.html" title="STM32L1" intro=""/> diff --git a/doc/stm32f2/Doxyfile b/doc/stm32f2/Doxyfile index d03f4e9d..bc0348e7 100644 --- a/doc/stm32f2/Doxyfile +++ b/doc/stm32f2/Doxyfile @@ -24,6 +24,8 @@ INPUT += ../../lib/stm32/f2 \ EXCLUDE = +EXCLUDE_PATTERNS = + LAYOUT_FILE = DoxygenLayout_stm32f2.xml TAGFILES = ../cm3/cm3.tag=../../cm3/html diff --git a/doc/stm32f2/Doxyfile_latex b/doc/stm32f2/Doxyfile_latex index 29bdc95b..dad68489 100644 --- a/doc/stm32f2/Doxyfile_latex +++ b/doc/stm32f2/Doxyfile_latex @@ -18,12 +18,15 @@ WARN_LOGFILE = doxygen_stm32f2_latex.log INPUT = ../../include/libopencm3/docmain.dox \ ../../include/libopencm3/license.dox \ ../../include/libopencm3/stm32/f2 \ - ../../include/libopencm3/stm32/common \ - ../../lib/stm32/f2 \ + ../../include/libopencm3/stm32/common + +INPUT += ../../lib/stm32/f2 \ ../../lib/stm32/common EXCLUDE = ../../include/libopencm3/stm32/f2/doc-stm32f2.h +EXCLUDE_PATTERNS = + LAYOUT_FILE = DoxygenLayout_stm32f2.xml GENERATE_HTML = NO diff --git a/doc/stm32f4/Doxyfile_latex b/doc/stm32f4/Doxyfile_latex index 6f62b216..e93248c5 100644 --- a/doc/stm32f4/Doxyfile_latex +++ b/doc/stm32f4/Doxyfile_latex @@ -18,12 +18,15 @@ WARN_LOGFILE = doxygen_stm32f4_latex.log INPUT = ../../include/libopencm3/docmain.dox \ ../../include/libopencm3/license.dox \ ../../include/libopencm3/stm32/f4 \ - ../../include/libopencm3/stm32/common \ - ../../lib/stm32/f4 \ + ../../include/libopencm3/stm32/common + +INPUT += ../../lib/stm32/f4 \ ../../lib/stm32/common EXCLUDE = ../../include/libopencm3/stm32/f4/doc-stm32f4.h +EXCLUDE_PATTERNS = + LAYOUT_FILE = DoxygenLayout_stm32f4.xml GENERATE_HTML = NO diff --git a/doc/stm32l1/Doxyfile b/doc/stm32l1/Doxyfile index deca18b4..566bb014 100644 --- a/doc/stm32l1/Doxyfile +++ b/doc/stm32l1/Doxyfile @@ -1,13 +1,13 @@ -# HTML Documentation for STM32F1 code level +# HTML Documentation for STM32L1 code level -# 14 September 2012 +# 15 December 2012 # (C) Ken Sarkies <ksarkies@internode.on.net> #--------------------------------------------------------------------------- # Common Include File #--------------------------------------------------------------------------- -@INCLUDE = ../Doxyfile_common +@INCLUDE = ../Doxyfile_common #--------------------------------------------------------------------------- # Local settings @@ -16,18 +16,21 @@ WARN_LOGFILE = doxygen_stm32l1.log INPUT = ../../include/libopencm3/license.dox \ - ../../include/libopencm3/stm32/l1 \ - ../../include/libopencm3/stm32/common \ - ../../lib/stm32/l1 \ - ../../lib/stm32/common + ../../include/libopencm3/stm32/l1 \ + ../../include/libopencm3/stm32/common -EXCLUDE = +INPUT += ../../lib/stm32/l1 \ + ../../lib/stm32/common -EXCLUDE_PATTERNS = *_common_f24.h +EXCLUDE = ../../include/libopencm3/stm32/common/gpio_common_f24.h -LAYOUT_FILE = DoxygenLayout_stm32l1.xml +EXCLUDE += ../../lib/stm32/common/gpio_common_f24.c -TAGFILES = ../cm3/cm3.tag=../../cm3/html \ +EXCLUDE_PATTERNS = + +LAYOUT_FILE = DoxygenLayout_stm32l1.xml + +TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = stm32l1.tag diff --git a/doc/stm32l1/Doxyfile_latex b/doc/stm32l1/Doxyfile_latex index 80b56005..51d217fd 100644 --- a/doc/stm32l1/Doxyfile_latex +++ b/doc/stm32l1/Doxyfile_latex @@ -18,13 +18,17 @@ WARN_LOGFILE = doxygen_stm32l1_latex.log INPUT = ../../include/libopencm3/docmain.dox \ ../../include/libopencm3/license.dox \ ../../include/libopencm3/stm32/l1 \ - ../../include/libopencm3/stm32/common \ - ../../lib/stm32/l1 \ - ../../lib/stm32/common + ../../include/libopencm3/stm32/common -EXCLUDE = ../../include/libopencm3/stm32/l1/doc-stm32l1.h +INPUT += ../../lib/stm32/l1 \ + ../../lib/stm32/common -EXCLUDE_PATTERNS = *_common_f24.h +EXCLUDE = ../../include/libopencm3/stm32/l1/doc-stm32l1.h \ + ../../include/libopencm3/stm32/common/gpio_common_f24.h + +EXCLUDE += ../../lib/stm32/common/gpio_common_f24.c + +EXCLUDE_PATTERNS = LAYOUT_FILE = DoxygenLayout_stm32l1.xml |