File tree 2 files changed +11
-6
lines changed
app/src/processing/app/debug 2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -286,11 +286,6 @@ public boolean avrdude(Collection params) throws RunnerException {
286
286
commandDownloader .add ("-v" );
287
287
commandDownloader .add ("-v" );
288
288
commandDownloader .add ("-v" );
289
- } else if (Base .getBoardPreferences ().get ("bootloader.path" ).equals ("caterina" )) {
290
- /* avrdude draws the line between verbose and quiet differently
291
- * uploads using AVR109 protocol. Compensate by being a little less
292
- * quiet about the results for these uploads */
293
- commandDownloader .add ("-q" );
294
289
} else {
295
290
commandDownloader .add ("-q" );
296
291
commandDownloader .add ("-q" );
Original file line number Diff line number Diff line change @@ -184,7 +184,17 @@ protected boolean executeUploadCommand(Collection commandDownloader)
184
184
boolean notFoundError ;
185
185
186
186
public void message (String s ) {
187
- //System.err.println("MSG: " + s);
187
+ // selectively suppress a bunch of avrdude output for AVR109/Caterina that should already be quelled but isn't
188
+ if (!Preferences .getBoolean ("upload.verbose" ) && (
189
+ s .indexOf ("Connecting to programmer:" ) != -1 ||
190
+ s .indexOf ("Found programmer: Id = \" CATERIN\" ; type = S" ) != -1 ||
191
+ s .indexOf ("Software Version = 1.0; No Hardware Version given." ) != -1 ||
192
+ s .indexOf ("Programmer supports auto addr increment." ) != -1 ||
193
+ s .indexOf ("Programmer supports buffered memory access with buffersize=128 bytes." ) != -1 ||
194
+ s .indexOf ("Programmer supports the following devices:" ) != -1 ||
195
+ s .indexOf ("Device code: 0x44" ) != -1 ))
196
+ s = "" ;
197
+
188
198
System .err .print (s );
189
199
190
200
// ignore cautions
You can’t perform that action at this time.
0 commit comments