OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

標籤
無標籤

Frequently used words (click to add to your profile)

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

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


Commit MetaInfo

修訂2696c8e4369f51c662ee950bc33ab7ba8e7b07a3 (tree)
時間2018-08-16 20:30:24
作者takemasa <suikan@user...>
Commitertakemasa

Log Message

Merge branch 'feature-sai-new' of git.pf.osdn.net:/gitroot/s/su/suikan/shared_foo into feature-sai-new

Change Summary

差異

--- a/stm32_development/.gitignore
+++ b/stm32_development/.gitignore
@@ -1,3 +1,5 @@
11 *.bak
22 rtf/
33 Backup/
4+latex/
5+
--- 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/murasaki.doxyfile
+++ b/stm32_development/murasaki/murasaki.doxyfile
@@ -1604,7 +1604,7 @@ EXTRA_SEARCH_MAPPINGS =
16041604 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
16051605 # The default value is: YES.
16061606
1607-GENERATE_LATEX = NO
1607+GENERATE_LATEX = YES
16081608
16091609 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
16101610 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1623,7 +1623,7 @@ LATEX_OUTPUT = latex
16231623 # The default file is: latex.
16241624 # This tag requires that the tag GENERATE_LATEX is set to YES.
16251625
1626-LATEX_CMD_NAME = latex
1626+LATEX_CMD_NAME = pdflatex
16271627
16281628 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
16291629 # index for LaTeX.
@@ -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 = HAL_UART_MODULE_ENABLED HAL_I2C_MODULE_ENABLED HAL_SPI_MODULE_ENABLED HAL_GPIO_MODULE_ENABLED
2040+PREDEFINED = HAL_UART_MODULE_ENABLED HAL_I2C_MODULE_ENABLED HAL_SPI_MODULE_ENABLED HAL_GPIO_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
--- a/stm32_development/sai_develop/.settings/language.settings.xml
+++ b/stm32_development/sai_develop/.settings/language.settings.xml
@@ -5,7 +5,7 @@
55 <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
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"/>
8- <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">
8+ <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">
99 <language-scope id="org.eclipse.cdt.core.gcc"/>
1010 <language-scope id="org.eclipse.cdt.core.g++"/>
1111 </provider>
@@ -16,7 +16,7 @@
1616 <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717 <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818 <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19- <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">
19+ <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">
2020 <language-scope id="org.eclipse.cdt.core.gcc"/>
2121 <language-scope id="org.eclipse.cdt.core.g++"/>
2222 </provider>