Skip to content

Commit a292677

Browse files
committed
Adding preference for disabling verification on upload (Nathan Seidle)
Adds a checkbox to the preferences dialog that controls whether or not to verify code on upload via serial (verification still always occurs when uploading using a programmer). It is checked by default to match current behavior.
1 parent f4f62f9 commit a292677

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

app/src/processing/app/Preferences.java

+13-2
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public class Preferences {
116116
JCheckBox exportSeparateBox;
117117
JCheckBox verboseCompilationBox;
118118
JCheckBox verboseUploadBox;
119+
JCheckBox verifyUploadBox;
119120
JCheckBox externalEditorBox;
120121
JCheckBox memoryOverrideBox;
121122
JTextField memoryField;
@@ -299,8 +300,16 @@ public void actionPerformed(ActionEvent e) {
299300
d = box.getPreferredSize();
300301
box.setBounds(left, top, d.width, d.height);
301302
top += d.height + GUI_BETWEEN;
302-
303303

304+
// [ ] Verify code after upload
305+
306+
verifyUploadBox = new JCheckBox("Verify code after upload");
307+
pain.add(verifyUploadBox);
308+
d = verifyUploadBox.getPreferredSize();
309+
verifyUploadBox.setBounds(left, top, d.width + 10, d.height);
310+
right = Math.max(right, left + d.width);
311+
top += d.height + GUI_BETWEEN;
312+
304313
// [ ] Use external editor
305314

306315
externalEditorBox = new JCheckBox(_("Use external editor"));
@@ -482,7 +491,8 @@ protected void applyFrame() {
482491
// put each of the settings into the table
483492
setBoolean("build.verbose", verboseCompilationBox.isSelected());
484493
setBoolean("upload.verbose", verboseUploadBox.isSelected());
485-
494+
setBoolean("upload.verify", verifyUploadBox.isSelected());
495+
486496
// setBoolean("sketchbook.closing_last_window_quits",
487497
// closingLastQuitsBox.isSelected());
488498
//setBoolean("sketchbook.prompt", sketchPromptBox.isSelected());
@@ -539,6 +549,7 @@ protected void showFrame(Editor editor) {
539549
// set all settings entry boxes to their actual status
540550
verboseCompilationBox.setSelected(getBoolean("build.verbose"));
541551
verboseUploadBox.setSelected(getBoolean("upload.verbose"));
552+
verifyUploadBox.setSelected(getBoolean("upload.verify"));
542553

543554
//closingLastQuitsBox.
544555
// setSelected(getBoolean("sketchbook.closing_last_window_quits"));

app/src/processing/app/debug/AvrdudeUploader.java

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ private boolean uploadViaBootloader(String buildPath, String className)
8181
commandDownloader.add(
8282
"-b" + Integer.parseInt(boardPreferences.get("upload.speed")));
8383
commandDownloader.add("-D"); // don't erase
84+
if (!Preferences.getBoolean("upload.verify")) commandDownloader.add("-V"); // disable verify
8485
commandDownloader.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
8586

8687
if (boardPreferences.get("upload.disable_flushing") == null ||

build/shared/lib/preferences.txt

+1
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ target = arduino
248248
programmer = arduino:avrispmkii
249249

250250
upload.using = bootloader
251+
upload.verify = true
251252

252253
serial.port=COM1
253254
serial.databits=8

0 commit comments

Comments
 (0)