#585 this works for some stuff

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

@@ -655,38 +655,14 @@ public IPath getReferencingLibraryPath() {
 
     public String getUploadPatternKey() {
         updateWhenDirty();
-        String upLoadTool = getActualUploadTool();
-        String action = UPLOAD;
-        if (usesProgrammer()) {
-            action = PROGRAM;
-        }
+        String upLoadTool = getuploadTool();
         String networkPrefix = EMPTY;
         if (isNetworkUpload()) {
             networkPrefix = NETWORK_PREFIX;
         }
-        return TOOLS + DOT + upLoadTool + DOT + action + DOT + networkPrefix + PATTERN;
-
+        return TOOLS + DOT + upLoadTool + DOT + UPLOAD + DOT + networkPrefix + PATTERN;
     }
 
-    public String getActualUploadTool() {
-        updateWhenDirty();
-        // if (confdesc == null) {
-        // Common.log(new Status(IStatus.ERROR, .CORE_PLUGIN_ID, "Confdesc null is
-        // not alowed here")); //$NON-NLS-1$
-        // return this.myUploadTool;
-        // }
-        // if (usesProgrammer()) {
-        // return Common.getBuildEnvironmentVariable(confdesc, PROGRAM_TOOL,
-        // "Program tool not properly configured"); //$NON-NLS-1$
-        // }
-        //
-        // if (this.myUploadTool == null) {
-        // return Common.getBuildEnvironmentVariable(confdesc, UPLOAD_TOOL,
-        // "upload tool not properly configured"); //$NON-NLS-1$
-        // }
-        return myUploadTool;
-
-    }
 
     public boolean usesProgrammer() {
         updateWhenDirty();
@@ -897,6 +873,7 @@ public Map<String, String> getEnvVars() {
         Programmers localProgrammers[] = Programmers.fromBoards(this);
         String programmer = getProgrammer();
         for (Programmers curProgrammer : localProgrammers) {
+       //     allVars.putAll(curProgrammer.getAllEnvironVars());
             String programmerID = curProgrammer.getIDFromNiceName(programmer);
             if (programmerID != null) {
                 allVars.putAll(curProgrammer.getAllEnvironVars(programmerID));

io.sloeber.core/src/io/sloeber/core/common/Const.java

@@ -50,7 +50,7 @@ public class Const {
 	public static final String COM_PORT = "com_port";
 	public static final String ARDUINO = "arduino";
 	public static final String PATH = "path";
-	public static final String PROTOCOL = "protocol";
+    public static final String PROTOCOL = "protocol";
 
 	// arduino txt pre and suffix
 	public static final String NETWORK_PREFIX = "network_";

io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java

@@ -1190,11 +1190,11 @@ private StringBuffer addTargets(List<String> outputVarsAdditionsList, boolean re
                 + "\t${tools.${upload.tool}.upload.pattern}\n" + "\n" + "uploadWithHoutBuild: \n"
                 + "\t@echo trying to upload without build with upload tool ${upload.tool}\n"
                 + "\t${tools.${upload.tool}.upload.pattern}\n" + "    \n" + "uploadWithProgrammerWithBuild: all\n"
-                + "\t@echo trying to build and upload with programmer ${programID}\n"
-                + "\t${tools.${${programID}.program.tool}.program.pattern}\n" + "\n"
+                + "\t@echo trying to build and upload with programmer ${program.tool}\n"
+                + "\t${tools.${program.tool}.program.pattern}\n" + "\n"
                 + "uploadWithProgrammerWithHoutBuild: \n"
-                + "\t@echo trying to upload with programmer ${programID} without build\n"
-                + "\t${tools.${${programID}.program.tool}.program.pattern}\n\n");
+                + "\t@echo trying to upload with programmer ${program.tool} without build\n"
+                + "\t${tools.${program.tool}.program.pattern}\n\n");
 		String defaultTarget = "all:";
 		if (prebuildStep.length() > 0) {
 			// Add the comment for the "All" target

io.sloeber.core/src/io/sloeber/core/tools/uploaders/UploadSketchWrapper.java

@@ -59,7 +59,7 @@ private Job internalUpload(IProject project,
         SloeberProject sProject = SloeberProject.getSloeberProject(project, false);
         BoardDescription boardDescriptor = sProject.getBoardDescription(confDesc.getName(), false);
 
-        String UpLoadTool = boardDescriptor.getActualUploadTool();
+        String UpLoadTool = boardDescriptor.getuploadTool();
 		// String uploadClass = Common.getBuildEnvironmentVariable(confDesc,
 		// Common.get_ENV_KEY_TOOL(Const.UPLOAD_CLASS),
 		// new String());/** @jniclass flags=no_gen */

io.sloeber.core/src/io/sloeber/core/tools/uploaders/arduinoUploader.java

@@ -43,9 +43,7 @@ public boolean uploadUsingPreferences(IFile hexFile, BoardDescription boardDescr
         IEnvironmentVariableManager envManager = CCorePlugin.getDefault().getBuildEnvironmentManager();
         IContributedEnvironment contribEnv = envManager.getContributedEnvironment();
 
-        if (boardDescr.usesProgrammer()) {
-            highStream.println(Messages.uploader_no_reset_using_programmer);
-        } else if (boardDescr.isNetworkUpload()) {
+        if (boardDescr.isNetworkUpload()) {
             setEnvironmentvarsForAutorizedUpload(contribEnv, mycConf);
             highStream.println(Messages.uploader_no_reset_using_network);
         } else {