rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-11 08:29:19 +01:00
Code Issues Releases Activity

[sam] fixing compilation in IDE (changing some #includes).

Browse Source
This commit is contained in:
David A. Mellis 2011-07-17 09:50:36 -04:00
parent 25e3924dda
commit d9dcc66232
23 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/processing/app/debug/Compiler.java
View File

@ -219,7 +219,7 @@ public class Compiler implements MessageConsumer {
// collecting them into the core.a library file. // collecting them into the core.a library file.
System.out.println("3. compileCore"); System.out.println("3. compileCore");
System.out.println("corePath: " + corePath); System.out.println("corePath: " + corePath);
compileCore(avrBasePath, buildPath, corePath, pins, pinsPath, configPreferences); compileCore(avrBasePath, buildPath, corePath, systemPath, pins, pinsPath, configPreferences);
/* /*
@ -762,13 +762,14 @@ public class Compiler implements MessageConsumer {
// 3. compile the core, outputting .o files to <buildPath> and then // 3. compile the core, outputting .o files to <buildPath> and then
// collecting them into the core.a library file. // collecting them into the core.a library file.
void compileCore (String avrBasePath, String buildPath, String corePath, String pins, String pinsPath, HashMap<String, String> configPreferences) void compileCore (String avrBasePath, String buildPath, String corePath, String systemPath, String pins, String pinsPath, HashMap<String, String> configPreferences)
throws RunnerException throws RunnerException
{ {
System.out.println("compileCore(...) start"); System.out.println("compileCore(...) start");
ArrayList<String> includePaths = new ArrayList(); ArrayList<String> includePaths = new ArrayList();
includePaths.add(corePath); //include core path only includePaths.add(corePath); //include core path only
includePaths.add(systemPath);
if (pinsPath != null) includePaths.add(pinsPath); if (pinsPath != null) includePaths.add(pinsPath);
//debug includePaths //debug includePaths

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

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

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

2
hardware/sam/system/libsam/include/SAM3S.h
View File

@ -129,7 +129,7 @@ typedef enum IRQn
* \brief CMSIS includes * \brief CMSIS includes
*/ */
#include <core_cm3.h> #include <CMSIS/CM3/CoreSupport/core_cm3.h>
/*@}*/ /*@}*/

2
hardware/sam/system/libsam/include/acc.h
View File

@ -50,7 +50,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>

2
hardware/sam/system/libsam/include/adc.h
View File

@ -50,7 +50,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/crccu.h
View File

@ -39,7 +39,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/dacc.h
View File

@ -50,7 +50,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>

2
hardware/sam/system/libsam/include/efc.h
View File

@ -53,7 +53,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/pio.h
View File

@ -5,7 +5,7 @@
* Headers * Headers
*/ */
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/pwmc.h
View File

@ -61,7 +61,7 @@
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/rtc.h
View File

@ -40,7 +40,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/rtt.h
View File

@ -52,7 +52,7 @@
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/spi.h
View File

@ -41,7 +41,7 @@
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Macros * Macros

2
hardware/sam/system/libsam/include/spi_pdc.h
View File

@ -40,7 +40,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Definitions * Definitions

2
hardware/sam/system/libsam/include/ssc.h
View File

@ -40,7 +40,7 @@
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/tc.h
View File

@ -48,7 +48,7 @@
* Headers * Headers
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/twi.h
View File

@ -41,7 +41,7 @@
* Headers * Headers
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/twid.h
View File

@ -34,7 +34,7 @@
* Headers * Headers
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/usart.h
View File

@ -58,7 +58,7 @@
* Headers * Headers
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

2
hardware/sam/system/libsam/include/wdt.h
View File

@ -44,7 +44,7 @@
#ifndef _WDT_ #ifndef _WDT_
#define _WDT_ #define _WDT_
#include "chip.h" #include "../chip.h"
#include <stdint.h> #include <stdint.h>

4
hardware/sam/variants/sam3s-ek/variant.h
View File

@ -20,6 +20,10 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#ifndef sam3s_ek
#define sam3s_ek
#endif
/** Name of the board */ /** Name of the board */
#define VARIANT_NAME "SAM3S-EK" #define VARIANT_NAME "SAM3S-EK"