Commit: f3d9ecb6b7e515b263c985d6cb2a1d06b49aa197 - shared_foo (git)

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

Commit MetaInfo

• Revision: f3d9ecb6b7e515b263c985d6cb2a1d06b49aa197 (tree)
• Time: 2018-02-22 21:40:48
• Author: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Chqange Debug to Debugger

Change Summary

• modified: stm32_development/murasaki/Src/my_test.cpp
• modified: stm32_development/murasaki/murasaki/murasaki.hpp
• modified: stm32_development/murasaki/murasaki/murasaki_assert.hpp
• delete: stm32_development/murasaki/murasaki/{debug.cpp => debugger.cpp}
• delete: stm32_development/murasaki/murasaki/{debug.hpp => debugger.hpp}

Incremental Difference

--- a/stm32_development/murasaki/Src/my_test.cpp
+++ b/stm32_development/murasaki/Src/my_test.cpp
@@ -21,7 +21,7 @@
 #endif
 
 murasaki::Platform murasaki::platform;
-murasaki::Debug * murasaki::debugger;
+murasaki::Debugger * murasaki::debugger;
 
 static int counter;
 
@@ -57,7 +57,7 @@ void InitTestUart(UART_HandleTypeDef * uart_handle, SPI_HandleTypeDef * spi_hand
     murasaki::platform.spi_master = new murasaki::SpiMaster(spi_handle);
 
     // Setting debugger
-    murasaki::debugger = new murasaki::Debug(murasaki::platform.logger);
+    murasaki::debugger = new murasaki::Debugger(murasaki::platform.logger);
     murasaki::debugger->AutoHistory();  // type any key to show history.
 }
 

--- a/stm32_development/murasaki/murasaki/debug.cpp
+++ b/stm32_development/murasaki/murasaki/debugger.cpp
@@ -5,8 +5,7 @@
  *      Author: takemasa
  */
 
-#include "debug.hpp"
-
+#include <debugger.hpp>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -18,7 +17,7 @@
 
 namespace murasaki {
 
-Debug::Debug(AbstractLogger * logger)
+Debugger::Debugger(AbstractLogger * logger)
 {
     // initialize internal variable;
     MURASAKI_ASSERT(logger != NULL)
@@ -39,7 +38,7 @@ Debug::Debug(AbstractLogger * logger)
 
     // start the debug task
     BaseType_t task_result = ::xTaskCreate(
-                  Debug::LaunchTxTask,                      // task entity;
+                  Debugger::LaunchTxTask,                      // task entity;
                   "DebugTask",                              // name of task
                   PLATFORM_CONFIG_DEBUG_TASK_STACK_SIZE,    // stack depth
                   this,                                     // parameter to task
@@ -50,7 +49,7 @@ Debug::Debug(AbstractLogger * logger)
 
 }
 
-Debug::~Debug()
+Debugger::~Debugger()
 {
     // Delete task;
     if (tx_task_ != NULL)
@@ -65,7 +64,7 @@ Debug::~Debug()
         ::vSemaphoreDelete( sem_notify_new_data_);
 }
 
-void Debug::printf(const char * fmt, ...)
+void Debugger::printf(const char * fmt, ...)
 {
     // obtain variable parameter list
     va_list argp;
@@ -105,7 +104,7 @@ void Debug::printf(const char * fmt, ...)
 
 }
 
-char Debug::GetchFromTask()
+char Debugger::GetchFromTask()
 {
     MURASAKI_ASSERT(isTaskContext());
 
@@ -114,7 +113,7 @@ char Debug::GetchFromTask()
 }
 
 // Assumes this is called only in the critical section.
-void Debug::AppendToBuffer()
+void Debugger::AppendToBuffer()
 {
     int avairable;
 
@@ -147,7 +146,7 @@ void Debug::AppendToBuffer()
  * This function is not protected from interrupt.
  * There is no easy way to solve this problem.
  */
-void Debug::PrintHistory()
+void Debugger::PrintHistory()
 {
     MURASAKI_ASSERT(isTaskContext());
 
@@ -163,7 +162,7 @@ void Debug::PrintHistory()
     ::taskEXIT_CRITICAL();
 }
 
-void Debug::AutoHistory()
+void Debugger::AutoHistory()
 {
     MURASAKI_ASSERT(isTaskContext());
     // protecting from double task creation
@@ -171,7 +170,7 @@ void Debug::AutoHistory()
         return;
 
     // start the debug task
-    BaseType_t task_result = ::xTaskCreate(Debug::LaunchAutoHistoryTask,             // task entity;
+    BaseType_t task_result = ::xTaskCreate(Debugger::LaunchAutoHistoryTask,             // task entity;
                                            "AutoHistoryTask",                        // name of task
                                            PLATFORM_CONFIG_DEBUG_TASK_STACK_SIZE,    // stack depth
                                            this,                                     // parameter to task
@@ -183,7 +182,7 @@ void Debug::AutoHistory()
     auto_history_enabled = true;
 }
 
-void Debug::LaunchAutoHistoryTask(void* this_pointer)
+void Debugger::LaunchAutoHistoryTask(void* this_pointer)
 {
     MURASAKI_ASSERT(NULL != this_pointer);
 
@@ -191,11 +190,11 @@ void Debug::LaunchAutoHistoryTask(void* this_pointer)
     // The caller passes the "this" pointer as parameter.
     // The caller is always "Debug" task.
     // The AutoHistoryTask() is private and task body.
-    static_cast<Debug *>(this_pointer)->AutoHistoryTask();
+    static_cast<Debugger *>(this_pointer)->AutoHistoryTask();
 
 }
 
-void Debug::AutoHistoryTask()
+void Debugger::AutoHistoryTask()
 {
     MURASAKI_ASSERT(isTaskContext());
     // Task body. Never return.
@@ -209,17 +208,17 @@ void Debug::AutoHistoryTask()
 }
 
 
-void Debug::LaunchTxTask(void * this_pointer)
+void Debugger::LaunchTxTask(void * this_pointer)
 {
     MURASAKI_ASSERT(NULL != this_pointer);
     // This is "interface class method" to allow to use a private method as task.
     // The caller passes the "this" pointer as parameter.
     // The caller is always "Debug" task.
     // The txTask() is private and task body.
-    static_cast<Debug *>(this_pointer)->TxTask();
+    static_cast<Debugger *>(this_pointer)->TxTask();
 }
 
-void Debug::TxTask()
+void Debugger::TxTask()
 {
     MURASAKI_ASSERT(isTaskContext());
     // Task body. Never return.

--- a/stm32_development/murasaki/murasaki/debug.hpp
+++ b/stm32_development/murasaki/murasaki/debugger.hpp
@@ -8,8 +8,8 @@
  * This class serves printf function for both task context and ISR context.
  */
 
-#ifndef DEBUG_HPP_
-#define DEBUG_HPP_
+#ifndef DEBUGGER_HPP_
+#define DEBUGGER_HPP_
 
 #include <FreeRTOS.h>
 #include <task.h>
@@ -37,18 +37,18 @@ namespace murasaki {
  * See \ref MURASAKI_PLATFORM_GROUP as example this class.
  *
  */
-class Debug
+class Debugger
 {
  public:
     /**
      * \brief Constructor. Create internal variable.
      * \param logger The pointer to the \ref AbstractLogger wrapper class variable.
      */
-    Debug(AbstractLogger* logger);
+    Debugger(AbstractLogger* logger);
     /**
      * \brief Deconstructor. Delete internal variable.
      */
-    virtual ~Debug();
+    virtual ~Debugger();
 
     /**
      * \brief Debug output function.
@@ -213,4 +213,4 @@ class Debug
 
 } /* namespace platform */
 
-#endif /* DEBUG_HPP_ */
+#endif /* DEBUGGER_HPP_ */

--- a/stm32_development/murasaki/murasaki/murasaki.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki.hpp
@@ -25,6 +25,7 @@
 #define MURASAKI_HPP_
 
 // Include HAL to refer from submodules of murasaki.
+#include <debugger.hpp>
 #include "stm32f7xx_hal.h"
 
 #include "murasaki_config.hpp"
@@ -38,7 +39,6 @@
 #include "i2cmaster.hpp"
 
 #include "uartlogger.hpp"
-#include "debug.hpp"
 #include "murasaki_assert.hpp"
 
 #include "platform_defs.hpp"

--- a/stm32_development/murasaki/murasaki/murasaki_assert.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki_assert.hpp
@@ -9,9 +9,9 @@
 #ifndef MURASAKI_ASSERT_HPP_
 #define MURASAKI_ASSERT_HPP_
 
+#include <debugger.hpp>
 #include "murasaki_config.hpp"
 #include "murasaki_defs.hpp"
-#include "debug.hpp"
 
 #define MURASAKI_ASSERT_MSG "!! Assertion failure in function %s(), at line %d of file %s !!\n\r"
 #define MURASAKI_ERROR_MSG  "Error in function %s(), at line %d of file %s : %s \n\r"
@@ -80,7 +80,7 @@ namespace murasaki {
  *
  */
 
-extern Debug* debugger;
+extern Debugger* debugger;
 }
 
 #endif /* MURASAKI_ASSERT_HPP_ */