Move I2C mux to variant

Author: facchinm

cores/arduino/wiring.c

@@ -434,11 +434,6 @@ void init()
 
 //#endif
 
-/****************************** TWI *******************************************/
-
-// 	PORTMUX.TWISPIROUTEA = (PORTMUX_TWI0_ALT1_gc | PORTMUX_SPI0_ALT2_gc);
-
-
 /****************************** USART *****************************************/
 
 #ifdef REV_A_ENGINEERING_SAMPLE

libraries/Wire/src/utility/twi.c

@@ -37,8 +37,10 @@ void TWI_MasterInit(uint32_t frequency)
 
 	// Enable pullups just in case, should have external ones though
 	//pinMode(PIN_WIRE_SDA, INPUT_PULLUP);
-	//pinMode(PIN_WIRE_SCL, INPUT_PULLUP);	
-	
+	//pinMode(PIN_WIRE_SCL, INPUT_PULLUP);
+
+	PORTMUX.TWISPIROUTEA |= TWI_MUX;
+
 	twi_mode = TWI_MODE_MASTER;
 
 	master_bytesRead = 0;

variants/uno2018/pins_arduino.h

@@ -349,4 +349,6 @@ const uint8_t PROGMEM digital_pin_to_timer[] = {
 #define SERIAL_PORT_USBVIRTUAL		Serial1
 #define SERIAL_PORT_HARDWARE_OPEN	Serial2
 
+#define TWI_MUX		PORTMUX_TWI0_DEFAULT_gc //PORTMUX_TWI0_ALT1_gc
+
 #endif