提交: aaf9b19cd2fbef43a6d67e5029a432fb5f94cfc6 - shared_foo_backup (git)

shared_fooの不要ディレクトリ削除前のもの

Commit MetaInfo

• 修訂: aaf9b19cd2fbef43a6d67e5029a432fb5f94cfc6 (tree)
• 時間: 2018-02-18 17:10:46
• 作者: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Changed comment.

Change Summary

• modified: stm32_development/murasaki/NUCLEO-F746ZG.xml
• modified: stm32_development/murasaki/murasaki/debug.cpp

差異

--- 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/debug.cpp
+++ b/stm32_development/murasaki/murasaki/debug.cpp
@@ -70,6 +70,8 @@ void Debug::printf(const char * fmt, ...)
     // obtain variable parameter list
     va_list argp;
 
+    MURASAKI_ASSERT(NULL != fmt);  // NULL check. Perhaps, overkill.
+
     ::portDISABLE_INTERRUPTS();   // ARM dependent API. OK to use in task and ISR.
     {
 #if 0
@@ -229,7 +231,7 @@ void Debug::TxTask()
         uint16_t snap_tail = tail_;
         ::taskEXIT_CRITICAL();
 
-        // check is data area is wrapped araound at the end of buffer. Note : Data is added to the head.
+        // check whether the data area is wrapped araound at the end of buffer. Note : Data is added to the head.
         if (snap_head > snap_tail) {    // not wrapped around
             // transmit entire data. return with error after waiting for 1sec.
             logger_->putMessage(