complete serialEventRun logic

Author: GrumpyOldPizza

cores/stm32l4/CDC.cpp

@@ -32,7 +32,7 @@
 #define CDC_TX_BUFFER_MASK ((CDC_TX_BUFFER_SIZE<<1)-1)
 #define CDC_TX_INDEX_MASK  (CDC_TX_BUFFER_SIZE-1)
 
-static stm32l4_usbd_cdc_t stm32l4_usbd_cdc;
+stm32l4_usbd_cdc_t stm32l4_usbd_cdc;
 
 CDC::CDC(struct _stm32l4_usbd_cdc_t *usbd_cdc)
 {
@@ -56,7 +56,13 @@ void CDC::begin(unsigned long baudrate)
 
 void CDC::begin(unsigned long baudrate, uint16_t config)
 {
-  stm32l4_usbd_cdc_enable(_usbd_cdc, 0, CDC::_event_callback, (void*)this, (USBD_CDC_EVENT_RECEIVE | USBD_CDC_EVENT_TRANSMIT));
+  /* If USBD_CDC has already been enabled/initialized by STDIO, just add the notify.
+   */
+  if (_usbd_cdc->state == USBD_CDC_STATE_INIT) {
+    stm32l4_usbd_cdc_enable(_usbd_cdc, 0, CDC::_event_callback, (void*)this, (USBD_CDC_EVENT_RECEIVE | USBD_CDC_EVENT_TRANSMIT));
+  } else {
+    stm32l4_usbd_cdc_notify(_usbd_cdc, CDC::_event_callback, (void*)this, (USBD_CDC_EVENT_RECEIVE | USBD_CDC_EVENT_TRANSMIT));
+  }
 }
 
 void CDC::end()
@@ -507,3 +513,5 @@ bool CDC::rts() {
 }
 
 CDC SerialUSB(&stm32l4_usbd_cdc);
+
+bool SerialUSB_empty() { return SerialUSB.empty(); }

cores/stm32l4/CDC.h

@@ -51,6 +51,9 @@ class CDC : public HardwareSerial
     // STM32L4 EXTENSTION: asynchronous receive callback
     void onReceive(void(*callback)(int));
 
+    // STM32L4 EXTENSTION: quick check for empty
+    inline int empty() { return (_rx_read == _rx_write); };
+
     operator bool();
 
     // These return the settings specified by the USB host for the

cores/stm32l4/HardwareSerial.cpp

@@ -0,0 +1,88 @@
+/*
+  HardwareSerial.cpp - Hardware serial library for Wiring
+  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  
+  Modified 23 November 2006 by David A. Mellis
+  Modified 28 September 2010 by Mark Sproul
+  Modified 14 August 2012 by Alarus
+  Modified 3 December 2013 by Matthijs Kooijman
+*/
+
+#include "Arduino.h"
+#include "HardwareSerial.h"
+
+// SerialEvent functions are weak, so when the user doesn't define them,
+// the linker just sets their address to 0 (which is checked below).
+// The Serialx_available is just a wrapper around Serialx.available(),
+// but we can refer to it weakly so we don't pull in the entire
+// HardwareSerial instance if the user doesn't also refer to it.
+
+void serialEvent() __attribute__((weak));
+bool SerialUSB_empty() __attribute__((weak));
+
+void serial1Event() __attribute__((weak));
+bool Serial1_empty() __attribute__((weak));
+
+#if SERIAL_INTERFACES_COUNT > 1
+
+void serial2Event() __attribute__((weak));
+bool Serial2_empty() __attribute__((weak));
+
+#endif
+
+#if SERIAL_INTERFACES_COUNT > 2
+
+void serial3Event() __attribute__((weak));
+bool Serial3_empty() __attribute__((weak));
+
+#endif
+
+#if SERIAL_INTERFACES_COUNT > 3
+
+void serial4Event() __attribute__((weak));
+bool Serial4_empty() __attribute__((weak));
+
+#endif
+
+#if SERIAL_INTERFACES_COUNT > 4
+
+void serial5Event() __attribute__((weak));
+bool Serial5_empty() __attribute__((weak));
+
+#endif
+
+void serialEventRun(void)
+{
+  if (serialEvent && SerialUSB_empty && !SerialUSB_empty()) { serialEvent();  }
+
+  if (serial1Event && Serial1_empty && !Serial1_empty()) { serial1Event(); }
+#if SERIAL_INTERFACES_COUNT > 1
+  if (serial2Event && Serial2_empty && !Serial2_empty()) { serial2Event(); }
+#endif
+#if SERIAL_INTERFACES_COUNT > 2
+  if (serial3Event && Serial3_empty && !Serial3_empty()) { serial3Event(); }
+#endif
+#if SERIAL_INTERFACES_COUNT > 3
+  if (serial4Event && Serial4_empty && !Serial4_empty()) { serial4Event(); }
+#endif
+#if SERIAL_INTERFACES_COUNT > 4
+  if (serial5Event && Serial5_empty && !Serial5_empty()) { serial5Event(); }
+#endif
+#if SERIAL_INTERFACES_COUNT > 5
+  if (serial6Event && Serial6_empty && !Serial6_empty()) { serial6Event(); }
+#endif
+}

cores/stm32l4/Makefile

@@ -21,6 +21,7 @@ SRCS = \
 	../../variants/dragonfly/variant.cpp \
 	CDC.cpp \
 	FS.cpp \
+	HardwareSerial.cpp \
 	IPAddress.cpp \
 	Print.cpp \
 	Reset.cpp \
@@ -50,6 +51,7 @@ OBJS = \
 	../../variants/dragonfly/variant.o \
 	CDC.o \
 	FS.o \
+	HardwareSerial.o \
 	IPAddress.o \
 	Print.o \
 	Reset.o \

cores/stm32l4/Uart.cpp

@@ -482,6 +482,8 @@ static const stm32l4_uart_pins_t stm32l4_usart3_pins = { GPIO_PIN_PC5_USART3_RX,
 
 Uart __attribute__((weak)) Serial1(&stm32l4_usart3, UART_INSTANCE_USART3, &stm32l4_usart3_pins, STM32L4_UART_IRQ_PRIORITY, UART_MODE_RX_DMA | UART_MODE_TX_DMA);
 
+bool Serial1_empty() { return Serial1.empty(); }
+
 #if SERIAL_INTERFACES_COUNT > 1
 
 static stm32l4_uart_t stm32l4_uart4;
@@ -490,6 +492,8 @@ static const stm32l4_uart_pins_t stm32l4_uart4_pins = { GPIO_PIN_PA1_UART4_RX, G
 
 Uart __attribute__((weak)) Serial2(&stm32l4_uart4, UART_INSTANCE_UART4, &stm32l4_uart4_pins, STM32L4_UART_IRQ_PRIORITY, UART_MODE_RX_DMA | UART_MODE_RX_DMA_SECONDARY);
 
+bool Serial2_empty() { return Serial2.empty(); }
+
 #endif
 
 #if SERIAL_INTERFACES_COUNT > 2
@@ -500,6 +504,8 @@ static const stm32l4_uart_pins_t stm32l4_usart2_pins = { GPIO_PIN_PA3_USART2_RX,
 
 Uart __attribute__((weak)) Serial3(&stm32l4_usart2, UART_INSTANCE_USART2, &stm32l4_usart2_pins, STM32L4_UART_IRQ_PRIORITY, 0);
 
+bool Serial3_empty() { return Serial3.empty(); }
+
 #endif
 
 #if SERIAL_INTERFACES_COUNT > 3
@@ -510,6 +516,8 @@ static const stm32l4_uart_pins_t stm32l4_uart5_pins = { GPIO_PIN_PD2_UART5_RX, G
 
 Uart __attribute__((weak)) Serial4(&stm32l4_uart5, UART_INSTANCE_UART5, &stm32l4_uart5_pins, STM32L4_UART_IRQ_PRIORITY, 0);
 
+bool Serial4_empty() { return Serial4.empty(); }
+
 #endif
 
 #if SERIAL_INTERFACES_COUNT > 4
@@ -520,5 +528,7 @@ static const stm32l4_uart_pins_t stm32l4_usart1_pins = { GPIO_PIN_PB7_USART1_RX,
 
 Uart __attribute__((weak)) Serial5(&stm32l4_usart1, UART_INSTANCE_USART1, &stm32l4_usart1_pins, STM32L4_UART_IRQ_PRIORITY, 0);
 
+bool Serial5_empty() { return Serial5.empty(); }
+
 #endif
 

cores/stm32l4/Uart.h

@@ -49,6 +49,9 @@ class Uart : public HardwareSerial
     // STM32L4 EXTENSTION: asynchronous receive callback
     void onReceive(void(*callback)(int));
 
+    // STM32L4 EXTENSTION: quick check for empty
+    inline int empty() { return (_rx_read == _rx_write); };
+
     operator bool() { return true; }
 
   private: