Add definitions of GPIO Serial

Author: matsujirushi

variants/wio_terminal/variant.cpp

@@ -93,9 +93,9 @@ const PinDescription g_APinDescription[] =
         //39 MIC INPUT
         {PORTC, 30, PIO_ANALOG, PIN_ATTR_ANALOG_ALT, ADC_Channel12, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14}, //MIC_INPUT
 
-        //40..41 UART Serial1
-        {PORTB, 26, PIO_SERCOM, (PIN_ATTR_DIGITAL | PIN_ATTR_PWM_F), No_ADC_Channel, TCC1_CH2, NOT_ON_TIMER, EXTERNAL_INT_12}, //UART1_TX, SERCOM2.0
-        {PORTB, 27, PIO_SERCOM, (PIN_ATTR_DIGITAL | PIN_ATTR_PWM_F), No_ADC_Channel, TCC1_CH3, NOT_ON_TIMER, EXTERNAL_INT_13}, //UART1_RX, SERCOM2.1
+        //40..41 UART GPIO (Host)
+        {PORTB, 26, PIO_SERCOM, (PIN_ATTR_DIGITAL | PIN_ATTR_PWM_F), No_ADC_Channel, TCC1_CH2, NOT_ON_TIMER, EXTERNAL_INT_12}, //SERCOM2.0
+        {PORTB, 27, PIO_SERCOM, (PIN_ATTR_DIGITAL | PIN_ATTR_PWM_F), No_ADC_Channel, TCC1_CH3, NOT_ON_TIMER, EXTERNAL_INT_13}, //SERCOM2.1
 
         // 42..44 - USB
         {PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8}, // USB_D-
@@ -186,8 +186,11 @@ const PinDescription g_APinDescription[] =
 
         //91..92 OUTPUT_CTR
         {PORTC, 14, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14},
-        {PORTC, 15, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15}
+        {PORTC, 15, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15},
 
+        //93..94 UART GPIO (Device)
+        {PORTB, 26, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_12}, //SERCOM4.1
+        {PORTB, 27, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_13}, //SERCOM4.0
 };
 
 const void *g_apTCInstances[TCC_INST_NUM + TC_INST_NUM] = {TCC0, TCC1, TCC2, TCC3, TCC4, TC0, TC1, TC2, TC3, TC4, TC5, TC6, TC7};
@@ -203,7 +206,6 @@ SERCOM sercom5(SERCOM5);
 SERCOM sercom6(SERCOM6);
 SERCOM sercom7(SERCOM7);
 
-Uart Serial1(&SERCOM_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX);
 Uart Serial2(&SERCOM_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX);
 
 void SERCOM1_0_Handler()
@@ -222,20 +224,3 @@ void SERCOM1_3_Handler()
 {
   Serial2.IrqHandler();
 }
-
-void SERCOM2_0_Handler()
-{
-  Serial1.IrqHandler();
-}
-void SERCOM2_1_Handler()
-{
-  Serial1.IrqHandler();
-}
-void SERCOM2_2_Handler()
-{
-  Serial1.IrqHandler();
-}
-void SERCOM2_3_Handler()
-{
-  Serial1.IrqHandler();
-}

variants/wio_terminal/variant.h

@@ -57,7 +57,7 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT (93u)
+#define PINS_COUNT (sizeof(g_APinDescription) / sizeof(g_APinDescription[0]))
 #define NUM_DIGITAL_PINS (23u)
 #define NUM_ANALOG_INPUTS (14u)
 #define NUM_ANALOG_OUTPUTS (2u)
@@ -265,20 +265,66 @@ static const uint8_t DAC1 = PIN_DAC1;
  * Serial interfaces
  */
 
-// Serial1
-#define PIN_SERIAL1_RX (41ul)
-#define PIN_SERIAL1_TX (40ul)
-#define PAD_SERIAL1_RX (SERCOM_RX_PAD_1)
-#define PAD_SERIAL1_TX (UART_TX_PAD_0)
-#define SERCOM_SERIAL1 sercom2
-
 // Serial2
 #define PIN_SERIAL2_RX (83ul)
 #define PIN_SERIAL2_TX (82ul)
 #define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
 #define PAD_SERIAL2_TX (UART_TX_PAD_0)
 #define SERCOM_SERIAL2 sercom1
 
+// UART GPIO (Host)
+//  static Uart GpioSerial(&SERCOM_GPIO_SERIAL, PIN_GPIO_SERIAL_RX, PIN_GPIO_SERIAL_TX, PAD_GPIO_SERIAL_RX, PAD_GPIO_SERIAL_TX);
+//  INTERRUPT_HANDLER_IMPLEMENT_GPIO_SERIAL(GpioSerial)
+#define PIN_GPIO_SERIAL_RX		(BCM15)
+#define PIN_GPIO_SERIAL_TX		(BCM14)
+#define PAD_GPIO_SERIAL_RX		(SERCOM_RX_PAD_1)
+#define PAD_GPIO_SERIAL_TX		(UART_TX_PAD_0)
+#define SERCOM_GPIO_SERIAL		sercom2
+#define INTERRUPT_HANDLER_IMPLEMENT_GPIO_SERIAL(uart) \
+	void SERCOM2_0_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM2_1_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM2_2_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM2_3_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	}
+
+// UART GPIO (Device)
+//  Uart GpioSerial(&SERCOM_GPIO_SERIAL_X, PIN_GPIO_SERIAL_X_RX, PIN_GPIO_SERIAL_X_TX, PAD_GPIO_SERIAL_X_RX, PAD_GPIO_SERIAL_X_TX);
+//  INTERRUPT_HANDLER_IMPLEMENT_GPIO_SERIAL_X(GpioSerial)
+
+#define PIN_GPIO_SERIAL_X_RX	(93ul)
+#define PIN_GPIO_SERIAL_X_TX	(94ul)
+#define PAD_GPIO_SERIAL_X_RX	(SERCOM_RX_PAD_1)
+#define PAD_GPIO_SERIAL_X_TX	(UART_TX_PAD_0)
+#define SERCOM_GPIO_SERIAL_X	sercom4
+#define INTERRUPT_HANDLER_IMPLEMENT_GPIO_SERIAL_X(uart) \
+	void SERCOM4_0_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM4_1_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM4_2_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	} \
+	void SERCOM4_3_Handler() \
+	{ \
+		(uart).IrqHandler(); \
+	}
+
 /*
  * Wire Interfaces
  */
@@ -476,7 +522,6 @@ extern SERCOM sercom5;
 extern SERCOM sercom6;
 extern SERCOM sercom7;
 
-extern Uart Serial1;
 extern Uart Serial2;
 
 #endif
@@ -499,8 +544,8 @@ extern Uart Serial2;
 #define SERIAL_PORT_USBVIRTUAL Serial
 #define SERIAL_PORT_MONITOR Serial
 // Serial has no physical pins broken out, so it's not listed as HARDWARE port
-#define SERIAL_PORT_HARDWARE Serial1
-#define SERIAL_PORT_HARDWARE_OPEN Serial1
+#define SERIAL_PORT_HARDWARE
+#define SERIAL_PORT_HARDWARE_OPEN
 #define RTL8720D Serial2
 // Alias Serial to SerialUSB
 #define SerialUSB Serial