Skip to content

Commit 15029f2

Browse files
tbowmotbowmo
committed
Updated to reflect Arduino samd core 1.6.6
1 parent 5d14b1d commit 15029f2

File tree

2 files changed

+20
-40
lines changed

2 files changed

+20
-40
lines changed

‎variants/mysensors_gw/variant.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ const PinDescription g_APinDescription[]=
118118
{ PORTA, 16, PIO_SERCOM, (PIN_ATTR_NONE), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[0]
119119
{ PORTA, 18, PIO_SERCOM, (PIN_ATTR_NONE), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[2]
120120
{ PORTA, 17, PIO_SERCOM, (PIN_ATTR_NONE), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: SERCOM4/PAD[3]
121-
{ PORTA, 9, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // Reset line
122-
{ PORTA, 12, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_12 }, // Reset line
123-
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14 }, // Reset line
124-
{ PORTA, 13, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_13 }, // Reset line
125-
{ PORTA, 27, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Reset line
126-
{ PORTA, 28, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Reset line
127-
{ PORTB, 7, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // Reset line
121+
{ PORTA, 9, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 },
122+
{ PORTA, 12, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_12 },
123+
{ PORTA, 14, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14 },
124+
{ PORTA, 13, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_13 },
125+
{ PORTA, 27, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
126+
{ PORTA, 28, PIO_OUTPUT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
127+
{ PORTB, 7, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 },
128128

129129
/*
130130
+------------+------------------+--------+-----------------+--------+-----------------------+---------+---------+--------+--------+----------+----------+

‎variants/mysensors_gw/variant.h

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#ifndef _VARIANT_MYSENSORS_GW_
2020
#define _VARIANT_MYSENSORS_GW_
2121

22+
#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10606
23+
2224
/*----------------------------------------------------------------------------
2325
* Definitions
2426
*----------------------------------------------------------------------------*/
@@ -54,15 +56,13 @@ extern "C" {
5456
//#define NUM_ANALOG_INPUTS (6u)
5557
//#define NUM_ANALOG_OUTPUTS (1u)
5658

57-
#define digitalPinToPort(P) (&(PORT->Group[g_APinDescription[P].ulPort]))
58-
#define digitalPinToBitMask(P) (1 << g_APinDescription[P].ulPin)
59+
#define digitalPinToPort(P) ( &(PORT->Group[g_APinDescription[P].ulPort]) )
60+
#define digitalPinToBitMask(P) ( 1 << g_APinDescription[P].ulPin )
5961
//#define analogInPinToBit(P) ( )
60-
#define portOutputRegister(port) (&(port->OUT.reg))
61-
#define portInputRegister(port) (&(port->IN.reg))
62-
#define portModeRegister(port) (&(port->DIR.reg))
63-
#define digitalPinHasPWM(P) \
64-
(g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || \
65-
g_APinDescription[P].ulTCChannel != NOT_ON_TIMER)
62+
#define portOutputRegister(port) ( &(port->OUT.reg) )
63+
#define portInputRegister(port) ( &(port->IN.reg) )
64+
#define portModeRegister(port) ( &(port->DIR.reg) )
65+
#define digitalPinHasPWM(P) ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
6666

6767
/*
6868
* digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
@@ -73,9 +73,6 @@ extern "C" {
7373
*/
7474
// #define digitalPinToTimer(P)
7575

76-
// Interrupts
77-
#define digitalPinToInterrupt(P) (g_APinDescription[P].ulExtInt)
78-
7976
// LEDs
8077
#define PIN_LED_13 (7u)
8178
#define PIN_LED_RXL (6u)
@@ -177,33 +174,16 @@ static const uint8_t SCK2 = PIN_SPI2_SCK;
177174
#define SPI_ETH SPI1
178175
#define SPI_USER SPI2
179176

180-
/*
181-
#define RADIO_SPI_MISO (36u)
182-
#define RADIO_SPI_MOSI (35u)
183-
#define RADIO_SPI_SCK (37u)
184-
185-
#define NET_SPI_MISO (48u)
186-
#define NET_SPI_MOSI (47u)
187-
#define NET_SPI_SCK (49u)
188-
189-
#define USR_SPI_MISO (48u)
190-
#define USR_SPI_MOSI (47u)
191-
#define USR_SPI_SCK (49u)
192-
*/
193-
194-
// static const uint8_t SS = PIN_A2 ; // SERCOM4 last PAD is present
195-
// on A2 but HW SS isn't used. Set here only for reference.
196-
/*static const uint8_t MOSI = PIN_SPI_MOSI ;
197-
static const uint8_t MISO = PIN_SPI_MISO ;
198-
static const uint8_t SCK = PIN_SPI_SCK ;
199-
*/
200177
/*
201178
* Wire Interfaces
202179
*/
203180
#define WIRE_INTERFACES_COUNT 1
204181

205-
#define PIN_WIRE_SDA (07u)
206-
#define PIN_WIRE_SCL (06u)
182+
#define PIN_WIRE_SDA (07u)
183+
#define PIN_WIRE_SCL (06u)
184+
185+
static const uint8_t SDA = PIN_WIRE_SDA;
186+
static const uint8_t SCL = PIN_WIRE_SCL;
207187

208188
/*
209189
* USB

0 commit comments

Comments
 (0)