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

[sam] renaming unused files and ensure that test app works on Due

Browse Source
This commit is contained in:
Thibaut VIARD 2011-09-16 23:51:04 +02:00
parent 8716884ada
commit ac4b087eb0
16 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hardware/sam/cores/sam/Tone.cpp.xxx → hardware/sam/cores/sam/Tone.cpp.disabled
View File

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

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

4
hardware/sam/cores/sam/build_gcc/libarduino_arduino_due.mk
View File

@ -69,7 +69,7 @@ C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC))) C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
# during development, remove some files # during development, remove some files
C_OBJ_FILTER=wiring_analog.o wiring_pulse.o dlib_lowlevel_sam3.o C_OBJ_FILTER=dlib_lowlevel_sam3.o
C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))
@ -81,7 +81,7 @@ CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp)
CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC)))
# during development, remove some files # during development, remove some files
CPP_OBJ_FILTER=Tone.o CPP_OBJ_FILTER=
CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP)) CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP))

4
hardware/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk
View File

@ -69,7 +69,7 @@ C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC))) C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
# during development, remove some files # during development, remove some files
C_OBJ_FILTER=wiring_analog.o wiring_pulse.o dlib_lowlevel_sam3.o C_OBJ_FILTER=dlib_lowlevel_sam3.o
C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))
@ -81,7 +81,7 @@ CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp)
CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC)))
# during development, remove some files # during development, remove some files
CPP_OBJ_FILTER=Tone.o CPP_OBJ_FILTER=
CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP)) CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP))

4
hardware/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk
View File

@ -69,7 +69,7 @@ C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC))) C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
# during development, remove some files # during development, remove some files
C_OBJ_FILTER=wiring_analog.o wiring_pulse.o dlib_lowlevel_sam3.o C_OBJ_FILTER=dlib_lowlevel_sam3.o
C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))
@ -81,7 +81,7 @@ CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp)
CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC)))
# during development, remove some files # during development, remove some files
CPP_OBJ_FILTER=Tone.o CPP_OBJ_FILTER=
CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP)) CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP))

0
hardware/sam/cores/sam/cortex_handlers.cpp → hardware/sam/cores/sam/cortex_handlers.c
View File

4
hardware/sam/cores/sam/validation/build_gcc/test.mk
View File

@ -4,8 +4,8 @@
# putting default variant # putting default variant
ifeq ("$(VARIANT)", "") ifeq ("$(VARIANT)", "")
#VARIANT=sam3s_ek #VARIANT=sam3s_ek
VARIANT=sam3u_ek #VARIANT=sam3u_ek
#VARIANT=arduino_due VARIANT=arduino_due
endif endif
ifeq ("$(VARIANT)", "sam3s_ek") ifeq ("$(VARIANT)", "sam3s_ek")

11
hardware/sam/cores/sam/validation/test.cpp
View File

@ -18,7 +18,7 @@ void setup( void )
Serial.begin( 115200 ) ; Serial.begin( 115200 ) ;
} }
void led_step1( void ) static void led_step1( void )
{ {
#if defined sam3s_ek #if defined sam3s_ek
digitalWrite( PIN_LED, HIGH ) ; // set the LED on digitalWrite( PIN_LED, HIGH ) ; // set the LED on
@ -36,7 +36,7 @@ void led_step1( void )
#endif /* arduino_due */ #endif /* arduino_due */
} }
void led_step2( void ) static void led_step2( void )
{ {
#if defined sam3s_ek #if defined sam3s_ek
digitalWrite( PIN_LED, LOW ) ; // set the LED off digitalWrite( PIN_LED, LOW ) ; // set the LED off
@ -61,8 +61,7 @@ void loop( void )
led_step2() ; led_step2() ;
delay( 1000 ) ; // wait for a second delay( 1000 ) ; // wait for a second
Serial.write( '-' ) ; // send an initial char Serial.write( '-' ) ; // send a char
Serial.println( "test1\n" ) ; // send an initial string Serial.println( "test1\n" ) ; // send a string
// delay( 1000 ) ; // wait for a second Serial.println( "test2" ) ; // send another string
// Serial.println( "test2" ) ; // send an initial string
} }

0
hardware/sam/cores/sam/wiring_analog.c.xxx → hardware/sam/cores/sam/wiring_analog.c.disabled
View File

0
hardware/sam/cores/sam/wiring_pulse.c.xxx → hardware/sam/cores/sam/wiring_pulse.c.disabled
View File

0
hardware/sam/system/libsam/source/adc.c → hardware/sam/system/libsam/source/adc.c.disabled
View File

BIN
hardware/sam/variants/arduino_due/1661fa.pdf Normal file
View File

Binary file not shown.

4
hardware/sam/variants/arduino_due/variant.h
View File

@ -10,8 +10,8 @@
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "Arduino.h" #include "Arduino.h"
#include "common/UART.h" #include "UART.h"
#include "common/USART.h" #include "USART.h"
/** /**
* Libc porting layers * Libc porting layers

4
hardware/sam/variants/sam3s_ek/variant.h
View File

@ -10,8 +10,8 @@
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "Arduino.h" #include "Arduino.h"
#include "common/UART.h" #include "UART.h"
#include "common/USART.h" #include "USART.h"
/** /**
* Libc porting layers * Libc porting layers

14
hardware/sam/variants/sam3u_ek/build_gcc/libvariant_sam3u_ek.mk
View File

@ -20,15 +20,17 @@ CMSIS_PATH = $(SYSTEM_PATH)/CMSIS/Include
ARDUINO_PATH = ../../../cores/sam ARDUINO_PATH = ../../../cores/sam
VARIANT_BASE_PATH = ../../../variants VARIANT_BASE_PATH = ../../../variants
VARIANT_PATH = ../../../variants/$(VARIANT) VARIANT_PATH = ../../../variants/$(VARIANT)
VARIANT_COMMON_PATH = ../../common #VARIANT_COMMON_PATH = ../../common
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Files # Files
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH) $(VARIANT_COMMON_PATH) vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH)
#$(VARIANT_COMMON_PATH)
#vpath %.c $(PROJECT_BASE_PATH) $(VARIANT_PATH) #vpath %.c $(PROJECT_BASE_PATH) $(VARIANT_PATH)
vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH) $(VARIANT_COMMON_PATH) vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH)
#$(VARIANT_COMMON_PATH)
VPATH+=$(PROJECT_BASE_PATH) VPATH+=$(PROJECT_BASE_PATH)
@ -74,7 +76,7 @@ C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC))) C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
# during development, remove some files # during development, remove some files
C_OBJ_FILTER=wiring_analog.o wiring_pulse.o C_OBJ_FILTER=
C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))
@ -82,12 +84,12 @@ C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP))
# CPP source files and objects # CPP source files and objects
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp) CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp)
CPP_SRC+=$(wildcard $(VARIANT_COMMON_PATH)/*.cpp) #CPP_SRC+=$(wildcard $(VARIANT_COMMON_PATH)/*.cpp)
CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC)))
# during development, remove some files # during development, remove some files
CPP_OBJ_FILTER=Tone.o CPP_OBJ_FILTER=
CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP)) CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP))

4
hardware/sam/variants/sam3u_ek/variant.h
View File

@ -10,8 +10,8 @@
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "Arduino.h" #include "Arduino.h"
#include "common/UART.h" #include "UART.h"
#include "common/USART.h" #include "USART.h"
/** /**
* Libc porting layers * Libc porting layers