• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revisiónf0f6e4db2a7270740189755e9e13d7393730036a (tree)
Tiempo2019-02-05 08:31:05
Autortakemasa <suikan@user...>
Commitertakemasa

Log Message

Refactored class name.

Cambiar Resumen

Diferencia incremental

--- a/stm32_development/murasaki/.settings/language.settings.xml
+++ b/stm32_development/murasaki/.settings/language.settings.xml
@@ -6,7 +6,7 @@
66 <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77 <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
88 <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
9- <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">
9+ <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">
1010 <language-scope id="org.eclipse.cdt.core.gcc"/>
1111 <language-scope id="org.eclipse.cdt.core.g++"/>
1212 </provider>
@@ -18,7 +18,7 @@
1818 <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1919 <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
2020 <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
21- <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">
21+ <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">
2222 <language-scope id="org.eclipse.cdt.core.gcc"/>
2323 <language-scope id="org.eclipse.cdt.core.g++"/>
2424 </provider>
--- a/stm32_development/murasaki/Inc/platform_defs.hpp
+++ b/stm32_development/murasaki/Inc/platform_defs.hpp
@@ -85,7 +85,7 @@ struct Platform
8585 BitOutStrategy * led; ///< GP out under test
8686 UartStrategy * uart; ///< UART under test
8787 SpiMasterStrategy * spiMaster; ///< SPI Master under test
88- AbstractSpiSlave * spiSlave; ///< SPI Slave under test
88+ SpiSlaveStrategy * spiSlave; ///< SPI Slave under test
8989 I2CMasterStrategy * i2cMaster; ///< I2C Master under test
9090 I2cSlaveStrategy * i2cSlave; ///< I2C Slave under test
9191
--- a/stm32_development/murasaki/NUCLEO-F746ZG.xml
+++ b/stm32_development/murasaki/NUCLEO-F746ZG.xml
@@ -12,8 +12,8 @@
1212 <targetDefinitions>
1313 <board id="nucleo-f746zg">
1414 <name>NUCLEO-F746ZG</name>
15- <dbgIF>JTAG</dbgIF>
1615 <dbgIF>SWD</dbgIF>
16+ <dbgIF>JTAG</dbgIF>
1717 <dbgDEV>ST-Link</dbgDEV>
1818 <mcuId>stm32f746zgtx</mcuId>
1919 </board>
--- a/stm32_development/murasaki/Src/murasaki_platform.cpp
+++ b/stm32_development/murasaki/Src/murasaki_platform.cpp
@@ -152,7 +152,7 @@ void ExecPlatform()
152152
153153 {
154154 // Create a slave specifier. This object specify the protocol and slave select pin
155- murasaki::AbstractSpiSlaveSpecifier * slave_spec;
155+ murasaki::SpiSlaveSpecifierStrategy * slave_spec;
156156 slave_spec = new murasaki::SpiSlaveSpecifier(
157157 murasaki::kspoFallThenRise,
158158 murasaki::ksphLatchThenShift,
--- a/stm32_development/murasaki/murasaki/debugger.hpp
+++ b/stm32_development/murasaki/murasaki/debugger.hpp
@@ -47,7 +47,7 @@ class Debugger
4747 public:
4848 /**
4949 * \brief Constructor. Create internal variable.
50- * \param logger The pointer to the \ref AbstractLogger wrapper class variable.
50+ * \param logger The pointer to the \ref LoggerStrategy wrapper class variable.
5151 */
5252 Debugger(LoggerStrategy* logger);
5353 /**
--- a/stm32_development/murasaki/murasaki/murasaki_defs.hpp
+++ b/stm32_development/murasaki/murasaki/murasaki_defs.hpp
@@ -125,7 +125,7 @@ enum WaitMilliSeconds
125125 /**
126126 * \brief Attribute of the UART Hardware Flow Control.
127127 * \details
128- * This is dedicated to the \ref AbstractUart class.
128+ * This is dedicated to the \ref UartStrategy class.
129129 */
130130 enum UartHardwareFlowControl
131131 {
--- a/stm32_development/murasaki/murasaki/spimaster.cpp
+++ b/stm32_development/murasaki/murasaki/spimaster.cpp
@@ -42,7 +42,7 @@ SpiMaster::~SpiMaster()
4242
4343 }
4444
45-SpiStatus SpiMaster::TransmitAndReceive(murasaki::AbstractSpiSlaveSpecifier* spi_spec,
45+SpiStatus SpiMaster::TransmitAndReceive(murasaki::SpiSlaveSpecifierStrategy* spi_spec,
4646 const uint8_t* tx_data,
4747 uint8_t* rx_data,
4848 unsigned int size,
--- a/stm32_development/murasaki/murasaki/spimaster.hpp
+++ b/stm32_development/murasaki/murasaki/spimaster.hpp
@@ -101,7 +101,7 @@ class SpiMaster : public SpiMasterStrategy
101101 * @li Other : Unhandled error . SPI re-initialized.
102102 */
103103 virtual SpiStatus TransmitAndReceive(
104- murasaki::AbstractSpiSlaveSpecifier * spi_spec,
104+ murasaki::SpiSlaveSpecifierStrategy * spi_spec,
105105 const uint8_t * tx_data,
106106 uint8_t * rx_data,
107107 unsigned int size,
--- a/stm32_development/murasaki/murasaki/spimasterstrategy.hpp
+++ b/stm32_development/murasaki/murasaki/spimasterstrategy.hpp
@@ -9,8 +9,8 @@
99 #ifndef SPIMASTERSTRATEGY_HPP_
1010 #define SPIMASTERSTRATEGY_HPP_
1111
12-#include <abstractspislavespecifier.hpp>
1312 #include <peripheralstrategy.hpp>
13+#include <spislavespecifierstrategy.hpp>
1414
1515 namespace murasaki {
1616
@@ -34,7 +34,7 @@ class SpiMasterStrategy:public murasaki::PeripheralStrategy
3434 * @return true if transfer complete, false if timeout
3535 */
3636 virtual SpiStatus TransmitAndReceive(
37- murasaki::AbstractSpiSlaveSpecifier * spi_spec,
37+ murasaki::SpiSlaveSpecifierStrategy * spi_spec,
3838 const uint8_t * tx_data,
3939 uint8_t * rx_data,
4040 unsigned int size,
--- a/stm32_development/murasaki/murasaki/spislave.hpp
+++ b/stm32_development/murasaki/murasaki/spislave.hpp
@@ -9,7 +9,7 @@
99 #ifndef SPISLAVE_HPP_
1010 #define SPISLAVE_HPP_
1111
12-#include <abstractspislave.hpp>
12+#include <spislavestrategy.hpp>
1313 #include <synchronizer.hpp>
1414 #include "criticalsection.hpp"
1515
@@ -63,7 +63,7 @@ namespace murasaki {
6363 * any of CRC detection, TI frame mode or Multi-master SPI.
6464 * @ingroup MURASAKI_GROUP
6565 */
66-class SpiSlave : public AbstractSpiSlave
66+class SpiSlave : public SpiSlaveStrategy
6767 {
6868 public:
6969 /**
--- a/stm32_development/murasaki/murasaki/spislavespecifier.cpp
+++ b/stm32_development/murasaki/murasaki/spislavespecifier.cpp
@@ -17,7 +17,7 @@ SpiSlaveSpecifier::SpiSlaveSpecifier(murasaki::SpiClockPolarity pol,
1717 murasaki::SpiClockPhase pha,
1818 ::GPIO_TypeDef* port,
1919 uint16_t pin)
20- : AbstractSpiSlaveSpecifier(pol, pha),
20+ : SpiSlaveSpecifierStrategy(pol, pha),
2121 port_(port),
2222 pin_(pin)
2323 {
@@ -26,7 +26,7 @@ SpiSlaveSpecifier::SpiSlaveSpecifier(murasaki::SpiClockPolarity pol,
2626 }
2727
2828 SpiSlaveSpecifier::SpiSlaveSpecifier(unsigned int pol, unsigned int pha, ::GPIO_TypeDef* port, uint16_t pin)
29- : AbstractSpiSlaveSpecifier(pol, pha),
29+ : SpiSlaveSpecifierStrategy(pol, pha),
3030 port_(port),
3131 pin_(pin)
3232 {
--- a/stm32_development/murasaki/murasaki/spislavespecifier.hpp
+++ b/stm32_development/murasaki/murasaki/spislavespecifier.hpp
@@ -9,7 +9,7 @@
99 #ifndef SPISLAVESPECIFIER_HPP_
1010 #define SPISLAVESPECIFIER_HPP_
1111
12-#include <abstractspislavespecifier.hpp>
12+#include <spislavespecifierstrategy.hpp>
1313
1414 // Check if CubeMx geenrates the SPI modeule
1515 #ifdef HAL_SPI_MODULE_ENABLED
@@ -29,7 +29,7 @@ namespace murasaki {
2929 *
3030 * @ingroup MURASAKI_GROUP
3131 */
32-class SpiSlaveSpecifier : public AbstractSpiSlaveSpecifier
32+class SpiSlaveSpecifier : public SpiSlaveSpecifierStrategy
3333 {
3434 public:
3535 SpiSlaveSpecifier();
--- a/stm32_development/murasaki/murasaki/abstractspislavespecifier.cpp
+++ b/stm32_development/murasaki/murasaki/spislavespecifierstrategy.cpp
@@ -5,48 +5,48 @@
55 * Author: takemasa
66 */
77
8-#include <abstractspislavespecifier.hpp>
8+#include <spislavespecifierstrategy.hpp>
99 #include "murasaki_assert.hpp"
1010
1111 namespace murasaki {
1212
1313
1414
15-AbstractSpiSlaveSpecifier::~AbstractSpiSlaveSpecifier()
15+SpiSlaveSpecifierStrategy::~SpiSlaveSpecifierStrategy()
1616 {
1717 // Do nothing.
1818 }
1919
20-void AbstractSpiSlaveSpecifier::AssertCs()
20+void SpiSlaveSpecifierStrategy::AssertCs()
2121 {
2222 // Do nothing here
2323 // Must be overriden
2424 }
2525
26-void AbstractSpiSlaveSpecifier::DeassertCs()
26+void SpiSlaveSpecifierStrategy::DeassertCs()
2727 {
2828 // Do nothing here
2929 // Must be overriden
3030 }
3131
32-murasaki::SpiClockPhase AbstractSpiSlaveSpecifier::GetCpha()
32+murasaki::SpiClockPhase SpiSlaveSpecifierStrategy::GetCpha()
3333 {
3434 return cpha_;
3535 }
3636
37-murasaki::SpiClockPolarity AbstractSpiSlaveSpecifier::GetCpol()
37+murasaki::SpiClockPolarity SpiSlaveSpecifierStrategy::GetCpol()
3838 {
3939 return cpol_;
4040 }
4141
4242
43-AbstractSpiSlaveSpecifier::AbstractSpiSlaveSpecifier(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha)
43+SpiSlaveSpecifierStrategy::SpiSlaveSpecifierStrategy(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha)
4444 : cpol_(pol),
4545 cpha_(pha)
4646 {
4747 }
4848
49-AbstractSpiSlaveSpecifier::AbstractSpiSlaveSpecifier(unsigned int pol, unsigned int pha)
49+SpiSlaveSpecifierStrategy::SpiSlaveSpecifierStrategy(unsigned int pol, unsigned int pha)
5050 : cpol_(static_cast<murasaki::SpiClockPolarity>(pol)),
5151 cpha_(static_cast<murasaki::SpiClockPhase>(pha))
5252 {
--- a/stm32_development/murasaki/murasaki/abstractspislavespecifier.hpp
+++ b/stm32_development/murasaki/murasaki/spislavespecifierstrategy.hpp
@@ -1,12 +1,12 @@
11 /**
2- * @file abstractspislavespecifier.hpp
2+ * @file spislavespecifierstrategy.hpp
33 *
44 * @date 2018/02/11
55 * @author: takemasa
66 */
77
8-#ifndef ABSTRACTSPISLAVESPECIFIER_HPP_
9-#define ABSTRACTSPISLAVESPECIFIER_HPP_
8+#ifndef SPISLAVESPECIFIERSTRATEGY_HPP_
9+#define SPISLAVESPECIFIERSTRATEGY_HPP_
1010
1111 #include "murasaki_defs.hpp"
1212
@@ -28,7 +28,7 @@ namespace murasaki {
2828 * These member functions will be called from the AbstractSpiMaster.
2929 * @ingroup MURASAKI_ABSTRACT_GROUP
3030 */
31-class AbstractSpiSlaveSpecifier
31+class SpiSlaveSpecifierStrategy
3232 {
3333 public:
3434 /**
@@ -36,17 +36,17 @@ class AbstractSpiSlaveSpecifier
3636 * @param pol Polarity setting
3737 * @param pha Phase setting
3838 */
39- AbstractSpiSlaveSpecifier(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha);
39+ SpiSlaveSpecifierStrategy(murasaki::SpiClockPolarity pol, murasaki::SpiClockPhase pha);
4040 /**
4141 * @brief Constructor
4242 * @param pol Polarity setting
4343 * @param pha Phase setting
4444 */
45- AbstractSpiSlaveSpecifier(unsigned int pol, unsigned int pha);
45+ SpiSlaveSpecifierStrategy(unsigned int pol, unsigned int pha);
4646 /**
4747 * @brief Destructor
4848 */
49- virtual ~AbstractSpiSlaveSpecifier();
49+ virtual ~SpiSlaveSpecifierStrategy();
5050 /**
5151 * @brief Chip select assertion
5252 * @details
@@ -87,4 +87,4 @@ class AbstractSpiSlaveSpecifier
8787
8888 } /* namespace murasaki */
8989
90-#endif /* ABSTRACTSPISLAVESPECIFIER_HPP_ */
90+#endif /* SPISLAVESPECIFIERSTRATEGY_HPP_ */
--- a/stm32_development/murasaki/murasaki/abstractspislave.hpp
+++ b/stm32_development/murasaki/murasaki/spislavestrategy.hpp
@@ -1,13 +1,13 @@
11 /**
2- * @file abstractspimaster.hpp
2+ * @file spislavestrategy.hpp
33 *
44 * @date 2018/02/11
55 * @author: takemasa
66 * @brief SPI master root class.
77 */
88
9-#ifndef ABSTRACTSPISLAVE_HPP_
10-#define ABSTRACTSPISLAVE_HPP_
9+#ifndef SPISLAVESTRATEGY_HPP_
10+#define SPISLAVESTRATEGY_HPP_
1111
1212 #include <peripheralstrategy.hpp>
1313
@@ -20,7 +20,7 @@ namespace murasaki {
2020 *
2121 * \ingroup MURASAKI_ABSTRACT_GROUP
2222 */
23-class AbstractSpiSlave : public murasaki::PeripheralStrategy
23+class SpiSlaveStrategy : public murasaki::PeripheralStrategy
2424 {
2525 public:
2626 /**
@@ -58,4 +58,4 @@ class AbstractSpiSlave : public murasaki::PeripheralStrategy
5858
5959 } /* namespace murasaki */
6060
61-#endif /* ABSTRACTSPISLAVE_HPP_ */
61+#endif /* SPISLAVESTRATEGY_HPP_ */