Skip to content

Implement Do-Not-Verify-After-Upload preference for Serial Uploads #4873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2016
Merged

Implement Do-Not-Verify-After-Upload preference for Serial Uploads #4873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions arduino-core/src/cc/arduino/packages/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
15 changes: 15 additions & 0 deletions arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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"))
Expand Down
6 changes: 4 additions & 2 deletions hardware/arduino/avr/platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down