add Serialx.attachInterrupt_Send

- add Serialx.attachInterrupt_Send()
- rename Serialx.attachInterrupt() to Serialx.attachInterrupt_Receive()

Author: gicking

cores/arduino/UARTClass.cpp

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "UARTClass.h"
+#include "Arduino.h"
 
 // Constructors ////////////////////////////////////////////////////////////////
 
@@ -32,7 +33,8 @@ UARTClass::UARTClass( Uart *pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer *p
   _dwIrq=dwIrq;
   _dwId=dwId;
 
-  _isr = NULL;
+  _isrRx = NULL;
+  _isrTx = NULL;
 }
 
 // Public Methods //////////////////////////////////////////////////////////////
@@ -168,9 +170,28 @@ size_t UARTClass::write( const uint8_t uc_data )
   return 1;
 }
 
-void UARTClass::attachInterrupt( USART_isr_t fn )
+void UARTClass::attachInterrupt_Receive( isrRx_t fn )
 {
-  _isr = fn;
+  // pause interrupts
+  uint8_t oldISR = ((__get_PRIMASK() & 0x1) == 0 && (__get_FAULTMASK() & 0x1) == 0); noInterrupts();
+  
+  // set custom function
+  _isrRx = fn;
+
+  // restore old interrupt setting
+  if (oldISR != 0) { interrupts(); }
+}
+
+void UARTClass::attachInterrupt_Send( isrTx_t fn )
+{
+  // pause interrupts
+  uint8_t oldISR = ((__get_PRIMASK() & 0x1) == 0 && (__get_FAULTMASK() & 0x1) == 0); noInterrupts();
+  
+  // set custom function for TX empty
+  _isrTx = fn;
+
+  // restore old interrupt setting
+  if (oldISR != 0) { interrupts(); }
 }
 
 void UARTClass::IrqHandler( void )
@@ -180,11 +201,11 @@ void UARTClass::IrqHandler( void )
   // Did we receive data?
   if ((status & UART_SR_RXRDY) == UART_SR_RXRDY) {
 
-    // user function was attached -> call it with data and status byte 
-    if (_isr) {
-      _isr(_pUart->UART_RHR, status);
+    // custom function was attached -> call it with data and status byte 
+    if (_isrRx) {
+      _isrRx(_pUart->UART_RHR, status);
     }
-    // no user function attached -> store in ring buffer
+    // no custom function attached -> store data in ring buffer
     else {
       _rx_buffer->store_char(_pUart->UART_RHR);
     }
@@ -202,6 +223,24 @@ void UARTClass::IrqHandler( void )
     {
       // Mask off transmit interrupt so we don't get it anymore
       _pUart->UART_IDR = UART_IDR_TXRDY;
+
+      // if custom routine attached, activate TXBUFE interrupt -> delay call until transmission finished
+      if (_isrTx != NULL) {
+        _pUart->UART_IER = UART_IER_TXEMPTY;
+      }
+    }
+
+  }
+
+  // Is data transmission finished? Used for call of attached custom function at end of transmission?
+  if ((status & UART_SR_TXEMPTY) == UART_SR_TXEMPTY)
+  {
+    // Mask off interrupt so we don't get it anymore
+    _pUart->UART_IDR = UART_IDR_TXEMPTY;
+    
+    // if custom routine attached, call it
+    if (_isrTx != NULL) {
+      _isrTx();
     }
   }
 

cores/arduino/UARTClass.h

@@ -34,7 +34,6 @@
 // missing in CMSIS
 #define UART_SR_RXBRK (0x1u << 2)
 
-
 class UARTClass : public HardwareSerial
 {
   public:
@@ -63,9 +62,12 @@ class UARTClass : public HardwareSerial
 
     void IrqHandler(void);
 
-    typedef void (*USART_isr_t)(uint8_t data, uint32_t status);
-    void attachInterrupt( USART_isr_t fn );
-    void detachInterrupt() { attachInterrupt( (USART_isr_t) NULL ); };
+    typedef void (* isrRx_t)(uint8_t data, uint32_t status);
+    typedef void (* isrTx_t)( void );
+    void attachInterrupt_Receive( isrRx_t fn );
+    void detachInterrupt_Receive( void ) { attachInterrupt_Receive( (isrRx_t) NULL); };
+    void attachInterrupt_Send( isrTx_t fn );
+    void detachInterrupt_Send( void ) { attachInterrupt_Send( (isrTx_t) NULL); };
 
     operator bool() { return true; }; // UART always active
 
@@ -79,7 +81,8 @@ class UARTClass : public HardwareSerial
     IRQn_Type _dwIrq;
     uint32_t _dwId;
 
-    USART_isr_t  _isr;
+    isrRx_t  _isrRx;
+    isrTx_t  _isrTx;
 };
 
 #endif // _UART_CLASS_