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.

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

Add .eep preference support to the Serial Uploader #4962

Open
wants to merge 2 commits into
base: master
from
Jump to file or symbol
Failed to load files and symbols.
+18 −0
Diff settings

Always

Just for now

@@ -107,6 +107,12 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
else
prefs.put("upload.verify", prefs.get("upload.params.noverify", ""));
File f = new File(buildPath,className+".eep");
if (f.exists() && !f.isDirectory() && (13<f.length())) // file is created at any time, but emty file mean 13B only
prefs.put("upload.uploadeep", prefs.get("upload.params.uploadeep", ""));
else
prefs.put("upload.uploadeep", prefs.get("upload.params.nouploadeep", ""));
boolean uploadResult;
try {
String pattern = prefs.getOrExcept("upload.pattern");
@@ -202,6 +208,12 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
else
prefs.put("upload.verify", prefs.get("upload.params.noverify", ""));
File f = new File(buildPath,className+".eep");
if (f.exists() && !f.isDirectory() && (13<f.length())) // file is created at any time, but emty file mean 13B only
prefs.put("upload.uploadeep", prefs.get("upload.params.uploadeep", ""));
else
prefs.put("upload.uploadeep", prefs.get("upload.params.nouploadeep", ""));
boolean uploadResult;
try {
String pattern = prefs.getOrExcept("upload.pattern");
@@ -333,6 +345,12 @@ private boolean uploadUsingProgrammer(String buildPath, String className) throws
else
prefs.put("program.verify", prefs.get("program.params.noverify", ""));
File f = new File(buildPath,className+".eep");
if (f.exists() && !f.isDirectory() && (13<f.length())) // file is created at any time, but emty file mean 13B only
prefs.put("program.uploadeep", prefs.get("program.params.uploadeep", ""));
else
prefs.put("program.uploadeep", prefs.get("program.params.nouploadeep", ""));
try {
// if (prefs.get("program.disable_flushing") == null
// || prefs.get("program.disable_flushing").toLowerCase().equals("false"))
ProTip! Use n and p to navigate between commits in a pull request.