From a292677108ea5f012a726d37f0403f7423fc9ea3 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sat, 3 Mar 2012 13:54:10 -0500
Subject: [PATCH] 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.
---
 app/src/processing/app/Preferences.java           | 15 +++++++++++++--
 app/src/processing/app/debug/AvrdudeUploader.java |  1 +
 build/shared/lib/preferences.txt                  |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 423b20559..94ab18376 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -116,6 +116,7 @@ public class Preferences {
   JCheckBox exportSeparateBox;
   JCheckBox verboseCompilationBox;
   JCheckBox verboseUploadBox;
+  JCheckBox verifyUploadBox;
   JCheckBox externalEditorBox;
   JCheckBox memoryOverrideBox;
   JTextField memoryField;
@@ -299,8 +300,16 @@ public class Preferences {
     d = box.getPreferredSize();
     box.setBounds(left, top, d.width, d.height);
     top += d.height + GUI_BETWEEN;
-    
 
+    // [ ] Verify code after upload
+    
+    verifyUploadBox = new JCheckBox("Verify code after upload");
+    pain.add(verifyUploadBox);
+    d = verifyUploadBox.getPreferredSize();
+    verifyUploadBox.setBounds(left, top, d.width + 10, d.height);
+    right = Math.max(right, left + d.width);
+    top += d.height + GUI_BETWEEN;
+    
     // [ ] Use external editor
 
     externalEditorBox = new JCheckBox(_("Use external editor"));
@@ -482,7 +491,8 @@ public class Preferences {
     // put each of the settings into the table
     setBoolean("build.verbose", verboseCompilationBox.isSelected());
     setBoolean("upload.verbose", verboseUploadBox.isSelected());
-
+    setBoolean("upload.verify", verifyUploadBox.isSelected());
+    
 //    setBoolean("sketchbook.closing_last_window_quits",
 //               closingLastQuitsBox.isSelected());
     //setBoolean("sketchbook.prompt", sketchPromptBox.isSelected());
@@ -539,6 +549,7 @@ public class Preferences {
     // set all settings entry boxes to their actual status
     verboseCompilationBox.setSelected(getBoolean("build.verbose"));
     verboseUploadBox.setSelected(getBoolean("upload.verbose"));
+    verifyUploadBox.setSelected(getBoolean("upload.verify"));
 
     //closingLastQuitsBox.
     //  setSelected(getBoolean("sketchbook.closing_last_window_quits"));
diff --git a/app/src/processing/app/debug/AvrdudeUploader.java b/app/src/processing/app/debug/AvrdudeUploader.java
index d5db258ad..408a9a67e 100755
--- a/app/src/processing/app/debug/AvrdudeUploader.java
+++ b/app/src/processing/app/debug/AvrdudeUploader.java
@@ -81,6 +81,7 @@ public class AvrdudeUploader extends Uploader  {
     commandDownloader.add(
       "-b" + Integer.parseInt(boardPreferences.get("upload.speed")));
     commandDownloader.add("-D"); // don't erase
+    if (!Preferences.getBoolean("upload.verify")) commandDownloader.add("-V"); // disable verify
     commandDownloader.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
 
     if (boardPreferences.get("upload.disable_flushing") == null ||
diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index 3db5b824d..51043bbbf 100755
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -248,6 +248,7 @@ target = arduino
 programmer = arduino:avrispmkii
 
 upload.using = bootloader
+upload.verify = true
 
 serial.port=COM1
 serial.databits=8