From 8e176b0084ec9f991b426d82ff05c5fd56bf6d00 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Fri, 30 Mar 2012 22:24:40 -0400 Subject: [PATCH] selectively suppress unwanted avrdude output for Leonardo when not verbose uploading is disabled --- app/src/processing/app/debug/AvrdudeUploader.java | 5 ----- app/src/processing/app/debug/Uploader.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/processing/app/debug/AvrdudeUploader.java b/app/src/processing/app/debug/AvrdudeUploader.java index 59556e898..1992e130e 100755 --- a/app/src/processing/app/debug/AvrdudeUploader.java +++ b/app/src/processing/app/debug/AvrdudeUploader.java @@ -286,11 +286,6 @@ public class AvrdudeUploader extends Uploader { commandDownloader.add("-v"); commandDownloader.add("-v"); commandDownloader.add("-v"); - } else if (Base.getBoardPreferences().get("bootloader.path").equals("caterina")) { - /* avrdude draws the line between verbose and quiet differently - * uploads using AVR109 protocol. Compensate by being a little less - * quiet about the results for these uploads */ - commandDownloader.add("-q"); } else { commandDownloader.add("-q"); commandDownloader.add("-q"); diff --git a/app/src/processing/app/debug/Uploader.java b/app/src/processing/app/debug/Uploader.java index 245e43bfd..f9ec4dd0c 100755 --- a/app/src/processing/app/debug/Uploader.java +++ b/app/src/processing/app/debug/Uploader.java @@ -184,7 +184,17 @@ public abstract class Uploader implements MessageConsumer { boolean notFoundError; public void message(String s) { - //System.err.println("MSG: " + s); + // selectively suppress a bunch of avrdude output for AVR109/Caterina that should already be quelled but isn't + if (!Preferences.getBoolean("upload.verbose") && ( + s.indexOf("Connecting to programmer:") != -1 || + s.indexOf("Found programmer: Id = \"CATERIN\"; type = S") != -1 || + s.indexOf("Software Version = 1.0; No Hardware Version given.") != -1 || + s.indexOf("Programmer supports auto addr increment.") != -1 || + s.indexOf("Programmer supports buffered memory access with buffersize=128 bytes.") != -1 || + s.indexOf("Programmer supports the following devices:") != -1 || + s.indexOf("Device code: 0x44") != -1)) + s = ""; + System.err.print(s); // ignore cautions