提交: bc6671aad6d8bb8dfe1941cbd426f97d43f9faa2 - shared_foo_backup (git)

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

Commit MetaInfo

• 修訂: bc6671aad6d8bb8dfe1941cbd426f97d43f9faa2 (tree)
• 時間: 2018-02-15 23:04:45
• 作者: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Change the name of the SPI slave specifier from
AbstractSpiMasterDecolator to AbstractSpiSlaveSpecifier

Change Summary

• modified: stm32_development/murasaki/murasaki/abstractspimaster.hpp
• delete: stm32_development/murasaki/murasaki/abstractspimasterdecorator.cpp
• add: stm32_development/murasaki/murasaki/abstractspislavespecifier.cpp
• modified: stm32_development/murasaki/murasaki/spimaster.cpp
• modified: stm32_development/murasaki/murasaki/spimaster.hpp
• delete: stm32_development/murasaki/murasaki/{abstractspimasterdecorator.hpp => abstractspislavespecifier.hpp}

差異

--- a/stm32_development/murasaki/murasaki/abstractspimaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspimaster.hpp
@@ -9,7 +9,7 @@
 #ifndef ABSTRACTSPIMASTER_HPP_
 #define ABSTRACTSPIMASTER_HPP_
 
-#include "abstractspimasterdecorator.hpp"
+#include <abstractspislavespecifier.hpp>
 
 namespace murasaki {
 
@@ -42,7 +42,7 @@ class AbstractSpiMaster
     virtual bool Transfer(uint8_t * tx_data,
                           uint8_t * rx_data,
                           uint16_t count,
-                          murasaki::AbstractSpiMasterDecorator * decorator,
+                          murasaki::AbstractSpiSlaveSpecifier * decorator,
                           murasaki::WaitMilliSeconds timeout_ms = murasaki::kwmsIndefinitely)=0;
     /**
      * @brief Callback to notifiy the end of transfer

--- a/stm32_development/murasaki/murasaki/abstractspimasterdecorator.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * abstractspimasterdecorator.cpp
- *
- *  Created on: 2018/02/11
- *      Author: takemasa
- */
-
-#include <abstractspimasterdecorator.hpp>
-#include "murasaki_assert.hpp"
-
-namespace murasaki {
-
-
-
-AbstractSpiMasterDecorator::~AbstractSpiMasterDecorator()
-{
-    // Do nothing.
-}
-
-void AbstractSpiMasterDecorator::AssertCs()
-{
-    // Do nothing here
-    // Must be overriden
-}
-
-void AbstractSpiMasterDecorator::DeassertCs()
-{
-    // Do nothing here
-    // Must be overriden
-}
-
-murasaki::SpiClockPhase AbstractSpiMasterDecorator::GetCpha()
-{
-    return cpha_;
-}
-
-murasaki::SpiClockPolarity AbstractSpiMasterDecorator::GetCpol()
-{
-    return cpol_;
-}
-
-
-AbstractSpiMasterDecorator::AbstractSpiMasterDecorator(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha)
-{
-    cpol_ = pol;
-    cpha_ = pha;
-}
-
-AbstractSpiMasterDecorator::AbstractSpiMasterDecorator(unsigned int pol, unsigned int pha)
-{
-    cpol_ = static_cast<murasaki::SpiClockPolarity>(pol);
-    cpha_ = static_cast<murasaki::SpiClockPhase>(pha);
-}
-
-
-} /* namespace murasaki */

--- /dev/null
+++ b/stm32_development/murasaki/murasaki/abstractspislavespecifier.cpp
@@ -0,0 +1,56 @@
+/*
+ * abstractspimasterdecorator.cpp
+ *
+ *  Created on: 2018/02/11
+ *      Author: takemasa
+ */
+
+#include <abstractspislavespecifier.hpp>
+#include "murasaki_assert.hpp"
+
+namespace murasaki {
+
+
+
+AbstractSpiSlaveSpecifier::~AbstractSpiSlaveSpecifier()
+{
+    // Do nothing.
+}
+
+void AbstractSpiSlaveSpecifier::AssertCs()
+{
+    // Do nothing here
+    // Must be overriden
+}
+
+void AbstractSpiSlaveSpecifier::DeassertCs()
+{
+    // Do nothing here
+    // Must be overriden
+}
+
+murasaki::SpiClockPhase AbstractSpiSlaveSpecifier::GetCpha()
+{
+    return cpha_;
+}
+
+murasaki::SpiClockPolarity AbstractSpiSlaveSpecifier::GetCpol()
+{
+    return cpol_;
+}
+
+
+AbstractSpiSlaveSpecifier::AbstractSpiSlaveSpecifier(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha)
+{
+    cpol_ = pol;
+    cpha_ = pha;
+}
+
+AbstractSpiSlaveSpecifier::AbstractSpiSlaveSpecifier(unsigned int pol, unsigned int pha)
+{
+    cpol_ = static_cast<murasaki::SpiClockPolarity>(pol);
+    cpha_ = static_cast<murasaki::SpiClockPhase>(pha);
+}
+
+
+} /* namespace murasaki */

--- a/stm32_development/murasaki/murasaki/abstractspimasterdecorator.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspislavespecifier.hpp
@@ -1,34 +1,34 @@
 /*
- * @file abstractspimasterdecorator.hpp
+ * @file abstractspislavespecifier.hpp
  *
  * @date 2018/02/11
  * @author: takemasa
  */
 
-#ifndef ABSTRACTSPIMASTERDECORATOR_HPP_
-#define ABSTRACTSPIMASTERDECORATOR_HPP_
+#ifndef ABSTRACTSPISLAVESPECIFIER_HPP_
+#define ABSTRACTSPISLAVESPECIFIER_HPP_
 
 #include "murasaki_defs.hpp"
 
 namespace murasaki {
 /**
- * \brief Definition of the root class of SPI master decorator.
+ * \brief Definition of the root class of SPI slave specifier.
  * \details
- * A prototype of the SPI master peripheral decorator.
+ * A prototype of the SPI slave device specifier.
  *
- * The decorator adds the following SPI attributes :
+ * The specifier adds the following SPI attributes :
  * @li CPOL
  * @li CPHA
  * @li Chip select control for slave.
  *
- * Because SPI slave has different setting device by device, this decorator should be
+ * Because SPI slave has different setting device by device, this specifier should be
  * passed to the each transactions.
  *
  * AssetCs() and DeassertCs() have to be overriden to control the chip select output.
  * These member functions will be called from the AbstractSpiMaster.
  * @ingroup MURASAKI_ABSTRACT_GROUP
  */
-class AbstractSpiMasterDecorator
+class AbstractSpiSlaveSpecifier
 {
  public:
     /**
@@ -36,17 +36,17 @@ class AbstractSpiMasterDecorator
      * @param pol Polarity setting
      * @param pha Phase setting
      */
-    AbstractSpiMasterDecorator(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha);
+    AbstractSpiSlaveSpecifier(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha);
     /**
      * @brief Constructor
      * @param pol Polarity setting
      * @param pha Phase setting
      */
-    AbstractSpiMasterDecorator(unsigned int pol, unsigned int pha);
+    AbstractSpiSlaveSpecifier(unsigned int pol, unsigned int pha);
     /**
      * @brief Destructor
      */
-    virtual ~AbstractSpiMasterDecorator();
+    virtual ~AbstractSpiSlaveSpecifier();
     /**
      * @brief Chip select assertion
      * @details
@@ -87,4 +87,4 @@ class AbstractSpiMasterDecorator
 
 } /* namespace murasaki */
 
-#endif /* ABSTRACTSPIMASTERDECORATOR_HPP_ */
+#endif /* ABSTRACTSPISLAVESPECIFIER_HPP_ */

--- a/stm32_development/murasaki/murasaki/spimaster.cpp
+++ b/stm32_development/murasaki/murasaki/spimaster.cpp
@@ -39,14 +39,14 @@ SpiMaster::~SpiMaster()
 bool SpiMaster::Transfer(uint8_t* tx_data,
                          uint8_t* rx_data,
                          uint16_t count,
-                         murasaki::AbstractSpiMasterDecorator* decorator,
+                         murasaki::AbstractSpiSlaveSpecifier* spi_spec,
                          murasaki::WaitMilliSeconds timeout_ms)
 {
     bool result;
 
     MURASAKI_ASSERT(NULL!= tx_data);
     MURASAKI_ASSERT(NULL!= rx_data);
-    MURASAKI_ASSERT(NULL != decorator);
+    MURASAKI_ASSERT(NULL != spi_spec);
 
     // exclusive operation
     critical_section_->Enter();
@@ -55,12 +55,12 @@ bool SpiMaster::Transfer(uint8_t* tx_data,
         // todo is following right?
         MURASAKI_ASSERT(HAL_SPI_DeInit(peripheral_) == HAL_OK);
         peripheral_->Init.CLKPolarity =
-                (decorator->GetCpol() == kscpRiseThenFall) ? SPI_POLARITY_LOW : SPI_POLARITY_HIGH;
-        peripheral_->Init.CLKPhase = (decorator->GetCpha() == kscpLatchThenShift) ? SPI_PHASE_1EDGE : SPI_PHASE_2EDGE;
+                (spi_spec->GetCpol() == kscpRiseThenFall) ? SPI_POLARITY_LOW : SPI_POLARITY_HIGH;
+        peripheral_->Init.CLKPhase = (spi_spec->GetCpha() == kscpLatchThenShift) ? SPI_PHASE_1EDGE : SPI_PHASE_2EDGE;
         MURASAKI_ASSERT(HAL_SPI_Init(peripheral_) == HAL_OK);
 
         // Assert the chip select for slave
-        decorator->AssertCs();
+        spi_spec->AssertCs();
         {
 
             // Transmit over SPI
@@ -72,7 +72,7 @@ bool SpiMaster::Transfer(uint8_t* tx_data,
             MURASAKI_ASSERT(result);
         }
         // Dessert the chip select for slave
-        decorator->DeassertCs();
+        spi_spec->DeassertCs();
     }
     critical_section_->Leave();
 

--- a/stm32_development/murasaki/murasaki/spimaster.hpp
+++ b/stm32_development/murasaki/murasaki/spimaster.hpp
@@ -66,14 +66,14 @@ class SpiMaster : public AbstractSpiMaster
      * @param tx_data Data to be transmitted
      * @param rx_data Data buffer to receive data
      * @param count Transfer data size [byte] for each way.
-     * @param decorator
+     * @param spi_spec A pointer to the AbstractSpiSpecification to specify the slave device.
      * @param timeout_ms Timeout limit [mS]
      * @return true if transfer complete, false if timeout
      */
     virtual bool Transfer(uint8_t * tx_data,
                           uint8_t * rx_data,
                           uint16_t count,
-                          murasaki::AbstractSpiMasterDecorator * decorator,
+                          murasaki::AbstractSpiSlaveSpecifier * spi_spec,
                           murasaki::WaitMilliSeconds timeout_ms = murasaki::kwmsIndefinitely);
     /**
      * @brief Callback to notifiy the end of transfer