Commit: 08e08da601f41867921e53c5728818a0c56f01c5 - shared_foo (git)

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

Commit MetaInfo

• Revision: 08e08da601f41867921e53c5728818a0c56f01c5 (tree)
• Time: 2019-02-04 18:42:39
• Author: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Refactoring the name of the class

Change Summary

• modified: stm32_development/murasaki/Inc/platform_defs.hpp
• modified: stm32_development/murasaki/murasaki-tp/adau1361.cpp
• modified: stm32_development/murasaki/murasaki-tp/adau1361.hpp
• modified: stm32_development/murasaki/murasaki-tp/umbadau1361.hpp
• modified: stm32_development/murasaki/murasaki/bitin.hpp
• modified: stm32_development/murasaki/murasaki/bitout.hpp
• modified: stm32_development/murasaki/murasaki/debuggerfifo.cpp
• modified: stm32_development/murasaki/murasaki/debuggerfifo.hpp
• modified: stm32_development/murasaki/murasaki/i2cmaster.hpp
• modified: stm32_development/murasaki/murasaki/i2cslave.hpp
• modified: stm32_development/murasaki/murasaki/murasaki.hpp
• delete: stm32_development/murasaki/murasaki/{abstractaudiocodec.hpp => audiocodecstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstractbitin.hpp => bitinstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstractbitout.hpp => bitoutstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstractfifo.cpp => fifostrategy.cpp}
• delete: stm32_development/murasaki/murasaki/{abstractfifo.hpp => fifostrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstracti2cmaster.hpp => i2cmasterstrategy.hpp}
• delete: stm32_development/murasaki/murasaki/{abstracti2cslave.hpp => i2cslavestrategy.hpp}

Incremental Difference

--- a/stm32_development/murasaki/Inc/platform_defs.hpp
+++ b/stm32_development/murasaki/Inc/platform_defs.hpp
@@ -82,12 +82,12 @@ struct Platform
     UartStrategy * uart_console;    ///< UART wrapping class object for debugging
     AbstractLogger * logger;        ///< logging class object for debugger
 
-    AbstractBitOut * led;           ///< GP out under test
+    BitOutStrategy * led;           ///< GP out 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
+    I2CMasterStrategy * i2cMaster;  ///< I2C Master under test
+    I2cSlaveStrategy * i2cSlave;    ///< I2C Slave under test
 
     TaskStrategy * task1;           ///< Task under test
 

--- a/stm32_development/murasaki/murasaki-tp/adau1361.cpp
+++ b/stm32_development/murasaki/murasaki-tp/adau1361.cpp
@@ -13,9 +13,9 @@
 #ifdef   HAL_I2C_MODULE_ENABLED
 
 namespace murasaki {
-Adau1361::Adau1361(unsigned int fs, murasaki::AbstractI2CMaster * controler,
+Adau1361::Adau1361(unsigned int fs, murasaki::I2CMasterStrategy * controler,
 		unsigned int i2c_device_addr) :
-		AbstractAudioCodec(fs), i2c_(controler), device_addr_(i2c_device_addr) {
+		AudioCodecStrategy(fs), i2c_(controler), device_addr_(i2c_device_addr) {
 }
 
 

--- a/stm32_development/murasaki/murasaki-tp/adau1361.hpp
+++ b/stm32_development/murasaki/murasaki-tp/adau1361.hpp
@@ -8,9 +8,9 @@
 #ifndef MURASAKI_TP_ADAU1361_HPP_
 #define MURASAKI_TP_ADAU1361_HPP_
 
+#include <audiocodecstrategy.hpp>
 #include "i2cmaster.hpp"
 
-#include <abstractaudiocodec.hpp>
 
 #ifdef HAL_I2C_MODULE_ENABLED
 
@@ -25,7 +25,7 @@ namespace murasaki {
  * \brief Audio Codec LSI class
  */
 
-class Adau1361: public AbstractAudioCodec {
+class Adau1361: public AudioCodecStrategy {
 public:
     /**
     * \brief constructor.
@@ -35,7 +35,7 @@ public:
     * \details
     *   initialize the internal variables.
     */
-	Adau1361(unsigned int fs, murasaki::AbstractI2CMaster * controler,
+	Adau1361(unsigned int fs, murasaki::I2CMasterStrategy * controler,
 			unsigned int i2c_device_addr);
 
     /**
@@ -99,7 +99,7 @@ public:
 			bool mute = false);
 
 protected:
-    murasaki::AbstractI2CMaster * const i2c_;
+    murasaki::I2CMasterStrategy * const i2c_;
     const unsigned int device_addr_;
 
     /**

--- a/stm32_development/murasaki/murasaki-tp/umbadau1361.hpp
+++ b/stm32_development/murasaki/murasaki-tp/umbadau1361.hpp
@@ -24,7 +24,7 @@ public:
 	 * \details
 	 *   initialize the internal variables.
 	 */
-	UmbAdau1361(unsigned int fs, murasaki::AbstractI2CMaster * controler,
+	UmbAdau1361(unsigned int fs, murasaki::I2CMasterStrategy * controler,
 			unsigned int addr) :
 	Adau1361( fs, controler, addr ) {};
 protected:

--- a/stm32_development/murasaki/murasaki/abstractaudiocodec.hpp
+++ b/stm32_development/murasaki/murasaki/audiocodecstrategy.hpp
@@ -1,5 +1,5 @@
 /**
- * @file abstractaudiocodec.hpp
+ * @file audiocodecstrategy.hpp
  *
  * @date 2018/05/11
  * @author: takemasa
@@ -16,7 +16,7 @@ namespace murasaki {
 * \details
 *   This class is template for all codec classes
 */
-class AbstractAudioCodec
+class AudioCodecStrategy
 {
 public:
 		/**
@@ -25,8 +25,8 @@ public:
 		* \details
 		*   initialize the internal variables.
 		*/
-	AbstractAudioCodec( unsigned int fs ):fs_(fs){};
-	virtual ~AbstractAudioCodec(){};
+	AudioCodecStrategy( unsigned int fs ):fs_(fs){};
+	virtual ~AudioCodecStrategy(){};
 
 		/**
 		* \brief Actual initializer.

--- a/stm32_development/murasaki/murasaki/bitin.hpp
+++ b/stm32_development/murasaki/murasaki/bitin.hpp
@@ -8,7 +8,7 @@
 #ifndef BITIN_HPP_
 #define BITIN_HPP_
 
-#include <abstractbitin.hpp>
+#include <bitinstrategy.hpp>
 #include "bitout.hpp"
 
 #ifdef HAL_GPIO_MODULE_ENABLED
@@ -27,7 +27,7 @@ namespace murasaki {
  * the GPIO peripheral have to be configured to be right direction.
  */
 
-class BitIn: public AbstractBitIn {
+class BitIn: public BitInStrategy {
 public:
 	/**
 	 * @brief Constructor

--- a/stm32_development/murasaki/murasaki/abstractbitin.hpp
+++ b/stm32_development/murasaki/murasaki/bitinstrategy.hpp
@@ -1,12 +1,12 @@
 /**
- * @file abstractbitin.hpp
+ * @file bitinstrategy.hpp
  *
  * @date 2018/05/07
  * @author takemasa
  */
 
-#ifndef ABSTRACTBITIN_HPP_
-#define ABSTRACTBITIN_HPP_
+#ifndef BITINSTRATEGY_HPP_
+#define BITINSTRATEGY_HPP_
 
 #include <peripheralstrategy.hpp>
 
@@ -18,7 +18,7 @@ namespace murasaki {
  * A prototype of the general purpose bit input class
  *
  */
-class AbstractBitIn: public PeripheralStrategy {
+class BitInStrategy: public PeripheralStrategy {
  public:
 	/**
 	 * @brief Get a status of the input pin
@@ -33,4 +33,4 @@ class AbstractBitIn: public PeripheralStrategy {
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTBITIN_HPP_ */
+#endif /* BITINSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/bitout.hpp
+++ b/stm32_development/murasaki/murasaki/bitout.hpp
@@ -8,7 +8,7 @@
 #ifndef BITOUT_HPP_
 #define BITOUT_HPP_
 
-#include <abstractbitout.hpp>
+#include <bitoutstrategy.hpp>
 
 #ifdef HAL_GPIO_MODULE_ENABLED
 
@@ -42,7 +42,7 @@ struct GPIO_type {
  * the GPIO peripheral have to be configured to be right direction.
  */
 
-class BitOut: public AbstractBitOut {
+class BitOut: public BitOutStrategy {
 public:
 	/**
 	 * @brief Constructor

--- a/stm32_development/murasaki/murasaki/abstractbitout.hpp
+++ b/stm32_development/murasaki/murasaki/bitoutstrategy.hpp
@@ -1,12 +1,12 @@
 /**
- * @file abstractbitout.hpp
+ * @file bitoutstrategy.hpp
  *
  * @date 2018/05/07
  * @author takemasa
  */
 
-#ifndef ABSTRACTBITOUT_HPP_
-#define ABSTRACTBITOUT_HPP_
+#ifndef BITOUTSTRATEGY_HPP_
+#define BITOUTSTRATEGY_HPP_
 
 #include <peripheralstrategy.hpp>
 
@@ -19,7 +19,7 @@ namespace murasaki {
  *
  */
 
-class AbstractBitOut: public PeripheralStrategy {
+class BitOutStrategy: public PeripheralStrategy {
 public:
 	/**
 	 * @brief Set a status of the output pin
@@ -48,4 +48,4 @@ public:
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTBITOUT_HPP_ */
+#endif /* BITOUTSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/debuggerfifo.cpp
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.cpp
@@ -18,7 +18,7 @@ namespace murasaki {
 
 
 DebuggerFifo::DebuggerFifo(unsigned int buffer_size)
-        : AbstractFifo(buffer_size),
+        : FifoStrategy(buffer_size),
           sync_(new Synchronizer())
 {
     MURASAKI_ASSERT(sync_ != nullptr);

--- a/stm32_development/murasaki/murasaki/debuggerfifo.hpp
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.hpp
@@ -8,7 +8,7 @@
 #ifndef DEBUGGERFIFO_HPP_
 #define DEBUGGERFIFO_HPP_
 
-#include <abstractfifo.hpp>
+#include <fifostrategy.hpp>
 #include "synchronizer.hpp"
 #include "abstractlogger.hpp"
 
@@ -34,7 +34,7 @@ namespace murasaki {
  *
  * @ingroup MURASAKI_HELPER_GROUP
  */
-class DebuggerFifo : public AbstractFifo
+class DebuggerFifo : public FifoStrategy
 {
  public:
     /**
@@ -74,7 +74,7 @@ class DebuggerFifo : public AbstractFifo
     virtual void SetPostMortem();
  private:
     // Alias to call the parent member function.
-    typedef AbstractFifo inherited;
+    typedef FifoStrategy inherited;
     // For the communication between generator / consumer.
     Synchronizer * const sync_;
     bool post_mortem_;

--- a/stm32_development/murasaki/murasaki/abstractfifo.cpp
+++ b/stm32_development/murasaki/murasaki/fifostrategy.cpp
@@ -1,18 +1,18 @@
 /*
- * basefifo.cpp
+ * fifostrategy.cpp
  *
  *  Created on: 2018/02/26
  *      Author: takemasa
  */
 
-#include <abstractfifo.hpp>
+#include <fifostrategy.hpp>
 #include <murasaki_assert.hpp>
 #include <algorithm>
 #include <string.h>
 
 namespace murasaki {
 
-AbstractFifo::AbstractFifo(unsigned int buffer_size):
+FifoStrategy::FifoStrategy(unsigned int buffer_size):
           size_of_buffer_(buffer_size),
           buffer_(new uint8_t[size_of_buffer_])
 {
@@ -24,13 +24,13 @@ AbstractFifo::AbstractFifo(unsigned int buffer_size):
 }
 
 
-AbstractFifo::~AbstractFifo()
+FifoStrategy::~FifoStrategy()
 {
     if (buffer_ != nullptr)
         delete[] buffer_;
 }
 
-unsigned int AbstractFifo::Put(uint8_t const data[], unsigned int size)
+unsigned int FifoStrategy::Put(uint8_t const data[], unsigned int size)
 {
     unsigned int avairable;
 
@@ -67,7 +67,7 @@ unsigned int AbstractFifo::Put(uint8_t const data[], unsigned int size)
 
 }
 
-unsigned int AbstractFifo::Get(uint8_t data[], unsigned int size)
+unsigned int FifoStrategy::Get(uint8_t data[], unsigned int size)
 {
     unsigned int copy_size = 0;
 
@@ -98,7 +98,7 @@ unsigned int AbstractFifo::Get(uint8_t data[], unsigned int size)
     return copy_size;
 }
 
-void AbstractFifo::ReWind()
+void FifoStrategy::ReWind()
 {
     // by setting tail as head+1, the entire buffer is marked as "not sent"
     tail_ = head_ + 1;

--- a/stm32_development/murasaki/murasaki/abstractfifo.hpp
+++ b/stm32_development/murasaki/murasaki/fifostrategy.hpp
@@ -1,12 +1,12 @@
 /**
- * @file abstractfifo.hpp
+ * @file fifostrategy.hpp
  *
  * @date 2018/02/26
  * @author takemasa
  */
 
-#ifndef ABSTRACTFIFO_HPP_
-#define ABSTRACTFIFO_HPP_
+#ifndef FIFOSTRATEGY_HPP_
+#define FIFOSTRATEGY_HPP_
 
 #include <ctype.h>
 #include <cinttypes>
@@ -25,10 +25,10 @@ namespace murasaki {
  * If the internal buffer is empty, it returns without copy data.
  * @ingroup MURASAKI_ABSTRACT_GROUP
  */
-class AbstractFifo
+class FifoStrategy
 {
  public:
-    AbstractFifo() = delete;
+    FifoStrategy() = delete;
     /**
      * @brief Create an internal buffer
      * @param buffer_size Size of the internal buffer to be allocated [byte]
@@ -36,11 +36,11 @@ class AbstractFifo
      * Allocate the internal buffer with given buffer_size.
      * The contents is not initialized.
      */
-    AbstractFifo(unsigned int buffer_size);
+    FifoStrategy(unsigned int buffer_size);
     /**
      * @brief Delete an internal buffer
      */
-    virtual ~AbstractFifo();
+    virtual ~FifoStrategy();
     /**
      * @brief Put the data into the internal buffer.
      * @param data Data to be copied to the internal buffer
@@ -85,4 +85,4 @@ class AbstractFifo
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTFIFO_HPP_ */
+#endif /* FIFOSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/i2cmaster.hpp
+++ b/stm32_development/murasaki/murasaki/i2cmaster.hpp
@@ -9,7 +9,7 @@
 #ifndef I2CMASTER_HPP_
 #define I2CMASTER_HPP_
 
-#include <abstracti2cmaster.hpp>
+#include <i2cmasterstrategy.hpp>
 #include <synchronizer.hpp>
 #include "criticalsection.hpp"
 
@@ -78,7 +78,7 @@ namespace murasaki {
  * According to the source code of the HAL_I2C_MASTER_ABORT_IT(), no interrupt will be
  * raised by this API call.
  */
-class I2cMaster : public AbstractI2CMaster
+class I2cMaster : public I2CMasterStrategy
 {
  public:
     /**

--- a/stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
+++ b/stm32_development/murasaki/murasaki/i2cmasterstrategy.hpp
@@ -1,13 +1,13 @@
 /**
- * \file abstracti2cmaster.hpp
+ * \file i2cmasterstrategy.hpp
  *
  *  \date  2018/02/11
  *  \author: takemasa
  *  \brief Root class definition of the I2C Master.
  */
 
-#ifndef ABSTRACTI2CMASTER_HPP_
-#define ABSTRACTI2CMASTER_HPP_
+#ifndef I2CMASTERSTRATEGY_HPP_
+#define I2CMASTERSTRATEGY_HPP_
 
 #include <peripheralstrategy.hpp>
 
@@ -27,7 +27,7 @@ namespace murasaki {
  * Transmit/Receive.
  */
 
-class AbstractI2CMaster : murasaki::PeripheralStrategy
+class I2CMasterStrategy : murasaki::PeripheralStrategy
 {
  public:
 
@@ -134,4 +134,4 @@ class AbstractI2CMaster : murasaki::PeripheralStrategy
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTI2CMASTER_HPP_ */
+#endif /* I2CMASTERSTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/i2cslave.hpp
+++ b/stm32_development/murasaki/murasaki/i2cslave.hpp
@@ -10,7 +10,7 @@
 #ifndef I2CSLAVE_HPP_
 #define I2CSLAVE_HPP_
 
-#include <abstracti2cslave.hpp>
+#include <i2cslavestrategy.hpp>
 #include <synchronizer.hpp>
 #include "criticalsection.hpp"
 
@@ -80,7 +80,7 @@ namespace murasaki {
  *
 
  */
-class I2cSlave : public AbstractI2cSlave {
+class I2cSlave : public I2cSlaveStrategy {
  public:
     I2cSlave(I2C_HandleTypeDef * i2c_handle);
     virtual ~I2cSlave();

--- a/stm32_development/murasaki/murasaki/abstracti2cslave.hpp
+++ b/stm32_development/murasaki/murasaki/i2cslavestrategy.hpp
@@ -1,13 +1,13 @@
 /**
- * @file abstracti2cslave.hpp
+ * @file i2cslavestrategy.hpp
  *
  * @date 2018/10/07
  * @author takemasa
  *  \brief Root class definition of the I2C Slave.
  */
 
-#ifndef ABSTRACTI2CSLAVE_HPP_
-#define ABSTRACTI2CSLAVE_HPP_
+#ifndef I2CSLAVESTRATEGY_HPP_
+#define I2CSLAVESTRATEGY_HPP_
 
 #include <peripheralstrategy.hpp>
 
@@ -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::PeripheralStrategy {
+class I2cSlaveStrategy : public murasaki::PeripheralStrategy {
  public:
     /**
      * @brief Thread safe, blocking transmission over I2C.
@@ -98,4 +98,4 @@ class AbstractI2cSlave : public murasaki::PeripheralStrategy {
 
 }  // namespace
 
-#endif /* ABSTRACTI2CSLAVE_HPP_ */
+#endif /* I2CSLAVESTRATEGY_HPP_ */

--- a/stm32_development/murasaki/murasaki/murasaki.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki.hpp
@@ -26,6 +26,7 @@
 
 // Include HAL to refer from submodules of murasaki.
 #include <debugger.hpp>
+#include <fifostrategy.hpp>
 #include <taskstrategy.hpp>
 
 // Configurations
@@ -33,7 +34,6 @@
 #include "murasaki_defs.hpp"
 
 // Task and Stack
-#include "abstractfifo.hpp"
 #include "task.hpp"
 
 // Peripherals