arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Adapting Rick's platform work to other platform changes.

Browse Source
This commit is contained in:
David A. Mellis
2011-06-25 12:51:56 -04:00
parent f7f9f78b5a
commit 05d622f3ac
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/Base.java
View File

@ -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;

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

@ -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<String> includePaths = new ArrayList();
includePaths.add(corePath);
includePaths.add(systemPath);
if (pinsPath != null) includePaths.add(pinsPath);
for (File file : sketch.getImportedLibraries()) {
includePaths.add(file.getPath());