[stm32] Fix UART transmission with buffer

salkinium · salkinium · commit cf7769bb4898 · 2024-06-24T23:08:37.000+02:00
diff --git a/src/modm/platform/uart/stm32/uart_buffer.hpp b/src/modm/platform/uart/stm32/uart_buffer.hpp
@@ -89,8 +89,7 @@ class BufferedUart<Hal, UartTxBuffer<SIZE>, Buffers...>: public BufferedUart<Hal
 	static bool
 	write(uint8_t data)
 	{
-		if (transmitBufferSize() == 0 and txBuffer.isEmpty())
-			Hal::write(data);
+		if (isWriteFinished()) Hal::write(data);
 		else
 		{
 			if (not txBuffer.push(data)) return false;
@@ -148,14 +147,15 @@ class BufferedUart<Hal, UartRxBuffer<SIZE>, Buffers...>: public BufferedUart<Hal
 	static bool
 	InterruptCallback(bool first)
 	{
-		if constexpr (Parent::TxBufferSize) Parent::InterruptCallback(false);
-
 		if (Hal::isReceiveRegisterNotEmpty())
 		{
 			uint8_t data;
 			Hal::read(data);
 			rxBuffer.push(data);
 		}
+
+		if constexpr (Parent::TxBufferSize) Parent::InterruptCallback(false);
+
 		if (first) Hal::acknowledgeInterruptFlags(Hal::InterruptFlag::OverrunError);
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@ class BufferedUart<Hal, UartTxBuffer<SIZE>, Buffers...>: public BufferedUart<Hal`
`89`	`89`	`static bool`
`90`	`90`	`write(uint8_t data)`
`91`	`91`	`{`
`92`		`- if (transmitBufferSize() == 0 and txBuffer.isEmpty())`
`93`		`- Hal::write(data);`
	`92`	`+ if (isWriteFinished()) Hal::write(data);`
`94`	`93`	`else`
`95`	`94`	`{`
`96`	`95`	`if (not txBuffer.push(data)) return false;`
`@@ -148,14 +147,15 @@ class BufferedUart<Hal, UartRxBuffer<SIZE>, Buffers...>: public BufferedUart<Hal`
`148`	`147`	`static bool`
`149`	`148`	`InterruptCallback(bool first)`
`150`	`149`	`{`
`151`		`- if constexpr (Parent::TxBufferSize) Parent::InterruptCallback(false);`
`152`		`-`
`153`	`150`	`if (Hal::isReceiveRegisterNotEmpty())`
`154`	`151`	`{`
`155`	`152`	`uint8_t data;`
`156`	`153`	`Hal::read(data);`
`157`	`154`	`rxBuffer.push(data);`
`158`	`155`	`}`
	`156`	`+`
	`157`	`+ if constexpr (Parent::TxBufferSize) Parent::InterruptCallback(false);`
	`158`	`+`
`159`	`159`	`if (first) Hal::acknowledgeInterruptFlags(Hal::InterruptFlag::OverrunError);`
`160`	`160`	`return true;`
`161`	`161`	`}`