arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

When build.core is not defined, fall back to "arduino". Fixes #2635

Browse Source
This commit is contained in:
Federico Fissore
2015-02-12 17:27:58 +01:00
parent ff6fb31f4a
commit e76d413454
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -688,7 +688,7 @@ public class BaseNoGui {
// Add library folder for the current selected platform // Add library folder for the current selected platform
TargetPlatform targetPlatform = getTargetPlatform(); TargetPlatform targetPlatform = getTargetPlatform();
if (targetPlatform != null) { if (targetPlatform != null) {
String core = getBoardPreferences().get("build.core"); String core = getBoardPreferences().get("build.core", "arduino");
if (core.contains(":")) { if (core.contains(":")) {
String referencedCore = core.split(":")[0]; String referencedCore = core.split(":")[0];
TargetPlatform referencedPlatform = getTargetPlatform(referencedCore, targetPlatform.getId()); TargetPlatform referencedPlatform = getTargetPlatform(referencedCore, targetPlatform.getId());

2
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -426,7 +426,7 @@ public class Compiler implements MessageConsumer {
TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform(); TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
TargetPlatform corePlatform = null; TargetPlatform corePlatform = null;
PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences(); PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
String core = boardPreferences.get("build.core"); String core = boardPreferences.get("build.core", "arduino");
if (core.contains(":")) { if (core.contains(":")) {
String[] split = core.split(":"); String[] split = core.split(":");
core = split[1]; core = split[1];

8
arduino-core/src/processing/app/helpers/PreferencesMap.java
View File

@ -319,4 +319,12 @@ public class PreferencesMap extends LinkedHashMap<String, String> {
return new Boolean(prev); return new Boolean(prev);
} }
public String get(String key, String defaultValue) {
String value = get(key);
if (value != null) {
return value;
}
return defaultValue;
}
} }