rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Removed useless defaults in platform. Remove useless boards.txt/*.platform keys. Renamed some method to a more meaningful name

Browse Source
This commit is contained in:
Cristian Maglie 2012-01-02 17:39:43 +01:00
parent 06b6d060db
commit 812265f1c0
4 changed files with 75 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class Base {
// found in the sketchbook)
static public String librariesClassPath;
static public Map<String, TargetPackage> targetsTable;
static public Map<String, TargetPackage> packages;
// Location for untitled items
static File untitledFolder;
@ -270,7 +270,7 @@ public class Base {
}
}
targetsTable = new HashMap<String, TargetPackage>();
packages = new HashMap<String, TargetPackage>();
loadHardware(getHardwareFolder());
loadHardware(getSketchbookHardwareFolder());
@ -941,52 +941,50 @@ public class Base {
}
}
public void rebuildImportMenu(JMenu importMenu) {
// System.out.println("rebuilding import menu");
importMenu.removeAll();
public void rebuildImportMenu(JMenu importMenu) {
// System.out.println("rebuilding import menu");
importMenu.removeAll();
// reset the set of libraries
libraries = new HashSet<File>();
// reset the set of libraries
libraries = new HashSet<File>();
// reset the table mapping imports to libraries
importToLibraryTable = new HashMap<String, File>();
// reset the table mapping imports to libraries
importToLibraryTable = new HashMap<String, File>();
// Add from the "libraries" subfolder in the Processing directory
// Choose which library to add by chip platform
// Add from the "libraries" subfolder in the Processing directory
// Choose which library to add by chip platform
try {
// Find the current target. Get the platform, and then select the
// correct name and core path.
PreferencesMap prefs = getTargetPlatform().getPreferences();
String targetname = prefs.get("name");
String libraryPath = prefs.get("library.core.path");
try {
// Find the current target. Get the platform, and then select the
// correct name and core path.
String platformname = getBoardPreferences().get("platform");
String targetname = getPlatformPreferences(platformname).get("name");
String libraryPath = getPlatformPreferences(platformname).get(
"library.core.path");
JMenuItem platformItem = new JMenuItem(targetname);
platformItem.setEnabled(false);
importMenu.add(platformItem);
importMenu.addSeparator();
addLibraries(importMenu, getCoreLibraries(libraryPath));
} catch (IOException e) {
e.printStackTrace();
}
JMenuItem platformItem = new JMenuItem(targetname);
platformItem.setEnabled(false);
importMenu.add(platformItem);
importMenu.addSeparator();
addLibraries(importMenu, getCoreLibraries(libraryPath));
} catch (IOException e) {
e.printStackTrace();
}
// Add libraries found in the sketchbook folder
int separatorIndex = importMenu.getItemCount();
try {
File sketchbookLibraries = getSketchbookLibrariesFolder();
boolean found = addLibraries(importMenu, sketchbookLibraries);
if (found) {
JMenuItem contrib = new JMenuItem(_("Contributed"));
contrib.setEnabled(false);
importMenu.insert(contrib, separatorIndex);
importMenu.insertSeparator(separatorIndex);
}
} catch (IOException e) {
e.printStackTrace();
}
}
// Add libraries found in the sketchbook folder
int separatorIndex = importMenu.getItemCount();
try {
File sketchbookLibraries = getSketchbookLibrariesFolder();
boolean found = addLibraries(importMenu, sketchbookLibraries);
if (found) {
JMenuItem contrib = new JMenuItem(_("Contributed"));
contrib.setEnabled(false);
importMenu.insert(contrib, separatorIndex);
importMenu.insertSeparator(separatorIndex);
}
} catch (IOException e) {
e.printStackTrace();
}
}
public void rebuildExamplesMenu(JMenu menu) {
//System.out.println("rebuilding examples menu");
@ -1015,7 +1013,7 @@ public class Base {
//System.out.println("rebuilding boards menu");
menu.removeAll();
ButtonGroup group = new ButtonGroup();
for (TargetPackage targetPackage : targetsTable.values()) {
for (TargetPackage targetPackage : packages.values()) {
for (TargetPlatform targetPlatform : targetPackage.platforms()) {
for (String board : targetPlatform.getBoards().keySet()) {
AbstractAction action = new AbstractAction(targetPlatform.getBoards().get(
@ -1053,7 +1051,7 @@ public class Base {
//System.out.println("rebuilding programmer menu");
menu.removeAll();
ButtonGroup group = new ButtonGroup();
for (TargetPackage targetPackage : targetsTable.values()) {
for (TargetPackage targetPackage : packages.values()) {
for (TargetPlatform targetPlatform : targetPackage.platforms()) {
for (String programmer : targetPlatform.getProgrammers().keySet()) {
String id = targetPackage.getName() + ":" + targetPlatform.getName() + ":"
@ -1282,7 +1280,7 @@ public class Base {
for (String target : list) {
File subfolder = new File(folder, target);
targetsTable.put(target, new TargetPackage(target, subfolder));
packages.put(target, new TargetPackage(target, subfolder));
}
}
@ -1565,38 +1563,31 @@ public class Base {
}
static public TargetPlatform getTarget() {
TargetPackage pack = targetsTable.get(Preferences.get("target_package"));
TargetPlatform platform = pack.get(Preferences.get("target_platform"));
if (platform == null) {
System.out.println("Selected platform is not in list. Replace with default.");
Preferences.set("target_platform", "arduino");
platform = pack.get(Preferences.get("target_platform"));
}
return platform;
/**
* Returns the currently selected TargetPlatform.
*
* @return
*/
static public TargetPlatform getTargetPlatform() {
String packageName = Preferences.get("target_package");
String platformName = Preferences.get("target_platform");
return getTargetPlatform(packageName, platformName);
}
static public PreferencesMap getPlatformPreferences() {
return getTarget().getPlatform();
}
// Search for a specific platform
static public TargetPlatform getTargetPlatform(String pack, String platform) {
return targetsTable.get(pack).get(platform);
/**
* Returns a specific TargetPlatform searching Package/Platform
*
* @param packageName
* @param platformName
* @return
*/
static public TargetPlatform getTargetPlatform(String packageName,
String platformName) {
return packages.get(packageName).get(platformName);
}
// Get a specific platform preferences inside actual package
static public PreferencesMap getPlatformPreferences(String platformName) {
if (platformName == null)
platformName = Preferences.get("platform");
TargetPackage pack = targetsTable.get(Preferences.get("target_package"));
TargetPlatform target = pack.get(platformName);
return target.getPlatform();
}
static public PreferencesMap getBoardPreferences() {
TargetPlatform target = getTarget();
TargetPlatform target = getTargetPlatform();
if (target != null) {
String board = Preferences.get("board");
return target.getBoards().get(board);

6
app/src/processing/app/debug/AvrdudeUploader.java
View File

@ -46,7 +46,7 @@ public class AvrdudeUploader extends Uploader {
// bootloader and upload using the selected programmer.
if (usingProgrammer || boardPreferences.get("upload.protocol") == null) {
String programmer = Preferences.get("programmer");
TargetPlatform targetPlatform = Base.getTarget();
TargetPlatform targetPlatform = Base.getTargetPlatform();
if (programmer.contains(":")) {
String[] split = programmer.split(":", 2);
@ -90,7 +90,7 @@ public class AvrdudeUploader extends Uploader {
public boolean burnBootloader() throws RunnerException {
String programmer = Preferences.get("programmer");
TargetPlatform targetPlatform = Base.getTarget();
TargetPlatform targetPlatform = Base.getTargetPlatform();
if (programmer.contains(":")) {
String[] split = programmer.split(":", 2);
targetPlatform = Base.getTargetPlatform(split[0], Preferences
@ -152,7 +152,7 @@ public class AvrdudeUploader extends Uploader {
TargetPlatform targetPlatform;
if (bootloaderPath.contains(":")) {
// the current target (associated with the board)
targetPlatform = Base.getTarget();
targetPlatform = Base.getTargetPlatform();
} else {
String[] split = bootloaderPath.split(":", 2);
targetPlatform = Base.getTargetPlatform(split[0], Preferences

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

@ -83,13 +83,8 @@ public class Compiler implements MessageConsumer {
PreferencesMap boardPreferences = Base.getBoardPreferences();
// Check for null platform, and use system default if not found
String platform = boardPreferences.get("platform");
PreferencesMap platformPreferences;
if (platform == null)
platformPreferences = Base.getPlatformPreferences();
else
platformPreferences = Base.getPlatformPreferences(platform);
TargetPlatform targetPlatform = Base.getTargetPlatform();
PreferencesMap platformPreferences = targetPlatform.getPreferences();
// Merge all the global preference configuration in order of priority
prefs = new PreferencesMap();
@ -104,10 +99,7 @@ public class Compiler implements MessageConsumer {
toolsPath = prefs.get("compiler.path");
if (toolsPath == null) {
toolsPath = Base.getAvrBasePath();
System.out.println("avrBasePath: " + toolsPath);
} else {
System.out.println("avrBasePath:exists: " + toolsPath);
// Put in the system path in the compiler path if available
MessageFormat compileFormat = new MessageFormat(toolsPath);
String basePath = System.getProperty("user.dir");
@ -131,7 +123,7 @@ public class Compiler implements MessageConsumer {
File coreFolder;
if (!core.contains(":")) {
TargetPlatform t = Base.getTarget();
TargetPlatform t = Base.getTargetPlatform();
coreFolder = new File(t.getFolder(), "cores");
coreFolder = new File(coreFolder, core);
} else {
@ -148,7 +140,7 @@ public class Compiler implements MessageConsumer {
if (variant != null) {
File variantFolder;
if (!variant.contains(":")) {
TargetPlatform t = Base.getTarget();
TargetPlatform t = Base.getTargetPlatform();
variantFolder = new File(t.getFolder(), "variants");
variantFolder = new File(variantFolder, variant);
} else {

10
app/src/processing/app/debug/TargetPlatform.java
View File

@ -34,7 +34,7 @@ public class TargetPlatform {
private File folder;
private Map<String, PreferencesMap> boards;
private Map<String, PreferencesMap> programmers;
private PreferencesMap platform;
private PreferencesMap preferences;
public TargetPlatform(String _name, File _folder) {
System.out.println("TargetPlatform: constructor start, name: " + _name);
@ -42,7 +42,7 @@ public class TargetPlatform {
folder = _folder;
boards = new HashMap<String, PreferencesMap>();
programmers = new HashMap<String, PreferencesMap>();
platform = new PreferencesMap();
preferences = new PreferencesMap();
try {
File boardsFile = new File(_folder, "boards.txt");
@ -58,7 +58,7 @@ public class TargetPlatform {
try {
File platformsFile = new File(_folder, "platforms.txt");
if (platformsFile.exists())
platform.load(platformsFile);
preferences.load(platformsFile);
} catch (Exception e) {
System.err.println("Error loading platforms from platform.txt: " + e);
}
@ -92,7 +92,7 @@ public class TargetPlatform {
return programmers;
}
public PreferencesMap getPlatform() {
return platform;
public PreferencesMap getPreferences() {
return preferences;
}
}