[uart] Add more interface methods

src/modm/architecture/interface/uart.hpp

@@ -127,6 +127,10 @@ class Uart : public ::modm::PeripheralDriver
 	static std::size_t
 	read(uint8_t *data, std::size_t length);
 
+	/// @return	the size of the receive FIFO queue.
+	static std::size_t
+	receiveBufferSize();
+
 	/**
 	 * Empty the receive FIFO queue and hardware buffer.
 	 *
@@ -135,13 +139,25 @@ class Uart : public ::modm::PeripheralDriver
 	static std::size_t
 	discardReceiveBuffer();
 
+	/// @return	the size of the transmit FIFO queue.
+	static std::size_t
+	transmitBufferSize();
+
 	/**
 	 * Empty the transmit FIFO queue and hardware buffer.
 	 *
 	 * @return	the size of the deleted FIFO queue.
 	 */
 	static std::size_t
 	discardTransmitBuffer();
+
+	/// @return `true` if an error occured during any write or read
+	static bool
+	hasError();
+
+	/// Reset the sticky error indication
+	static void
+	clearError();
 #endif
 };
 

src/modm/platform/uart/stm32/uart.cpp.in

@@ -115,6 +115,16 @@ modm::platform::{{ name }}::isWriteFinished()
 %% endif
 }
 
+std::size_t
+modm::platform::{{ name }}::transmitBufferSize()
+{
+%% if options["buffered"]
+	return txBuffer.getSize();
+%% else
+	return {{ hal }}::isTransmitRegisterEmpty() ? 0 : 1;
+%% endif
+}
+
 std::size_t
 modm::platform::{{ name }}::discardTransmitBuffer()
 {
@@ -178,6 +188,16 @@ modm::platform::{{ name }}::read(uint8_t *data, std::size_t length)
 %% endif
 }
 
+std::size_t
+modm::platform::{{ name }}::receiveBufferSize()
+{
+%% if options["buffered"]
+	return rxBuffer.getSize();
+%% else
+	return {{ hal }}::isReceiveRegisterNotEmpty() ? 1 : 0;
+%% endif
+}
+
 std::size_t
 modm::platform::{{ name }}::discardReceiveBuffer()
 {
@@ -193,6 +213,27 @@ modm::platform::{{ name }}::discardReceiveBuffer()
 %% endif
 }
 
+bool
+modm::platform::{{ name }}::hasError()
+{
+	return {{ hal }}::getInterruptFlags().any(
+		{{ hal }}::InterruptFlag::ParityError |
+#ifdef USART_ISR_NE
+		{{ hal }}::InterruptFlag::NoiseError |
+#endif
+		{{ hal }}::InterruptFlag::OverrunError | {{ hal }}::InterruptFlag::FramingError);
+}
+void
+modm::platform::{{ name }}::clearError()
+{
+	return {{ hal }}::acknowledgeInterruptFlags(
+		{{ hal }}::InterruptFlag::ParityError |
+#ifdef USART_ISR_NE
+		{{ hal }}::InterruptFlag::NoiseError |
+#endif
+		{{ hal }}::InterruptFlag::OverrunError | {{ hal }}::InterruptFlag::FramingError);
+}
+
 
 %% if options["buffered"]
 %% set hal = "modm::platform::" ~ hal
@@ -219,5 +260,6 @@ MODM_ISR({{ name | upper }})
 			txBuffer.pop();
 		}
 	}
+	{{ hal }}::acknowledgeInterruptFlags({{ hal }}::InterruptFlag::OverrunError);
 }
 %% endif

src/modm/platform/uart/stm32/uart.hpp.in

@@ -50,14 +50,16 @@ private:
 %% endif
 
 public:
+	using Hal = {{ hal }};
 	// Expose jinja template parameters to be checked by e.g. drivers or application
 	static constexpr size_t RxBufferSize = {{ options["buffer.rx"] }};
 	static constexpr size_t TxBufferSize = {{ options["buffer.tx"] }};
 
 public:
 	template< template<Peripheral _> class... Signals >
 	static void
-	connect(Gpio::InputType InputTypeRx = Gpio::InputType::PullUp)
+	connect(Gpio::InputType InputTypeRx = Gpio::InputType::PullUp,
+	        Gpio::OutputType OutputTypeTx = Gpio::OutputType::PushPull)
 	{
 		using Connector = GpioConnector<Peripheral::{{ name }}, Signals...>;
 		using Tx = typename Connector::template GetSignal< Gpio::Signal::Tx >;
@@ -67,7 +69,7 @@ public:
 					  "{{ name }}::connect() requires one Tx and/or one Rx signal!");
 
 		// Connector::disconnect();
-		Tx::setOutput(Gpio::OutputType::PushPull);
+		Tx::setOutput(OutputTypeTx);
 		Rx::setInput(InputTypeRx);
 		Connector::connect();
 	}
@@ -113,6 +115,9 @@ public:
 	static bool
 	isWriteFinished();
 
+	static std::size_t
+	transmitBufferSize();
+
 	static std::size_t
 	discardTransmitBuffer();
 
@@ -122,9 +127,18 @@ public:
 	static std::size_t
 	read(uint8_t *buffer, std::size_t length);
 
+	static std::size_t
+	receiveBufferSize();
+
 	static std::size_t
 	discardReceiveBuffer();
 
+	static bool
+	hasError();
+
+	static void
+	clearError();
+
 %% if id in shared_irq_ids
 	static void
 	irq();

src/modm/platform/uart/stm32/uart_base.hpp.in

@@ -77,6 +77,10 @@ public:
 %%	set reg = "ISR"
 		/// Set if match character is received.
 		CharacterMatch	= USART_{{reg}}_CMF,
+#ifdef USART_{{reg}}_NE
+		/// Set if noise was detected on the input.
+		NoiseError		= USART_{{reg}}_NE,
+#endif
 %% else
 %%	set reg = "SR"
 %% endif
@@ -128,6 +132,19 @@ public:
 		Output = USART_CR2_LBCL,
 	};
 
+	enum class
+	WordLength : uint32_t
+	{
+#ifdef USART_CR1_M1
+		Bit7 = USART_CR1_M1,
+		Bit8 = 0,
+		Bit9 = USART_CR1_M0,
+#else
+		Bit8 = 0,
+		Bit9 = USART_CR1_M,
+#endif
+	};
+
 	enum class
 	SpiClock : uint32_t
 	{

src/modm/platform/uart/stm32/uart_hal.hpp.in

@@ -81,13 +81,15 @@ public:
 	initialize(	Parity parity = Parity::Disabled);
 %% endif
 
+	static inline void
+	setWordLength(WordLength length);
 
 	/**
-	* Initialize Uart HAL Peripheral
-	*
-	* Enables clocks, the UART peripheral (but neither TX nor RX)
-	* Sets raw brr, parity and oversampling mode.
-	*/
+	 * Initialize Uart HAL Peripheral
+	 *
+	 * Enables clocks, the UART peripheral (but neither TX nor RX)
+	 * Sets raw brr, parity and oversampling mode.
+	 */
 	static void
 	initializeWithBrr(uint16_t brr,
 %% if target["family"] == "f1"

src/modm/platform/uart/stm32/uart_hal_impl.hpp.in

@@ -176,6 +176,31 @@ modm::platform::{{ name }}::setSpiDataMode(SpiDataMode mode)
 %% endif
 }
 
+void
+modm::platform::{{ name }}::setWordLength(WordLength length)
+{
+%% if "extended" in driver["type"]
+	const bool usartEnabled = ({{ peripheral }}->CR1 & USART_CR1_UE);
+	if(usartEnabled) {
+		disableOperation();
+	}
+%% endif
+
+	{{ peripheral }}->CR1 =
+#ifdef USART_CR1_M1
+		({{ peripheral }}->CR1 & ~(USART_CR1_M0 | USART_CR1_M1))
+#else
+		({{ peripheral }}->CR1 & ~USART_CR1_M)
+#endif
+		| static_cast<uint32_t>(length);
+
+%% if "extended" in driver["type"]
+	if(usartEnabled) {
+		enableOperation();
+	}
+%% endif
+}
+
 void
 modm::platform::{{ name }}::setLastBitClockPulse(LastBitClockPulse pulse)
 {