Merge branch 'api-avr4809' of github.com:bcmi-labs/ArduinoCore-avr-api into api-avr4809-master

# Conflicts:
#	cores/arduino/wiring.c
#	variants/uno2018/pins_arduino.h

Author: espreng

boards.txt

@@ -1,6 +1,6 @@
 # See: http://code.google.com/p/arduino/wiki/Platforms
 
-menu.cpu=Processor
+menu.revision=Revision
 
 ##############################################################
 
@@ -15,6 +15,11 @@ uno2018.upload.maximum_size=32256
 uno2018.upload.maximum_data_size=2048
 uno2018.upload.speed=115200
 
+uno2018.menu.revision.rev2=RevB
+uno2018.menu.revision.rev2.build.extra_flags=
+uno2018.menu.revision.rev1=RevA (Engineering sample)
+uno2018.menu.revision.rev1.build.extra_flags=-DREV_A_ENGINEERING_SAMPLE
+
 uno2018.bootloader.tool=avrdude
 uno2018.bootloader.low_fuses=0xFF
 uno2018.bootloader.high_fuses=0xDE

cores/arduino/wiring.c

@@ -277,12 +277,12 @@ void init()
 	/* Disable system clock prescaler - F_CPU should now be ~16MHz */
 	_PROTECTED_WRITE(CLKCTRL_MCLKCTRLB, 0x00);
 
-// 	/* Calculate actual F_CPU with error values from signature row */
-// 	int8_t sigrow_val = SIGROW.OSC16ERR5V;
-// 	int64_t cpu_freq = F_CPU;
-// 	cpu_freq *= (1024 + sigrow_val);
-// 	cpu_freq /= 1024;
-// 	F_CPU_CORRECTED = (uint32_t)cpu_freq;
+	/* Calculate actual F_CPU with error values from signature row */
+	int8_t sigrow_val = SIGROW.OSC16ERR5V;
+	int64_t cpu_freq = F_CPU;
+	cpu_freq *= (1024 + sigrow_val);
+	cpu_freq /= 1024;
+	F_CPU_CORRECTED = (uint32_t)cpu_freq;
 
 /***************************** TIMERS FOR PWM *********************************/
 
@@ -392,10 +392,20 @@ void init()
 
 /****************************** USART *****************************************/
 
-// 	/* Configure PORTMUX for USARTS */
-// 	PORTMUX.USARTROUTEA = (PORTMUX_USART1_ALT1_gc // MAIN
-// 					| PORTMUX_USART0_ALT1_gc // SPARE
-// 					| PORTMUX_USART3_ALT1_gc); // DEBUG
+#ifdef REV_A_ENGINEERING_SAMPLE
+	/* Configure PORTMUX for USARTS */
+	//PORTMUX.USARTROUTEA = (PORTMUX_USART1_ALT1_gc // MAIN
+	//| PORTMUX_USART0_ALT1_gc // SPARE
+	//| PORTMUX_USART3_ALT1_gc); // DEBUG
+
+	PORTMUX.USARTROUTEA = (PORTMUX_USART0_ALT1_gc // SPARE
+	| PORTMUX_USART3_ALT1_gc); // DEBUG
+#else
+	/* Configure PORTMUX for USARTS */
+	PORTMUX.USARTROUTEA = (PORTMUX_USART1_ALT1_gc // MAIN
+					| PORTMUX_USART0_ALT1_gc // SPARE
+					| PORTMUX_USART3_ALT1_gc); // DEBUG
+#endif
 
 /********************* TCB3 for system time tracking **************************/
 

variants/uno2018/pins_arduino.h

@@ -46,8 +46,8 @@ static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK  = PIN_SPI_SCK;
 
-#define PIN_WIRE_SDA        (20)
-#define PIN_WIRE_SCL        (21)
+#define PIN_WIRE_SDA        (18)
+#define PIN_WIRE_SCL        (19)
 
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
@@ -56,20 +56,23 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 // USART1 on mega4809 (alternative pins)
 // Mapped to HWSERIAL0 in Serial library
 #define HWSERIAL0 (&USART1)
+//!!BUG in device header file. The RXC and DRE vectors are swapped!!
 #define HWSERIAL0_DRE_VECTOR (USART1_DRE_vect)
-#define HWSERIAL0_DRE_VECTOR_NUM (USART1_DRE_vect_num)
 #define HWSERIAL0_RXC_VECTOR (USART1_RXC_vect)
-// #define PIN_WIRE_HWSERIAL0_RX (0)
-// #define PIN_WIRE_HWSERIAL0_TX (1)
+#ifdef REV_A_ENGINEERING_SAMPLE
 #define PIN_WIRE_HWSERIAL0_RX (12)
 #define PIN_WIRE_HWSERIAL0_TX (11)
+#else
+#define PIN_WIRE_HWSERIAL0_RX (0)
+#define PIN_WIRE_HWSERIAL0_TX (1)
+#endif
 
 // Uno2 Debug USART (not available on headers, only via the EDGB virtual COM port)
 // USART3 on mega4809 (alternative pins)
 // Mapped to HWSERIAL1 in Serial library
 #define HWSERIAL1 (&USART3)
+//!!BUG in device header file. The RXC and DRE vectors are swapped!!
 #define HWSERIAL1_DRE_VECTOR (USART3_DRE_vect)
-#define HWSERIAL1_DRE_VECTOR_NUM (USART3_DRE_vect_num)
 #define HWSERIAL1_RXC_VECTOR (USART3_RXC_vect)
 #define PIN_WIRE_HWSERIAL1_RX (26)
 #define PIN_WIRE_HWSERIAL1_TX (27)
@@ -78,8 +81,8 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 // USART0 on mega4809 (alternative pins)
 // Mapped to HWSERIAL2 in Serial library
 #define HWSERIAL2 (&USART0)
+//!!BUG in device header file. The RXC and DRE vectors are swapped!!
 #define HWSERIAL2_DRE_VECTOR (USART0_DRE_vect)
-#define HWSERIAL2_DRE_VECTOR_NUM (USART0_DRE_vect_num)
 #define HWSERIAL2_RXC_VECTOR (USART0_RXC_vect)
 #define PIN_WIRE_HWSERIAL2_RX (23)
 #define PIN_WIRE_HWSERIAL2_TX (24)