From 05d622f3ac8a55f433bba0aceddd2b44b67af8c6 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Sat, 25 Jun 2011 12:51:56 -0400 Subject: [PATCH] Adapting Rick's platform work to other platform changes. --- app/src/processing/app/Base.java | 2 +- app/src/processing/app/debug/Compiler.java | 9 ++++++--- build/build.xml | 9 +++++++++ build/shared/lib/preferences.txt | 2 +- hardware/{arduino => avr}/platforms.txt | 6 +++--- hardware/sam/boards.txt | 8 ++++---- 6 files changed, 24 insertions(+), 12 deletions(-) rename hardware/{arduino => avr}/platforms.txt (96%) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 11cd52e28..99138ce3a 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1558,7 +1558,7 @@ public class Base { Target target = Base.targetsTable.get(Preferences.get("target")); if (target == null) { System.out.println("default target is not in list. Replace with default."); - Preferences.set("target", "arduino"); + Preferences.set("target", "avr"); target = Base.targetsTable.get(Preferences.get("target")); } return target; diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index cdae52013..285cb7266 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -135,17 +135,19 @@ public class Compiler implements MessageConsumer { re.hideStackTrace(); throw re; } - String corePath; + String corePath, systemPath; if (core.indexOf(':') == -1) { Target t = Base.getTarget(); File coreFolder = new File(new File(t.getFolder(), "cores"), core); corePath = coreFolder.getAbsolutePath(); + systemPath = new File(t.getFolder(), "system").getAbsolutePath(); } else { Target t = Base.targetsTable.get(core.substring(0, core.indexOf(':'))); File coreFolder = new File(t.getFolder(), "cores"); coreFolder = new File(coreFolder, core.substring(core.indexOf(':') + 1)); corePath = coreFolder.getAbsolutePath(); + systemPath = new File(t.getFolder(), "system").getAbsolutePath(); } String pins = configPreferences.get("build.pins"); @@ -154,11 +156,11 @@ public class Compiler implements MessageConsumer { if (pins != null) { if (pins.indexOf(':') == -1) { Target t = Base.getTarget(); - File pinsFolder = new File(new File(t.getFolder(), "pins"), pins); + File pinsFolder = new File(new File(t.getFolder(), "variants"), pins); pinsPath = pinsFolder.getAbsolutePath(); } else { Target t = Base.targetsTable.get(pins.substring(0, pins.indexOf(':'))); - File pinsFolder = new File(t.getFolder(), "pins"); + File pinsFolder = new File(t.getFolder(), "variants"); pinsFolder = new File(pinsFolder, pins.substring(pins.indexOf(':') + 1)); pinsPath = pinsFolder.getAbsolutePath(); } @@ -169,6 +171,7 @@ public class Compiler implements MessageConsumer { ArrayList includePaths = new ArrayList(); includePaths.add(corePath); + includePaths.add(systemPath); if (pinsPath != null) includePaths.add(pinsPath); for (File file : sketch.getImportedLibraries()) { includePaths.add(file.getPath()); diff --git a/build/build.xml b/build/build.xml index c7709c120..0775a3975 100644 --- a/build/build.xml +++ b/build/build.xml @@ -208,6 +208,14 @@ + + + + + + + + @@ -430,6 +438,7 @@ + diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt index c1d370cfe..cfabd5b54 100755 --- a/build/shared/lib/preferences.txt +++ b/build/shared/lib/preferences.txt @@ -238,7 +238,7 @@ run.present.exclusive.macosx = true # ARDUINO PREFERENCES board = uno -target = arduino +target = avr platform = avr software=ARDUINO diff --git a/hardware/arduino/platforms.txt b/hardware/avr/platforms.txt similarity index 96% rename from hardware/arduino/platforms.txt rename to hardware/avr/platforms.txt index d946b8274..a82454e03 100755 --- a/hardware/arduino/platforms.txt +++ b/hardware/avr/platforms.txt @@ -38,12 +38,12 @@ avr.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex ######################################################## -avr.name=Arduino +avr.name=avr #avr.compiler.path Official default is correct, only need to change this if you want to overide the initial default #avr.compiler.path={0}/hardware/tools/avr/bin/ avr.compiler.c.cmd=avr-gcc avr.compiler.c.flags=|-c|-g|-Os|-w|-ffunction-sections|-fdata-sections -avr.compiler.c.elf.flags=|-Os|-Wl|--gc-sections +avr.compiler.c.elf.flags=|-Os|-Wl,--gc-sections avr.compiler.c.elf.cmd=avr-gcc avr.compiler.S.flags=|-c|-g|-assembler-with-cpp avr.compiler.cpp.cmd=avr-g++ @@ -59,6 +59,6 @@ avr.compiler.cpudef=-mmcu= avr.compiler.upload.cmd= avr.compiler.upload.flags= avr.compiler.define=-DARDUINO= -avr.library.path=./hardware/arduino/cores/arduino +avr.library.path=./hardware/avr/cores/arduino avr.library.core.path=./libraries diff --git a/hardware/sam/boards.txt b/hardware/sam/boards.txt index fe4dd5b83..aabb3d92c 100644 --- a/hardware/sam/boards.txt +++ b/hardware/sam/boards.txt @@ -1,13 +1,13 @@ ############################################################## sam3s_ek.name=Atmel SAM3S-EK +sam3s_ek.platform=sam sam3s_ek.upload.protocol=sam-ba sam3s_ek.upload.maximum_size=49152 sam3s_ek.upload.speed=115200 sam3s_ek.bootloader.path=sam3s_boot sam3s_ek.bootloader.file=sam3s_boot.bin -sam3s_ek.build.mcu=sam3s4c +sam3s_ek.build.mcu=cortex-m3 sam3s_ek.build.f_cpu=64000000L -sam3s_ek.build.core=at91 - - +sam3s_ek.build.core=sam +sam3s_ek.build.pins=sam3s-ek \ No newline at end of file