Merge branch 'upload-without-verify' of https://github.com/gh-megabit…

…/Arduino
arduino · Apr 28, 2016 · bca7716 · bca7716
2 parents 66c9303 + 4b64ef7
commit bca7716
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/arduino-core/src/cc/arduino/packages/Uploader.java b/arduino-core/src/cc/arduino/packages/Uploader.java
@@ -70,18 +70,21 @@ public abstract class Uploader implements MessageConsumer {
   }
 
   protected final boolean verbose;
+  protected final boolean verifyUpload;
 
   private String error;
   protected boolean notFoundError;
   protected boolean noUploadPort;
 
   protected Uploader() {
     this.verbose = PreferencesData.getBoolean("upload.verbose");
+    this.verifyUpload = PreferencesData.getBoolean("upload.verify");
     init(false);
   }
 
   protected Uploader(boolean nup) {
     this.verbose = PreferencesData.getBoolean("upload.verbose");
+    this.verifyUpload = PreferencesData.getBoolean("upload.verify");
     init(nup);
   }
 

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -102,6 +102,11 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       else
         prefs.put("upload.verbose", prefs.getOrExcept("upload.params.quiet"));
 
+      if (verifyUpload)
+        prefs.put("upload.verify", prefs.get("upload.params.verify", ""));
+      else
+        prefs.put("upload.verify", prefs.get("upload.params.noverify", ""));
+
       boolean uploadResult;
       try {
         String pattern = prefs.getOrExcept("upload.pattern");
@@ -192,6 +197,11 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       prefs.put("upload.verbose", prefs.getOrExcept("upload.params.quiet"));
     }
 
+    if (verifyUpload)
+      prefs.put("upload.verify", prefs.get("upload.params.verify", ""));
+    else
+      prefs.put("upload.verify", prefs.get("upload.params.noverify", ""));
+
     boolean uploadResult;
     try {
       String pattern = prefs.getOrExcept("upload.pattern");
@@ -318,6 +328,11 @@ private boolean uploadUsingProgrammer(String buildPath, String className) throws
     else
       prefs.put("program.verbose", prefs.getOrExcept("program.params.quiet"));
 
+    if (verifyUpload)
+      prefs.put("program.verify", prefs.get("program.params.verify", ""));
+    else
+      prefs.put("program.verify", prefs.get("program.params.noverify", ""));
+
     try {
       // if (prefs.get("program.disable_flushing") == null
       // || prefs.get("program.disable_flushing").toLowerCase().equals("false"))

diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
@@ -97,11 +97,13 @@ tools.avrdude.config.path={path}/etc/avrdude.conf
 
 tools.avrdude.upload.params.verbose=-v
 tools.avrdude.upload.params.quiet=-q -q
-tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"
+tools.avrdude.upload.params.noverify=-V
+tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} {upload.verify} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"
 
 tools.avrdude.program.params.verbose=-v
 tools.avrdude.program.params.quiet=-q -q
-tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
+tools.avrdude.program.params.noverify=-V
+tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} {program.verify} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
 
 tools.avrdude.erase.params.verbose=-v
 tools.avrdude.erase.params.quiet=-q -q