From d00f0949ed00d53c885fd04e342b2ce55a6b4d8e Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Tue, 23 Aug 2011 17:07:39 -0400 Subject: [PATCH] Renaming pins/ directory to the more generic variants/ http://code.google.com/p/arduino/issues/detail?id=588 --- app/src/processing/app/debug/Compiler.java | 24 ++++++------- hardware/arduino/boards.txt | 34 +++++++++---------- .../{pins => variants}/mega/pins_arduino.h | 0 .../standard/pins_arduino.h | 0 4 files changed, 29 insertions(+), 29 deletions(-) rename hardware/arduino/{pins => variants}/mega/pins_arduino.h (100%) rename hardware/arduino/{pins => variants}/standard/pins_arduino.h (100%) diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index dd0889859..559df3a61 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -91,19 +91,19 @@ public class Compiler implements MessageConsumer { corePath = coreFolder.getAbsolutePath(); } - String pins = boardPreferences.get("build.pins"); - String pinsPath = null; + String variant = boardPreferences.get("build.variant"); + String variantPath = null; - if (pins != null) { - if (pins.indexOf(':') == -1) { + if (variant != null) { + if (variant.indexOf(':') == -1) { Target t = Base.getTarget(); - File pinsFolder = new File(new File(t.getFolder(), "pins"), pins); - pinsPath = pinsFolder.getAbsolutePath(); + File variantFolder = new File(new File(t.getFolder(), "variants"), variant); + variantPath = variantFolder.getAbsolutePath(); } else { - Target t = Base.targetsTable.get(pins.substring(0, pins.indexOf(':'))); - File pinsFolder = new File(t.getFolder(), "pins"); - pinsFolder = new File(pinsFolder, pins.substring(pins.indexOf(':') + 1)); - pinsPath = pinsFolder.getAbsolutePath(); + Target t = Base.targetsTable.get(variant.substring(0, variant.indexOf(':'))); + File variantFolder = new File(t.getFolder(), "variants"); + variantFolder = new File(variantFolder, variant.substring(variant.indexOf(':') + 1)); + variantPath = variantFolder.getAbsolutePath(); } } @@ -114,7 +114,7 @@ public class Compiler implements MessageConsumer { sketch.setCompilingProgress(20); List includePaths = new ArrayList(); includePaths.add(corePath); - if (pinsPath != null) includePaths.add(pinsPath); + if (variantPath != null) includePaths.add(variantPath); for (File file : sketch.getImportedLibraries()) { includePaths.add(file.getPath()); } @@ -162,7 +162,7 @@ public class Compiler implements MessageConsumer { sketch.setCompilingProgress(50); includePaths.clear(); includePaths.add(corePath); // include path for core only - if (pinsPath != null) includePaths.add(pinsPath); + if (variantPath != null) includePaths.add(variantPath); List coreObjectFiles = compileFiles(avrBasePath, buildPath, includePaths, findFilesInPath(corePath, "S", true), diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt index 88a71433d..8a2af1134 100644 --- a/hardware/arduino/boards.txt +++ b/hardware/arduino/boards.txt @@ -14,7 +14,7 @@ uno.bootloader.lock_bits=0x0F uno.build.mcu=atmega328p uno.build.f_cpu=16000000L uno.build.core=arduino -uno.build.pins=standard +uno.build.variant=standard ############################################################## @@ -35,7 +35,7 @@ atmega328.bootloader.lock_bits=0x0F atmega328.build.mcu=atmega328p atmega328.build.f_cpu=16000000L atmega328.build.core=arduino -atmega328.build.pins=standard +atmega328.build.variant=standard ############################################################## @@ -56,7 +56,7 @@ diecimila.bootloader.lock_bits=0x0F diecimila.build.mcu=atmega168 diecimila.build.f_cpu=16000000L diecimila.build.core=arduino -diecimila.build.pins=standard +diecimila.build.variant=standard ############################################################## @@ -77,7 +77,7 @@ mega2560.bootloader.lock_bits=0x0F mega2560.build.mcu=atmega2560 mega2560.build.f_cpu=16000000L mega2560.build.core=arduino -mega2560.build.pins=mega +mega2560.build.variant=mega ############################################################## @@ -98,7 +98,7 @@ mega.bootloader.lock_bits=0x0F mega.build.mcu=atmega1280 mega.build.f_cpu=16000000L mega.build.core=arduino -mega.build.pins=mega +mega.build.variant=mega ############################################################## @@ -119,7 +119,7 @@ mini.bootloader.lock_bits=0x0F mini.build.mcu=atmega168 mini.build.f_cpu=16000000L mini.build.core=arduino -mini.build.pins=standard +mini.build.variant=standard ############################################################## @@ -140,7 +140,7 @@ fio.bootloader.lock_bits=0x0F fio.build.mcu=atmega328p fio.build.f_cpu=8000000L fio.build.core=arduino -fio.build.pins=standard +fio.build.variant=standard ############################################################## @@ -162,7 +162,7 @@ bt328.bootloader.lock_bits=0x0F bt328.build.mcu=atmega328p bt328.build.f_cpu=16000000L bt328.build.core=arduino -bt328.build.pins=standard +bt328.build.variant=standard ############################################################## @@ -184,7 +184,7 @@ bt.bootloader.lock_bits=0x0F bt.build.mcu=atmega168 bt.build.f_cpu=16000000L bt.build.core=arduino -bt.build.pins=standard +bt.build.variant=standard ############################################################## @@ -205,7 +205,7 @@ lilypad328.bootloader.lock_bits=0x0F lilypad328.build.mcu=atmega328p lilypad328.build.f_cpu=8000000L lilypad328.build.core=arduino -lilypad328.build.pins=standard +lilypad328.build.variant=standard ############################################################## @@ -226,7 +226,7 @@ lilypad.bootloader.lock_bits=0x0F lilypad.build.mcu=atmega168 lilypad.build.f_cpu=8000000L lilypad.build.core=arduino -lilypad.build.pins=standard +lilypad.build.variant=standard ############################################################## @@ -247,7 +247,7 @@ pro5v328.bootloader.lock_bits=0x0F pro5v328.build.mcu=atmega328p pro5v328.build.f_cpu=16000000L pro5v328.build.core=arduino -pro5v328.build.pins=standard +pro5v328.build.variant=standard ############################################################## @@ -268,7 +268,7 @@ pro5v.bootloader.lock_bits=0x0F pro5v.build.mcu=atmega168 pro5v.build.f_cpu=16000000L pro5v.build.core=arduino -pro5v.build.pins=standard +pro5v.build.variant=standard ############################################################## @@ -289,7 +289,7 @@ pro328.bootloader.lock_bits=0x0F pro328.build.mcu=atmega328p pro328.build.f_cpu=8000000L pro328.build.core=arduino -pro328.build.pins=standard +pro328.build.variant=standard ############################################################## @@ -310,7 +310,7 @@ pro.bootloader.lock_bits=0x0F pro.build.mcu=atmega168 pro.build.f_cpu=8000000L pro.build.core=arduino -pro.build.pins=standard +pro.build.variant=standard ############################################################## @@ -331,7 +331,7 @@ atmega168.bootloader.lock_bits=0x0F atmega168.build.mcu=atmega168 atmega168.build.f_cpu=16000000L atmega168.build.core=arduino -atmega168.build.pins=standard +atmega168.build.variant=standard ############################################################## @@ -351,4 +351,4 @@ atmega8.bootloader.lock_bits=0x0F atmega8.build.mcu=atmega8 atmega8.build.f_cpu=16000000L atmega8.build.core=arduino -atmega8.build.pins=standard +atmega8.build.variant=standard diff --git a/hardware/arduino/pins/mega/pins_arduino.h b/hardware/arduino/variants/mega/pins_arduino.h similarity index 100% rename from hardware/arduino/pins/mega/pins_arduino.h rename to hardware/arduino/variants/mega/pins_arduino.h diff --git a/hardware/arduino/pins/standard/pins_arduino.h b/hardware/arduino/variants/standard/pins_arduino.h similarity index 100% rename from hardware/arduino/pins/standard/pins_arduino.h rename to hardware/arduino/variants/standard/pins_arduino.h