add Serial.attachInterrupt_Send()

gicking · gicking · commit 8665c0367d9f · 2019-11-17T09:08:23.000+01:00
add Serial.attachInterrupt_Send()
rename Serial.attachInterrupt() to Serial.attachInterrupt_Receive()
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
@@ -114,6 +114,14 @@ void HardwareSerial::_tx_udr_empty_irq(void)
   }
 }
 
+void HardwareSerial::_tx_complete_irq(void)
+{
+  // user send function was attached -> call it
+  if (_isrTx) {
+    _isrTx();
+  }
+}
+
 // Public Methods //////////////////////////////////////////////////////////////
 
 void HardwareSerial::begin(unsigned long baud, byte config)
@@ -160,6 +168,7 @@ void HardwareSerial::end()
   cbi(*_ucsrb, TXEN0);
   cbi(*_ucsrb, RXCIE0);
   cbi(*_ucsrb, UDRIE0);
+  cbi(*_ucsrb, TXCIE0);
   
   // clear any received data
   _rx_buffer_head = _rx_buffer_tail;
@@ -280,11 +289,29 @@ size_t HardwareSerial::write(uint8_t c)
   return 1;
 }
 
-void HardwareSerial::attachInterrupt( isr_t fn )
+void HardwareSerial::attachInterrupt_Receive( isrRx_t fn )
+{
+  uint8_t oldSREG = SREG;
+  cli();
+  _isrRx = fn;
+  SREG = oldSREG;
+}
+
+void HardwareSerial::attachInterrupt_Send( isrTx_t fn )
+{
+  uint8_t oldSREG = SREG;
+  cli();
+  _isrTx = fn;
+  sbi(*_ucsrb, TXCIE0);
+  SREG = oldSREG;
+}
+
+void HardwareSerial::detachInterrupt_Send()
 {
   uint8_t oldSREG = SREG;
   cli();
-  _isr = fn;
+  _isrTx = NULL;
+  cbi(*_ucsrb, TXCIE0);
   SREG = oldSREG;
 }
 
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
@@ -139,12 +139,17 @@ class HardwareSerial : public Stream
     // Interrupt handlers - Not intended to be called externally
     inline void _rx_complete_irq(void);
     void _tx_udr_empty_irq(void);
-
-    typedef void (* isr_t)( uint8_t d, uint8_t s );
-    void attachInterrupt( isr_t fn );
-    void detachInterrupt() { attachInterrupt( (isr_t) NULL ); };
+    void _tx_complete_irq(void);
+
+    typedef void (* isrRx_t)( uint8_t d, uint8_t s );
+    void attachInterrupt_Receive( isrRx_t fn );
+    void detachInterrupt_Receive() { attachInterrupt_Receive( (isrRx_t) NULL ); };
+    typedef void (* isrTx_t)( void );
+    void attachInterrupt_Send( isrTx_t fn );
+    void detachInterrupt_Send( void );
   private:
-    isr_t  _isr;
+    isrRx_t  _isrRx;
+    isrTx_t  _isrTx;
 
     HardwareSerial( const HardwareSerial & );
     HardwareSerial & operator =( const HardwareSerial &);
diff --git a/cores/arduino/HardwareSerial0.cpp b/cores/arduino/HardwareSerial0.cpp
@@ -20,8 +20,7 @@
   Modified 28 September 2010 by Mark Sproul
   Modified 14 August 2012 by Alarus
   Modified 3 December 2013 by Matthijs Kooijman
-  Modified 2 November 2015 by SlashDev
-  Modified 7 November 2019 by Georg Icking-Konert
+  Modified 17 November 2019 by Georg Icking-Konert
 */
 
 #include "Arduino.h"
@@ -66,6 +65,19 @@ ISR(USART_UDRE_vect)
   Serial._tx_udr_empty_irq();
 }
 
+#if defined(UART0_TX_vect)
+ISR(UART0_TX_vect)
+#elif defined(USART0_TX_vect)
+ISR(USART0_TX_vect)
+#elif defined(USART_TX_vect)
+ISR(USART_TX_vect)
+#else
+  #error "Don't know what the Transmission Complete vector is called for Serial"
+#endif
+{
+  Serial._tx_complete_irq();
+}
+
 #if defined(UBRRH) && defined(UBRRL)
   HardwareSerial Serial(&UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR);
 #else
diff --git a/cores/arduino/HardwareSerial1.cpp b/cores/arduino/HardwareSerial1.cpp
@@ -20,8 +20,7 @@
   Modified 28 September 2010 by Mark Sproul
   Modified 14 August 2012 by Alarus
   Modified 3 December 2013 by Matthijs Kooijman
-  Modified 2 November 2015 by SlashDev
-  Modified 7 November 2019 by Georg Icking-Konert
+  Modified 17 November 2019 by Georg Icking-Konert
 */
 
 #include "Arduino.h"
@@ -60,6 +59,17 @@ ISR(USART1_UDRE_vect)
   Serial1._tx_udr_empty_irq();
 }
 
+#if defined(UART1_TX_vect)
+ISR(UART1_TX_vect)
+#elif defined(USART1_TX_vect)
+ISR(USART1_TX_vect)
+#else
+  #error "Don't know what the Transmission Complete vector is called for Serial1"
+#endif
+{
+  Serial1._tx_complete_irq();
+}
+
 HardwareSerial Serial1(&UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1);
 
 // Function that can be weakly referenced by serialEventRun to prevent
diff --git a/cores/arduino/HardwareSerial2.cpp b/cores/arduino/HardwareSerial2.cpp
@@ -20,8 +20,7 @@
   Modified 28 September 2010 by Mark Sproul
   Modified 14 August 2012 by Alarus
   Modified 3 December 2013 by Matthijs Kooijman
-  Modified 2 November 2015 by SlashDev
-  Modified 7 November 2019 by Georg Icking-Konert
+  Modified 17 November 2019 by Georg Icking-Konert
 */
 
 #include "Arduino.h"
@@ -38,16 +37,30 @@
 
 #if defined(HAVE_HWSERIAL2)
 
+// xxx
+extern int count;
+
 ISR(USART2_RX_vect)
 {
   Serial2._rx_complete_irq();
 }
 
 ISR(USART2_UDRE_vect)
 {
+  // xxx
+  Serial.println(++count);
+  digitalWrite(LED_BUILTIN, HIGH);
+  delayMicroseconds(50);
+  digitalWrite(LED_BUILTIN, LOW);
+
   Serial2._tx_udr_empty_irq();
 }
 
+ISR(USART2_TX_vect)
+{
+  Serial2._tx_complete_irq();
+}
+
 HardwareSerial Serial2(&UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2);
 
 // Function that can be weakly referenced by serialEventRun to prevent
diff --git a/cores/arduino/HardwareSerial3.cpp b/cores/arduino/HardwareSerial3.cpp
@@ -20,8 +20,7 @@
   Modified 28 September 2010 by Mark Sproul
   Modified 14 August 2012 by Alarus
   Modified 3 December 2013 by Matthijs Kooijman
-  Modified 2 November 2015 by SlashDev
-  Modified 7 November 2019 by Georg Icking-Konert
+  Modified 17 November 2019 by Georg Icking-Konert
 */
 
 #include "Arduino.h"
@@ -48,6 +47,11 @@ ISR(USART3_UDRE_vect)
   Serial3._tx_udr_empty_irq();
 }
 
+ISR(USART3_TX_vect)
+{
+  Serial3._tx_complete_irq();
+}
+
 HardwareSerial Serial3(&UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3);
 
 // Function that can be weakly referenced by serialEventRun to prevent
diff --git a/cores/arduino/HardwareSerial_private.h b/cores/arduino/HardwareSerial_private.h
@@ -20,7 +20,7 @@
   Modified 28 September 2010 by Mark Sproul
   Modified 14 August 2012 by Alarus
   Modified 2 November 2015 by SlashDev
-  Modified 7 November 2019 by Georg Icking-Konert
+  Modified 17 November 2019 by Georg Icking-Konert
 */
 
 #include "wiring_private.h"
@@ -95,19 +95,19 @@ HardwareSerial::HardwareSerial(
     _udr(udr),
     _rx_buffer_head(0), _rx_buffer_tail(0),
     _tx_buffer_head(0), _tx_buffer_tail(0),
-    _isr(0)
+    _isrRx(0), _isrTx(0)
 {
 }
 
 // Actual interrupt handlers //////////////////////////////////////////////////////////////
 
 void HardwareSerial::_rx_complete_irq(void)
 {
-  // user function was attached -> call it with data and status byte 
-  if (_isr) {
+  // user receive function was attached -> call it with data and status byte 
+  if (_isrRx) {
     unsigned char status = *_ucsra;
     unsigned char data = *_udr;
-    _isr( data, status );
+    _isrRx( data, status );
   }
 
   // default: save data in ring buffer
