コミット: 561359aec4c66db08753138784345aeb302c30ad - shared_foo (git)

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

コミットメタ情報

• リビジョン: 561359aec4c66db08753138784345aeb302c30ad (tree)
• 日時: 2018-09-15 08:38:56
• 作者: takemasa <suikan@user...>
• コミッター: takemasa

ログメッセージ

Modified comment of the I2C status enumulation type.

Added more specific description of the each error, and how to respond in
the user program.

変更サマリ

• modified: stm32_development/murasaki/.settings/language.settings.xml
• modified: stm32_development/murasaki/NUCLEO-F746ZG.xml
• modified: stm32_development/murasaki/murasaki/murasaki_defs.hpp
• modified: stm32_development/nucleo-l152re-fujitsubo-test/.settings/language.settings.xml
• modified: stm32_development/nucleo-l152re-fujitsubo-test/NUCLEO-L152RE.xml

差分

--- a/stm32_development/murasaki/.settings/language.settings.xml
+++ b/stm32_development/murasaki/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1263656286462129955" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1263656286462129955" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

--- a/stm32_development/murasaki/NUCLEO-F746ZG.xml
+++ b/stm32_development/murasaki/NUCLEO-F746ZG.xml
@@ -12,8 +12,8 @@
 <targetDefinitions>
   <board id="nucleo-f746zg">
     <name>NUCLEO-F746ZG</name>
-    <dbgIF>JTAG</dbgIF>
     <dbgIF>SWD</dbgIF>
+    <dbgIF>JTAG</dbgIF>
     <dbgDEV>ST-Link</dbgDEV>
     <mcuId>stm32f746zgtx</mcuId>
   </board>

--- a/stm32_development/murasaki/murasaki/murasaki_defs.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki_defs.hpp
@@ -162,6 +162,21 @@ enum SpiClockPhase
  * @brief Return status of the I2C classes.
  * @details
  * This enums represents the return status from the I2C class method.
+ *
+ * In a single master controler system, you need to care only ki2csNak and ki2csTimeOut.
+ * Other error may be caused by multiple master system.
+ *
+ * The ki2csNak is returned when one of two happens :
+ * @li The slave device terminated transfer.
+ * @li No slave device responded to the address specified by master device.
+ *
+ * The ki2csTimeOUt is returned when slave device streched transfere too long.
+ *
+ * The ki2csArbitrationLost is returned when another master won the arbitration. Usulally, the master have to
+ * re-try the transfer after certain waiting period.
+ *
+ * The ki2csBussError is fatal condition. In the master mode, it could be problem of other device.
+ * The root cause is not deterministic. Probably it is hardware problem.
  */
 enum I2CStatus
 {
@@ -169,7 +184,7 @@ enum I2CStatus
     ki2csTimeOut,               //!< Master mode error. No response from device.
     ki2csNak,                   //!< Master mode error. Device answeres NAK
     ki2csBussError,             //!< Master&Slave mode error. START/STOP condition at irregular location.
-    ki2csArbitrationLost        //!< Master&Slave mode error. ki2csArbitrationLost
+    ki2csArbitrationLost        //!< Master&Slave mode error. Lost arbitration against other master device.
 };
 
 /**

--- a/stm32_development/nucleo-l152re-fujitsubo-test/.settings/language.settings.xml
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1263656286462129955" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1263656286462129955" 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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

--- a/stm32_development/nucleo-l152re-fujitsubo-test/NUCLEO-L152RE.xml
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/NUCLEO-L152RE.xml
@@ -12,8 +12,8 @@
 <targetDefinitions>
   <board id="nucleo-l152re">
     <name>NUCLEO-L152RE</name>
-    <dbgIF>JTAG</dbgIF>
     <dbgIF>SWD</dbgIF>
+    <dbgIF>JTAG</dbgIF>
     <dbgDEV>ST-Link</dbgDEV>
     <mcuId>stm32l152retx</mcuId>
   </board>