Skip to content

Commit d00f094

Browse files
damellisdamellis
committed
Renaming pins/ directory to the more generic variants/
http://code.google.com/p/arduino/issues/detail?id=588
1 parent 6886910 commit d00f094

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎app/src/processing/app/debug/Compiler.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@ public boolean compile(Sketch sketch,
9191
corePath = coreFolder.getAbsolutePath();
9292
}
9393

94-
String pins = boardPreferences.get("build.pins");
95-
String pinsPath = null;
94+
String variant = boardPreferences.get("build.variant");
95+
String variantPath = null;
9696

97-
if (pins != null) {
98-
if (pins.indexOf(':') == -1) {
97+
if (variant != null) {
98+
if (variant.indexOf(':') == -1) {
9999
Target t = Base.getTarget();
100-
File pinsFolder = new File(new File(t.getFolder(), "pins"), pins);
101-
pinsPath = pinsFolder.getAbsolutePath();
100+
File variantFolder = new File(new File(t.getFolder(), "variants"), variant);
101+
variantPath = variantFolder.getAbsolutePath();
102102
} else {
103-
Target t = Base.targetsTable.get(pins.substring(0, pins.indexOf(':')));
104-
File pinsFolder = new File(t.getFolder(), "pins");
105-
pinsFolder = new File(pinsFolder, pins.substring(pins.indexOf(':') + 1));
106-
pinsPath = pinsFolder.getAbsolutePath();
103+
Target t = Base.targetsTable.get(variant.substring(0, variant.indexOf(':')));
104+
File variantFolder = new File(t.getFolder(), "variants");
105+
variantFolder = new File(variantFolder, variant.substring(variant.indexOf(':') + 1));
106+
variantPath = variantFolder.getAbsolutePath();
107107
}
108108
}
109109

@@ -114,7 +114,7 @@ public boolean compile(Sketch sketch,
114114
sketch.setCompilingProgress(20);
115115
List includePaths = new ArrayList();
116116
includePaths.add(corePath);
117-
if (pinsPath != null) includePaths.add(pinsPath);
117+
if (variantPath != null) includePaths.add(variantPath);
118118
for (File file : sketch.getImportedLibraries()) {
119119
includePaths.add(file.getPath());
120120
}
@@ -162,7 +162,7 @@ public boolean compile(Sketch sketch,
162162
sketch.setCompilingProgress(50);
163163
includePaths.clear();
164164
includePaths.add(corePath); // include path for core only
165-
if (pinsPath != null) includePaths.add(pinsPath);
165+
if (variantPath != null) includePaths.add(variantPath);
166166
List<File> coreObjectFiles =
167167
compileFiles(avrBasePath, buildPath, includePaths,
168168
findFilesInPath(corePath, "S", true),

‎hardware/arduino/boards.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ uno.bootloader.lock_bits=0x0F
1414
uno.build.mcu=atmega328p
1515
uno.build.f_cpu=16000000L
1616
uno.build.core=arduino
17-
uno.build.pins=standard
17+
uno.build.variant=standard
1818

1919
##############################################################
2020

@@ -35,7 +35,7 @@ atmega328.bootloader.lock_bits=0x0F
3535
atmega328.build.mcu=atmega328p
3636
atmega328.build.f_cpu=16000000L
3737
atmega328.build.core=arduino
38-
atmega328.build.pins=standard
38+
atmega328.build.variant=standard
3939

4040
##############################################################
4141

@@ -56,7 +56,7 @@ diecimila.bootloader.lock_bits=0x0F
5656
diecimila.build.mcu=atmega168
5757
diecimila.build.f_cpu=16000000L
5858
diecimila.build.core=arduino
59-
diecimila.build.pins=standard
59+
diecimila.build.variant=standard
6060

6161
##############################################################
6262

@@ -77,7 +77,7 @@ mega2560.bootloader.lock_bits=0x0F
7777
mega2560.build.mcu=atmega2560
7878
mega2560.build.f_cpu=16000000L
7979
mega2560.build.core=arduino
80-
mega2560.build.pins=mega
80+
mega2560.build.variant=mega
8181

8282
##############################################################
8383

@@ -98,7 +98,7 @@ mega.bootloader.lock_bits=0x0F
9898
mega.build.mcu=atmega1280
9999
mega.build.f_cpu=16000000L
100100
mega.build.core=arduino
101-
mega.build.pins=mega
101+
mega.build.variant=mega
102102

103103
##############################################################
104104

@@ -119,7 +119,7 @@ mini.bootloader.lock_bits=0x0F
119119
mini.build.mcu=atmega168
120120
mini.build.f_cpu=16000000L
121121
mini.build.core=arduino
122-
mini.build.pins=standard
122+
mini.build.variant=standard
123123

124124
##############################################################
125125

@@ -140,7 +140,7 @@ fio.bootloader.lock_bits=0x0F
140140
fio.build.mcu=atmega328p
141141
fio.build.f_cpu=8000000L
142142
fio.build.core=arduino
143-
fio.build.pins=standard
143+
fio.build.variant=standard
144144

145145
##############################################################
146146

@@ -162,7 +162,7 @@ bt328.bootloader.lock_bits=0x0F
162162
bt328.build.mcu=atmega328p
163163
bt328.build.f_cpu=16000000L
164164
bt328.build.core=arduino
165-
bt328.build.pins=standard
165+
bt328.build.variant=standard
166166

167167
##############################################################
168168

@@ -184,7 +184,7 @@ bt.bootloader.lock_bits=0x0F
184184
bt.build.mcu=atmega168
185185
bt.build.f_cpu=16000000L
186186
bt.build.core=arduino
187-
bt.build.pins=standard
187+
bt.build.variant=standard
188188

189189
##############################################################
190190

@@ -205,7 +205,7 @@ lilypad328.bootloader.lock_bits=0x0F
205205
lilypad328.build.mcu=atmega328p
206206
lilypad328.build.f_cpu=8000000L
207207
lilypad328.build.core=arduino
208-
lilypad328.build.pins=standard
208+
lilypad328.build.variant=standard
209209

210210
##############################################################
211211

@@ -226,7 +226,7 @@ lilypad.bootloader.lock_bits=0x0F
226226
lilypad.build.mcu=atmega168
227227
lilypad.build.f_cpu=8000000L
228228
lilypad.build.core=arduino
229-
lilypad.build.pins=standard
229+
lilypad.build.variant=standard
230230

231231
##############################################################
232232

@@ -247,7 +247,7 @@ pro5v328.bootloader.lock_bits=0x0F
247247
pro5v328.build.mcu=atmega328p
248248
pro5v328.build.f_cpu=16000000L
249249
pro5v328.build.core=arduino
250-
pro5v328.build.pins=standard
250+
pro5v328.build.variant=standard
251251

252252
##############################################################
253253

@@ -268,7 +268,7 @@ pro5v.bootloader.lock_bits=0x0F
268268
pro5v.build.mcu=atmega168
269269
pro5v.build.f_cpu=16000000L
270270
pro5v.build.core=arduino
271-
pro5v.build.pins=standard
271+
pro5v.build.variant=standard
272272

273273
##############################################################
274274

@@ -289,7 +289,7 @@ pro328.bootloader.lock_bits=0x0F
289289
pro328.build.mcu=atmega328p
290290
pro328.build.f_cpu=8000000L
291291
pro328.build.core=arduino
292-
pro328.build.pins=standard
292+
pro328.build.variant=standard
293293

294294
##############################################################
295295

@@ -310,7 +310,7 @@ pro.bootloader.lock_bits=0x0F
310310
pro.build.mcu=atmega168
311311
pro.build.f_cpu=8000000L
312312
pro.build.core=arduino
313-
pro.build.pins=standard
313+
pro.build.variant=standard
314314

315315
##############################################################
316316

@@ -331,7 +331,7 @@ atmega168.bootloader.lock_bits=0x0F
331331
atmega168.build.mcu=atmega168
332332
atmega168.build.f_cpu=16000000L
333333
atmega168.build.core=arduino
334-
atmega168.build.pins=standard
334+
atmega168.build.variant=standard
335335

336336
##############################################################
337337

@@ -351,4 +351,4 @@ atmega8.bootloader.lock_bits=0x0F
351351
atmega8.build.mcu=atmega8
352352
atmega8.build.f_cpu=16000000L
353353
atmega8.build.core=arduino
354-
atmega8.build.pins=standard
354+
atmega8.build.variant=standard

‎hardware/arduino/pins/mega/pins_arduino.h renamed to ‎hardware/arduino/variants/mega/pins_arduino.h

File renamed without changes.

‎hardware/arduino/pins/standard/pins_arduino.h renamed to ‎hardware/arduino/variants/standard/pins_arduino.h

File renamed without changes.

0 commit comments

Comments
 (0)