diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index aaa28162f..23aabc575 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -953,8 +953,20 @@ public class Base { importToLibraryTable = new HashMap(); // Add from the "libraries" subfolder in the Processing directory + //Choose which library to add by chip platform + try { - addLibraries(importMenu, librariesFolder); + //Find the current target. Get the platform, and then select the correct name and core path. + String platformname = this.getBoardPreferences().get("platform"); + String targetname = this.getPlatformPreferences(platformname).get("name"); + String libraryPath = this.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(); } @@ -1011,6 +1023,8 @@ public class Base { Preferences.set("board", (String) getValue("board")); onBoardOrPortChange(); Sketch.buildSettingChanged(); + //Debug: created new imports menu based on board + rebuildImportMenu(activeEditor.importMenu); } }; action.putValue("target", target.getName()); @@ -1527,6 +1541,10 @@ public class Base { return getContentFile("hardware"); } + //Get the core libraries + static public File getCoreLibraries(String path) { + return getContentFile(path); + } static public String getHardwarePath() { return getHardwareFolder().getAbsolutePath(); @@ -1544,20 +1562,105 @@ public class Base { static public Target getTarget() { - return Base.targetsTable.get(Preferences.get("target")); + System.out.println("Base.targetsTable.get(Preferences.get(\"target\"))" + Base.targetsTable.get(Preferences.get("target"))); + System.out.println("Preferences.get(\"target\")" + Preferences.get("target")); + 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"); + target = Base.targetsTable.get(Preferences.get("target")); + } + return target; } - - static public Map getBoardPreferences() { + +static public Map getPlatformPreferences() { + System.out.println("getPlatformPreferences() no arguments: start"); Target target = getTarget(); - if (target == null) return new LinkedHashMap(); - Map map = target.getBoards(); - if (map == null) return new LinkedHashMap(); - map = (Map) map.get(Preferences.get("board")); - if (map == null) return new LinkedHashMap(); + //if (target == null) return new LinkedHashMap(); + Map map = target.getPlatforms(); + /* + if (map == null) + { + System.err.println("Error loading platforms preference from Target"); + System.exit(0); + } + */ + //if (map == null) return new LinkedHashMap(); + map = (Map) map.get(Preferences.get("platform")); + //if (map == null) return new LinkedHashMap(); return map; } - + + //Get a specific platform + static public Map getPlatformPreferences(String platformname) { + if (platformname == null) { + platformname = Preferences.get("platform"); + + } + System.out.println("getlatformPreferences(String platformname)): start: platformname = " + platformname ); + Target target = getTarget(); + if (target == null ) { + System.out.println("get target is null. trouble! "); + } + Map map = target.getPlatforms(); + map = (Map) map.get(platformname); + + //What if null or defaults to nonexisent platform + System.out.println("PlatformName: " + platformname); + if (map == null) + { + System.err.println("Error loading platforms preference from Target"); + System.exit(0); + } + + return map; + } + + static public Map bogusgetBoardPreferences() { + System.out.println("getBoardPrefences method: start"); + Target target = getTarget(); + if (target == null) { + System.out.println("getBoardPrefereces method: target == null"); + return new LinkedHashMap(); + } + Map map = target.getBoards(); + if (map == null) { + System.out.println("getBoardPrefereces method: target.getBoards() == null"); + return new LinkedHashMap(); + } + map = (Map) map.get(Preferences.get("board")); + if (map == null) { + System.out.println("getBoardPrefereces method: Preferences.get(board) == null"); + return new LinkedHashMap(); + } + //Debug iterate the map + Iterator iterator = map.entrySet().iterator(); + while(iterator.hasNext()) + { + Map.Entry pair = (Map.Entry)iterator.next(); + if (pair.getValue() == null) + { + System.out.println("KeyName: " + pair.getKey() + " val: null"); + } + else + { + System.out.println("KeyName: " + pair.getKey() + " val" + pair.getValue()); + } + } + + return map; + } + +static public Map getBoardPreferences() { + Target target = getTarget(); + Map map = new LinkedHashMap(); + if (target != null) { + map = target.getBoards(); + map = (Map) map.get(Preferences.get("board")); + } + return map; + } static public File getSketchbookFolder() { return new File(Preferences.get("sketchbook.path")); diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index ba2e641c2..9e52a021b 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -689,6 +689,9 @@ public class Editor extends JFrame implements RunnerListener { if (boardsMenu == null) { boardsMenu = new JMenu(_("Board")); base.rebuildBoardsMenu(boardsMenu); + //Debug: rebuild imports + importMenu.removeAll(); + base.rebuildImportMenu(importMenu); } menu.add(boardsMenu); diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index 423b20559..0cbb81b88 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -780,4 +780,22 @@ public class Preferences { return new SyntaxStyle(color, italic, bold, underlined); } + + //get a Map of the Preferences + static public Map getMap() + { + Map globalpreferences = new LinkedHashMap(); + Enumeration e = table.keys(); + + while (e.hasMoreElements()) + { + String key = (String) e.nextElement(); + //System.out.println("Key: " + key + "Val: " + table.get(key)); + String value = (String) table.get(key); + globalpreferences.put(key, value ); + } + + return globalpreferences; + } + } diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java index 1d540c374..31182dead 100644 --- a/app/src/processing/app/Sketch.java +++ b/app/src/processing/app/Sketch.java @@ -1438,9 +1438,12 @@ public class Sketch { // grab the imports from the code just preproc'd importedLibraries = new ArrayList(); - + //Remember to clear library path before building it. + libraryPath = ""; for (String item : preprocessor.getExtraImports()) { - File libFolder = (File) Base.importToLibraryTable.get(item); + + File libFolder = (File) Base.importToLibraryTable.get(item); + //If needed can Debug libraryPath here if (libFolder != null && !importedLibraries.contains(libFolder)) { importedLibraries.add(libFolder); diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index 29953666d..ecaf38048 100644 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -34,6 +34,7 @@ import static processing.app.I18n._; import java.io.*; import java.util.*; import java.util.zip.*; +import java.text.MessageFormat; public class Compiler implements MessageConsumer { @@ -45,9 +46,22 @@ public class Compiler implements MessageConsumer { Sketch sketch; String buildPath; String primaryClassName; - boolean verbose; + String platform; + String board; + boolean verbose; + RunnerException exception; + + HashMap configPreferences; + HashMap boardPreferences; + HashMap platformPreferences; + + String avrBasePath; + String corePath; + + List objectFiles; + ArrayList includePaths; public Compiler() { } @@ -68,13 +82,56 @@ public class Compiler implements MessageConsumer { this.buildPath = buildPath; this.primaryClassName = primaryClassName; this.verbose = verbose; + objectFiles = new ArrayList(); // the pms object isn't used for anything but storage MessageStream pms = new MessageStream(this); - - String avrBasePath = Base.getAvrBasePath(); Map boardPreferences = Base.getBoardPreferences(); - String core = boardPreferences.get("build.core"); + + //Check for null platform, and use system default if not found + platform = boardPreferences.get("platform"); + if (platform == null) + { + platformPreferences = new HashMap(Base.getPlatformPreferences()); + } + else + { + platformPreferences = new HashMap(Base.getPlatformPreferences(platform)); + } + + System.out.println("////////////////////////////compiler.java is doing stuff/////////////////"); + //Put all the global preference configuration into one Master configpreferences + configPreferences = mergePreferences( Preferences.getMap(), platformPreferences, boardPreferences); + avrBasePath = configPreferences.get("compiler.path"); + if (avrBasePath == null) + { + avrBasePath = Base.getAvrBasePath(); + System.out.println("avrBasePath: " + avrBasePath); + } + else + { + System.out.println("avrBasePath:exists: " + avrBasePath); + + //Put in the system path in the compiler path if available + MessageFormat compileFormat = new MessageFormat(avrBasePath); + String basePath = System.getProperty("user.dir"); + if (Base.isMacOS()) { + //logger.debug("basePath: " + basePath); + basePath += "/Arduino.app/Contents/Resources/Java"; + } + Object[] Args = {basePath}; + avrBasePath = compileFormat.format( Args ); + System.out.println("avrBasePath:new: " + avrBasePath); + + + } + this.board = configPreferences.get("board"); + if (this.board == "") + { + this.board = "_UNKNOWN"; + } + + String core = configPreferences.get("build.core"); if (core == null) { RunnerException re = new RunnerException(_("No board selected; please choose a board from the Tools > Board menu.")); re.hideStackTrace(); @@ -95,6 +152,9 @@ public class Compiler implements MessageConsumer { String variant = boardPreferences.get("build.variant"); String variantPath = null; + + String pins = configPreferences.get("build.pins"); + String pinsPath = null; if (variant != null) { if (variant.indexOf(':') == -1) { @@ -109,12 +169,11 @@ public class Compiler implements MessageConsumer { } } - List objectFiles = new ArrayList(); // 0. include paths for core + all libraries sketch.setCompilingProgress(20); - List includePaths = new ArrayList(); + ArrayList includePaths = new ArrayList(); includePaths.add(corePath); if (variantPath != null) includePaths.add(variantPath); for (File file : sketch.getImportedLibraries()) { @@ -122,18 +181,19 @@ public class Compiler implements MessageConsumer { } // 1. compile the sketch (already in the buildPath) - + System.out.println("1. compileSketch"); sketch.setCompilingProgress(30); - objectFiles.addAll( - compileFiles(avrBasePath, buildPath, includePaths, - findFilesInPath(buildPath, "S", false), - findFilesInPath(buildPath, "c", false), - findFilesInPath(buildPath, "cpp", false), - boardPreferences)); + compileSketch(avrBasePath, buildPath, includePaths, configPreferences); // 2. compile the libraries, outputting .o files to: // + // 2. compile the libraries, outputting .o files to: + // // + //Doesn't really use configPreferences + System.out.println("2. compileLibraries"); + sketch.setCompilingProgress(40); + compileLibraries(avrBasePath, buildPath, includePaths, configPreferences); +/* - sketch.setCompilingProgress(40); for (File libraryFolder : sketch.getImportedLibraries()) { File outputFolder = new File(buildPath, libraryFolder.getName()); File utilityFolder = new File(libraryFolder, "utility"); @@ -157,11 +217,17 @@ public class Compiler implements MessageConsumer { // other libraries should not see this library's utility/ folder includePaths.remove(includePaths.size() - 1); } +*/ // 3. compile the core, outputting .o files to and then // collecting them into the core.a library file. - + System.out.println("3. compileCore"); + System.out.println("corePath: " + corePath); sketch.setCompilingProgress(50); + compileCore(avrBasePath, buildPath, corePath, pins, pinsPath, configPreferences); + + +/* includePaths.clear(); includePaths.add(corePath); // include path for core only if (variantPath != null) includePaths.add(variantPath); @@ -183,16 +249,13 @@ public class Compiler implements MessageConsumer { commandAR.add(file.getAbsolutePath()); execAsynchronously(commandAR); } - +*/ // 4. link it all together into the .elf file - // For atmega2560, need --relax linker option to link larger - // programs correctly. - String optRelax = ""; - String atmega2560 = new String ("atmega2560"); - if ( atmega2560.equals(boardPreferences.get("build.mcu")) ) { - optRelax = new String(",--relax"); - } - sketch.setCompilingProgress(60); + sketch.setCompilingProgress(60); + System.out.println("4. compileLink"); + compileLink(avrBasePath, buildPath, corePath, includePaths, configPreferences); + +/* List baseCommandLinker = new ArrayList(Arrays.asList(new String[] { avrBasePath + "avr-gcc", "-Os", @@ -219,9 +282,11 @@ public class Compiler implements MessageConsumer { })); List commandObjcopy; +*/ // 5. extract EEPROM data (from EEMEM directive) to .eep file. sketch.setCompilingProgress(70); +/* commandObjcopy = new ArrayList(baseCommandObjcopy); commandObjcopy.add(2, "ihex"); commandObjcopy.set(3, "-j"); @@ -233,26 +298,32 @@ public class Compiler implements MessageConsumer { commandObjcopy.add(buildPath + File.separator + primaryClassName + ".elf"); commandObjcopy.add(buildPath + File.separator + primaryClassName + ".eep"); execAsynchronously(commandObjcopy); +*/ + System.out.println("5. compileEep"); + compileEep(avrBasePath, buildPath, includePaths, configPreferences); // 6. build the .hex file sketch.setCompilingProgress(80); +/* commandObjcopy = new ArrayList(baseCommandObjcopy); commandObjcopy.add(2, "ihex"); commandObjcopy.add(".eeprom"); // remove eeprom data commandObjcopy.add(buildPath + File.separator + primaryClassName + ".elf"); commandObjcopy.add(buildPath + File.separator + primaryClassName + ".hex"); execAsynchronously(commandObjcopy); +*/ + System.out.println("6. compileHex"); + compileHex(avrBasePath, buildPath, includePaths, configPreferences); sketch.setCompilingProgress(90); - return true; } private List compileFiles(String avrBasePath, - String buildPath, List includePaths, - List sSources, - List cSources, List cppSources, + String buildPath, ArrayList includePaths, + ArrayList sSources, + ArrayList cSources, ArrayList cppSources, Map boardPreferences) throws RunnerException { @@ -264,7 +335,7 @@ public class Compiler implements MessageConsumer { execAsynchronously(getCommandCompilerS(avrBasePath, includePaths, file.getAbsolutePath(), objectPath, - boardPreferences)); + configPreferences)); } for (File file : cSources) { @@ -277,7 +348,7 @@ public class Compiler implements MessageConsumer { execAsynchronously(getCommandCompilerC(avrBasePath, includePaths, file.getAbsolutePath(), objectPath, - boardPreferences)); + configPreferences)); } for (File file : cppSources) { @@ -290,7 +361,7 @@ public class Compiler implements MessageConsumer { execAsynchronously(getCommandCompilerCPP(avrBasePath, includePaths, file.getAbsolutePath(), objectPath, - boardPreferences)); + configPreferences)); } return objectPaths; @@ -365,9 +436,18 @@ public class Compiler implements MessageConsumer { /** * Either succeeds or throws a RunnerException fit for public consumption. */ - private void execAsynchronously(List commandList) throws RunnerException { - String[] command = new String[commandList.size()]; - commandList.toArray(command); + private void execAsynchronously(String[] command) throws RunnerException { + + //eliminate any empty array entries + List stringList = new ArrayList(); + for(String string : command) { + string = string.trim(); + if(string != null && string.length() > 0) { + stringList.add(string); + } + } + command = stringList.toArray(new String[stringList.size()]); + int result = 0; if (verbose || Preferences.getBoolean("build.verbose")) { @@ -427,6 +507,7 @@ public class Compiler implements MessageConsumer { re.hideStackTrace(); throw re; } + System.out.println("execAsync: Done."); } @@ -523,7 +604,7 @@ public class Compiler implements MessageConsumer { } ///////////////////////////////////////////////////////////////////////////// - +/* static private List getCommandCompilerS(String avrBasePath, List includePaths, String sourceName, String objectName, Map boardPreferences) { List baseCommandCompiler = new ArrayList(Arrays.asList(new String[] { @@ -545,7 +626,39 @@ public class Compiler implements MessageConsumer { return baseCommandCompiler; } +*/ + // /////////////////////////////////////////////////////////////////////////// + static private String[] getCommandCompilerS(String avrBasePath, + ArrayList includePaths, String sourceName, String objectName, + HashMap configPreferences) + { + System.out.println("getCommandCompilerS: start"); + String baseCommandString = configPreferences.get("recipe.cpp.o.pattern"); + MessageFormat compileFormat = new MessageFormat(baseCommandString); + //getIncludes to String + + String includes = preparePaths(includePaths); + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.cpp.cmd"), + configPreferences.get("compiler.S.flags"), + configPreferences.get("compiler.cpudef"), + configPreferences.get("build.mcu"), + configPreferences.get("build.f_cpu"), + configPreferences.get("software"), + Base.REVISION, + includes, + sourceName, + objectName + }; + + String command = compileFormat.format( Args ); + String[] commandArray = command.split("\\|"); + return commandArray; + } + +/* static private List getCommandCompilerC(String avrBasePath, List includePaths, String sourceName, String objectName, Map boardPreferences) { @@ -574,7 +687,38 @@ public class Compiler implements MessageConsumer { return baseCommandCompiler; } + */ + //removed static + private String[] getCommandCompilerC(String avrBasePath, + ArrayList includePaths, String sourceName, String objectName, + HashMap configPreferences) + { + System.out.println("getCommandCompilerC: start"); + String baseCommandString = configPreferences.get("recipe.c.o.pattern"); + MessageFormat compileFormat = new MessageFormat(baseCommandString); + //getIncludes to String + String includes = preparePaths(includePaths); + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.c.cmd"), + configPreferences.get("compiler.c.flags"), + configPreferences.get("compiler.cpudef"), + configPreferences.get("build.mcu"), + configPreferences.get("build.f_cpu"), + configPreferences.get("software"), + Base.REVISION, + includes, + sourceName, + objectName + }; + + String command = compileFormat.format( Args ); + String[] commandArray = command.split("\\|"); + return commandArray; + } +/* static private List getCommandCompilerCPP(String avrBasePath, List includePaths, String sourceName, String objectName, @@ -605,7 +749,44 @@ public class Compiler implements MessageConsumer { return baseCommandCompilerCPP; } +*/ + static private String[] getCommandCompilerCPP(String avrBasePath, + ArrayList includePaths, String sourceName, String objectName, + HashMap configPreferences) + { + System.out.println("getCommandCompilerCPP: start"); + String baseCommandString = configPreferences.get("recipe.cpp.o.pattern"); + MessageFormat compileFormat = new MessageFormat(baseCommandString); + //getIncludes to String + String includes = preparePaths(includePaths); + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.cpp.cmd"), + configPreferences.get("compiler.cpp.flags"), + configPreferences.get("compiler.cpudef"), + configPreferences.get("build.mcu"), + configPreferences.get("build.f_cpu"), + configPreferences.get("software"), + Base.REVISION, + includes, + sourceName, + objectName + }; + + String command = compileFormat.format( Args ); + String[] commandArray = command.split("\\|"); + + /* + System.out.println("command:" + command); + for (int ii = 0; ii < commandArray.length; ii++) + { + System.out.println("'" + commandArray[ii] + "'"); + } + */ + return commandArray; + } ///////////////////////////////////////////////////////////////////////////// @@ -633,6 +814,7 @@ public class Compiler implements MessageConsumer { static public ArrayList findFilesInPath(String path, String extension, boolean recurse) { + System.out.println("findFilesInPath: " + path); return findFilesInFolder(new File(path), extension, recurse); } @@ -655,4 +837,277 @@ public class Compiler implements MessageConsumer { return files; } + + + // 1. compile the sketch (already in the buildPath) + void compileSketch(String avrBasePath, String buildPath, ArrayList includePaths, HashMap configPreferences) + throws RunnerException + { + System.out.println("compileSketch: start"); + System.out.println("includePaths: "); + for (int i = 0; i < includePaths.size(); i++) { + System.out.println("-I" + (String) includePaths.get(i)); + } + + //logger.debug("compileSketch: start"); + this.objectFiles.addAll(compileFiles(avrBasePath, buildPath, includePaths, + findFilesInPath(buildPath, "S", false), + findFilesInPath(buildPath, "c", false), + findFilesInPath(buildPath, "cpp", false), + configPreferences)); + } + + // 2. compile the libraries, outputting .o files to: + // // + void compileLibraries (String avrBasePath, String buildPath, ArrayList includePaths, HashMap configPreferences) + throws RunnerException + { + System.out.println("compileLibraries: start"); + + for (File libraryFolder : sketch.getImportedLibraries()) { + System.out.println("libraryFolder: " + libraryFolder); + File outputFolder = new File(buildPath, libraryFolder.getName()); + File utilityFolder = new File(libraryFolder, "utility"); + createFolder(outputFolder); + // this library can use includes in its utility/ folder + includePaths.add(utilityFolder.getAbsolutePath()); + //debug includePaths + System.out.println("includePaths: "); + for (int i = 0; i < includePaths.size(); i++) { + System.out.println("-I" + (String) includePaths.get(i)); + } + + + objectFiles.addAll( + compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths, + findFilesInFolder(libraryFolder, "S", false), + findFilesInFolder(libraryFolder, "c", false), + findFilesInFolder(libraryFolder, "cpp", false), + boardPreferences)); + outputFolder = new File(outputFolder, "utility"); + createFolder(outputFolder); + objectFiles.addAll( + compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths, + findFilesInFolder(utilityFolder, "S", false), + findFilesInFolder(utilityFolder, "c", false), + findFilesInFolder(utilityFolder, "cpp", false), + boardPreferences)); + // other libraries should not see this library's utility/ folder + includePaths.remove(includePaths.size() - 1); + } + } + + // 3. compile the core, outputting .o files to and then + // collecting them into the core.a library file. + void compileCore (String avrBasePath, String buildPath, String corePath, String pins, String pinsPath, HashMap configPreferences) + throws RunnerException + { + System.out.println("compileCore(...) start"); + + ArrayList includePaths = new ArrayList(); + includePaths.add(corePath); //include core path only + if (pinsPath != null) includePaths.add(pinsPath); + + //debug includePaths + System.out.println("includePaths: "); + for (int i = 0; i < includePaths.size(); i++) { + System.out.println("-I" + (String) includePaths.get(i)); + } + + String baseCommandString = configPreferences.get("recipe.ar.pattern"); + String commandString = ""; + MessageFormat compileFormat = new MessageFormat(baseCommandString); + System.out.println("corePath: " + corePath); + List coreObjectFiles = compileFiles( + avrBasePath, + buildPath, + includePaths, + findFilesInPath(corePath, "S", true), + findFilesInPath(corePath, "c", true), + findFilesInPath(corePath, "cpp", true), + configPreferences); + + for (File file : coreObjectFiles) { + //List commandAR = new ArrayList(baseCommandAR); + //commandAR = commandAR + file.getAbsolutePath(); + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.ar.cmd"), + configPreferences.get("compiler.ar.flags"), + //corePath, + buildPath + File.separator, + "core.a", + //objectName + file.getAbsolutePath() + }; + System.out.println("compileCore(...) substitute"); + + commandString = compileFormat.format( Args ); + String[] commandArray = commandString.split("\\|"); + execAsynchronously(commandArray); + + + } + } + + // 4. link it all together into the .elf file + void compileLink(String avrBasePath, String buildPath, String corePath, ArrayList includePaths, HashMap configPreferences) + throws RunnerException + { + // For atmega2560, need --relax linker option to link larger + // programs correctly. + String optRelax = ""; + if (boardPreferences.get("build.mcu").equals("atmega2560")) + optRelax = ",--relax"; + + System.out.println("compileLink: start"); + String baseCommandString = configPreferences.get("recipe.c.combine.pattern"); + String commandString = ""; + MessageFormat compileFormat = new MessageFormat(baseCommandString); + String objectFileList = ""; + + for (File file : objectFiles) { + objectFileList = objectFileList + file.getAbsolutePath() + "|"; + } + System.out.println("objectFileList: " + objectFileList); + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.c.elf.cmd"), + configPreferences.get("compiler.c.elf.flags")+optRelax, + configPreferences.get("compiler.cpudef"), + configPreferences.get("build.mcu"), + buildPath + File.separator, + primaryClassName, + objectFileList, + buildPath + File.separator + "core.a", + buildPath, + corePath, + configPreferences.get("ldscript"), + }; + commandString = compileFormat.format( Args ); + String[] commandArray = commandString.split("\\|"); + execAsynchronously(commandArray); + } + + // 5. extract EEPROM data (from EEMEM directive) to .eep file. + void compileEep (String avrBasePath, String buildPath, ArrayList includePaths, HashMap configPreferences) + throws RunnerException + { + //logger.debug("compileEep: start"); + String baseCommandString = configPreferences.get("recipe.objcopy.eep.pattern"); + String commandString = ""; + MessageFormat compileFormat = new MessageFormat(baseCommandString); + String objectFileList = ""; + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.objcopy.cmd"), + configPreferences.get("compiler.objcopy.eep.flags"), + buildPath + File.separator + primaryClassName, + buildPath + File.separator + primaryClassName + }; + commandString = compileFormat.format( Args ); + String[] commandArray = commandString.split("\\|"); + execAsynchronously(commandArray); + } + + // 6. build the .hex file + void compileHex (String avrBasePath, String buildPath, ArrayList includePaths, HashMap configPreferences) + throws RunnerException + { + //logger.debug("compileHex: start"); + String baseCommandString = configPreferences.get("recipe.objcopy.hex.pattern"); + String commandString = ""; + MessageFormat compileFormat = new MessageFormat(baseCommandString); + String objectFileList = ""; + + Object[] Args = { + avrBasePath, + configPreferences.get("compiler.elf2hex.cmd"), + configPreferences.get("compiler.elf2hex.flags"), + buildPath + File.separator + primaryClassName, + buildPath + File.separator + primaryClassName + }; + commandString = compileFormat.format( Args ); + String[] commandArray = commandString.split("\\|"); + execAsynchronously(commandArray); + } + + //merge all the preferences file in the correct order of precedence + HashMap mergePreferences(Map Preferences, Map platformPreferences, Map boardPreferences) + { + HashMap _map = new HashMap(); + + Iterator iterator = Preferences.entrySet().iterator(); + + while(iterator.hasNext()) + { + Map.Entry pair = (Map.Entry)iterator.next(); + if (pair.getValue() == null) + { + _map.put(pair.getKey(), ""); + } + else + { + _map.put(pair.getKey(), pair.getValue()); + } + } + + //logger.debug("Done: Preferences"); + + iterator = platformPreferences.entrySet().iterator(); + + while(iterator.hasNext()) + { + Map.Entry pair = (Map.Entry)iterator.next(); + + if (pair.getValue() == null) + { + _map.put(pair.getKey(), ""); + } + else + { + _map.put(pair.getKey(), pair.getValue()); + } + //System.out.println(pair.getKey() + " = " + pair.getValue()); + } + + //System.out.println("Done: platformPreferences"); + iterator = boardPreferences.entrySet().iterator(); + + while(iterator.hasNext()) + { + Map.Entry pair = (Map.Entry)iterator.next(); + + if (pair.getValue() == null) + { + _map.put(pair.getKey(), ""); + } + else + { + _map.put(pair.getKey(), pair.getValue()); + } + //System.out.println(pair.getKey() + " = " + pair.getValue()); + } + //System.out.println("Done: boardPreferences"); + + + return _map; + } + + private static String preparePaths(ArrayList includePaths) { + //getIncludes to String + //logger.debug("Start: Prepare paths"); + String includes = ""; + for (int i = 0; i < includePaths.size(); i++) + { + includes = includes + (" -I" + (String) includePaths.get(i)) + "|"; + } + //logger.debug("Paths prepared: " + includes); + return includes; + } + + } diff --git a/app/src/processing/app/debug/Target.java b/app/src/processing/app/debug/Target.java index 1aa2f81be..6849544f5 100644 --- a/app/src/processing/app/debug/Target.java +++ b/app/src/processing/app/debug/Target.java @@ -29,18 +29,22 @@ import java.io.*; import java.util.*; import processing.app.Preferences; +//import processing.app.Base; public class Target { private String name; private File folder; private Map boards; private Map programmers; - + private Map platforms; + public Target(String name, File folder) { + System.out.println("Target: constructor start, name: " + name); this.name = name; this.folder = folder; this.boards = new LinkedHashMap(); this.programmers = new LinkedHashMap(); + this.platforms = new LinkedHashMap(); File boardsFile = new File(folder, "boards.txt"); try { @@ -58,8 +62,31 @@ public class Target { } } catch (Exception e) { System.err.println("Error loading boards from " + boardsFile + ": " + e); + } + File platformsFile = new File(folder,"platforms.txt"); + try + { + if(platformsFile.exists()){ + Map platformPreferences = new LinkedHashMap(); + Preferences.load(new FileInputStream(platformsFile), platformPreferences); + for(Object k : platformPreferences.keySet()) + { + String key=(String) k; + String platform=key.substring(0,key.indexOf('.')); + if (!platforms.containsKey(platform)) platforms.put(platform, new HashMap()); + ((Map) platforms.get(platform)).put(key.substring(key.indexOf('.') + 1),platformPreferences.get(key)); + } + } + } catch (Exception e) { + System.err.println("Error loading platforms from " + + platformsFile + ": " + e); + //System.exit(0); + + } + + File programmersFile = new File(folder, "programmers.txt"); try { if (programmersFile.exists()) { @@ -88,4 +115,8 @@ public class Target { public Map> getProgrammers() { return programmers; } -} \ No newline at end of file + public Map> getPlatforms() { + return platforms; + } + +} diff --git a/build/build.xml b/build/build.xml index 6a40d1b2c..167531df0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -217,6 +217,10 @@ + + + + diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt index bca71bfd9..c1d370cfe 100755 --- a/build/shared/lib/preferences.txt +++ b/build/shared/lib/preferences.txt @@ -239,6 +239,8 @@ run.present.exclusive.macosx = true # ARDUINO PREFERENCES board = uno target = arduino +platform = avr +software=ARDUINO programmer = arduino:avrispmkii diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt index 018a7fa31..942ffe07c 100644 --- a/hardware/arduino/boards.txt +++ b/hardware/arduino/boards.txt @@ -1,7 +1,8 @@ ############################################################## uno.name=Arduino Uno -uno.upload.protocol=arduino +uno.platform=avr +uno.upload.protocol=stk500 uno.upload.maximum_size=32256 uno.upload.speed=115200 uno.bootloader.low_fuses=0xff @@ -19,7 +20,7 @@ uno.build.variant=standard ############################################################## atmega328.name=Arduino Duemilanove w/ ATmega328 - +atmega328.platform=avr atmega328.upload.protocol=arduino atmega328.upload.maximum_size=30720 atmega328.upload.speed=57600 @@ -40,7 +41,7 @@ atmega328.build.variant=standard ############################################################## diecimila.name=Arduino Diecimila or Duemilanove w/ ATmega168 - +diecimila.platform=avr diecimila.upload.protocol=arduino diecimila.upload.maximum_size=14336 diecimila.upload.speed=19200 @@ -61,7 +62,7 @@ diecimila.build.variant=standard ############################################################## nano328.name=Arduino Nano w/ ATmega328 - +nano328.platform=avr nano328.upload.protocol=arduino nano328.upload.maximum_size=30720 nano328.upload.speed=57600 @@ -82,7 +83,7 @@ nano328.build.variant=eightanaloginputs ############################################################## nano.name=Arduino Nano w/ ATmega168 - +nano.platform=avr nano.upload.protocol=arduino nano.upload.maximum_size=14336 nano.upload.speed=19200 @@ -103,7 +104,7 @@ nano.build.variant=eightanaloginputs ############################################################## mega2560.name=Arduino Mega 2560 or Mega ADK - +mega2560.platform=avr mega2560.upload.protocol=stk500v2 mega2560.upload.maximum_size=258048 mega2560.upload.speed=115200 @@ -124,7 +125,7 @@ mega2560.build.variant=mega ############################################################## mega.name=Arduino Mega (ATmega1280) - +mega.platform=avr mega.upload.protocol=arduino mega.upload.maximum_size=126976 mega.upload.speed=57600 @@ -145,6 +146,7 @@ mega.build.variant=mega ############################################################## #leonardo.name=Arduino Leonardo +#leonardo.platform=avr #leonardo.upload.protocol=arduino #leonardo.upload.maximum_size=28672 #leonardo.upload.speed=1200 @@ -163,6 +165,7 @@ mega.build.variant=mega ############################################################## #micro.name=Arduino Micro +#micro.platform=avr #micro.upload.protocol=arduino #micro.upload.maximum_size=30720 #micro.upload.speed=1200 @@ -181,7 +184,7 @@ mega.build.variant=mega ############################################################## mini328.name=Arduino Mini w/ ATmega328 - +mini328.platform=avr mini328.upload.protocol=stk500 mini328.upload.maximum_size=28672 mini328.upload.speed=115200 @@ -202,7 +205,7 @@ mini328.build.variant=eightanaloginputs ############################################################## mini.name=Arduino Mini w/ ATmega168 - +mini.platform=avr mini.upload.protocol=arduino mini.upload.maximum_size=14336 mini.upload.speed=19200 @@ -223,7 +226,7 @@ mini.build.variant=eightanaloginputs ############################################################## ethernet.name=Arduino Ethernet - +ethernet.platform=avr ethernet.upload.protocol=arduino ethernet.upload.maximum_size=32256 ethernet.upload.speed=115200 @@ -244,7 +247,7 @@ ethernet.build.core=arduino ############################################################## fio.name=Arduino Fio - +fio.platform=avr fio.upload.protocol=arduino fio.upload.maximum_size=30720 fio.upload.speed=57600 @@ -265,7 +268,7 @@ fio.build.variant=eightanaloginputs ############################################################## bt328.name=Arduino BT w/ ATmega328 - +bt328.platform=avr bt328.upload.protocol=arduino bt328.upload.maximum_size=28672 bt328.upload.speed=19200 @@ -287,7 +290,7 @@ bt328.build.variant=eightanaloginputs ############################################################## bt.name=Arduino BT w/ ATmega168 - +bt.platform=avr bt.upload.protocol=arduino bt.upload.maximum_size=14336 bt.upload.speed=19200 @@ -309,7 +312,7 @@ bt.build.variant=eightanaloginputs ############################################################## lilypad328.name=LilyPad Arduino w/ ATmega328 - +lilypad328.platform=avr lilypad328.upload.protocol=arduino lilypad328.upload.maximum_size=30720 lilypad328.upload.speed=57600 @@ -330,7 +333,7 @@ lilypad328.build.variant=standard ############################################################## lilypad.name=LilyPad Arduino w/ ATmega168 - +lilypad.platform=avr lilypad.upload.protocol=arduino lilypad.upload.maximum_size=14336 lilypad.upload.speed=19200 @@ -351,7 +354,7 @@ lilypad.build.variant=standard ############################################################## pro5v328.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328 - +pro5v328.platform=avr pro5v328.upload.protocol=arduino pro5v328.upload.maximum_size=30720 pro5v328.upload.speed=57600 @@ -372,7 +375,7 @@ pro5v328.build.variant=standard ############################################################## pro5v.name=Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168 - +pro5v.platform=avr pro5v.upload.protocol=arduino pro5v.upload.maximum_size=14336 pro5v.upload.speed=19200 @@ -393,7 +396,7 @@ pro5v.build.variant=standard ############################################################## pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328 - +pro328.platform=avr pro328.upload.protocol=arduino pro328.upload.maximum_size=30720 pro328.upload.speed=57600 @@ -414,7 +417,7 @@ pro328.build.variant=standard ############################################################## pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168 - +pro.platform=avr pro.upload.protocol=arduino pro.upload.maximum_size=14336 pro.upload.speed=19200 @@ -435,7 +438,7 @@ pro.build.variant=standard ############################################################## atmega168.name=Arduino NG or older w/ ATmega168 - +atmega168.platform=avr atmega168.upload.protocol=arduino atmega168.upload.maximum_size=14336 atmega168.upload.speed=19200 @@ -456,7 +459,7 @@ atmega168.build.variant=standard ############################################################## atmega8.name=Arduino NG or older w/ ATmega8 - +atmega8.platform=avr atmega8.upload.protocol=arduino atmega8.upload.maximum_size=7168 atmega8.upload.speed=19200 diff --git a/hardware/arduino/platforms.txt b/hardware/arduino/platforms.txt new file mode 100755 index 000000000..ae495d5b7 --- /dev/null +++ b/hardware/arduino/platforms.txt @@ -0,0 +1,64 @@ +#########Compiler Recipe################################# +##compile c object files +##Default.recipe, overide if overide exists, these defauls should remain the same, if you need to change them do it as an overide. + +#default.recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} +#default.recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} +#default.recipe.ar.pattern={0}{1}|{2}|{3}{4}|{5} +#default.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}|{8}|-L{9}|-lm +#default.recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep +#default.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex + +########avr compile pattern ########## +#avr.recipe.c.o.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-D{7=ARDUINO}={6=Base.REVISION}{7=-I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=OBJECT_NAME} +#object name seems to have build path in it. +avr.recipe.c.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} + + +##compile cc object files +#avr.recipe.cc.o.pattern={0=compiler.path}{1=compiler.cc.cmd}{2=compiler.c.flags}{3=compiler.cpudef}{4=build.mcu}-DF_CPU={5=build.f_cpu}-DARDUINO={6=Base.REVISION}{-7=I/INCLUDE_PATHS} {8=SOURCE_NAME} -o{9=BUILD_PATH}{10=OBJECT_NAME} +avr.recipe.cpp.o.pattern={0}{1}|{2}|{3}{4}|-DF_CPU={5}|-D{6}={7}|{8}|{9}|-o|{10} +##create archives +#avr.recipe.ar.pattern={0=compiler.path}{1=compiler.ar.cmd}{2=compiler.ar.flags}{3=BUILD_PATH}{4=CORE_NAME=core.a}{5=BUILD_PATH}{6=OBJECT_NAME} +avr.recipe.ar.pattern={0}{1}|{2}|{3}{4}|{5} + +##combine gc-sections| archives, and objects +#avr.recipe.c.combine.pattern={0=compiler.path}{1=compiler.c.cmd}{2=compiler.combine.flags}{3=compiler.cpudef}{4=build.mcu} -o {5=BUILD_PATH}{6=SOURCE_NAME}.elf {7=BUILD_PATH}{8=SOURCE_NAME}.o {9=BUILD_PATH}{10=CORE_NAME=core.a} -L{11=BUILD_PATH} -lm +#avr.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}{8}|{9}|-L{10}|-lm +avr.recipe.c.combine.pattern={0}{1}|{2}|{3}{4}|-o|{5}{6}.elf|{7}|{8}|-L{9}|-lm + +##create eeprom +#avr.recipe.objcopy.eep.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.eep.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.eep +avr.recipe.objcopy.eep.pattern={0}{1}|{2}|{3}.elf|{4}.eep + +##create hex +#avr.recipe.objcopy.hex.pattern={0=compiler.path}{1=compiler.objcopy.cmd}{2=compiler.objcopy.elf.flags} {3=BUILD_PATH}{4=SOURCE_NAME}.elf {5=BUILD_PATH}{6=SOURCE_NAME}.hex +avr.recipe.objcopy.hex.pattern={0}{1}|{2}|{3}.elf|{4}.hex + + + +######################################################## +avr.name=Arduino +#avr.compiler.path Official default is correct, only need to change this if you want to overide the initial default +#avr.compiler.path={0}/hardware/tools/avr/bin/ +avr.compiler.c.cmd=avr-gcc +avr.compiler.c.flags=|-c|-g|-Os|-w|-ffunction-sections|-fdata-sections +avr.compiler.c.elf.flags=|-Os|-Wl,--gc-sections +avr.compiler.c.elf.cmd=avr-gcc +avr.compiler.S.flags=|-c|-g|-assembler-with-cpp +avr.compiler.cpp.cmd=avr-g++ +avr.compiler.cpp.flags=|-c|-g|-Os|-w|-fno-exceptions|-ffunction-sections|-fdata-sections +avr.compiler.ar.cmd=avr-ar +avr.compiler.ar.flags=rcs +avr.compiler.objcopy.cmd=avr-objcopy +avr.compiler.objcopy.eep.flags=|-O|ihex|-j|.eeprom|--set-section-flags=.eeprom=alloc,load|--no-change-warnings|--change-section-lma|.eeprom=0 +avr.compiler.elf2hex.flags=|-O|ihex|-R|.eeprom +avr.compiler.elf2hex.cmd=avr-objcopy +avr.compiler.ldflags= +avr.compiler.cpudef=-mmcu= +avr.compiler.upload.cmd= +avr.compiler.upload.flags= +avr.compiler.define=-DARDUINO= +avr.library.path=./hardware/arduino/cores/arduino +avr.library.core.path=./libraries +