Skip to content
Snippets Groups Projects
Commit f478a172 authored by Jonathan BAUDIN's avatar Jonathan BAUDIN
Browse files

Merge branch 'zero' of github.com:arduino/ArduinoZero into zero 

Conflicts:
	hardware/arduino/samd/cores/arduino/Arduino.h
	hardware/arduino/samd/cores/arduino/validation/build_gcc/test.mk
	hardware/arduino/samd/variants/arduino_zero/variant.h
parents f307bf45 c594b75f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 407 additions and 183 deletions
boards.txt
+ 4
− 47
View file @ f478a172
......@@ -8,12 +8,12 @@ arduino_zero_dbg.upload.maximum_size=262144
arduino_zero_dbg.upload.use_1200bps_touch=false
arduino_zero_dbg.upload.wait_for_upload_port=false
arduino_zero_dbg.upload.native_usb=false
arduino_zero_dbg.build.mcu=cortex-m0p
arduino_zero_dbg.build.mcu=cortex-m0plus
arduino_zero_dbg.build.f_cpu=48000000L
arduino_zero_dbg.build.usb_product="Arduino Zero"
arduino_zero_dbg.build.board=SAM_ZERO
arduino_zero_dbg.build.core=arduino
arduino_zero_dbg.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
arduino_zero_dbg.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
arduino_zero_dbg.build.ldscript=linker_scripts/gcc/flash.ld
arduino_zero_dbg.build.variant=arduino_zero
arduino_zero_dbg.build.variant_system_lib=
......@@ -29,57 +29,14 @@ arduino_zero.upload.maximum_size=262144
arduino_zero.upload.use_1200bps_touch=false
arduino_zero.upload.wait_for_upload_port=false
arduino_zero.upload.native_usb=true
arduino_zero.build.mcu=cortex-m0p
arduino_zero.build.mcu=cortex-m0plus
arduino_zero.build.f_cpu=48000000L
arduino_zero.build.usb_product="Arduino Zero"
arduino_zero.build.board=SAM_ZERO
arduino_zero.build.core=arduino
arduino_zero.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
arduino_zero.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
arduino_zero.build.ldscript=linker_scripts/gcc/flash.ld
arduino_zero.build.variant=arduino_zero
arduino_zero.build.variant_system_lib=
arduino_zero.build.vid=0x2341
arduino_zero.build.pid=0x004d
arduino_zero_dbg.name=SAMS21-XPRO (Programming Port)
arduino_zero_dbg.vid.0=0x03eb
arduino_zero_dbg.pid.0=0x2111
arduino_zero_dbg.upload.tool=bossac
arduino_zero_dbg.upload.protocol=sam-ba
arduino_zero_dbg.upload.maximum_size=262144
arduino_zero_dbg.upload.use_1200bps_touch=false
arduino_zero_dbg.upload.wait_for_upload_port=false
arduino_zero_dbg.upload.native_usb=false
arduino_zero_dbg.build.mcu=cortex-m0p
arduino_zero_dbg.build.f_cpu=48000000L
arduino_zero_dbg.build.usb_product="SAMD21-XPRO"
arduino_zero_dbg.build.board=SAM_ZERO
arduino_zero_dbg.build.core=arduino
arduino_zero_dbg.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
arduino_zero_dbg.build.ldscript=linker_scripts/gcc/flash.ld
arduino_zero_dbg.build.variant=samd21_xpro
arduino_zero_dbg.build.variant_system_lib=
arduino_zero_dbg.build.vid=0x03eb
arduino_zero_dbg.build.pid=0x2111
arduino_zero.name=SAMS21-XPRO (Native USB Port)
arduino_zero.vid.0=0x2341
arduino_zero.pid.0=0x004d
arduino_zero.upload.tool=bossac
arduino_zero.upload.protocol=sam-ba
arduino_zero.upload.maximum_size=262144
arduino_zero.upload.use_1200bps_touch=false
arduino_zero.upload.wait_for_upload_port=false
arduino_zero.upload.native_usb=true
arduino_zero.build.mcu=cortex-m0p
arduino_zero.build.f_cpu=48000000L
arduino_zero.build.usb_product="SAMD21-XPRO"
arduino_zero.build.board=SAM_ZERO
arduino_zero.build.core=arduino
arduino_zero.build.extra_flags=-D__SAMD21J18A__ -mthumb {build.usb_flags}
arduino_zero.build.ldscript=linker_scripts/gcc/flash.ld
arduino_zero.build.variant=samd21_xpro
arduino_zero.build.variant_system_lib=
arduino_zero.build.vid=0x2341
arduino_zero.build.pid=0x004d
cores/arduino/Arduino.h
+ 21
− 13
View file @ f478a172
......@@ -53,9 +53,6 @@ void yield( void ) ;
extern void setup( void ) ;
extern void loop( void ) ;
//#define NOT_A_PIN 0 // defined in pio.h/EPioType
#define NOT_A_PORT 0
#define NOT_AN_INTERRUPT -1
typedef enum _EExt_Interrupts
......@@ -87,11 +84,19 @@ typedef enum _EAnalogChannel
{
NO_ADC=-1,
ADC0=0,
ADC1,
ADC2,
ADC3,
ADC4,
ADC5
ADC1=1,
ADC2=2,
ADC3=3,
ADC4=4,
ADC5=5,
ADC6=6,
ADC7=7,
ADC10=10,
ADC16=16,
ADC17=17,
ADC18=18,
ADC19=19,
DAC0,
} EAnalogChannel ;
#define ADC_CHANNEL_NUMBER_NONE 0xffffffff
......@@ -134,9 +139,13 @@ typedef enum _ETCChannel
// TC2_CHB8
} ETCChannel ;
#define PORTA (0ul)
#define PORTB (1ul)
#define PORTC (2ul)
typedef enum _EPortType
{
NOT_A_PORT=-1,
PORTA=0,
PORTB=1,
PORTC=2,
} EPortType ;
//A B C D E F G H
//EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK
......@@ -171,9 +180,8 @@ typedef enum _EPioType
/* Types used for the table below */
typedef struct _PinDescription
{
void* pPort ;
uint32_t ulPort ;
uint32_t ulPin ;
// uint32_t ulPeripheralId ;
EPioType ulPinType ;
uint32_t ulPinConfiguration ;
uint32_t ulPinAttribute ;
......
cores/arduino/validation/build_gcc/test.mk
+ 15
− 12
View file @ f478a172
......@@ -25,13 +25,13 @@ VARIANT=arduino_zero
endif
ifeq ("$(VARIANT)", "arduino_zero")
DEVICE=__SAMD21G18__
DEVICE=__SAMD21G18A__
endif
ifeq ($(DEVICE), __SAMD21G18__)
ifeq ($(DEVICE), __SAMD21G18A__)
DEVICE_NAME=samd21g18
DEVICE_SERIE=samd21
else ifeq ($(DEVICE), __SAMD21J18__)
else ifeq ($(DEVICE), __SAMD21J18A__)
DEVICE_NAME=samd21j18
DEVICE_SERIE=samd21
endif
......@@ -62,7 +62,7 @@ OUTPUT_PATH = debug_$(VARIANT)
# Files
#-------------------------------------------------------------------------------
vpath %.cpp $(PROJECT_BASE_PATH)
vpath %.cpp $(PROJECT_BASE_PATH) $(ARDUINO_CORE_PATH) $(VARIANT_PATH)
vpath %.c $(ARDUINO_CORE_PATH) $(VARIANT_PATH)
#VPATH+=$(PROJECT_BASE_PATH)
......@@ -72,7 +72,7 @@ INCLUDES += -I$(ARDUINO_USB_PATH)
INCLUDES += -I$(VARIANT_PATH)
INCLUDES += -I$(CMSIS_ARM_PATH)
INCLUDES += -I$(CMSIS_ATMEL_PATH)
INCLUDES += -I$(CMSIS_DEVICE_PATH)
#INCLUDES += -I$(CMSIS_DEVICE_PATH)
#-------------------------------------------------------------------------------
ifdef DEBUG
......@@ -109,9 +109,10 @@ LIB_PATH+=-L=/lib/thumb2
#-------------------------------------------------------------------------------
# C source files and objects
#-------------------------------------------------------------------------------
C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_SRC+=$(wildcard $(ARDUINO_CORE_PATH)/*.c)
C_SRC+=$(wildcard $(VARIANT_PATH)/*.c)
C_SRC=
#C_SRC+=$(wildcard $(PROJECT_BASE_PATH)/*.c)
#C_SRC+=$(wildcard $(ARDUINO_CORE_PATH)/*.c)
#C_SRC+=$(wildcard $(VARIANT_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
......@@ -182,14 +183,16 @@ create_output:
@echo ------------------------------------------------------------------------------------
$(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c
@echo Current folder is $(shell cd)
@echo Current folder is $(shell cd) - $@ $^
# @"$(CC)" -c $(CFLAGS) $< -o $@
"$(CC)" -v -c $(CFLAGS) $< -o $@
# "$(CC)" -v -c $(CFLAGS) $< -o $@
"$(CC)" -c $(CFLAGS) $< -o $@
$(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp
@echo Current folder is $(shell cd)
@echo Current folder is $(shell cd) - $@ $^
# @"$(CXX)" -c $(CPPFLAGS) $< -o $@
"$(CXX)" -v -c $(CPPFLAGS) $< -o $@
# "$(CXX)" -v -c $(CPPFLAGS) $< -o $@
"$(CXX)" -c $(CPPFLAGS) $< -o $@
$(OUTPUT_BIN): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ))
@"$(CC)" $(LIB_PATH) $(LDFLAGS) -T"$(VARIANT_PATH)/linker_scripts/gcc/flash.ld" -Wl,-Map,$(OUTPUT_PATH)/$@.map -o $(OUTPUT_PATH)/$@.elf $^ $(LIBS)
......
cores/arduino/validation/test.cpp
+ 8
− 24
View file @ f478a172
......@@ -18,6 +18,7 @@
#include "Arduino.h"
/*
#ifdef _VARIANT_SAM3X_EK_
#define MAX_ANALOG A0
#elif defined _VARIANT_ARDUINO_DUE_X_
......@@ -25,9 +26,11 @@
#elif defined _VARIANT_ADK2_
#define MAX_ANALOG A9
#endif
*/
void setup( void )
{
/*
// Initialize the digital pin as an output.
// Pin PIN_LED has a LED connected on most Arduino boards:
pinMode( PIN_LED, OUTPUT ) ;
......@@ -38,46 +41,26 @@ void setup( void )
digitalWrite( PIN_LED2, HIGH ) ;
Serial1.begin( 115200 ) ;
*/
}
/*
static void led_step1( void )
{
#if defined sam3s_ek
digitalWrite( PIN_LED, HIGH ) ; // set the LED on
digitalWrite( PIN_LED2, LOW ) ; // set the red LED off
#endif /* sam3s_ek */
#if defined sam3u_ek
digitalWrite( PIN_LED, HIGH ) ; // set the LED on
digitalWrite( PIN_LED2, LOW ) ; // set the red LED off
#endif /* sam3u_ek */
#if defined arduino_due_x
digitalWrite( PIN_LED, LOW ) ; // set the LED on
digitalWrite( PIN_LED2, LOW ) ; // set the red LED off
#endif /* arduino_due_x */
}
static void led_step2( void )
{
#if defined sam3s_ek
digitalWrite( PIN_LED, LOW ) ; // set the LED off
digitalWrite( PIN_LED2, HIGH ) ; // set the red LED on
#endif /* sam3s_ek */
#if defined sam3u_ek
digitalWrite( PIN_LED, LOW ) ; // set the LED off
digitalWrite( PIN_LED2, HIGH ) ; // set the red LED on
#endif /* sam3u_ek */
#if defined arduino_due_x
digitalWrite( PIN_LED, HIGH ) ; // set the LED off
digitalWrite( PIN_LED2, HIGH ) ; // set the red LED on
#endif /* arduino_due_x */
}
*/
void loop( void )
{
/*
led_step1() ;
delay( 1000 ) ; // wait for a second
led_step2() ;
......@@ -95,4 +78,5 @@ void loop( void )
}
Serial1.println();
delay(100);
*/
}
platform.txt
+ 1
− 1
View file @ f478a172
......@@ -7,7 +7,7 @@
name=Arduino ARM (32-bits) Boards
version=1.5.6
# SAM3 compile variables
# SAMD compile variables
# ----------------------
compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
......
variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld 0 → 100644
+ 191
− 0
View file @ f478a172
/* Linker script to configure memory regions.
* Need modifying for a specific board.
* FLASH.ORIGIN: starting address of flash
* FLASH.LENGTH: length of flash
* RAM.ORIGIN: starting address of RAM bank 0
* RAM.LENGTH: length of RAM bank 0
*/
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
}
/* Linker script to place sections and symbol values. Should be used together
* with other linker script that defines memory regions FLASH and RAM.
* It references following symbols, which must be defined in code:
* Reset_Handler : Entry of reset handler
*
* It defines following symbols, which code can use without definition:
* __exidx_start
* __exidx_end
* __copy_table_start__
* __copy_table_end__
* __zero_table_start__
* __zero_table_end__
* __etext
* __data_start__
* __preinit_array_start
* __preinit_array_end
* __init_array_start
* __init_array_end
* __fini_array_start
* __fini_array_end
* __data_end__
* __bss_start__
* __bss_end__
* __end__
* end
* __HeapLimit
* __StackLimit
* __StackTop
* __stack
*/
ENTRY(Reset_Handler)
SECTIONS
{
.text :
{
KEEP(*(.isr_vector))
*(.text*)
KEEP(*(.init))
KEEP(*(.fini))
/* .ctors */
*crtbegin.o(.ctors)
*crtbegin?.o(.ctors)
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
*(SORT(.ctors.*))
*(.ctors)
/* .dtors */
*crtbegin.o(.dtors)
*crtbegin?.o(.dtors)
*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
*(SORT(.dtors.*))
*(.dtors)
*(.rodata*)
KEEP(*(.eh_frame*))
} > FLASH
.ARM.extab :
{
*(.ARM.extab* .gnu.linkonce.armextab.*)
} > FLASH
__exidx_start = .;
.ARM.exidx :
{
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
} > FLASH
__exidx_end = .;
/* To copy multiple ROM to RAM sections,
* uncomment .copy.table section and,
* define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
/*
.copy.table :
{
. = ALIGN(4);
__copy_table_start__ = .;
LONG (__etext)
LONG (__data_start__)
LONG (__data_end__ - __data_start__)
LONG (__etext2)
LONG (__data2_start__)
LONG (__data2_end__ - __data2_start__)
__copy_table_end__ = .;
} > FLASH
*/
/* To clear multiple BSS sections,
* uncomment .zero.table section and,
* define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
/*
.zero.table :
{
. = ALIGN(4);
__zero_table_start__ = .;
LONG (__bss_start__)
LONG (__bss_end__ - __bss_start__)
LONG (__bss2_start__)
LONG (__bss2_end__ - __bss2_start__)
__zero_table_end__ = .;
} > FLASH
*/
__etext = .;
.data : AT (__etext)
{
__data_start__ = .;
*(vtable)
*(.data*)
. = ALIGN(4);
/* preinit data */
PROVIDE_HIDDEN (__preinit_array_start = .);
KEEP(*(.preinit_array))
PROVIDE_HIDDEN (__preinit_array_end = .);
. = ALIGN(4);
/* init data */
PROVIDE_HIDDEN (__init_array_start = .);
KEEP(*(SORT(.init_array.*)))
KEEP(*(.init_array))
PROVIDE_HIDDEN (__init_array_end = .);
. = ALIGN(4);
/* finit data */
PROVIDE_HIDDEN (__fini_array_start = .);
KEEP(*(SORT(.fini_array.*)))
KEEP(*(.fini_array))
PROVIDE_HIDDEN (__fini_array_end = .);
KEEP(*(.jcr*))
. = ALIGN(4);
/* All data end */
__data_end__ = .;
} > RAM
.bss :
{
. = ALIGN(4);
__bss_start__ = .;
*(.bss*)
*(COMMON)
. = ALIGN(4);
__bss_end__ = .;
} > RAM
.heap (COPY):
{
__end__ = .;
PROVIDE(end = .);
*(.heap*)
__HeapLimit = .;
} > RAM
/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
* values to stack symbols later */
.stack_dummy (COPY):
{
*(.stack*)
} > RAM
/* Set stack top to end of RAM, and stack limit move down by
* size of stack_dummy section */
__StackTop = ORIGIN(RAM) + LENGTH(RAM);
__StackLimit = __StackTop - SIZEOF(.stack_dummy);
PROVIDE(__stack = __StackTop);
/* Check if data + heap + stack exceeds RAM limit */
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
}
variants/arduino_zero/variant.cpp
+ 145
− 60
View file @ f478a172
/*
Copyright (c) 2014 Arduino. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*
*
* ZERO Board pin | PIN | Label/Name
* ------------------+--------+-----------------
* Analog Connector | |
* ------------------+--------+-----------------
* 1 | PA02 | A0
* 2 | PB08 | A1
* 3 | PB09 | A2
* 4 | PA04 | A3
* 5 | PA05 | A4
* 6 | PB02 | A5
* ------------------+--------+-----------------
* Digital Low | |
* ------------------+--------+-----------------
* 1 | PA10 | 0 -> RX
* 2 | PA11 | 1 <- TX
* 3 | PA08 | ~2
* 4 | PA09 | ~3
* 5 | PA14 | ~4
* 6 | PA15 | ~5
* 7 | PA20 | ~6
* 8 | PA21 | ~7
* ------------------+--------+-----------------
* Digital High | |
* ------------------+--------+-----------------
* 1 | PA06 | ~8
* 2 | PA07 | ~9
* 3 | PA18 | ~10
* 4 | PA16 | ~11
* 5 | PA19 | ~12
* 6 | PA17 | ~13
* 7 | | GND
* 8 | PA03 | AREF
* 9 | PA22 | SDA
* 10 | PA23 | SCL
* ------------------+--------+-----------------
* SPI (Legacy ICSP) | |
* ------------------+--------+-----------------
* 1 | PA12 | MISO
* 2 | | 5V0
* 3 | PB11 | SCK
* 4 | PB10 | MOSI
* 5 | | RESET
* 6 | | GND
* ------------------+--------+-----------------
* LEDs | |
* ------------------+--------+-----------------
* | PB03 | RX
* | PA27 | TX
* ------------------+--------+-----------------
* USB | |
* ------------------+--------+-----------------
* | PA28 | USB HOST ENABLE
* | PA24 | USB_NEGATIVE
* | PA25 | USB_POSITIVE
* ------------------+--------+-----------------
* 32.768KHz Crystal | |
* ------------------+--------+-----------------
* | PA00 | XIN32
* | PA01 | XOUT32
*
* + Pin number + ZERO Board pin | PIN | Label/Name | Comments (* is for default peripheral in use)
* +------------+------------------+--------+-----------------+------------------------------
* | | Digital Low | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 0 | 0 -> RX | PA10 | | EIC/EXTINT[10] ADC/AIN[18] *SERCOM0/PAD[2] TCC1/WO[0] TCC0/WO[2]
* | 1 | 1 <- TX | PA11 | | EIC/EXTINT[11] ADC/AIN[19] *SERCOM0/PAD[3] SERCOM2/PAD[3] TCC1/WO[1] TCC0/WO[3]
* | 2 | ~2 | PA08 | | EIC/NMI ADC/AIN[16] SERCOM0/PAD[0] SERCOM2/PAD[0] *TCC0/WO[0] TCC1/WO[2]
* | 3 | ~3 | PA09 | | EIC/EXTINT[9] ADC/AIN[17] SERCOM0/PAD[1] SERCOM2/PAD[1] *TCC0/WO[1] TCC1/WO[3]
* | 4 | ~4 | PA14 | | EIC/EXTINT[14] SERCOM2/PAD[2] SERCOM4/PAD[2] *TC3/WO[0] TCC0/WO[4]
* | 5 | ~5 | PA15 | | EIC/EXTINT[15] SERCOM2/PAD[3] SERCOM4/PAD[3] *TC3/WO[1] TCC0/WO[5]
* | 6 | ~6 | PA20 | | EIC/EXTINT[4] SERCOM5/PAD[2] SERCOM3/PAD[2] TC7/WO[0] *TCC0/WO[6]
* | 7 | ~7 | PA21 | | EIC/EXTINT[5] SERCOM5/PAD[3] SERCOM3/PAD[3] TC7/WO[1] *TCC0/WO[7]
* +------------+------------------+--------+-----------------+------------------------------
* | | Digital High | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 8 | ~8 | PA06 | | EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] SERCOM0/PAD[2] *TCC1/WO[0]
* | 9 | ~9 | PA07 | | EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] SERCOM0/PAD[3] *TCC1/WO[1]
* | 10 | ~10 | PA18 | | EIC/EXTINT[2] SERCOM1/PAD[2] SERCOM3/PAD[2] *TC3/WO[0] TCC0/WO[2]
* | 11 | ~11 | PA16 | | EIC/EXTINT[0] SERCOM1/PAD[0] SERCOM3/PAD[0] *TCC2/WO[0] TCC0/WO[6]
* | 12 | ~12 | PA19 | | EIC/EXTINT[3] SERCOM1/PAD[3] SERCOM3/PAD[3] *TC3/WO[1] TCC0/WO[3]
* | 13 | ~13 | PA17 | LED | EIC/EXTINT[1] SERCOM1/PAD[1] SERCOM3/PAD[1] *TCC2/WO[1] TCC0/WO[7]
* | 14 | GND | | |
* | 15 | AREF | PA03 | | *DAC/VREFP
* | 16 | SDA | PA22 | | EIC/EXTINT[6] *SERCOM3/PAD[0] SERCOM5/PAD[0] TC4/WO[0] TCC0/WO[4]
* | 17 | SCL | PA23 | | EIC/EXTINT[7] *SERCOM3/PAD[1] SERCOM5/PAD[1] TC4/WO[1] TCC0/WO[5]
* +------------+------------------+--------+-----------------+------------------------------
* | |SPI (Legacy ICSP) | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 18 | 1 | PA12 | MISO | EIC/EXTINT[12] SERCOM2/PAD[0] *SERCOM4/PAD[0] TCC2/WO[0] TCC0/WO[6]
* | 19 | 2 | | 5V0 |
* | 20 | 3 | PB11 | SCK | EIC/EXTINT[11] *SERCOM4/PAD[3] TC5/WO[1] TCC0/WO[5]
* | 21 | 4 | PB10 | MOSI | EIC/EXTINT[10] *SERCOM4/PAD[2] TC5/WO[0] TCC0/WO[4]
* | 22 | 5 | | RESET |
* | 23 | 6 | | GND |
* +------------+------------------+--------+-----------------+------------------------------
* | | Analog Connector | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 24 | A0 | PA02 | | EIC/EXTINT[2] *DAC/VOUT
* | 25 | A1 | PB08 | | EIC/EXTINT[8] *ADC/AIN[2] SERCOM4/PAD[0] TC4/WO[0]
* | 26 | A2 | PB09 | | EIC/EXTINT[9] *ADC/AIN[3] SERCOM4/PAD[1] TC4/WO[1]
* | 27 | A3 | PA04 | | EIC/EXTINT[4] *ADC/AIN[4] AC/AIN[0] SERCOM0/PAD[0] TCC0/WO[0]
* | 28 | A4 | PA05 | | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] SERCOM0/PAD[1] TCC0/WO[1]
* | 29 | A5 | PB02 | | EIC/EXTINT[2] *ADC/AIN[10] SERCOM5/PAD[0] TC6/WO[0]
* +------------+------------------+--------+-----------------+------------------------------
* | | LEDs | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 30 | | PB03 | RX |
* | 31 | | PA27 | TX |
* +------------+------------------+--------+-----------------+------------------------------
* | | USB | | |
* +------------+------------------+--------+-----------------+------------------------------
* | 32 | | PA28 | USB HOST ENABLE |
* | 33 | | PA24 | USB_NEGATIVE | USB/DM
* | 34 | | PA25 | USB_POSITIVE | USB/DP
* +------------+------------------+--------+-----------------+------------------------------
* | |32.768KHz Crystal | | |
* +------------+------------------+--------+-----------------+------------------------------
* | | | PA00 | XIN32 | EXTINT[0] SERCOM1/PAD[0] TCC2/WO[0]
* | | | PA01 | XOUT32 | EXTINT[1] SERCOM1/PAD[1] TCC2/WO[1]
* +------------+------------------+--------+-----------------+------------------------------
*/
/*
* Pins descriptions
*/
extern const PinDescription g_APinDescription[]=
{
// 0 .. 19 - Digital pins
// ----------------------
// 0/1 - SERCOM/UART (Serial)
{ PORTA, 10, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // RX: SERCOM0/PAD[2]
{ PORTA, 11, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TX: SERCOM0/PAD[3]
// 2..12
{ PORTA, 8, PIO_TIMER, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC0/WO[0]
{ PORTA, 9, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC0/WO[1]
{ PORTA, 14, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TC3/WO[0]
{ PORTA, 15, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TC3/WO[1]
{ PORTA, 20, PIO_TIMER_ALT, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC0/WO[6]
{ PORTA, 21, PIO_TIMER_ALT, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC0/WO[7]
{ PORTA, 6, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC1/WO[0]
{ PORTA, 7, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC1/WO[1]
{ PORTA, 18, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TC3/WO[0]
{ PORTA, 16, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC2/WO[0]
{ PORTA, 19, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TC3/WO[1]
// 13 (LED)
{ PORTA, 17, PIO_TIMER, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // TCC2/WO[1]
// 14 (GND)
{ NOT_A_PORT, 0, PIO_NOT_A_PIN, 0, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER },
// 15 (AREF)
{ PORTA, 3, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // DAC/VREFP
// 16..17 I2C (SDA/SCL)
{ PORTA, 22, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // SDA: SERCOM3/PAD[0]
{ PORTA, 23, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // SCL: SERCOM3/PAD[1]
// 18..23 SPI (ICSP:MISO,SCK,MOSI)
{ PORTA, 12, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // MISO: SERCOM4/PAD[0]
{ NOT_A_PORT, 0, PIO_NOT_A_PIN, 0, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // 5V0
{ PORTB, 11, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // SCK: SERCOM4/PAD[3]
{ PORTB, 10, PIO_SERCOM, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // MOSI: SERCOM4/PAD[2]
{ NOT_A_PORT, 0, PIO_NOT_A_PIN, 0, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // RESET
{ NOT_A_PORT, 0, PIO_NOT_A_PIN, 0, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // GND
// 24..29 - Analog pins
// --------------------
// 24 - A0 (DAC output)
{ PORTA, PORT_PA02B_DAC_VOUT, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, DAC0, A0, NOT_ON_PWM, NOT_ON_TIMER }, // DAC/VOUT
// 25..29 - A1-A5
{ PORTB, 8, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC2, A1, NOT_ON_PWM, NOT_ON_TIMER }, // ADC/AIN[2]
{ PORTB, 9, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC3, A2, NOT_ON_PWM, NOT_ON_TIMER }, // ADC/AIN[3]
{ PORTA, 4, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC4, A3, NOT_ON_PWM, NOT_ON_TIMER }, // ADC/AIN[4]
{ PORTA, 5, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC5, A4, NOT_ON_PWM, NOT_ON_TIMER }, // ADC/AIN[5]
{ PORTA, 2, PIO_ANALOG, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC10, A5, NOT_ON_PWM, NOT_ON_TIMER }, // ADC/AIN[10]
// 30..31 - RX/TX LEDS (PB03/PA27)
{ PORTB, 3, PIO_DIGITAL, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // use as pure output
{ PORTA, 27, PIO_DIGITAL, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // use as pure output
// 32..33 - USB
{ PORTA, 28, PIO_COM, PIO_DEFAULT, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // USB/SOF
{ PORTA, 24, PIO_COM, PIO_DEFAULT, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // USB/DM
{ PORTA, 25, PIO_COM, PIO_DEFAULT, 0, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // USB/DP
} ;
variants/arduino_zero/variant.h
+ 22
− 26
View file @ f478a172
......@@ -54,17 +54,17 @@ extern "C"{
*----------------------------------------------------------------------------*/
// Number of pins defined in PinDescription array
#define PINS_COUNT (25u)
#define PINS_COUNT (34u)
#define NUM_DIGITAL_PINS (19u)
#define NUM_ANALOG_INPUTS (5u)
#define NUM_ANALOG_OUTPUTS (1u)
#define digitalPinToPort(P) ( g_APinDescription[P].pPort )
#define digitalPinToBitMask(P) ( g_APinDescription[P].ulPin )
#define digitalPinToPort(P) ( &(PORT->Group[g_APinDescription[P].ulPort]) )
#define digitalPinToBitMask(P) ( 1 << g_APinDescription[P].ulPin )
#define digitalPinToTimer(P) ( )
//#define analogInPinToBit(P) ( )
#define portOutputRegister(port) ( &(port->PIO_ODSR) )
#define portInputRegister(port) ( &(port->PIO_PDSR) )
#define portOutputRegister(port) ( &(port->OUT) )
#define portInputRegister(port) ( &(port->IN) )
//#define portModeRegister(P) ( )
#define digitalPinHasPWM(P) ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
......@@ -73,8 +73,8 @@ extern "C"{
// LEDs
#define PIN_LED_13 (13u)
#define PIN_LED_RXL (72u)
#define PIN_LED_TXL (73u)
#define PIN_LED_RXL (30u)
#define PIN_LED_TXL (31u)
#define PIN_LED PIN_LED_13
#define PIN_LED2 PIN_LED_RXL
#define PIN_LED3 PIN_LED_TXL
......@@ -84,7 +84,7 @@ extern "C"{
* SPI Interfaces
*/
#define SPI_INTERFACES_COUNT 1
/*
#define SPI_INTERFACE SPI0
#define SPI_INTERFACE_ID ID_SPI0
#define SPI_CHANNELS_NUM 4
......@@ -117,42 +117,32 @@ static const uint8_t SS3 = BOARD_SPI_SS3;
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 2
#define WIRE_INTERFACES_COUNT 1
#define PIN_WIRE_SDA (20u)
#define PIN_WIRE_SCL (21u)
#define PIN_WIRE_SDA (16u)
#define PIN_WIRE_SCL (17u)
/*
#define WIRE_INTERFACE TWI1
#define WIRE_INTERFACE_ID ID_TWI1
#define WIRE_ISR_HANDLER TWI1_Handler
#define WIRE_ISR_ID TWI1_IRQn
#define PIN_WIRE1_SDA (70u)
#define PIN_WIRE1_SCL (71u)
#define WIRE1_INTERFACE TWI0
#define WIRE1_INTERFACE_ID ID_TWI0
#define WIRE1_ISR_HANDLER TWI0_Handler
#define WIRE1_ISR_ID TWI0_IRQn
*/
/*
* UART/USART Interfaces
*/
// Serial
#define PINS_UART (81u)
// Serial1
#define PINS_USART0 (82u)
// Serial2
#define PINS_USART1 (83u)
// Serial3
#define PINS_USART3 (84u)
//#define PINS_UART (81u)
/*
* USB Interfaces
*/
#define PINS_USB (85u)
//#define PINS_USB (85u)
/*
* Analog pins
......@@ -168,31 +158,37 @@ static const uint8_t A5 = 25 ;
/*
* DAC
*/
/*
#define DACC_INTERFACE DACC
#define DACC_INTERFACE_ID ID_DACC
#define DACC_RESOLUTION 12
#define DACC_ISR_HANDLER DACC_Handler
#define DACC_ISR_ID DACC_IRQn
*/
/*
* PWM
*/
/*
#define PWM_INTERFACE PWM
#define PWM_INTERFACE_ID ID_PWM
#define PWM_FREQUENCY 1000
#define PWM_MAX_DUTY_CYCLE 255
#define PWM_MIN_DUTY_CYCLE 0
#define PWM_RESOLUTION 8
*/
/*
* TC
*/
/*
#define TC_INTERFACE TC0
#define TC_INTERFACE_ID ID_TC0
#define TC_FREQUENCY 1000
#define TC_MAX_DUTY_CYCLE 255
#define TC_MIN_DUTY_CYCLE 0
#define TC_RESOLUTION 8
*/
#ifdef __cplusplus
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment