• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

テスト用のあれこれ共用フォルダ


Commit MetaInfo

修訂ce03b2ba4c603828729c61602467e60387ba67a6 (tree)
時間2018-03-06 08:35:35
作者takemasa <suikan@user...>
Commitertakemasa

Log Message

Change the member function name of AbstractSpiMaster. This change makes
consistensy of the name among classes better
Added predefined macro to the doxygen configuration file, to enable the
doc generation for uart/spimaster/i2c always.

Change Summary

差異

--- a/stm32_development/murasaki/.settings/language.settings.xml
+++ b/stm32_development/murasaki/.settings/language.settings.xml
@@ -6,7 +6,7 @@
66 <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77 <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
88 <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
9- <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-964660132747690961" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
9+ <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1464480601815891179" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
1010 <language-scope id="org.eclipse.cdt.core.gcc"/>
1111 <language-scope id="org.eclipse.cdt.core.g++"/>
1212 </provider>
@@ -18,7 +18,7 @@
1818 <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1919 <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
2020 <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
21- <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-964660132747690961" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
21+ <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-1464480601815891179" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2222 <language-scope id="org.eclipse.cdt.core.gcc"/>
2323 <language-scope id="org.eclipse.cdt.core.g++"/>
2424 </provider>
--- a/stm32_development/murasaki/Src/my_test.cpp
+++ b/stm32_development/murasaki/Src/my_test.cpp
@@ -155,7 +155,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef * huart)
155155
156156 void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef * hspi)
157157 {
158- if (murasaki::platform.spi_master->TransferCompleteCallback(hspi))
158+ if (murasaki::platform.spi_master->TransmitAndReceiveCompleteCallback(hspi))
159159 return;
160160 }
161161
--- a/stm32_development/murasaki/murasaki.doxyfile
+++ b/stm32_development/murasaki/murasaki.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "Murasaki Class Library"
3838 # could be handy for archiving the generated documentation or if some version
3939 # control system is used.
4040
41-PROJECT_NUMBER =
41+PROJECT_NUMBER =
4242
4343 # Using the PROJECT_BRIEF tag one can provide an optional one line description
4444 # for a project that appears at the top of each page and should give viewer a
@@ -51,14 +51,14 @@ PROJECT_BRIEF = "A peripheral controll class collections for the STM32 microproc
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 =
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
5858 # entered, it will be relative to the location where doxygen was started. If
5959 # left blank the current directory will be used.
6060
61-OUTPUT_DIRECTORY =
61+OUTPUT_DIRECTORY =
6262
6363 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464 # directories (in 2 levels) under the output directory of each output format and
@@ -118,7 +118,7 @@ REPEAT_BRIEF = YES
118118 # the entity):The $name class, The $name widget, The $name file, is, provides,
119119 # specifies, contains, represents, a, an and the.
120120
121-ABBREVIATE_BRIEF =
121+ABBREVIATE_BRIEF =
122122
123123 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
124124 # doxygen will generate a detailed section even if there is only a brief
@@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES
152152 # will be relative from the directory where doxygen is started.
153153 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
154154
155-STRIP_FROM_PATH =
155+STRIP_FROM_PATH =
156156
157157 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
158158 # path mentioned in the documentation of a class, which tells the reader which
@@ -161,7 +161,7 @@ STRIP_FROM_PATH =
161161 # specify the list of include paths that are normally passed to the compiler
162162 # using the -I flag.
163163
164-STRIP_FROM_INC_PATH =
164+STRIP_FROM_INC_PATH =
165165
166166 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
167167 # less readable) file names. This can be useful is your file systems doesn't
@@ -228,13 +228,13 @@ TAB_SIZE = 4
228228 # "Side Effects:". You can put \n's in the value part of an alias to insert
229229 # newlines.
230230
231-ALIASES =
231+ALIASES =
232232
233233 # This tag can be used to specify a number of word-keyword mappings (TCL only).
234234 # A mapping has the form "name=value". For example adding "class=itcl::class"
235235 # will allow you to use the command class in the itcl::class meaning.
236236
237-TCL_SUBST =
237+TCL_SUBST =
238238
239239 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
240240 # only. Doxygen will then generate output that is more tailored for C. For
@@ -281,7 +281,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
281281 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
282282 # the files are not read by doxygen.
283283
284-EXTENSION_MAPPING =
284+EXTENSION_MAPPING =
285285
286286 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
287287 # according to the Markdown format, which allows for more readable
@@ -629,7 +629,7 @@ GENERATE_DEPRECATEDLIST = YES
629629 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
630630 # ... \endcond blocks.
631631
632-ENABLED_SECTIONS =
632+ENABLED_SECTIONS =
633633
634634 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
635635 # initial value of a variable or macro / define can have for it to appear in the
@@ -671,7 +671,7 @@ SHOW_NAMESPACES = YES
671671 # by doxygen. Whatever the program writes to standard output is used as the file
672672 # version. For an example see the documentation.
673673
674-FILE_VERSION_FILTER =
674+FILE_VERSION_FILTER =
675675
676676 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
677677 # by doxygen. The layout file controls the global structure of the generated
@@ -684,7 +684,7 @@ FILE_VERSION_FILTER =
684684 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
685685 # tag is left empty.
686686
687-LAYOUT_FILE =
687+LAYOUT_FILE =
688688
689689 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
690690 # the reference definitions. This must be a list of .bib files. The .bib
@@ -694,7 +694,7 @@ LAYOUT_FILE =
694694 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
695695 # search path. See also \cite for info how to create references.
696696
697-CITE_BIB_FILES =
697+CITE_BIB_FILES =
698698
699699 #---------------------------------------------------------------------------
700700 # Configuration options related to warning and progress messages
@@ -759,7 +759,7 @@ WARN_FORMAT = "$file:$line: $text"
759759 # messages should be written. If left blank the output is written to standard
760760 # error (stderr).
761761
762-WARN_LOGFILE =
762+WARN_LOGFILE =
763763
764764 #---------------------------------------------------------------------------
765765 # Configuration options related to the input files
@@ -796,7 +796,7 @@ INPUT_ENCODING = UTF-8
796796 # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
797797 # *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
798798
799-FILE_PATTERNS =
799+FILE_PATTERNS =
800800
801801 # The RECURSIVE tag can be used to specify whether or not subdirectories should
802802 # be searched for input files as well.
@@ -811,7 +811,7 @@ RECURSIVE = YES
811811 # Note that relative paths are relative to the directory from which doxygen is
812812 # run.
813813
814-EXCLUDE =
814+EXCLUDE =
815815
816816 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
817817 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -827,7 +827,7 @@ EXCLUDE_SYMLINKS = NO
827827 # Note that the wildcards are matched against the file with absolute path, so to
828828 # exclude all test directories for example use the pattern */test/*
829829
830-EXCLUDE_PATTERNS =
830+EXCLUDE_PATTERNS =
831831
832832 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
833833 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -838,7 +838,7 @@ EXCLUDE_PATTERNS =
838838 # Note that the wildcards are matched against the file with absolute path, so to
839839 # exclude all test directories use the pattern */test/*
840840
841-EXCLUDE_SYMBOLS =
841+EXCLUDE_SYMBOLS =
842842
843843 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
844844 # that contain example code fragments that are included (see the \include
@@ -851,7 +851,7 @@ EXAMPLE_PATH = Middlewares Drivers
851851 # *.h) to filter out the source-files in the directories. If left blank all
852852 # files are included.
853853
854-EXAMPLE_PATTERNS =
854+EXAMPLE_PATTERNS =
855855
856856 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
857857 # searched for input files to be used with the \include or \dontinclude commands
@@ -864,7 +864,7 @@ EXAMPLE_RECURSIVE = NO
864864 # that contain images that are to be included in the documentation (see the
865865 # \image command).
866866
867-IMAGE_PATH =
867+IMAGE_PATH =
868868
869869 # The INPUT_FILTER tag can be used to specify a program that doxygen should
870870 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -885,7 +885,7 @@ IMAGE_PATH =
885885 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
886886 # properly processed by doxygen.
887887
888-INPUT_FILTER =
888+INPUT_FILTER =
889889
890890 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
891891 # basis. Doxygen will compare the file name with each pattern and apply the
@@ -898,7 +898,7 @@ INPUT_FILTER =
898898 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
899899 # properly processed by doxygen.
900900
901-FILTER_PATTERNS =
901+FILTER_PATTERNS =
902902
903903 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
904904 # INPUT_FILTER) will also be used to filter the input files that are used for
@@ -913,14 +913,14 @@ FILTER_SOURCE_FILES = NO
913913 # *.ext= (so without naming a filter).
914914 # This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
915915
916-FILTER_SOURCE_PATTERNS =
916+FILTER_SOURCE_PATTERNS =
917917
918918 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
919919 # is part of the input, its contents will be placed on the main page
920920 # (index.html). This can be useful if you have a project on for instance GitHub
921921 # and want to reuse the introduction page also for the doxygen output.
922922
923-USE_MDFILE_AS_MAINPAGE =
923+USE_MDFILE_AS_MAINPAGE =
924924
925925 #---------------------------------------------------------------------------
926926 # Configuration options related to source browsing
@@ -1025,7 +1025,7 @@ CLANG_ASSISTED_PARSING = NO
10251025 # specified with INPUT and INCLUDE_PATH.
10261026 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
10271027
1028-CLANG_OPTIONS =
1028+CLANG_OPTIONS =
10291029
10301030 #---------------------------------------------------------------------------
10311031 # Configuration options related to the alphabetical class index
@@ -1051,7 +1051,7 @@ COLS_IN_ALPHA_INDEX = 5
10511051 # while generating the index headers.
10521052 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
10531053
1054-IGNORE_PREFIX =
1054+IGNORE_PREFIX =
10551055
10561056 #---------------------------------------------------------------------------
10571057 # Configuration options related to the HTML output
@@ -1095,7 +1095,7 @@ HTML_FILE_EXTENSION = .html
10951095 # of the possible markers and block names see the documentation.
10961096 # This tag requires that the tag GENERATE_HTML is set to YES.
10971097
1098-HTML_HEADER =
1098+HTML_HEADER =
10991099
11001100 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
11011101 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1105,7 +1105,7 @@ HTML_HEADER =
11051105 # that doxygen normally uses.
11061106 # This tag requires that the tag GENERATE_HTML is set to YES.
11071107
1108-HTML_FOOTER =
1108+HTML_FOOTER =
11091109
11101110 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
11111111 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1130,7 +1130,7 @@ HTML_STYLESHEET = doxygen.css
11301130 # list). For an example see the documentation.
11311131 # This tag requires that the tag GENERATE_HTML is set to YES.
11321132
1133-HTML_EXTRA_STYLESHEET =
1133+HTML_EXTRA_STYLESHEET =
11341134
11351135 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
11361136 # other source files which should be copied to the HTML output directory. Note
@@ -1140,7 +1140,7 @@ HTML_EXTRA_STYLESHEET =
11401140 # files will be copied as-is; there are no commands or markers available.
11411141 # This tag requires that the tag GENERATE_HTML is set to YES.
11421142
1143-HTML_EXTRA_FILES =
1143+HTML_EXTRA_FILES =
11441144
11451145 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
11461146 # will adjust the colors in the style sheet and background images according to
@@ -1269,7 +1269,7 @@ GENERATE_HTMLHELP = NO
12691269 # written to the html output directory.
12701270 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
12711271
1272-CHM_FILE =
1272+CHM_FILE =
12731273
12741274 # The HHC_LOCATION tag can be used to specify the location (absolute path
12751275 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -1277,7 +1277,7 @@ CHM_FILE =
12771277 # The file has to be specified with full path.
12781278 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
12791279
1280-HHC_LOCATION =
1280+HHC_LOCATION =
12811281
12821282 # The GENERATE_CHI flag controls if a separate .chi index file is generated
12831283 # (YES) or that it should be included in the master .chm file (NO).
@@ -1290,7 +1290,7 @@ GENERATE_CHI = NO
12901290 # and project file content.
12911291 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
12921292
1293-CHM_INDEX_ENCODING =
1293+CHM_INDEX_ENCODING =
12941294
12951295 # The BINARY_TOC flag controls whether a binary table of contents is generated
12961296 # (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
@@ -1321,7 +1321,7 @@ GENERATE_QHP = NO
13211321 # the HTML output folder.
13221322 # This tag requires that the tag GENERATE_QHP is set to YES.
13231323
1324-QCH_FILE =
1324+QCH_FILE =
13251325
13261326 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
13271327 # Project output. For more information please see Qt Help Project / Namespace
@@ -1346,7 +1346,7 @@ QHP_VIRTUAL_FOLDER = doc
13461346 # filters).
13471347 # This tag requires that the tag GENERATE_QHP is set to YES.
13481348
1349-QHP_CUST_FILTER_NAME =
1349+QHP_CUST_FILTER_NAME =
13501350
13511351 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
13521352 # custom filter to add. For more information please see Qt Help Project / Custom
@@ -1354,21 +1354,21 @@ QHP_CUST_FILTER_NAME =
13541354 # filters).
13551355 # This tag requires that the tag GENERATE_QHP is set to YES.
13561356
1357-QHP_CUST_FILTER_ATTRS =
1357+QHP_CUST_FILTER_ATTRS =
13581358
13591359 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
13601360 # project's filter section matches. Qt Help Project / Filter Attributes (see:
13611361 # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
13621362 # This tag requires that the tag GENERATE_QHP is set to YES.
13631363
1364-QHP_SECT_FILTER_ATTRS =
1364+QHP_SECT_FILTER_ATTRS =
13651365
13661366 # The QHG_LOCATION tag can be used to specify the location of Qt's
13671367 # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
13681368 # generated .qhp file.
13691369 # This tag requires that the tag GENERATE_QHP is set to YES.
13701370
1371-QHG_LOCATION =
1371+QHG_LOCATION =
13721372
13731373 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
13741374 # generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1501,7 +1501,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
15011501 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
15021502 # This tag requires that the tag USE_MATHJAX is set to YES.
15031503
1504-MATHJAX_EXTENSIONS =
1504+MATHJAX_EXTENSIONS =
15051505
15061506 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
15071507 # of code that will be used on startup of the MathJax code. See the MathJax site
@@ -1509,7 +1509,7 @@ MATHJAX_EXTENSIONS =
15091509 # example see the documentation.
15101510 # This tag requires that the tag USE_MATHJAX is set to YES.
15111511
1512-MATHJAX_CODEFILE =
1512+MATHJAX_CODEFILE =
15131513
15141514 # When the SEARCHENGINE tag is enabled doxygen will generate a search box for
15151515 # the HTML output. The underlying search engine uses javascript and DHTML and
@@ -1569,7 +1569,7 @@ EXTERNAL_SEARCH = NO
15691569 # Searching" for details.
15701570 # This tag requires that the tag SEARCHENGINE is set to YES.
15711571
1572-SEARCHENGINE_URL =
1572+SEARCHENGINE_URL =
15731573
15741574 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
15751575 # search data is written to a file for indexing by an external tool. With the
@@ -1585,7 +1585,7 @@ SEARCHDATA_FILE = searchdata.xml
15851585 # projects and redirect the results back to the right project.
15861586 # This tag requires that the tag SEARCHENGINE is set to YES.
15871587
1588-EXTERNAL_SEARCH_ID =
1588+EXTERNAL_SEARCH_ID =
15891589
15901590 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
15911591 # projects other than the one defined by this configuration file, but that are
@@ -1595,7 +1595,7 @@ EXTERNAL_SEARCH_ID =
15951595 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
15961596 # This tag requires that the tag SEARCHENGINE is set to YES.
15971597
1598-EXTRA_SEARCH_MAPPINGS =
1598+EXTRA_SEARCH_MAPPINGS =
15991599
16001600 #---------------------------------------------------------------------------
16011601 # Configuration options related to the LaTeX output
@@ -1659,7 +1659,7 @@ PAPER_TYPE = a4
16591659 # If left blank no extra packages will be included.
16601660 # This tag requires that the tag GENERATE_LATEX is set to YES.
16611661
1662-EXTRA_PACKAGES =
1662+EXTRA_PACKAGES =
16631663
16641664 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
16651665 # generated LaTeX document. The header should contain everything until the first
@@ -1675,7 +1675,7 @@ EXTRA_PACKAGES =
16751675 # to HTML_HEADER.
16761676 # This tag requires that the tag GENERATE_LATEX is set to YES.
16771677
1678-LATEX_HEADER =
1678+LATEX_HEADER =
16791679
16801680 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
16811681 # generated LaTeX document. The footer should contain everything after the last
@@ -1686,7 +1686,7 @@ LATEX_HEADER =
16861686 # Note: Only use a user-defined footer if you know what you are doing!
16871687 # This tag requires that the tag GENERATE_LATEX is set to YES.
16881688
1689-LATEX_FOOTER =
1689+LATEX_FOOTER =
16901690
16911691 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
16921692 # LaTeX style sheets that are included after the standard style sheets created
@@ -1697,7 +1697,7 @@ LATEX_FOOTER =
16971697 # list).
16981698 # This tag requires that the tag GENERATE_LATEX is set to YES.
16991699
1700-LATEX_EXTRA_STYLESHEET =
1700+LATEX_EXTRA_STYLESHEET =
17011701
17021702 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
17031703 # other source files which should be copied to the LATEX_OUTPUT output
@@ -1705,7 +1705,7 @@ LATEX_EXTRA_STYLESHEET =
17051705 # markers available.
17061706 # This tag requires that the tag GENERATE_LATEX is set to YES.
17071707
1708-LATEX_EXTRA_FILES =
1708+LATEX_EXTRA_FILES =
17091709
17101710 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
17111711 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -1813,14 +1813,14 @@ RTF_HYPERLINKS = NO
18131813 # default style sheet that doxygen normally uses.
18141814 # This tag requires that the tag GENERATE_RTF is set to YES.
18151815
1816-RTF_STYLESHEET_FILE =
1816+RTF_STYLESHEET_FILE =
18171817
18181818 # Set optional variables used in the generation of an RTF document. Syntax is
18191819 # similar to doxygen's config file. A template extensions file can be generated
18201820 # using doxygen -e rtf extensionFile.
18211821 # This tag requires that the tag GENERATE_RTF is set to YES.
18221822
1823-RTF_EXTENSIONS_FILE =
1823+RTF_EXTENSIONS_FILE =
18241824
18251825 # If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
18261826 # with syntax highlighting in the RTF output.
@@ -1865,7 +1865,7 @@ MAN_EXTENSION = .3
18651865 # MAN_EXTENSION with the initial . removed.
18661866 # This tag requires that the tag GENERATE_MAN is set to YES.
18671867
1868-MAN_SUBDIR =
1868+MAN_SUBDIR =
18691869
18701870 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
18711871 # will generate one additional man file for each entity documented in the real
@@ -1978,7 +1978,7 @@ PERLMOD_PRETTY = YES
19781978 # overwrite each other's variables.
19791979 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
19801980
1981-PERLMOD_MAKEVAR_PREFIX =
1981+PERLMOD_MAKEVAR_PREFIX =
19821982
19831983 #---------------------------------------------------------------------------
19841984 # Configuration options related to the preprocessor
@@ -2027,7 +2027,7 @@ INCLUDE_PATH = src platform Inc
20272027 # used.
20282028 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20292029
2030-INCLUDE_FILE_PATTERNS =
2030+INCLUDE_FILE_PATTERNS =
20312031
20322032 # The PREDEFINED tag can be used to specify one or more macro names that are
20332033 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -2037,7 +2037,7 @@ INCLUDE_FILE_PATTERNS =
20372037 # recursively expanded use the := operator instead of the = operator.
20382038 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20392039
2040-PREDEFINED =
2040+PREDEFINED = HAL_UART_MODULE_ENABLED HAL_I2C_MODULE_ENABLED HAL_SPI_MODULE_ENABLED
20412041
20422042 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
20432043 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2046,7 +2046,7 @@ PREDEFINED =
20462046 # definition found in the source code.
20472047 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20482048
2049-EXPAND_AS_DEFINED =
2049+EXPAND_AS_DEFINED =
20502050
20512051 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
20522052 # remove all references to function-like macros that are alone on a line, have
@@ -2075,13 +2075,13 @@ SKIP_FUNCTION_MACROS = YES
20752075 # the path). If a tag file is not located in the directory in which doxygen is
20762076 # run, you must also specify the path to the tagfile here.
20772077
2078-TAGFILES =
2078+TAGFILES =
20792079
20802080 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
20812081 # tag file that is based on the input files it reads. See section "Linking to
20822082 # external documentation" for more information about the usage of tag files.
20832083
2084-GENERATE_TAGFILE =
2084+GENERATE_TAGFILE =
20852085
20862086 # If the ALLEXTERNALS tag is set to YES, all external class will be listed in
20872087 # the class index. If set to NO, only the inherited external classes will be
@@ -2130,14 +2130,14 @@ CLASS_DIAGRAMS = YES
21302130 # the mscgen tool resides. If left empty the tool is assumed to be found in the
21312131 # default search path.
21322132
2133-MSCGEN_PATH =
2133+MSCGEN_PATH =
21342134
21352135 # You can include diagrams made with dia in doxygen documentation. Doxygen will
21362136 # then run dia to produce the diagram and insert it in the documentation. The
21372137 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
21382138 # If left empty dia is assumed to be found in the default search path.
21392139
2140-DIA_PATH =
2140+DIA_PATH =
21412141
21422142 # If set to YES the inheritance and collaboration graphs will hide inheritance
21432143 # and usage relations if the target is undocumented or is not a class.
@@ -2186,7 +2186,7 @@ DOT_FONTSIZE = 10
21862186 # the path where dot can find it using this tag.
21872187 # This tag requires that the tag HAVE_DOT is set to YES.
21882188
2189-DOT_FONTPATH =
2189+DOT_FONTPATH =
21902190
21912191 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
21922192 # each documented class showing the direct and indirect inheritance relations.
@@ -2332,26 +2332,26 @@ INTERACTIVE_SVG = NO
23322332 # found. If left blank, it is assumed the dot tool can be found in the path.
23332333 # This tag requires that the tag HAVE_DOT is set to YES.
23342334
2335-DOT_PATH =
2335+DOT_PATH =
23362336
23372337 # The DOTFILE_DIRS tag can be used to specify one or more directories that
23382338 # contain dot files that are included in the documentation (see the \dotfile
23392339 # command).
23402340 # This tag requires that the tag HAVE_DOT is set to YES.
23412341
2342-DOTFILE_DIRS =
2342+DOTFILE_DIRS =
23432343
23442344 # The MSCFILE_DIRS tag can be used to specify one or more directories that
23452345 # contain msc files that are included in the documentation (see the \mscfile
23462346 # command).
23472347
2348-MSCFILE_DIRS =
2348+MSCFILE_DIRS =
23492349
23502350 # The DIAFILE_DIRS tag can be used to specify one or more directories that
23512351 # contain dia files that are included in the documentation (see the \diafile
23522352 # command).
23532353
2354-DIAFILE_DIRS =
2354+DIAFILE_DIRS =
23552355
23562356 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
23572357 # path where java can find the plantuml.jar file. If left blank, it is assumed
@@ -2359,12 +2359,12 @@ DIAFILE_DIRS =
23592359 # generate a warning when it encounters a \startuml command in this case and
23602360 # will not generate output for the diagram.
23612361
2362-PLANTUML_JAR_PATH =
2362+PLANTUML_JAR_PATH =
23632363
23642364 # When using plantuml, the specified paths are searched for files specified by
23652365 # the !include statement in a plantuml block.
23662366
2367-PLANTUML_INCLUDE_PATH =
2367+PLANTUML_INCLUDE_PATH =
23682368
23692369 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
23702370 # that will be shown in the graph. If the number of nodes in a graph becomes
--- a/stm32_development/murasaki/murasaki/abstractspimaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspimaster.hpp
@@ -39,7 +39,7 @@ class AbstractSpiMaster
3939 * @param timeout_ms Timeout limit [mS]
4040 * @return true if transfer complete, false if timeout
4141 */
42- virtual bool Transfer(murasaki::AbstractSpiSlaveSpecifier * spi_spec,
42+ virtual bool TransmitAndReceive(murasaki::AbstractSpiSlaveSpecifier * spi_spec,
4343 uint8_t * tx_data,
4444 uint8_t * rx_data,
4545 unsigned int size,
@@ -49,7 +49,7 @@ class AbstractSpiMaster
4949 * @param ptr Pointer to the control object.
5050 * @return true if no error.
5151 */
52- virtual bool TransferCompleteCallback(void * ptr) = 0;
52+ virtual bool TransmitAndReceiveCompleteCallback(void * ptr) = 0;
5353 /**
5454 * @brief Handling error report of device.
5555 * @param ptr Pointer for generic use. Usually, points a struct of a device control
--- a/stm32_development/murasaki/murasaki/abstracttask.hpp
+++ b/stm32_development/murasaki/murasaki/abstracttask.hpp
@@ -26,6 +26,8 @@ namespace murasaki {
2626 *
2727 * The destructor deletes the task.
2828 * Releasing thask from all the resources ( ex: semaphore ) before deleting, is the responsibility of the programmer.
29+ *
30+ * Base on the description at http://idken.net/posts/2017-02-01-freertos_task_cpp/
2931 * @ingroup MURASAKI_ABSTRACT_GROUP
3032 */
3133 class AbstractTask
--- a/stm32_development/murasaki/murasaki/spimaster.cpp
+++ b/stm32_development/murasaki/murasaki/spimaster.cpp
@@ -39,7 +39,7 @@ SpiMaster::~SpiMaster()
3939
4040 }
4141
42-bool SpiMaster::Transfer(murasaki::AbstractSpiSlaveSpecifier* spi_spec,
42+bool SpiMaster::TransmitAndReceive(murasaki::AbstractSpiSlaveSpecifier* spi_spec,
4343 uint8_t* tx_data,
4444 uint8_t* rx_data,
4545 unsigned int size,
@@ -87,7 +87,7 @@ bool SpiMaster::Transfer(murasaki::AbstractSpiSlaveSpecifier* spi_spec,
8787
8888 }
8989
90-bool SpiMaster::TransferCompleteCallback(void* ptr)
90+bool SpiMaster::TransmitAndReceiveCompleteCallback(void* ptr)
9191 {
9292 MURASAKI_ASSERT(nullptr != ptr)
9393
--- a/stm32_development/murasaki/murasaki/spimaster.hpp
+++ b/stm32_development/murasaki/murasaki/spimaster.hpp
@@ -18,7 +18,6 @@
1818
1919 namespace murasaki {
2020 /**
21- * \ingroup MURASAKI_GROUP
2221 * @brief Thread safe, blocking IO. Encapsulating SPI master. Based on STM32 HAL driver and FreeRTOS
2322 * \details
2423 * The SpiMaster class is the wrapper of the SPI controller. To use the SpiMaster class,
@@ -35,10 +34,10 @@ namespace murasaki {
3534 * \code
3635 * void HAL_SPI_TxRxCpltCallback (SPI_HandleTypeDef * hspi)
3736 * {
38- * my_spi3->TransferCompleteCallback(hspi);
37+ * my_spi3->TransmitAndReceiveCompleteCallback(hspi);
3938 * }
4039 * \endcode
41- * todo
40+ *
4241 * Where HAL_SPI_TxRxCpltCallback is a predefined name of the SPI interrupt handler.
4342 * This is invoked by system whenever a interrupt baed SPI transmission is complete.
4443 * Becuase the default function is weakly bound, above definition will overwride the
@@ -51,13 +50,14 @@ namespace murasaki {
5150 *
5251 * Once the instance and callbacks are correctly prepared, we can use the Transfer member function.
5352 *
54- * The @ref SpiMaster::Transfer() member function is a blocking function. A programmer can specify the
53+ * The @ref SpiMaster::TransmitAndReceive() member function is a blocking function. A programmer can specify the
5554 * timeout by timeout_ms parameter. By default, this parameter is set by kwmsIndefinitely
5655 * which specifes never time out.
5756 *
5857 *
5958 * Both methods can be called from only the task context. If these are called in the ISR
6059 * context, the result is unknown.
60+ * @ingroup MURASAKI_GROUP
6161 */
6262 class SpiMaster : public AbstractSpiMaster
6363 {
@@ -83,7 +83,7 @@ class SpiMaster : public AbstractSpiMaster
8383 * from the spi_spec. And then, assert the chips elect through the spi_spec during the
8484 * data transfer.
8585 */
86- virtual bool Transfer(murasaki::AbstractSpiSlaveSpecifier * spi_spec,
86+ virtual bool TransmitAndReceive(murasaki::AbstractSpiSlaveSpecifier * spi_spec,
8787 uint8_t * tx_data,
8888 uint8_t * rx_data,
8989 unsigned int size,
@@ -93,7 +93,7 @@ class SpiMaster : public AbstractSpiMaster
9393 * @param ptr Pointer to the control object.
9494 * @return true if no error.
9595 */
96- virtual bool TransferCompleteCallback(void * ptr);
96+ virtual bool TransmitAndReceiveCompleteCallback(void * ptr);
9797 /**
9898 * @brief Error handling
9999 * @param ptr Pointer to I2C_HandleTypeDef struct.