rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-12 06:54:24 +01:00
Code Issues Releases Activity

[SAM] Added SAM3X_EK support for USB debug

Browse Source
This commit is contained in:
Thibault RICHARD 2012-04-28 17:36:57 +02:00
parent 9139b106ef
commit e034de5ea9
11 changed files with 97 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/arduino/sam/cores/sam/build_gcc/Makefile
View File

@ -1,6 +1,6 @@
ifeq ("$(VARIANTS)", "") ifeq ("$(VARIANTS)", "")
VARIANTS = arduino_due_x arduino_due_u VARIANTS = arduino_due_x arduino_due_u sam3x_ek
#VARIANTS = sam3u_ek sam3s_ek sam3x_ek #VARIANTS = sam3u_ek sam3s_ek
endif endif
SUBMAKE_OPTIONS=--no-builtin-rules --no-builtin-variables SUBMAKE_OPTIONS=--no-builtin-rules --no-builtin-variables

2
hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk
View File

@ -39,7 +39,7 @@ CMSIS_ROOT_PATH = $(SYSTEM_PATH)/CMSIS
CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include
CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL
CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE)
VARIANT_PATH = ../../../variants/$(VARIANT) VARIANT_PATH = ../../../../../atmel/sam/variants/$(VARIANT)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Files # Files

9
hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk
View File

@ -23,18 +23,19 @@
ifeq ("$(VARIANT)", "") ifeq ("$(VARIANT)", "")
#VARIANT=sam3s_ek #VARIANT=sam3s_ek
#VARIANT=sam3u_ek #VARIANT=sam3u_ek
VARIANT=arduino_due_x VARIANT=sam3x_ek
#VARIANT=arduino_due_x
endif endif
ifeq ("$(VARIANT)", "sam3s_ek") ifeq ("$(VARIANT)", "sam3s_ek")
CHIP=__SAM3S4C__ CHIP=__SAM3S4C__
VARIANT_PATH = ../../../../atmel/sam/variants/$(VARIANT) VARIANT_PATH = ../../../../../../atmel/sam/variants/$(VARIANT)
else ifeq ("$(VARIANT)", "sam3u_ek") else ifeq ("$(VARIANT)", "sam3u_ek")
CHIP=__SAM3U4E__ CHIP=__SAM3U4E__
VARIANT_PATH = ../../../../atmel/sam/variants/$(VARIANT) VARIANT_PATH = ../../../../../../atmel/sam/variants/$(VARIANT)
else ifeq ("$(VARIANT)", "sam3x_ek") else ifeq ("$(VARIANT)", "sam3x_ek")
CHIP=__SAM3X8H__ CHIP=__SAM3X8H__
VARIANT_PATH = ../../../../atmel/sam/variants/$(VARIANT) VARIANT_PATH = ../../../../../../atmel/sam/variants/$(VARIANT)
else ifeq ("$(VARIANT)", "arduino_due_u") else ifeq ("$(VARIANT)", "arduino_due_u")
CHIP=__SAM3U4E__ CHIP=__SAM3U4E__
VARIANT_PATH = ../../../../variants/$(VARIANT) VARIANT_PATH = ../../../../variants/$(VARIANT)

8
hardware/arduino/sam/cores/sam/validation/test.cpp
View File

@ -18,6 +18,12 @@
#include "variant.h" #include "variant.h"
#ifdef _VARIANT_SAM3X_EK_
#define MAX_ANALOG A0
#elif _VARIANT_ARDUINO_DUE_X_
#define MAX_ANALOG A10
#endif
void setup( void ) void setup( void )
{ {
// Initialize the digital pin as an output. // Initialize the digital pin as an output.
@ -80,7 +86,7 @@ void loop( void )
// Serial1.write( "test2" ) ; // send another string // Serial1.write( "test2" ) ; // send another string
Serial1.print("Analog ins: "); Serial1.print("Analog ins: ");
for (int i=A0; i<A11; i++) { for (int i=A0; i<=MAX_ANALOG; i++) {
int a = analogRead(i); int a = analogRead(i);
Serial1.print(a, DEC); Serial1.print(a, DEC);
Serial1.print(" "); Serial1.print(" ");

2
hardware/arduino/sam/cores/sam/wiring_analog.c
View File

@ -107,7 +107,7 @@ uint32_t analogRead(uint32_t ulPin)
} }
#endif #endif
#if defined __SAM3X8E__ #if defined __SAM3X8E__ || defined __SAM3X8H__
switch ( g_APinDescription[ulPin].ulAnalogChannel ) switch ( g_APinDescription[ulPin].ulAnalogChannel )
{ {
// Handling ADC 10 bits channels // Handling ADC 10 bits channels

2
hardware/arduino/sam/variants/arduino_due_x/debug_scripts/gcc/arduino_due_flash.gdb
View File

@ -27,5 +27,7 @@ set *0x80004 = *0x80004 & 0xFFFFFFFE
mon reg pc=(0x80004) mon reg pc=(0x80004)
info reg info reg
break main
# end of 'reset' command # end of 'reset' command
end end

6
hardware/arduino/sam/variants/arduino_due_x/variant.h
View File

@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _VARIANT_ARDUINO_DUE_ #ifndef _VARIANT_ARDUINO_DUE_X_
#define _VARIANT_ARDUINO_DUE_ #define _VARIANT_ARDUINO_DUE_X_
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
@ -182,5 +182,5 @@ extern USARTClass Serial4 ;
#endif #endif
#endif /* _VARIANT_ARDUINO_DUE_ */ #endif /* _VARIANT_ARDUINO_DUE_X_ */

10
hardware/atmel/sam/variants/sam3x_ek/build_gcc/libvariant_sam3x_ek.mk
View File

@ -29,17 +29,17 @@ TOOLCHAIN=gcc
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Output directories # Output directories
OUTPUT_BIN = ../../../cores/sam OUTPUT_BIN = ../../../../../arduino/sam/cores/sam
# Libraries # Libraries
PROJECT_BASE_PATH = .. PROJECT_BASE_PATH = ..
SYSTEM_PATH = ../../../system SYSTEM_PATH = ../../../../../arduino/sam/system
CMSIS_ROOT_PATH = $(SYSTEM_PATH)/CMSIS CMSIS_ROOT_PATH = $(SYSTEM_PATH)/CMSIS
CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include
CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL
#CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) #CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE)
ARDUINO_PATH = ../../../cores/sam ARDUINO_PATH = ../../../../../arduino/sam/cores/sam
VARIANT_BASE_PATH = ../../../variants VARIANT_BASE_PATH = ../../../variants
VARIANT_PATH = ../../../variants/$(VARIANT) VARIANT_PATH = ../../../variants/$(VARIANT)
@ -166,8 +166,8 @@ $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s
@"$(AS)" -c $(ASFLAGS) $< -o $@ @"$(AS)" -c $(ASFLAGS) $< -o $@
$(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ)) $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ))
@"$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^ "$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^
@"$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" "$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt"
.PHONY: clean .PHONY: clean

32
hardware/atmel/sam/variants/sam3x_ek/linker_scripts/gcc/flash.ld
View File

@ -1,12 +1,12 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* ATMEL Microcontroller Software Support * SAM Software Package License
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* Copyright (c) 2009, Atmel Corporation * Copyright (c) 2012, Atmel Corporation
* *
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following condition is met:
* *
* - Redistributions of source code must retain the above copyright notice, * - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the disclaimer below. * this list of conditions and the disclaimer below.
@ -27,10 +27,6 @@
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
/*------------------------------------------------------------------------------
* Linker script for running in internal FLASH on the SAM3U4
*----------------------------------------------------------------------------*/
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
SEARCH_DIR(.) SEARCH_DIR(.)
@ -38,16 +34,14 @@ SEARCH_DIR(.)
/* Memory Spaces Definitions */ /* Memory Spaces Definitions */
MEMORY MEMORY
{ {
flash0 (W!RX) : ORIGIN = 0x00080000, LENGTH = 0x00020000 /* Flash0, 128K */ rom (rx) : ORIGIN = 0x00080000, LENGTH = 0x00080000 /* Flash, 512K */
flash1 (W!RX) : ORIGIN = 0x00100000, LENGTH = 0x00020000 /* Flash1, 128K */ sram0 (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00010000 /* sram0, 64K */
sram0 (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* Sram0, 32K */ sram1 (rwx) : ORIGIN = 0x20080000, LENGTH = 0x00008000 /* sram1, 32K */
sram1 (W!RX) : ORIGIN = 0x20080000, LENGTH = 0x00004000 /* Sram1, 16K */ ram (rwx) : ORIGIN = 0x20070000, LENGTH = 0x00018000 /* sram, 96K */
rom (rx) : ORIGIN = ORIGIN(flash1)-LENGTH(flash0), LENGTH = LENGTH(flash0)+LENGTH(flash1) /* Flash, 256K */
ram (rwx) : ORIGIN = ORIGIN( sram1)-LENGTH( sram0), LENGTH = LENGTH( sram0)+LENGTH( sram1) /* sram, 48K */
} }
/* The stack size used by the application. NOTE: you need to adjust */ /* The stack size used by the application. NOTE: you need to adjust */
STACK_SIZE = 0x2000; STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : 0x2000 ;
/* Section Definitions */ /* Section Definitions */
SECTIONS SECTIONS
@ -99,14 +93,14 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_efixed = .; /* End of text section */ _efixed = .; /* End of text section */
} > flash0 } > rom
/* .ARM.exidx is sorted, so has to go in its own output section. */ /* .ARM.exidx is sorted, so has to go in its own output section. */
PROVIDE_HIDDEN (__exidx_start = .); PROVIDE_HIDDEN (__exidx_start = .);
.ARM.exidx : .ARM.exidx :
{ {
*(.ARM.exidx* .gnu.linkonce.armexidx.*) *(.ARM.exidx* .gnu.linkonce.armexidx.*)
} > flash0 } > rom
PROVIDE_HIDDEN (__exidx_end = .); PROVIDE_HIDDEN (__exidx_end = .);
. = ALIGN(4); . = ALIGN(4);
@ -120,7 +114,7 @@ SECTIONS
*(.data .data.*); *(.data .data.*);
. = ALIGN(4); . = ALIGN(4);
_erelocate = .; _erelocate = .;
} > sram0 } > ram
/* .bss section which is used for uninitialized data */ /* .bss section which is used for uninitialized data */
.bss (NOLOAD) : .bss (NOLOAD) :
@ -133,7 +127,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_ebss = . ; _ebss = . ;
_ezero = .; _ezero = .;
} > sram0 } > ram
/* stack section */ /* stack section */
.stack (NOLOAD): .stack (NOLOAD):
@ -143,7 +137,7 @@ SECTIONS
. = . + STACK_SIZE; . = . + STACK_SIZE;
. = ALIGN(8); . = ALIGN(8);
_estack = .; _estack = .;
} > sram1 } > ram
. = ALIGN(4); . = ALIGN(4);
_end = . ; _end = . ;

17
hardware/atmel/sam/variants/sam3x_ek/variant.cpp
View File

@ -58,15 +58,20 @@ extern const PinDescription g_APinDescription[]=
{ PIOA, PIO_PA12, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // USER_LED3 { PIOA, PIO_PA12, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // USER_LED3
{ PIOA, PIO_PA13, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // POWER_LED { PIOA, PIO_PA13, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // POWER_LED
// USART0 (Serial2) // 6/7 - USART0 (Serial2)
{ PIOA, PIO_PA10A_RXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // URXD { PIOA, PIO_PA10A_RXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // URXD
{ PIOA, PIO_PA11A_TXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // UTXD { PIOA, PIO_PA11A_TXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC }, // UTXD
// x .. x - "All pins" masks // 8 - UART (Serial) all pins
// x - UART (Serial) all pins
{ PIOA, PIO_PA8A_URXD|PIO_PA9A_UTXD, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC }, { PIOA, PIO_PA8A_URXD|PIO_PA9A_UTXD, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC },
// x - USART0 (Serial2) all pins
// 9 - USART0 (Serial2) all pins
{ PIOA, PIO_PA11A_TXD0|PIO_PA10A_RXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC }, { PIOA, PIO_PA11A_TXD0|PIO_PA10A_RXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC },
// 10 - Analog pins
// ----------------------
{ PIOA, PIO_PA3, ID_PIOA, PIO_INPUT, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC0, ADC7, NO_PWM, NO_TC }, // AD0
{ NULL, 0, 0, PIO_NOT_A_PIN, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC } // END { NULL, 0, 0, PIO_NOT_A_PIN, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NO_PWM, NO_TC } // END
} ; } ;
@ -75,12 +80,12 @@ extern const PinDescription g_APinDescription[]=
*/ */
RingBuffer rx_buffer1 ; RingBuffer rx_buffer1 ;
UARTClass Serial( UART, UART_IRQn, ID_UART, &rx_buffer1 ) ; UARTClass Serial1( UART, UART_IRQn, ID_UART, &rx_buffer1 ) ;
// IT handlers // IT handlers
void UART_Handler(void) void UART_Handler(void)
{ {
Serial.IrqHandler() ; Serial1.IrqHandler() ;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

29
hardware/atmel/sam/variants/sam3x_ek/variant.h
View File

@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _VARIANT_SAM3U_EK_ #ifndef _VARIANT_SAM3X_EK_
#define _VARIANT_SAM3U_EK_ #define _VARIANT_SAM3X_EK_
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
@ -86,18 +86,39 @@
#define PINS_USART0 (9u) #define PINS_USART0 (9u)
/*
* Analog pins
*/
static const uint8_t A0 = 10;
/*
* 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
/*
* 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
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#ifdef __cplusplus #ifdef __cplusplus
extern UARTClass Serial ; extern UARTClass Serial1 ;
extern USARTClass Serial2 ; extern USARTClass Serial2 ;
#endif #endif
#endif /* _VARIANT_SAM3U_EK_ */ #endif /* _VARIANT_SAM3X_EK_ */