arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-11-30 05:24:00 +03:00
Code Activity

Revert "support compile-time passing of PID to Leonardo/Micro sketches. PID comes from boards.txt - different for Micro and Leonardo"

Browse Source 
This reverts commit 3e0d195492.
This commit is contained in:
Zach Eveland
2011-09-08 15:39:17 -04:00
parent 3e0d195492
commit c295917fad
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ public class Compiler implements MessageConsumer {
"-mmcu=" + boardPreferences.get("build.mcu"),
"-o",
buildPath + File.separator + primaryClassName + ".elf"
}));
}));
for (File file : objectFiles) {
baseCommandLinker.add(file.getAbsolutePath());
@@ -424,10 +424,6 @@ public class Compiler implements MessageConsumer {
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
"-DARDUINO=" + Base.REVISION,
}));
if (boardPreferences.get("usb.pid") != null) {
baseCommandCompiler.add("-DARDUINO_MODEL_PID=" + boardPreferences.get("usb.pid"));
}
for (int i = 0; i < includePaths.size(); i++) {
baseCommandCompiler.add("-I" + (String) includePaths.get(i));
@@ -455,10 +451,6 @@ public class Compiler implements MessageConsumer {
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
"-DARDUINO=" + Base.REVISION,
}));
if (boardPreferences.get("usb.pid") != null) {
baseCommandCompiler.add("-DARDUINO_MODEL_PID=" + boardPreferences.get("usb.pid"));
}
for (int i = 0; i < includePaths.size(); i++) {
baseCommandCompiler.add("-I" + (String) includePaths.get(i));
@@ -488,10 +480,6 @@ public class Compiler implements MessageConsumer {
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
"-DARDUINO=" + Base.REVISION,
}));
if (boardPreferences.get("usb.pid") != null) {
baseCommandCompilerCPP.add("-DARDUINO_MODEL_PID=" + boardPreferences.get("usb.pid"));
}
for (int i = 0; i < includePaths.size(); i++) {
baseCommandCompilerCPP.add("-I" + (String) includePaths.get(i));