Reenable Serial1 sercom int handlers, disable Wire i2c slave int handlers

Author: JordanMajd

variants/trellis_m4/variant.cpp

@@ -110,22 +110,21 @@ SERCOM sercom3( SERCOM3 ) ;
 SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 
-// TODO resolve SERCOM4_X_Handler conflict w/ I2C Wire
-// Uart Serial1( &sercom4, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
-
-// void SERCOM4_0_Handler()
-// {
-//   Serial1.IrqHandler();
-// }
-// void SERCOM4_1_Handler()
-// {
-//   Serial1.IrqHandler();
-// }
-// void SERCOM4_2_Handler()
-// {
-//   Serial1.IrqHandler();
-// }
-// void SERCOM4_3_Handler()
-// {
-//   Serial1.IrqHandler();
-// }
+Uart Serial1( &sercom4, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM4_0_Handler()
+{
+  Serial1.IrqHandler();
+}
+void SERCOM4_1_Handler()
+{
+  Serial1.IrqHandler();
+}
+void SERCOM4_2_Handler()
+{
+  Serial1.IrqHandler();
+}
+void SERCOM4_3_Handler()
+{
+  Serial1.IrqHandler();
+}

variants/trellis_m4/variant.h

@@ -156,10 +156,13 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SCL         (22u)
 #define PERIPH_WIRE          sercom4
 #define WIRE_IT_HANDLER      SERCOM4_Handler
-#define WIRE_IT_HANDLER_0    SERCOM4_0_Handler
-#define WIRE_IT_HANDLER_1    SERCOM4_1_Handler
-#define WIRE_IT_HANDLER_2    SERCOM4_2_Handler
-#define WIRE_IT_HANDLER_3    SERCOM4_3_Handler
+
+// Sercom interrupt handlers for I2C slave not set; they are used by Serial1
+// #define WIRE_IT_HANDLER_0    SERCOM4_0_Handler
+// #define WIRE_IT_HANDLER_1    SERCOM4_1_Handler
+// #define WIRE_IT_HANDLER_2    SERCOM4_2_Handler
+// #define WIRE_IT_HANDLER_3    SERCOM4_3_Handler
+
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;