OSDN > Developer >

suikan > Chamber > shared_foo > Commit

suikan

酔漢用書き散らし
Fork

(Original repository, No fork origin)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revisão	85c7159882addcb4d6bec4378ccc6e9d942ca851 (tree)
Hora	2018-02-18 09:11:13
Autor	takemasa <suikan@user...>
Commiter	takemasa

Mensagem de Log

Made UART, I2C, SPI related modules dependent to the configuration. For
example, If CubeMX doesn't geenrate any SPI module, the murasaki source
related to the SPI will be masked off by #ifdef.

Mudança Sumário

modified: stm32_development/murasaki/murasaki/i2cmaster.cpp (diff)
modified: stm32_development/murasaki/murasaki/i2cmaster.hpp (diff)
modified: stm32_development/murasaki/murasaki/murasaki.hpp (diff)
modified: stm32_development/murasaki/murasaki/spimaster.cpp (diff)
modified: stm32_development/murasaki/murasaki/spimaster.hpp (diff)
modified: stm32_development/murasaki/murasaki/spislavespecifier.cpp (diff)
modified: stm32_development/murasaki/murasaki/spislavespecifier.hpp (diff)
modified: stm32_development/murasaki/murasaki/uart.cpp (diff)
modified: stm32_development/murasaki/murasaki/uart.hpp (diff)
modified: stm32_development/murasaki/murasaki/uartlogger.cpp (diff)
modified: stm32_development/murasaki/murasaki/uartlogger.hpp (diff)

Diff

--- a/stm32_development/murasaki/murasaki/i2cmaster.cpp

+++ b/stm32_development/murasaki/murasaki/i2cmaster.cpp

		@@ -8,6 +8,9 @@
8	8	#include <i2cmaster.hpp>
9	9	#include "murasaki_assert.hpp"
10	10
	11	+// check if I2C module is enabled by CubeMX
	12	+#ifdef HAL_I2C_MODULE_ENABLED
	13	+
11	14	namespace murasaki {
12	15
13	16	I2cMaster::I2cMaster(I2C_HandleTypeDef * i2c_handle)

		@@ -150,3 +153,5 @@ bool I2cMaster::ReceiveCompleteCallback(void* ptr)
150	153	}
151	154
152	155	} /* namespace murasaki */
	156	+
	157	+#endif //HAL_I2C_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/i2cmaster.hpp

+++ b/stm32_development/murasaki/murasaki/i2cmaster.hpp

		@@ -13,6 +13,9 @@
13	13	#include "criticalsection.hpp"
14	14	#include "interruptsynchronizer.hpp"
15	15
	16	+// Check whether I2C module is enabled by CubeMX.
	17	+#ifdef HAL_I2C_MODULE_ENABLED
	18	+
16	19	namespace murasaki {
17	20
18	21	/**

		@@ -157,4 +160,6 @@ class I2cMaster : public AbstractI2CMaster
157	160
158	161	} /* namespace murasaki */
159	162
	163	+#endif // HAL_I2C_MODULE_ENABLED
	164	+
160	165	#endif /* I2CMASTER_HPP_ */

--- a/stm32_development/murasaki/murasaki/murasaki.hpp

+++ b/stm32_development/murasaki/murasaki/murasaki.hpp

		@@ -24,6 +24,8 @@
24	24	#ifndef MURASAKI_HPP_
25	25	#define MURASAKI_HPP_
26	26
	27	+// Include HAL to refer from submodules of murasaki.
	28	+#include "stm32f7xx_hal.h"
27	29
28	30	#include "murasaki_config.hpp"
29	31	#include "murasaki_defs.hpp"

--- a/stm32_development/murasaki/murasaki/spimaster.cpp

+++ b/stm32_development/murasaki/murasaki/spimaster.cpp

		@@ -8,6 +8,9 @@
8	8	#include <spimaster.hpp>
9	9	#include "murasaki_assert.hpp"
10	10
	11	+// Check if CubeMX generated SPI Module
	12	+#ifdef HAL_SPI_MODULE_ENABLED
	13	+
11	14	namespace murasaki {
12	15
13	16	SpiMaster::SpiMaster(SPI_HandleTypeDef * spi_handle)

		@@ -99,3 +102,5 @@ bool SpiMaster::TransferCompleteCallback(void* ptr)
99	102	}
100	103
101	104	} /* namespace murasaki */
	105	+
	106	+#endif // HAL_SPI_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/spimaster.hpp

+++ b/stm32_development/murasaki/murasaki/spimaster.hpp

		@@ -13,6 +13,8 @@
13	13	#include "criticalsection.hpp"
14	14	#include "interruptsynchronizer.hpp"
15	15
	16	+// Check if CubeMX genrated SPI module
	17	+#ifdef HAL_SPI_MODULE_ENABLED
16	18
17	19	namespace murasaki {
18	20	/**

		@@ -100,4 +102,6 @@ class SpiMaster : public AbstractSpiMaster
100	102
101	103	} /* namespace murasaki */
102	104
	105	+#endif // HAL_SPI_MODULE_ENABLED
	106	+
103	107	#endif /* SPIMASTER_HPP_ */

--- a/stm32_development/murasaki/murasaki/spislavespecifier.cpp

+++ b/stm32_development/murasaki/murasaki/spislavespecifier.cpp

		@@ -8,6 +8,9 @@
8	8	#include <spislavespecifier.hpp>
9	9	#include "murasaki_assert.hpp"
10	10
	11	+// Check if CubeMX generated SPI modules.
	12	+#ifdef HAL_SPI_MODULE_ENABLED
	13	+
11	14	namespace murasaki {
12	15
13	16	SpiSlaveSpecifier::SpiSlaveSpecifier(murasaki::SpiClockPolarity pol,

		@@ -42,3 +45,5 @@ void SpiSlaveSpecifier::DeassertCs()
42	45	}
43	46
44	47	} /* namespace murasaki */
	48	+
	49	+#endif // HAL_SPI_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/spislavespecifier.hpp

+++ b/stm32_development/murasaki/murasaki/spislavespecifier.hpp

		@@ -11,6 +11,9 @@
11	11
12	12	#include <abstractspislavespecifier.hpp>
13	13
	14	+// Check if CubeMx geenrates the SPI modeule
	15	+#ifdef HAL_SPI_MODULE_ENABLED
	16	+
14	17	namespace murasaki {
15	18
16	19	/**

		@@ -73,4 +76,6 @@ class SpiSlaveSpecifier : public AbstractSpiSlaveSpecifier
73	76
74	77	} /* namespace murasaki */
75	78
	79	+#endif //HAL_SPI_MODULE_ENABLED
	80	+
76	81	#endif /* SPISLAVESPECIFIER_HPP_ */

--- a/stm32_development/murasaki/murasaki/uart.cpp

+++ b/stm32_development/murasaki/murasaki/uart.cpp

		@@ -9,6 +9,10 @@
9	9	#include "murasaki_defs.hpp"
10	10	#include "murasaki_assert.hpp"
11	11
	12	+// Check if CubeMX generates UART module
	13	+#ifdef HAL_UART_MODULE_ENABLED
	14	+
	15	+
12	16	namespace murasaki {
13	17
14	18	Uart::Uart(UART_HandleTypeDef * uart)

		@@ -162,3 +166,5 @@ bool Uart::ReceiveCompleteCallback(void* ptr)
162	166	}
163	167
164	168	} /* namespace platform */
	169	+
	170	+#endif // HAL_UART_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/uart.hpp

+++ b/stm32_development/murasaki/murasaki/uart.hpp

		@@ -13,6 +13,9 @@
13	13	#include "criticalsection.hpp"
14	14	#include "interruptsynchronizer.hpp"
15	15
	16	+// Check if CubeMX generates UART module
	17	+#ifdef HAL_UART_MODULE_ENABLED
	18	+
16	19	namespace murasaki {
17	20
18	21	/**

		@@ -179,4 +182,6 @@ class Uart : public AbstractUart
179	182
180	183	} /* namespace platform */
181	184
	185	+#endif // HAL_UART_MODULE_ENABLED
	186	+
182	187	#endif /* UART_HPP_ */

--- a/stm32_development/murasaki/murasaki/uartlogger.cpp

+++ b/stm32_development/murasaki/murasaki/uartlogger.cpp

		@@ -9,6 +9,10 @@
9	9	#include "murasaki_config.hpp"
10	10	#include "murasaki_assert.hpp"
11	11
	12	+// Check if CubeMX generates UART module
	13	+#ifdef HAL_UART_MODULE_ENABLED
	14	+
	15	+
12	16	namespace murasaki {
13	17
14	18	UartLogger::UartLogger(AbstractUart * uart)

		@@ -43,3 +47,5 @@ char UartLogger::getCharacter()
43	47	}
44	48
45	49	} /* namespace murasaki */
	50	+
	51	+#endif // HAL_UART_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/uartlogger.hpp

+++ b/stm32_development/murasaki/murasaki/uartlogger.hpp

		@@ -12,6 +12,10 @@
12	12	#include "abstractlogger.hpp"
13	13	#include "abstractuart.hpp"
14	14
	15	+// Check if CubeMX generates UART module
	16	+#ifdef HAL_UART_MODULE_ENABLED
	17	+
	18	+
15	19	namespace murasaki {
16	20	/**
17	21	* \brief Logging through an UART port.

		@@ -44,4 +48,7 @@ class UartLogger : public AbstractLogger
44	48
45	49	} /* namespace murasaki */
46	50
	51	+#endif // HAL_UART_MODULE_ENABLED
	52	+
	53	+
47	54	#endif /* UARTLOGGER_HPP_ */

酔漢用書き散らし Fork