Skip to content

Commit d7a0778

Browse files
author
Jim Lindblom
committed
Updating variants folder to match Arduino 1.6.5 samd definitions.
1 parent 2a1cea2 commit d7a0778

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

‎sparkfun/samd/variants/SparkFun_SAMD_Mini/variant.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const PinDescription g_APinDescription[]=
123123
{ 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]
124124
{ 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]
125125
{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_15 }, // TC3/WO[1]
126-
{ PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
126+
{ PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
127127
{ PORTA, 21, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
128128

129129
// Digital High

‎sparkfun/samd/variants/SparkFun_SAMD_Mini/variant.h

+12-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifndef _VARIANT_ARDUINO_ZERO_
2020
#define _VARIANT_ARDUINO_ZERO_
2121

22+
// The definitions here needs a SAMD core >=1.6.3
23+
#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10603
24+
2225
/*----------------------------------------------------------------------------
2326
* Definitions
2427
*----------------------------------------------------------------------------*/
@@ -93,13 +96,15 @@ extern "C"
9396
#define PIN_A3 (17ul)
9497
#define PIN_A4 (18ul)
9598
#define PIN_A5 (19ul)
96-
97-
static const uint8_t A0 = PIN_A0 ;
98-
static const uint8_t A1 = PIN_A1 ;
99-
static const uint8_t A2 = PIN_A2 ;
100-
static const uint8_t A3 = PIN_A3 ;
101-
static const uint8_t A4 = PIN_A4 ;
102-
static const uint8_t A5 = PIN_A5 ;
99+
#define PIN_DAC0 (14ul)
100+
101+
static const uint8_t A0 = PIN_A0;
102+
static const uint8_t A1 = PIN_A1;
103+
static const uint8_t A2 = PIN_A2;
104+
static const uint8_t A3 = PIN_A3;
105+
static const uint8_t A4 = PIN_A4;
106+
static const uint8_t A5 = PIN_A5;
107+
static const uint8_t DAC0 = PIN_DAC0;
103108
#define ADC_RESOLUTION 12
104109

105110
// Other pins

‎sparkfun/samd/variants/arduino_zero/variant.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,27 @@ const PinDescription g_APinDescription[]=
123123
{ 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]
124124
{ 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]
125125
{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_15 }, // TC3/WO[1]
126-
{ PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
126+
{ PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
127127
{ PORTA, 21, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
128128

129129
// Digital High
130130
{ PORTA, 6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
131131
{ PORTA, 7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // TCC1/WO[1]
132132
{ PORTA, 18, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_2 }, // TC3/WO[0]
133133
{ 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]
134-
{ 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]
134+
{ PORTA, 19, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]
135135

136136
// 13 (LED)
137137
{ PORTA, 17, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM2_CH1, NOT_ON_TIMER, EXTERNAL_INT_1 }, // TCC2/WO[1]
138138

139139
// 14..19 - Analog pins
140140
// --------------------
141141
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
142-
{ PORTB, 8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // ADC/AIN[2]
143-
{ PORTB, 9, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel3, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // ADC/AIN[3]
144-
{ PORTA, 4, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
145-
{ PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
146-
{ PORTB, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]
142+
{ PORTB, 8, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel2, PWM4_CH0, TC4_CH0, EXTERNAL_INT_8 }, // ADC/AIN[2]
143+
{ PORTB, 9, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel3, PWM4_CH1, TC4_CH1, EXTERNAL_INT_9 }, // ADC/AIN[3]
144+
{ PORTA, 4, PIO_ANALOG, 0, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
145+
{ PORTA, 5, PIO_ANALOG, 0, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
146+
{ PORTB, 2, PIO_ANALOG, 0, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]
147147

148148
// 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
149149
// ----------------------

‎sparkfun/samd/variants/arduino_zero/variant.h

+12-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifndef _VARIANT_ARDUINO_ZERO_
2020
#define _VARIANT_ARDUINO_ZERO_
2121

22+
// The definitions here needs a SAMD core >=1.6.3
23+
#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10603
24+
2225
/*----------------------------------------------------------------------------
2326
* Definitions
2427
*----------------------------------------------------------------------------*/
@@ -93,13 +96,15 @@ extern "C"
9396
#define PIN_A3 (17ul)
9497
#define PIN_A4 (18ul)
9598
#define PIN_A5 (19ul)
96-
97-
static const uint8_t A0 = PIN_A0 ;
98-
static const uint8_t A1 = PIN_A1 ;
99-
static const uint8_t A2 = PIN_A2 ;
100-
static const uint8_t A3 = PIN_A3 ;
101-
static const uint8_t A4 = PIN_A4 ;
102-
static const uint8_t A5 = PIN_A5 ;
99+
#define PIN_DAC0 (14ul)
100+
101+
static const uint8_t A0 = PIN_A0;
102+
static const uint8_t A1 = PIN_A1;
103+
static const uint8_t A2 = PIN_A2;
104+
static const uint8_t A3 = PIN_A3;
105+
static const uint8_t A4 = PIN_A4;
106+
static const uint8_t A5 = PIN_A5;
107+
static const uint8_t DAC0 = PIN_DAC0;
103108
#define ADC_RESOLUTION 12
104109

105110
// Other pins

0 commit comments

Comments
 (0)