Commit: 77791bcd80466e0a62b2af58a750674e951afd4e - shared_foo (git)

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

Commit MetaInfo

• Revisión: 77791bcd80466e0a62b2af58a750674e951afd4e (tree)
• Tiempo: 2019-02-04 13:43:43
• Autor: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Refactering class name.

Changeng class name from Abstract*** to ***Strategy,
to belong with the pattern programming.

Cambiar Resumen

• modified: stm32_development/murasaki/.settings/language.settings.xml
• modified: stm32_development/murasaki/Inc/platform_defs.hpp
• modified: stm32_development/murasaki/murasaki/abstractbitin.hpp
• modified: stm32_development/murasaki/murasaki/abstractbitout.hpp
• modified: stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
• modified: stm32_development/murasaki/murasaki/abstracti2cslave.hpp
• modified: stm32_development/murasaki/murasaki/abstractlogger.hpp
• modified: stm32_development/murasaki/murasaki/abstractspimaster.hpp
• modified: stm32_development/murasaki/murasaki/abstractspislave.hpp
• modified: stm32_development/murasaki/murasaki/debuggerautoreprinttask.cpp
• modified: stm32_development/murasaki/murasaki/debuggerautoreprinttask.hpp
• modified: stm32_development/murasaki/murasaki/debuggertxtask.cpp
• modified: stm32_development/murasaki/murasaki/debuggertxtask.hpp
• modified: stm32_development/murasaki/murasaki/debuggeruart.hpp
• modified: stm32_development/murasaki/murasaki/murasaki.hpp
• modified: stm32_development/murasaki/murasaki/task.cpp
• modified: stm32_development/murasaki/murasaki/task.hpp
• modified: stm32_development/murasaki/murasaki/uart.hpp
• modified: stm32_development/murasaki/murasaki/uartlogger.cpp
• modified: stm32_development/murasaki/murasaki/uartlogger.hpp
• delete: stm32_development/murasaki/murasaki/{abstractperipheral.hpp => peripheralstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstracttask.cpp => taskstrategy.cpp}
• delete: stm32_development/murasaki/murasaki/{abstracttask.hpp => taskstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstractuart.hpp => uartstrategy.hpp}

Diferencia incremental

--- 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="1318604374853316739" 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="-1429691010231092235" 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="1318604374853316739" 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="-1429691010231092235" 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/Inc/platform_defs.hpp
+++ b/stm32_development/murasaki/Inc/platform_defs.hpp
@@ -79,17 +79,17 @@ namespace murasaki {
 struct Platform
 {
     // Platform dependent Custom variables.
-    AbstractUart * uart_console;    ///< UART wrapping class object for debugging
+    UartStrategy * uart_console;    ///< UART wrapping class object for debugging
     AbstractLogger * logger;        ///< logging class object for debugger
 
     AbstractBitOut * led;           ///< GP out under test
-    AbstractUart * uart;            ///< UART under test
+    UartStrategy * uart;            ///< UART under test
     AbstractSpiMaster * spiMaster;  ///< SPI Master under test
     AbstractSpiSlave * spiSlave;    ///< SPI Slave under test
     AbstractI2CMaster * i2cMaster;  ///< I2C Master under test
     AbstractI2cSlave * i2cSlave;    ///< I2C Slave under test
 
-    AbstractTask * task1;           ///< Task under test
+    TaskStrategy * task1;           ///< Task under test
 
 };
 

--- a/stm32_development/murasaki/murasaki/abstractbitin.hpp
+++ b/stm32_development/murasaki/murasaki/abstractbitin.hpp
@@ -8,7 +8,7 @@
 #ifndef ABSTRACTBITIN_HPP_
 #define ABSTRACTBITIN_HPP_
 
-#include <abstractperipheral.hpp>
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -18,7 +18,7 @@ namespace murasaki {
  * A prototype of the general purpose bit input class
  *
  */
-class AbstractBitIn: public AbstractPeripheral {
+class AbstractBitIn: public PeripheralStrategy {
  public:
 	/**
 	 * @brief Get a status of the input pin

--- a/stm32_development/murasaki/murasaki/abstractbitout.hpp
+++ b/stm32_development/murasaki/murasaki/abstractbitout.hpp
@@ -8,7 +8,7 @@
 #ifndef ABSTRACTBITOUT_HPP_
 #define ABSTRACTBITOUT_HPP_
 
-#include <abstractperipheral.hpp>
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -19,7 +19,7 @@ namespace murasaki {
  *
  */
 
-class AbstractBitOut: public AbstractPeripheral {
+class AbstractBitOut: public PeripheralStrategy {
 public:
 	/**
 	 * @brief Set a status of the output pin

--- a/stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
@@ -9,7 +9,7 @@
 #ifndef ABSTRACTI2CMASTER_HPP_
 #define ABSTRACTI2CMASTER_HPP_
 
-#include "abstractperipheral.hpp"
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -27,7 +27,7 @@ namespace murasaki {
  * Transmit/Receive.
  */
 
-class AbstractI2CMaster : murasaki::AbstractPeripheral
+class AbstractI2CMaster : murasaki::PeripheralStrategy
 {
  public:
 

--- a/stm32_development/murasaki/murasaki/abstracti2cslave.hpp
+++ b/stm32_development/murasaki/murasaki/abstracti2cslave.hpp
@@ -9,7 +9,7 @@
 #ifndef ABSTRACTI2CSLAVE_HPP_
 #define ABSTRACTI2CSLAVE_HPP_
 
-#include <abstractperipheral.hpp>
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -25,7 +25,7 @@ namespace murasaki {
  * Two call back member functions are prepared to sync with the interrupt which tells the end of
  * Transmit/Receive.
  */
-class AbstractI2cSlave : public murasaki::AbstractPeripheral {
+class AbstractI2cSlave : public murasaki::PeripheralStrategy {
  public:
     /**
      * @brief Thread safe, blocking transmission over I2C.

--- a/stm32_development/murasaki/murasaki/abstractlogger.hpp
+++ b/stm32_development/murasaki/murasaki/abstractlogger.hpp
@@ -9,7 +9,7 @@
 #ifndef ABSTRACTLOGGER_HPP_
 #define ABSTRACTLOGGER_HPP_
 
-#include <abstractperipheral.hpp>
+#include <peripheralstrategy.hpp>
 #include <stdint.h>
 namespace murasaki {
 
@@ -72,7 +72,7 @@ class AbstractLogger
      * \brief This special method helps derived loggers. The loggers can access the raw device, in case of the
      * post mortem processing.
      */
-    static void * GetPeripheralHandle(murasaki::AbstractPeripheral * peripheral);
+    static void * GetPeripheralHandle(murasaki::PeripheralStrategy * peripheral);
 };
 /**
  * \}
@@ -81,7 +81,7 @@ class AbstractLogger
 } /* namespace murasaki */
 
 inline void* murasaki::AbstractLogger::GetPeripheralHandle(
-		murasaki::AbstractPeripheral* peripheral)
+		murasaki::PeripheralStrategy* peripheral)
 {
 	return(peripheral->GetPeripheralHandle());
 }

--- a/stm32_development/murasaki/murasaki/abstractspimaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspimaster.hpp
@@ -10,7 +10,7 @@
 #define ABSTRACTSPIMASTER_HPP_
 
 #include <abstractspislavespecifier.hpp>
-#include "abstractperipheral.hpp"
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 
@@ -21,7 +21,7 @@ namespace murasaki {
  *
  * \ingroup MURASAKI_ABSTRACT_GROUP
  */
-class AbstractSpiMaster:public murasaki::AbstractPeripheral
+class AbstractSpiMaster:public murasaki::PeripheralStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/abstractspislave.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspislave.hpp
@@ -9,7 +9,7 @@
 #ifndef ABSTRACTSPISLAVE_HPP_
 #define ABSTRACTSPISLAVE_HPP_
 
-#include "abstractperipheral.hpp"
+#include <peripheralstrategy.hpp>
 
 namespace murasaki {
 
@@ -20,7 +20,7 @@ namespace murasaki {
  *
  * \ingroup MURASAKI_ABSTRACT_GROUP
  */
-class AbstractSpiSlave : public murasaki::AbstractPeripheral
+class AbstractSpiSlave : public murasaki::PeripheralStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/debuggerautoreprinttask.cpp
+++ b/stm32_development/murasaki/murasaki/debuggerautoreprinttask.cpp
@@ -16,7 +16,7 @@ DebuggerAutoRePrintTask::DebuggerAutoRePrintTask(const char * task_name,
                                                  UBaseType_t task_priority,
                                                  const void * task_parameter)
         // Forward initialization parameter to the parent class
-        : AbstractTask(task_name, stack_depth, task_priority, task_parameter)
+        : TaskStrategy(task_name, stack_depth, task_priority, task_parameter)
 {
     // Do nothing
 }

--- a/stm32_development/murasaki/murasaki/debuggerautoreprinttask.hpp
+++ b/stm32_development/murasaki/murasaki/debuggerautoreprinttask.hpp
@@ -8,7 +8,7 @@
 #ifndef DEBUGGERAUTOREPRINTTASK_HPP_
 #define DEBUGGERAUTOREPRINTTASK_HPP_
 
-#include <abstracttask.hpp>
+#include <taskstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -22,7 +22,7 @@ namespace murasaki {
  * @ingroup MURASAKI_HELPER_GROUP
  */
 
-class DebuggerAutoRePrintTask : public AbstractTask
+class DebuggerAutoRePrintTask : public TaskStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/debuggertxtask.cpp
+++ b/stm32_development/murasaki/murasaki/debuggertxtask.cpp
@@ -16,7 +16,7 @@ DebuggerTxTask::DebuggerTxTask(const char * task_name,
                                UBaseType_t task_priority,
                                const void * task_parameter)
         // Forward initialization parameter to the parent class
-        : AbstractTask(task_name, stack_depth, task_priority, task_parameter)
+        : TaskStrategy(task_name, stack_depth, task_priority, task_parameter)
 {
         // Do nothing
 }

--- a/stm32_development/murasaki/murasaki/debuggertxtask.hpp
+++ b/stm32_development/murasaki/murasaki/debuggertxtask.hpp
@@ -8,7 +8,7 @@
 #ifndef DEBUGGERTXTASK_HPP_
 #define DEBUGGERTXTASK_HPP_
 
-#include <abstracttask.hpp>
+#include <taskstrategy.hpp>
 
 namespace murasaki {
 /**
@@ -25,7 +25,7 @@ namespace murasaki {
  * @ingroup MURASAKI_HELPER_GROUP
  */
 
-class DebuggerTxTask : public AbstractTask
+class DebuggerTxTask : public TaskStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/debuggeruart.hpp
+++ b/stm32_development/murasaki/murasaki/debuggeruart.hpp
@@ -10,7 +10,7 @@
 #define DEBUGGER_UART_HPP_
 
 #include <synchronizer.hpp>
-#include "abstractuart.hpp"
+#include <uartstrategy.hpp>
 #include "criticalsection.hpp"
 
 // Check if CubeMX generates UART module
@@ -65,7 +65,7 @@ namespace murasaki {
  * Both methods can be called from only the task context. If these are called in the ISR
  * context, the result is unknown.
  */
-class DebuggerUart : public AbstractUart
+class DebuggerUart : public UartStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/murasaki.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki.hpp
@@ -26,13 +26,13 @@
 
 // Include HAL to refer from submodules of murasaki.
 #include <debugger.hpp>
+#include <taskstrategy.hpp>
 
 // Configurations
 #include "murasaki_config.hpp"
 #include "murasaki_defs.hpp"
 
 // Task and Stack
-#include "abstracttask.hpp"
 #include "abstractfifo.hpp"
 #include "task.hpp"
 

--- a/stm32_development/murasaki/murasaki/abstractperipheral.hpp
+++ b/stm32_development/murasaki/murasaki/peripheralstrategy.hpp
@@ -1,13 +1,13 @@
 /**
- * @file abstractperipheral.hpp
+ * @file peripheralstrategy.hpp
  *
  * @date 2018/04/26
  * @author: takemasa
  * @brief Mother of All peripheral
  */
 
-#ifndef ABSTRACTPERIPHERAL_HPP_
-#define ABSTRACTPERIPHERAL_HPP_
+#ifndef PERIPHERALSTRATEGY_HPP_
+#define PERIPHERALSTRATEGY_HPP_
 
 #include "murasaki_defs.hpp"
 
@@ -22,12 +22,12 @@ namespace murasaki {
  * raw peripheral to respond to the post mortem situation. By using class, programmer can pass the
  * raw peripheral handler to loggers, while keep it hidden from the application.
  */
-class AbstractPeripheral {
+class PeripheralStrategy {
 public:
 	/**
 	 * @brief destructor
 	 */
-	virtual ~AbstractPeripheral(){};
+	virtual ~PeripheralStrategy(){};
 private:
 	/**
 	 * @brief pass the raw peripheral handler
@@ -39,4 +39,4 @@ friend class AbstractLogger;
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTPERIPHERAL_HPP_ */
+#endif /* PERIPHERALSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/task.cpp
+++ b/stm32_development/murasaki/murasaki/task.cpp
@@ -15,7 +15,7 @@ murasaki::Task::Task(
                      const void* task_parameter,
                      void (*task_body_func)(const void*))
         :
-          murasaki::AbstractTask(
+          murasaki::TaskStrategy(
                                  task_name,
                                  stack_depth,
                                  task_priority,

--- a/stm32_development/murasaki/murasaki/task.hpp
+++ b/stm32_development/murasaki/murasaki/task.hpp
@@ -8,7 +8,7 @@
 #ifndef TASK_HPP_
 #define TASK_HPP_
 
-#include <abstracttask.hpp>
+#include <taskstrategy.hpp>
 
 namespace murasaki {
 
@@ -35,7 +35,7 @@ namespace murasaki {
  * @endcode
  *
  */
-class Task : public murasaki::AbstractTask {
+class Task : public murasaki::TaskStrategy {
  public:
     /**
      * @brief Ease to use task class.

--- a/stm32_development/murasaki/murasaki/abstracttask.cpp
+++ b/stm32_development/murasaki/murasaki/taskstrategy.cpp
@@ -5,12 +5,12 @@
  *      Author: takemasa
  */
 
-#include <abstracttask.hpp>
+#include <taskstrategy.hpp>
 #include "murasaki_assert.hpp"
 
 namespace murasaki {
 
-AbstractTask::AbstractTask(const char * task_name, unsigned short stack_depth, UBaseType_t priority, const void * parameter)
+TaskStrategy::TaskStrategy(const char * task_name, unsigned short stack_depth, UBaseType_t priority, const void * parameter)
         : name_(task_name),
           stack_depth_(stack_depth),
           parameter_(parameter),
@@ -23,12 +23,12 @@ AbstractTask::AbstractTask(const char * task_name, unsigned short stack_depth, U
     task_ = 0;
 }
 
-AbstractTask::~AbstractTask()
+TaskStrategy::~TaskStrategy()
 {
     vTaskDelete(task_);
 }
 
-void AbstractTask::Start()
+void TaskStrategy::Start()
 {
     // Create a task.
     //
@@ -37,7 +37,7 @@ void AbstractTask::Start()
     // So FreeRTOS API can start the as task.
     // The passed static function calls TaskBody() member funciton, which is
     // defined by user.
-    BaseType_t task_result = ::xTaskCreate(AbstractTask::Launch,         // task entity;
+    BaseType_t task_result = ::xTaskCreate(TaskStrategy::Launch,         // task entity;
                                            name_,                        // name of task
                                            stack_depth_,                 // stack depth [byte]
                                            this,                         // See AbstractTask::Launch for the details.
@@ -48,29 +48,29 @@ void AbstractTask::Start()
 
 }
 
-void AbstractTask::Resume()
+void TaskStrategy::Resume()
 {
     vTaskResume(task_);
 }
 
-void AbstractTask::Suspend()
+void TaskStrategy::Suspend()
 {
     vTaskSuspend(task_);
 }
 
-const char* AbstractTask::GetName()
+const char* TaskStrategy::GetName()
 {
     return name_;
 }
 
 // This is a static member function
-void AbstractTask::Launch(void * ptr)
+void TaskStrategy::Launch(void * ptr)
 {
     MURASAKI_ASSERT(nullptr != ptr);
 
     // Enforce the ptr to be AbstractTask * type. This is safe because this class member funciton is called from
     // only @ref AbsutractTask::Start(). And that member function always passes its "this" pointer.
-    AbstractTask * this_ptr = static_cast<AbstractTask *>(ptr);
+    TaskStrategy * this_ptr = static_cast<TaskStrategy *>(ptr);
 
     // Call its task body. This is virtual function. Then, while the ptr is enfoced to be AbstractTask type,
     // the TaksBody is always the member function of the callee class ( Descendants of AbstractTask ).

--- a/stm32_development/murasaki/murasaki/abstracttask.hpp
+++ b/stm32_development/murasaki/murasaki/taskstrategy.hpp
@@ -1,5 +1,5 @@
 /**
- * @file abstracttask.hpp
+ * @file taskstrategy.hpp
  *
  * @date 2018/02/20
  * @author: takemasa
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef ABSTRACTTASK_HPP_
-#define ABSTRACTTASK_HPP_
+#ifndef TASKSTRATEGY_HPP_
+#define TASKSTRATEGY_HPP_
 
 #include <FreeRTOS.h>
 #include <task.h>
@@ -30,10 +30,10 @@ namespace murasaki {
  * Base on the description at http://idken.net/posts/2017-02-01-freertos_task_cpp/
  * @ingroup MURASAKI_ABSTRACT_GROUP
  */
-class AbstractTask
+class TaskStrategy
 {
  public:
-    AbstractTask() = delete;
+    TaskStrategy() = delete;
     /**
      * @brief Constractor. Task entity is not created here.
      * @param task_name Name of task. Will be passed to task when started.
@@ -41,11 +41,11 @@ class AbstractTask
      * @param task_priority Priority of the task. from 1 to up to configMAX_PRIORITIES -1. The high number is the high priority.
      * @param task_parameter Optional parameter to the task.
      */
-    AbstractTask(const char * task_name, unsigned short stack_depth, UBaseType_t task_priority, const void * task_parameter);
+    TaskStrategy(const char * task_name, unsigned short stack_depth, UBaseType_t task_priority, const void * task_parameter);
     /**
      * @brief Destructor
      */
-    virtual ~AbstractTask();
+    virtual ~TaskStrategy();
     /**
      * @brief Create a task and run it.
      * @details
@@ -91,4 +91,4 @@ class AbstractTask
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTTASK_HPP_ */
+#endif /* TASKSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/uart.hpp
+++ b/stm32_development/murasaki/murasaki/uart.hpp
@@ -10,7 +10,7 @@
 #define UART_HPP_
 
 #include <synchronizer.hpp>
-#include "abstractuart.hpp"
+#include <uartstrategy.hpp>
 #include "criticalsection.hpp"
 
 // Check if CubeMX generates UART module
@@ -65,7 +65,7 @@ namespace murasaki {
  * Both methods can be called from only the task context. If these are called in the ISR
  * context, the result is unknown.
  */
-class Uart : public AbstractUart
+class Uart : public UartStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/uartlogger.cpp
+++ b/stm32_development/murasaki/murasaki/uartlogger.cpp
@@ -15,7 +15,7 @@
 
 namespace murasaki {
 
-UartLogger::UartLogger(AbstractUart * uart):
+UartLogger::UartLogger(UartStrategy * uart):
 		uart_ ( uart)
 {
     MURASAKI_ASSERT(nullptr != uart)

--- a/stm32_development/murasaki/murasaki/uartlogger.hpp
+++ b/stm32_development/murasaki/murasaki/uartlogger.hpp
@@ -9,8 +9,8 @@
 #ifndef UARTLOGGER_HPP_
 #define UARTLOGGER_HPP_
 
+#include <uartstrategy.hpp>
 #include "abstractlogger.hpp"
-#include "abstractuart.hpp"
 
 // Check if CubeMX generates UART module
 #ifdef HAL_UART_MODULE_ENABLED
@@ -34,7 +34,7 @@ class UartLogger : public AbstractLogger
      * \brief Constructor
      * \param uart Pointer to the uart object.
      */
-    UartLogger(AbstractUart * uart);
+    UartLogger(UartStrategy * uart);
     /**
      * \brief Message output member function.
      * \param message Non null terminated character array. This data is stored or output to the logger.
@@ -56,7 +56,7 @@ class UartLogger : public AbstractLogger
     virtual void DoPostMortem( void * debugger_fifo);
 
  protected:
-    AbstractUart * const uart_;
+    UartStrategy * const uart_;
 };
 
 } /* namespace murasaki */

--- a/stm32_development/murasaki/murasaki/abstractuart.hpp
+++ b/stm32_development/murasaki/murasaki/uartstrategy.hpp
@@ -1,16 +1,16 @@
 /**
- * \file abstractuart.hpp
+ * \file uartstrategy.hpp
  *
  * \date 2017/11/04
  * \author: Takemasa Nakamura
  * \brief Root class definition of the UART driver
  */
 
-#ifndef ABSTRACTUART_HPP_
-#define ABSTRACTUART_HPP_
+#ifndef UARTSTRATEGY_HPP_
+#define UARTSTRATEGY_HPP_
 
+#include <peripheralstrategy.hpp>
 #include "murasaki_defs.hpp"
-#include "abstractperipheral.hpp"
 
 namespace murasaki {
 
@@ -37,7 +37,7 @@ namespace murasaki {
  * Transmit/Recieve.
  */
 
-class AbstractUart : public murasaki::AbstractPeripheral {
+class UartStrategy : public murasaki::PeripheralStrategy {
 public:
 
     /**
@@ -124,4 +124,4 @@ public:
  */
 }
 
-#endif /* ABSTRACTUART_HPP_ */
+#endif /* UARTSTRATEGY_HPP_ */