rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Merge branch 'patch-6' of https://github.com/NicoHood/Arduino into master

Browse Source
This commit is contained in:
Cristian Maglie 2015-09-29 18:49:11 +02:00
commit e4bd514ee9
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arduino-core/src/processing/app/debug/LegacyTargetPlatform.java
View File

@ -70,8 +70,23 @@ public class LegacyTargetPlatform implements TargetPlatform {
// Load boards
try {
Map<String, PreferencesMap> boardsPreferences = new PreferencesMap(
boardsFile).firstLevelMap();
PreferencesMap bPrefs = new PreferencesMap(
boardsFile);
// Allow overriding values in boards.txt. This allows changing
// boards.txt (e.g. to add user-specific items to a menu), without
// having to modify boards.txt (which, when running from git,
// prevents files being marked as changed).
File localboardsFile = new File(folder, "boards.local.txt");
try {
if (localboardsFile.exists() && localboardsFile.canRead()) {
bPrefs.load(localboardsFile);
}
} catch (IOException e) {
throw new TargetPlatformException(
format(tr("Error loading {0}"), localboardsFile.getAbsolutePath()), e);
}
Map<String, PreferencesMap> boardsPreferences = bPrefs.firstLevelMap();
// Create custom menus for this platform
PreferencesMap menus = boardsPreferences.get("menu");

2
hardware/arduino/avr/cores/arduino/PluggableUSB.h
View File

@ -50,8 +50,6 @@ int PUSB_GetDescriptor(int8_t t);
bool PUSB_Setup(USBSetup& setup, u8 i);
void PUSB_Begin();
#endif
#endif