#826 if no programmers.txt is found use the arduino

Author: jantje

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

@@ -297,8 +297,13 @@ private void ParseSection(Map<String, String> boardInfo) {
 				String refVersion = valueSplit[2];
 				String actualValue = valueSplit[3];
 				this.myBoardsVariant = actualValue;
+				if("*".equals(refVersion)) {
+					this.myReferencedBoardVariantPlatformPath = Manager.getPlatformInstallPath(refVendor, refArchitecture);
+				}
+				else {
 				this.myReferencedBoardVariantPlatformPath = Manager.getPlatformInstallPath(refVendor, refArchitecture,
 						refVersion);
+				}
 				if (this.myReferencedBoardVariantPlatformPath == null) {
 					Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
 							Messages.Helpers_tool_reference_missing.replaceAll(TOOL_KEY, variant)
@@ -928,4 +933,13 @@ public IPath getreferencedHardwarePath() {
 		return platformPath.removeLastSegments(1);
 	}
 
+	/*
+	 * get the latest installed arduino platform with the same architecture.
+	 * This is the platform to use the programmers.txt if no other programmers.txt
+	 * are found.
+	 */
+	public IPath getArduinoPlatformPath() {
+		return Manager.getPlatformInstallPath("arduino", getArchitecture());
+	}
+
 }

io.sloeber.core/src/io/sloeber/core/tools/Programmers.java

@@ -21,7 +21,8 @@ public class Programmers extends TxtFile {
 		super(programmersFile);
 	}
 
-	private static Programmers[] fromBoards(IPath referencingPlatformPath, IPath referencedPlatformPath) {
+	private static Programmers[] fromBoards(IPath referencingPlatformPath, IPath referencedPlatformPath,
+			IPath arduinoPlatformPath) {
 		HashSet<File> BoardsFiles = new HashSet<>();
 		BoardsFiles.add(referencingPlatformPath.append(programmersFileName1).toFile());
 		BoardsFiles.add(referencingPlatformPath.append(programmersFileName2).toFile());
@@ -35,7 +36,11 @@ private static Programmers[] fromBoards(IPath referencingPlatformPath, IPath ref
 				i.remove();
 			}
 		}
-
+		if ((BoardsFiles.size() == 0) && (referencedPlatformPath == null) && (arduinoPlatformPath != null)) {
+			if (arduinoPlatformPath.append(programmersFileName1).toFile().exists()) {
+				BoardsFiles.add(arduinoPlatformPath.append(programmersFileName1).toFile());
+			}
+		}
 		Programmers ret[] = new Programmers[BoardsFiles.size()];
 		int i = 0;
 		for (File file : BoardsFiles) {
@@ -49,8 +54,7 @@ private static Programmers[] fromBoards(IPath referencingPlatformPath, IPath ref
 	public static String[] getUploadProtocols(BoardDescriptor boardsDescriptor) {
 		String[] ret = new String[1];
 		ret[0] = Defaults.getDefaultUploadProtocol();
-		Programmers allProgrammers[] = fromBoards(boardsDescriptor.getreferencingPlatformPath(),
-				boardsDescriptor.getReferencedUploadPlatformPath());
+		Programmers allProgrammers[] = fromBoards(boardsDescriptor);
 		for (Programmers curprogrammer : allProgrammers) {
 			ret = curprogrammer.getAllNames(ret);
 		}
@@ -60,7 +64,7 @@ public static String[] getUploadProtocols(BoardDescriptor boardsDescriptor) {
 
 	public static Programmers[] fromBoards(BoardDescriptor boardsDescriptor) {
 		return fromBoards(boardsDescriptor.getreferencingPlatformPath(),
-				boardsDescriptor.getReferencedUploadPlatformPath());
+				boardsDescriptor.getReferencedUploadPlatformPath(), boardsDescriptor.getArduinoPlatformPath());
 	}
 
 }