[stm32] Fix SPI setDataMode()

modm-io · Apr 8, 2023 · 972b74b · 972b74b
1 parent e0c484f
commit 972b74b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/modm/platform/spi/stm32/spi_hal.hpp.in b/src/modm/platform/spi/stm32/spi_hal.hpp.in
@@ -140,6 +140,12 @@ public:
 	 */
 	static void
 	acknowledgeInterruptFlag(InterruptFlag_t flags);
+
+	static void
+	enableTransfer();
+
+	static void
+	disableTransfer();
 };
 
 } // namespace platform

diff --git a/src/modm/platform/spi/stm32/spi_hal_impl.hpp.in b/src/modm/platform/spi/stm32/spi_hal_impl.hpp.in
@@ -21,7 +21,7 @@ void inline
 modm::platform::SpiHal{{ id }}::enable()
 {
 	Rcc::enable<Peripheral::Spi{{id}}>();
-	SPI{{ id }}->CR1 |= SPI_CR1_SPE;		// SPI Enable
+	enableTransfer();
 }
 
 void inline
@@ -186,3 +186,16 @@ modm::platform::SpiHal{{ id }}::acknowledgeInterruptFlag(InterruptFlag_t /*flags
 	// TODO: implement; see STM32F3 reference manual p. 736
 	// SPI{{ id }}->SR = flags.value;
 }
+
+void inline
+modm::platform::SpiHal{{ id }}::enableTransfer()
+{
+	SPI{{ id }}->CR1 |= SPI_CR1_SPE;
+}
+
+void inline
+modm::platform::SpiHal{{ id }}::disableTransfer()
+{
+	SPI{{ id }}->CR1 &= ~SPI_CR1_SPE;
+	__DSB();
+}
diff --git a/src/modm/platform/spi/stm32/spi_master.hpp.in b/src/modm/platform/spi/stm32/spi_master.hpp.in
@@ -108,18 +108,24 @@ public:
 	static void
 	setDataMode(DataMode mode)
 	{
+		SpiHal{{ id }}::disableTransfer();
 		SpiHal{{ id }}::setDataMode(static_cast<SpiHal{{ id }}::DataMode>(mode));
+		SpiHal{{ id }}::enableTransfer();
 	}
 
 	static void
 	setDataOrder(DataOrder order)
 	{
+		SpiHal{{ id }}::disableTransfer();
 		SpiHal{{ id }}::setDataOrder(static_cast<SpiHal{{ id }}::DataOrder>(order));
+		SpiHal{{ id }}::enableTransfer();
 	}
 	static void
 	setDataSize(DataSize size)
 	{
+		SpiHal{{ id }}::disableTransfer();
 		SpiHal{{ id }}::setDataSize(static_cast<SpiHal{{ id }}::DataSize>(size));
+		SpiHal{{ id }}::enableTransfer();
 	}