diff --git a/cores/validation/validation_core/test.cpp b/cores/validation/validation_core/test.cpp
index fb3918c35b111e4b39f7a746a8dd448b7bf44a48..1c73c56065eff5d0bb23be0529ce6edd3394461b 100644
--- a/cores/validation/validation_core/test.cpp
+++ b/cores/validation/validation_core/test.cpp
@@ -63,7 +63,7 @@ void setup( void )
pinPeripheral( 13, PIO_AC_CLK ) ; // Clock Gen 3*/
//**********************************************
- Serial5.begin( 115200 ) ; // Output to EDBG Virtual COM Port
+ Serial.begin( 115200 ) ; // Output to EDBG Virtual COM Port
// Test External Interrupt
attachInterrupt( 3, Interrupt_Pin3, LOW ) ;
@@ -107,14 +107,14 @@ void loop( void )
delay( 500 ) ; // wait for a second
// Test Serial output
- Serial5.write( '-' ) ; // send a char
- Serial5.write( "test1\n" ) ; // send a string
- Serial5.write( "test2" ) ; // send another string
+ Serial.write( '-' ) ; // send a char
+ Serial.write( "test1\n" ) ; // send a string
+ Serial.write( "test2" ) ; // send another string
// Test digitalRead: connect pin 2 to either GND or 3.3V. !!!! NOT on 5V pin !!!!
pin_value=digitalRead( 2 ) ;
- Serial5.write( "pin 2 value is " ) ;
- Serial5.write( (pin_value == LOW)?"LOW\n":"HIGH\n" ) ;
+ Serial.write( "pin 2 value is " ) ;
+ Serial.write( (pin_value == LOW)?"LOW\n":"HIGH\n" ) ;
duty_cycle+=8 ;//=(uint8_t)(millis() & 0xff) ;
analogWrite( 13, duty_cycle ) ;
@@ -127,48 +127,46 @@ void loop( void )
dac_value += 64;
analogWrite(A0, dac_value);
-
-
- Serial5.print("\r\nAnalog pins: ");
+ Serial.print("\r\nAnalog pins: ");
for ( uint32_t i = A0 ; i <= A0+NUM_ANALOG_INPUTS ; i++ )
{
int a = analogRead(i);
- Serial5.print(a, DEC);
- Serial5.print(" ");
+ Serial.print(a, DEC);
+ Serial.print(" ");
}
- Serial5.println();
+ Serial.println();
- Serial5.println("External interrupt pins:");
+ Serial.println("External interrupt pins:");
if ( ul_Interrupt_Pin3 == 1 )
{
- Serial5.println( "Pin 3 triggered (LOW)" ) ;
+ Serial.println( "Pin 3 triggered (LOW)" ) ;
ul_Interrupt_Pin3 = 0 ;
}
if ( ul_Interrupt_Pin4 == 1 )
{
- Serial5.println( "Pin 4 triggered (HIGH)" ) ;
+ Serial.println( "Pin 4 triggered (HIGH)" ) ;
ul_Interrupt_Pin4 = 0 ;
}
if ( ul_Interrupt_Pin5 == 1 )
{
- Serial5.println( "Pin 5 triggered (FALLING)" ) ;
+ Serial.println( "Pin 5 triggered (FALLING)" ) ;
ul_Interrupt_Pin5 = 0 ;
}
if ( ul_Interrupt_Pin6 == 1 )
{
- Serial5.println( "Pin 6 triggered (RISING)" ) ;
+ Serial.println( "Pin 6 triggered (RISING)" ) ;
ul_Interrupt_Pin6 = 0 ;
}
if ( ul_Interrupt_Pin7 == 1 )
{
- Serial5.println( "Pin 7 triggered (CHANGE)" ) ;
+ Serial.println( "Pin 7 triggered (CHANGE)" ) ;
ul_Interrupt_Pin7 = 0 ;
}
}
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp
index 4b2a7dfddf778949970fd4e0a75efab5f7732a39..5a0a9c6cb968104f49e0e47a117f541db26786a0 100644
--- a/variants/arduino_zero/variant.cpp
+++ b/variants/arduino_zero/variant.cpp
@@ -39,8 +39,14 @@
* | 11 | ~11 | PA16 | | EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] SERCOM3/PAD[0] *TCC2/WO[0] TCC0/WO[6]
* | 12 | ~12 | PA19 | | EIC/EXTINT[3] PTC/X[7] SERCOM1/PAD[3] SERCOM3/PAD[3] TC3/WO[1] *TCC0/WO[3]
* | 13 | ~13 | PA17 | LED | EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] SERCOM3/PAD[1] *TCC2/WO[1] TCC0/WO[7]
+ * +------------+------------------+--------+-----------------+------------------------------
+ * | |Wire | | |
+ * +------------+------------------+--------+-----------------+------------------------------
* | 14 | GND | | |
* | 15 | AREF | PA03 | | *DAC/VREFP PTC/Y[1]
+ * +------------+------------------+--------+-----------------+------------------------------
+ * | | Wire | | |
+ * +------------+------------------+--------+-----------------+------------------------------
* | 16 | SDA | PA22 | | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] SERCOM5/PAD[0] TC4/WO[0] TCC0/WO[4]
* | 17 | SCL | PA23 | | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] SERCOM5/PAD[1] TC4/WO[1] TCC0/WO[5]
* +------------+------------------+--------+-----------------+------------------------------
@@ -105,7 +111,7 @@
*/
const PinDescription g_APinDescription[]=
{
- // 0 .. 19 - Digital pins
+ // 0..13 - Digital pins
// ----------------------
// 0/1 - SERCOM/UART (Serial1)
{ PORTA, 10, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // RX: SERCOM0/PAD[2]
@@ -114,83 +120,77 @@ const PinDescription g_APinDescription[]=
// 2..12
{ PORTA, 8, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
{ PORTA, 9, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
- { PORTA, 14, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH4, TCC0_CH4, EXTERNAL_INT_14 }, // TCC0/WO[4]
- { PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH5, TCC0_CH5, EXTERNAL_INT_15 }, // TCC0/WO[5]
- { PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM7_CH0, TC7_CH0, EXTERNAL_INT_4 }, // TC7/WO[0]
- { PORTA, 21, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM7_CH1, TC7_CH1, EXTERNAL_INT_5 }, // TC7/WO[1]
- { PORTA, 6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_4 }, // TCC1/WO[0]
- { PORTA, 7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_5 }, // TCC1/WO[1]
- { PORTA, 18, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH2, TCC0_CH2, EXTERNAL_INT_2 }, // TCC0/WO[2]
+ { PORTA, 14, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH4, TCC0_CH4, EXTERNAL_INT_14 }, // TCC0/WO[4]
+ { PORTA, 15, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH5, TCC0_CH5, EXTERNAL_INT_15 }, // TCC0/WO[5]
+ { PORTA, 20, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM7_CH0, TC7_CH0, EXTERNAL_INT_4 }, // TC7/WO[0]
+ { PORTA, 21, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM7_CH1, TC7_CH1, EXTERNAL_INT_5 }, // TC7/WO[1]
+ { PORTA, 6, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_4 }, // TCC1/WO[0]
+ { PORTA, 7, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_5 }, // TCC1/WO[1]
+ { PORTA, 18, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH2, TCC0_CH2, EXTERNAL_INT_2 }, // TCC0/WO[2]
{ PORTA, 16, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // TCC2/WO[0]
- { PORTA, 19, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]
+ { PORTA, 19, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]
// 13 (LED)
{ PORTA, 17, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM2_CH1, NOT_ON_TIMER, EXTERNAL_INT_1 }, // TCC2/WO[1]
- // 14 (GND)
- { NOT_A_PORT, 0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-
- // 15 (AREF)
- { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VREFP
+ // 14..19 - Analog pins
+ // --------------------
+ { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
+ { PORTB, 8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // ADC/AIN[2]
+ { PORTB, 9, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel3, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // ADC/AIN[3]
+ { PORTA, 4, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
+ { PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
+ { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]
- // 16..17 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
+ // 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
// ----------------------
{ PORTA, 22, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
{ PORTA, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
- // 18..23 - SPI pins (ICSP:MISO,SCK,MOSI)
+ // 22..24 - SPI pins (ICSP:MISO,SCK,MOSI)
// ----------------------
{ PORTA, 12, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_12 }, // MISO: SERCOM4/PAD[0]
- { NOT_A_PORT, 0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // 5V0
- { PORTB, 11, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // SCK: SERCOM4/PAD[3]
{ PORTB, 10, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // MOSI: SERCOM4/PAD[2]
- { NOT_A_PORT, 0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RESET
- { NOT_A_PORT, 0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // GND
-
- // 24..29 - Analog pins
- // --------------------
- { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
- { PORTB, 8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // ADC/AIN[2]
- { PORTB, 9, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel3, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // ADC/AIN[3]
- { PORTA, 4, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
- { PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
- { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]
+ { PORTB, 11, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // SCK: SERCOM4/PAD[3]
- // 30..31 - RX/TX LEDS (PB03/PA27)
+ // 25..26 - RX/TX LEDS (PB03/PA27)
// --------------------
{ PORTB, 3, PIO_OUTPUT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
- { PORTA, 27, PIO_OUTPUT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as pure only
+ { PORTA, 27, PIO_OUTPUT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
- // 32..33 - USB
+ // 27..29 - USB
// --------------------
{ PORTA, 28, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/SOF
{ PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM
{ PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP
- // 35 .. 46 - EDBG
+ // 30..41 - EDBG
// ----------------------
- // 35/36 - EDBG/UART
+ // 30/31 - EDBG/UART
{ PORTB, 22, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // TX: SERCOM5/PAD[2]
{ PORTB, 23, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
- // 37/38 I2C (SDA/SCL and also EDBG:SDA/SCL)
+ // 32/33 I2C (SDA/SCL and also EDBG:SDA/SCL)
{ PORTA, 22, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SDA: SERCOM3/PAD[0]
{ PORTA, 23, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM3/PAD[1]
- // 39 .. 42 - EDBG/SPI
+ // 34..37 - EDBG/SPI
{ PORTA, 19, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
{ PORTA, 16, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM1/PAD[0]
{ PORTA, 18, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: SERCOM1/PAD[2]
{ PORTA, 17, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM1/PAD[1]
- // 43 .. 46 - EDBG/Digital
+ // 38..41 - EDBG/Digital
{ PORTA, 13, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM0_CH5, NOT_ON_TIMER, EXTERNAL_INT_13 }, // EIC/EXTINT[13] *TCC2/WO[1] TCC0/WO[7]
{ PORTA, 21, PIO_PWM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM0_CH7, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 7
{ PORTA, 6, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH0, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 8
{ PORTA, 7, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH1, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 9
- // ----------------------
- // 47 - Alternate use of A0 (DAC output)
+ // 42 (AREF)
+ { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VREFP
+
+ // ----------------------
+ // 43 - Alternate use of A0 (DAC output)
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // DAC/VOUT
} ;
@@ -204,5 +204,5 @@ SERCOM sercom3( SERCOM3 ) ;
SERCOM sercom4( SERCOM4 ) ;
SERCOM sercom5( SERCOM5 ) ;
-Uart Serial( &sercom0, 0, 1 ) ;
-Uart Serial5( &sercom5, 36, 35 ) ;
+Uart Serial1( &sercom0, 0, 1 ) ;
+Uart Serial( &sercom5, 36, 35 ) ;
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index d414ff2b6664b7865ea262411ca367e78aa7bef4..7c5bdfe212ac40f29368503b639095ec5783935d 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -41,7 +41,8 @@
#endif // __cplusplus
#ifdef __cplusplus
-extern "C"{
+extern "C"
+{
#endif // __cplusplus
/*----------------------------------------------------------------------------
@@ -50,8 +51,8 @@ extern "C"{
// Number of pins defined in PinDescription array
#define PINS_COUNT (34u)
-#define NUM_DIGITAL_PINS (19u)
-#define NUM_ANALOG_INPUTS (5u)
+#define NUM_DIGITAL_PINS (14u)
+#define NUM_ANALOG_INPUTS (6u)
#define NUM_ANALOG_OUTPUTS (1u)
#define digitalPinToPort(P) ( &(PORT->Group[g_APinDescription[P].ulPort]) )
@@ -68,98 +69,65 @@ extern "C"{
// LEDs
#define PIN_LED_13 (13u)
-#define PIN_LED_RXL (30u)
-#define PIN_LED_TXL (31u)
+#define PIN_LED_RXL (25u)
+#define PIN_LED_TXL (26u)
#define PIN_LED PIN_LED_13
#define PIN_LED2 PIN_LED_RXL
#define PIN_LED3 PIN_LED_TXL
#define LED_BUILTIN PIN_LED_13
+/*
+ * Analog pins
+ */
+#define PIN_A0 (14ul)
+#define PIN_A1 (15ul)
+#define PIN_A2 (16ul)
+#define PIN_A3 (17ul)
+#define PIN_A4 (18ul)
+#define PIN_A5 (19ul)
+
+static const uint8_t A0 = PIN_A0 ;
+static const uint8_t A1 = PIN_A1 ;
+static const uint8_t A2 = PIN_A2 ;
+static const uint8_t A3 = PIN_A3 ;
+static const uint8_t A4 = PIN_A4 ;
+static const uint8_t A5 = PIN_A5 ;
+#define ADC_RESOLUTION 12
+
/*
* SPI Interfaces
*/
#define SPI_INTERFACES_COUNT 1
-/*
-#define SPI_INTERFACE SPI0
-#define SPI_INTERFACE_ID ID_SPI0
-#define SPI_CHANNELS_NUM 4
-#define PIN_SPI_SS0 (77u)
-#define PIN_SPI_SS1 (87u)
-#define PIN_SPI_SS2 (86u)
-#define PIN_SPI_SS3 (78u)
-*/
-#define PIN_SPI_MOSI (21u)
-#define PIN_SPI_MISO (18u)
-#define PIN_SPI_SCK (20u)
-/*
-#define BOARD_SPI_SS0 (10u)
-#define BOARD_SPI_SS1 (4u)
-#define BOARD_SPI_SS2 (52u)
-#define BOARD_SPI_SS3 PIN_SPI_SS3
-
-#define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3
-
-#define BOARD_PIN_TO_SPI_PIN(x) \
- (x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
- (x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
- (x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
-#define BOARD_PIN_TO_SPI_CHANNEL(x) \
- (x==BOARD_SPI_SS0 ? 0 : \
- (x==BOARD_SPI_SS1 ? 1 : \
- (x==BOARD_SPI_SS2 ? 2 : 3)))
-
-static const uint8_t SS1 = BOARD_SPI_SS1;
-static const uint8_t SS2 = BOARD_SPI_SS2;
-static const uint8_t SS3 = BOARD_SPI_SS3;*/
-static const uint8_t SS = 14; //GND
-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_SPI_MISO (22u)
+#define PIN_SPI_MOSI (23u)
+#define PIN_SPI_SCK (24u)
+static const uint8_t SS = PIN_A2 ; // SERCOM4 last PAD is present on A2 but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK = PIN_SPI_SCK ;
/*
* Wire Interfaces
*/
#define WIRE_INTERFACES_COUNT 1
-#define PIN_WIRE_SDA (16u)
-#define PIN_WIRE_SCL (17u)
+#define PIN_WIRE_SDA (20u)
+#define PIN_WIRE_SCL (21u)
/*
-#define WIRE_INTERFACE TWI1
-#define WIRE_INTERFACE_ID ID_TWI1
-#define WIRE_ISR_HANDLER TWI1_Handler
-#define WIRE_ISR_ID TWI1_IRQn
+#define WIRE_INTERFACE SERCOM3
+#define WIRE_INTERFACE_ID
+#define WIRE_ISR_HANDLER SERCOM3_Handler
+#define WIRE_ISR_ID SERCOM3_IRQn
*/
-/*
- * UART/USART Interfaces
- */
-// Serial
-//#define PINS_UART (81u)
-
-/*
- * USB Interfaces
- */
-//#define PINS_USB (85u)
-
-/*
- * Analog pins
- */
-static const uint8_t A0 = 24 ;
-static const uint8_t A1 = 25 ;
-static const uint8_t A2 = 26 ;
-static const uint8_t A3 = 27 ;
-static const uint8_t A4 = 28 ;
-static const uint8_t A5 = 29 ;
-#define ADC_RESOLUTION 12
-
/*
* DAC
*/
/*
#define DACC_INTERFACE DACC
-#define DACC_INTERFACE_ID ID_DACC
+#define DACC_INTERFACE_ID
#define DACC_RESOLUTION 12
#define DACC_ISR_HANDLER DACC_Handler
#define DACC_ISR_ID DACC_IRQn
@@ -211,7 +179,7 @@ extern SERCOM sercom4;
extern SERCOM sercom5;
extern Uart Serial;
-extern Uart Serial5;
+extern Uart Serial1;
#endif
@@ -233,12 +201,8 @@ extern Uart Serial5;
#define SERIAL_PORT_MONITOR Serial
#define SERIAL_PORT_USBVIRTUAL SerialUSB
#define SERIAL_PORT_HARDWARE_OPEN Serial1
-#define SERIAL_PORT_HARDWARE_OPEN1 Serial2
-#define SERIAL_PORT_HARDWARE_OPEN2 Serial3
#define SERIAL_PORT_HARDWARE Serial
#define SERIAL_PORT_HARDWARE1 Serial1
-#define SERIAL_PORT_HARDWARE2 Serial2
-#define SERIAL_PORT_HARDWARE3 Serial3
#endif /* _VARIANT_ARDUINO_ZERO_ */