Add teensy package url to the default package url's #1615

jan · jan · commit b985a2f0e142 · 2024-01-25T18:34:04.000+01:00
diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java b/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java
@@ -73,6 +73,7 @@ public class BoardsManager {
             + "https://raw.githubusercontent.com/jantje/hardware/master/package_jantje_index.json\n" //$NON-NLS-1$
             + "https://raw.githubusercontent.com/jantje/ArduinoLibraries/master/library_jantje_index.json\n" //$NON-NLS-1$
             + "https://arduino.esp8266.com/stable/package_esp8266com_index.json\n" //$NON-NLS-1$
+            + "https://www.pjrc.com/teensy/package_teensy_index.json\n" //$NON-NLS-1$
             + KEY_MANAGER_ARDUINO_LIBRARY_JSON_URL;
 
     protected static List<ArduinoPlatformPackageIndex> packageIndices;
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/PackageManager.java b/io.sloeber.core/src/io/sloeber/core/tools/PackageManager.java
@@ -68,7 +68,7 @@ public static IStatus downloadAndInstall(String pURL, String pArchiveFileName, I
                 pMonitor.subTask("Downloading " + pArchiveFileName + " .."); //$NON-NLS-1$ //$NON-NLS-2$
                 myCopy(dl, archivePath.toFile(), true);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             return new Status(IStatus.ERROR, Activator.getId(), Messages.Manager_Failed_to_download.replace(FILE, pURL),
                     e);
         }
diff --git a/io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java b/io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java
@@ -40,6 +40,7 @@
 import io.sloeber.providers.ESP32;
 import io.sloeber.providers.ESP8266;
 import io.sloeber.providers.MCUBoard;
+import io.sloeber.providers.Teensy;
 import io.sloeber.ui.monitor.SerialConnection;
 
 @SuppressWarnings({"nls","unused"})
@@ -134,8 +135,7 @@ public static void installAdditionalBoards() {
         Arduino.installLatestSamDBoards();
         Arduino.installLatestIntellCurieBoards();
         Arduino.installLatestSamBoards();
-
-		BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
+        Teensy.installLatest();
 
 	}
 
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnTeensyTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnTeensyTest.java
@@ -101,12 +101,7 @@ private static boolean skipExample(Example example) {
     }
 
     public static void installAdditionalBoards() {
-        if (MySystem.getTeensyPlatform().isEmpty()) {
-            System.err.println("ERROR: Teensy not installed/configured skipping tests!!!");
-        } else {
-            BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
-        }
-
+    	Teensy.installLatest();
     }
 
     @Test
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java
@@ -31,7 +31,6 @@ public class CreateAndCompileDefaultInoOnAllBoardsTest {
     private static final boolean removeAllinstallationInfoAtStartup = false;
     private static final boolean skipPlatformInstallation = false;
     private static final boolean apply_known_work_Arounds = true;
-    private static final boolean testPrivateHardware = true;
     private static final boolean closeFailedProjects = false;
     private static int myBuildCounter = 0;
     private static int myTotalFails = 0;
@@ -323,10 +322,6 @@ public static void installAdditionalBoards() {
         }
         BoardsManager.setPackageURLs(toAddList, true);
 
-        if (testPrivateHardware) {
-            BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
-        }
-
         if (!skipPlatformInstallation) {
             BoardsManager.installAllLatestPlatforms();
             // PackageManager.installsubsetOfLatestPlatforms(0,5);
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileLibraryExamplesTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileLibraryExamplesTest.java
@@ -106,11 +106,6 @@ public static void installAdditionalBoards() {
             LibraryManager.installAllLatestLibraries();
             // LibraryManager.onlyKeepLatestPlatforms();
         }
-        if (MySystem.getTeensyPlatform().isEmpty()) {
-            System.err.println("ERROR: Teensy not installed/configured skipping tests!!!");
-        } else {
-            BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
-        }
         BoardsManager.installAllLatestPlatforms();
 
     }
diff --git a/io.sloeber.tests/src/io/sloeber/core/MySystem.java b/io.sloeber.tests/src/io/sloeber/core/MySystem.java
@@ -15,7 +15,6 @@
 @SuppressWarnings("nls")
 public class MySystem {
     private static final String jantjesWindowsMachine = "1248215851";
-    //the one below is based on one mac address Fysiek adres (MAC):	C0-3F-D5-66-04-58 
     private static final String jantjesLinuxMachine = "88937904";
     private static final String currentMachine = getMachine();
 
@@ -30,20 +29,7 @@ private static String getMachine() {
         return new String();
     }
 
-    public static String getTeensyPlatform() {
-        switch (currentMachine) {
-        case jantjesWindowsMachine:
-            return "E:\\arduino\\arduino-1.8.12 - teensy\\hardware\\teensy";
-        case jantjesLinuxMachine:
-            return "/home/jan/teensyduino/arduino-1.8.12/hardware/teensy";
-        default:
-            return new String();
-        }
-    }
 
-    public static String getTeensyBoard_txt() {
-        return getTeensyPlatform() + "/avr/boards.txt";
-    }
 
     public static MCUBoard[] getUploadBoards() {
         switch (currentMachine) {
diff --git a/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java b/io.sloeber.tests/src/io/sloeber/core/RegressionTest.java
@@ -14,7 +14,6 @@
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -66,10 +65,8 @@ public static void installAdditionalBoards() {
         ESP8266.installLatest();
         ESP32.installLatest();
         Arduino.installLatestAVRBoards();
+        Teensy.installLatest();
 
-        if (!MySystem.getTeensyPlatform().isEmpty()) {
-            BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
-        }
     }
 
     /**
@@ -78,13 +75,6 @@ public static void installAdditionalBoards() {
      */
     @Test
     public void issue555() {
-        if (MySystem.getTeensyPlatform().isEmpty()) {
-            // skip test due to no teensy install folder provided
-            // do not fail as this will always fail on travis
-            System.out.println("skipping the test because teensy is not installed.");
-            return;
-        }
-        System.out.println("Teensy is installed at " + MySystem.getTeensyPlatform());
         BoardDescription unoBoardid = Arduino.uno().getBoardDescriptor();
         BoardDescription teensyBoardid = Teensy.Teensy3_1().getBoardDescriptor();
 
diff --git a/io.sloeber.tests/src/io/sloeber/core/RegressionTestFailingOnTravis.java b/io.sloeber.tests/src/io/sloeber/core/RegressionTestFailingOnTravis.java
@@ -35,9 +35,6 @@ public static void WaitForInstallerToFinish() {
 	public static void installAdditionalBoards() {
 		String[] packageUrlsToAdd = { "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json" };
 		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), false);
-		if (!MySystem.getTeensyPlatform().isEmpty()) {
-			BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
-		}
 	}
 
 	/**
diff --git a/io.sloeber.tests/src/io/sloeber/providers/ESP8266.java b/io.sloeber.tests/src/io/sloeber/providers/ESP8266.java
@@ -13,7 +13,7 @@ public class ESP8266 extends MCUBoard {
     private static final String provider = "esp8266";
     private static final String architectureName = "esp8266";
     private static final String jsonFileName = "package_esp8266com_index.json";
-    public static final String packageURL = "http://arduino.esp8266.com/stable/package_esp8266com_index.json";
+    public static final String packageURL = "https://arduino.esp8266.com/stable/package_esp8266com_index.json";
 
     public static MCUBoard wemosD1() {
         Map<String, String> options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -32,7 +32,7 @@ public static MCUBoard ESPressoLite() {
     }
 
     public ESP8266(String boardName, Map<String, String> options) {
-        this.myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, provider, architectureName, boardName,
+        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, provider, architectureName, boardName,
                 options);
         if (this.myBoardDescriptor == null) {
             fail(boardName + " Board not found");
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Jantje.java b/io.sloeber.tests/src/io/sloeber/providers/Jantje.java
@@ -19,7 +19,7 @@ public class Jantje extends MCUBoard {
     private static final String localDebugArchitectureName = "pc";
     private static final String jsonFileName = "package_jantje_index.json";
     // the below json url is need as esp8266 is a referenced platform
-    public static final String additionalJsonURL = "http://arduino.esp8266.com/stable/package_esp8266com_index.json";
+    public static final String additionalJsonURL = "https://arduino.esp8266.com/stable/package_esp8266com_index.json";
 
     @Override
     public boolean isExampleSupported(Example example) {
@@ -38,8 +38,8 @@ public boolean isExampleSupported(Example example) {
         return super.isExampleSupported(example);
     }
 
-    public static List<MCUBoard> getAllBoards() {
-        return getAllBoards(provider, Arduino.uno());
+    public static  List<MCUBoard> getAllBoards() {
+        return getAllBoards(provider, uno());
     }
 
     @Override
@@ -52,6 +52,10 @@ public Jantje(BoardDescription boardDesc) {
         myBoardDescriptor = boardDesc;
         setAttributes();
     }
+    
+    public static MCUBoard uno() {
+        return new Jantje( Arduino.unoID);
+    }
 
     public Jantje(String boardName) {
         Map<String, String> options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
diff --git a/io.sloeber.tests/src/io/sloeber/providers/MCUBoard.java b/io.sloeber.tests/src/io/sloeber/providers/MCUBoard.java
@@ -24,7 +24,7 @@ public abstract class MCUBoard {
 
     protected abstract void setAttributes();
 
-    public static List<MCUBoard> getAllBoards(String provider, MCUBoard creator) {
+    public static List<MCUBoard> getAllBoards(String provider, MCUBoard board) {
         List<MCUBoard> ret = new LinkedList<>();
         ArduinoPackage arduinoPkg = BoardsManager.getPackageByProvider(provider);
         for (ArduinoPlatform curPlatform : arduinoPkg.getPlatforms()) {
@@ -33,7 +33,7 @@ public static List<MCUBoard> getAllBoards(String provider, MCUBoard creator) {
                 List<BoardDescription> boardDescriptions = BoardDescription
                         .makeBoardDescriptors(curPlatformVersion.getBoardsFile());
                 for (BoardDescription curBoardDesc : boardDescriptions) {
-                    MCUBoard curBoard = creator.createMCUBoard(curBoardDesc);
+                    MCUBoard curBoard = board.createMCUBoard(curBoardDesc);
                     curBoard.myAttributes.boardID = curBoardDesc.getBoardID();
                     ret.add(curBoard);
                 }
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Teensy.java b/io.sloeber.tests/src/io/sloeber/providers/Teensy.java
@@ -1,15 +1,11 @@
 package io.sloeber.providers;
 
-import static io.sloeber.core.common.Const.*;
-import static org.junit.Assert.*;
-
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 import io.sloeber.core.BoardAttributes;
 import io.sloeber.core.Example;
-import io.sloeber.core.MySystem;
 import io.sloeber.core.api.BoardDescription;
 import io.sloeber.core.api.BoardsManager;
 
@@ -23,7 +19,10 @@ public class Teensy extends MCUBoard {
     public final static String Teensy3_5_ID = "teensy35";
     public final static String Teensy3_6_ID = "teensy36";
     public final static String Teensy_LC_ID = "teensyLC";
-    public final static String TEENSY_ARCHITECTURE_ID = "teensy";
+    public final static String TEENSY_PLATFORM_ID = "avr";
+    public final static String TEENSY_PROVIDER= "teensy";
+	private static final String jsonFileName = "package_teensy_index.json";
+	public static final String packageURL = "https://www.pjrc.com/teensy/package_teensy_index.json";
 
     public static MCUBoard Teensy_LC() {
         return new Teensy(Teensy_LC_ID);
@@ -72,12 +71,8 @@ private Teensy(String boardName) {
         default:
             break;
         }
+        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID,boardName,options);
 
-        myBoardDescriptor = BoardsManager.getBoardDescription(LOCAL, MySystem.getTeensyBoard_txt(), "ignored",
-                boardName, options);
-        if (myBoardDescriptor == null) {
-            fail(boardName + " Board not found");
-        }
         setUploadPort("none");
         setAttributes();
     }
@@ -117,9 +112,6 @@ public Map<String, String> getBoardOptions(Example example) {
         return ret;
     }
 
-    public static List<MCUBoard> getAllBoards() {
-        return getAllBoards(MySystem.getTeensyPlatform(), teensy2());
-    }
 
     @Override
     public MCUBoard createMCUBoard(BoardDescription boardDescriptor) {
@@ -146,4 +138,13 @@ protected void setAttributes() {
         myAttributes.wire1 = true;
         myAttributes.myArchitectures.add(myBoardDescriptor.getArchitecture());
     }
+
+	public static void installLatest() {
+	        BoardsManager.installLatestPlatform(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID);
+	}
+
+	public static List<MCUBoard> getAllBoards() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static IStatus downloadAndInstall(String pURL, String pArchiveFileName, I`
`68`	`68`	`pMonitor.subTask("Downloading " + pArchiveFileName + " .."); //$NON-NLS-1$ //$NON-NLS-2$`
`69`	`69`	`myCopy(dl, archivePath.toFile(), true);`
`70`	`70`	`}`
`71`		`- } catch (IOException e) {`
	`71`	`+ } catch (Exception e) {`
`72`	`72`	`return new Status(IStatus.ERROR, Activator.getId(), Messages.Manager_Failed_to_download.replace(FILE, pURL),`
`73`	`73`	`e);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,7 @@ private static boolean skipExample(Example example) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public static void installAdditionalBoards() {`
`104`		`- if (MySystem.getTeensyPlatform().isEmpty()) {`
`105`		`- System.err.println("ERROR: Teensy not installed/configured skipping tests!!!");`
`106`		`- } else {`
`107`		`- BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());`
`108`		`- }`
`109`		`-`
	`104`	`+ Teensy.installLatest();`
`110`	`105`	`}`
`111`	`106`
`112`	`107`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,6 @@ public static void installAdditionalBoards() {`
`106`	`106`	`LibraryManager.installAllLatestLibraries();`
`107`	`107`	`// LibraryManager.onlyKeepLatestPlatforms();`
`108`	`108`	`}`
`109`		`- if (MySystem.getTeensyPlatform().isEmpty()) {`
`110`		`- System.err.println("ERROR: Teensy not installed/configured skipping tests!!!");`
`111`		`- } else {`
`112`		`- BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());`
`113`		`- }`
`114`	`109`	`BoardsManager.installAllLatestPlatforms();`
`115`	`110`
`116`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ public static void WaitForInstallerToFinish() {`
`35`	`35`	`public static void installAdditionalBoards() {`
`36`	`36`	`String[] packageUrlsToAdd = { "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json" };`
`37`	`37`	`BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), false);`
`38`		`- if (!MySystem.getTeensyPlatform().isEmpty()) {`
`39`		`- BoardsManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());`
`40`		`- }`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`/**`