Merge branch 'master' of https://github.com/jantje/arduino-eclipse-plugin.git

Author: jantje

io.sloeber.core/src/jUnit/CreateAndCompile.java

@@ -407,11 +407,11 @@ public static Collection boards() {
 				{ "package_sparkfun_index.json", "SparkFun", "SparkFun AVR Boards", "atmega128rfa1", "" }, //
 
 				// Teensy
-				{ "local", Shared.teensyBoards_txt, "", "teensy31", "usb=serial\nspeed=96\nkeys=en-us" }, //
-				{ "local", Shared.teensyBoards_txt, "", "teensy30", "usb=serial\nspeed=96\nkeys=en-us" }, //
-				{ "local", Shared.teensyBoards_txt, "", "teensyLC", "usb=serial\nl\nspeed=48\nkeys=en-us" }, //
-				{ "local", Shared.teensyBoards_txt, "", "teensypp2", "usb=serial\nspeed=16\nkeys=en-us" }, //
-				{ "local", Shared.teensyBoards_txt, "", "teensy2", "usb=serial\nspeed=16\nkeys=en-us" }, //
+				{ "local", Shared.getTeensyBoard_txt(), "", "teensy31", "usb=serial\nspeed=96\nkeys=en-us" }, //
+				{ "local", Shared.getTeensyBoard_txt(), "", "teensy30", "usb=serial\nspeed=96\nkeys=en-us" }, //
+				{ "local", Shared.getTeensyBoard_txt(), "", "teensyLC", "usb=serial\nl\nspeed=48\nkeys=en-us" }, //
+				{ "local", Shared.getTeensyBoard_txt(), "", "teensypp2", "usb=serial\nspeed=16\nkeys=en-us" }, //
+				{ "local", Shared.getTeensyBoard_txt(), "", "teensy2", "usb=serial\nspeed=16\nkeys=en-us" }, //
 
 				// TeeOnArdu avr
 				{ "package_adafruit_index.json", "TeeOnArdu", "Adafruit TeeOnArdu", "TeeOnArdu",
@@ -516,7 +516,7 @@ public static void installAdditionalBoards() {
 				"https://udooboard.github.io/arduino-board-package/package_udoo_index.json" };
 		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
 		BoardsManager.installAllLatestPlatforms();
-		BoardsManager.referenceLocallInstallation(Shared.teensyInstall);
+		BoardsManager.referenceLocallInstallation(Shared.getTeensyPlatform());
 	}
 
 	@Test

io.sloeber.core/src/jUnit/Regression.java

@@ -41,6 +41,7 @@ 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)), true);
+		BoardsManager.referenceLocallInstallation(Shared.getTeensyPlatform());
 	}
 
 	/**
@@ -76,7 +77,7 @@ public void issue555() {
 		teensyOptions.put("usb", "serial");
 		teensyOptions.put("speed", "96");
 		teensyOptions.put("keys", "en-us");
-		BoardDescriptor teensyBoardid = BoardsManager.getBoardID("local", Shared.teensyBoards_txt, "", "teensy31",
+		BoardDescriptor teensyBoardid = BoardsManager.getBoardID("local", Shared.getTeensyBoard_txt(), "", "teensy31",
 				teensyOptions);
 		IProject theTestProject = null;
 		CodeDescriptor codeDescriptor = CodeDescriptor.createDefaultIno();

io.sloeber.core/src/jUnit/Shared.java

@@ -15,8 +15,23 @@
 
 @SuppressWarnings("nls")
 public class Shared {
-	public static String teensyInstall = "D:/arduino/arduino-1.6.9 - Teensy 1.29/hardware";
-	public static String teensyBoards_txt = teensyInstall + "/teensy/avr/boards.txt";
+	private static String teensyInstall = "D:/arduino/arduino-1.6.9 - Teensy 1.29/hardware/teensy";
+	private static String teensyInstallLinux = "/home/jantje/programs/arduino-1.8.0/hardware/teensy";
+ 
+	public static String getTeensyPlatform(){
+		switch (Platform.getOS()){
+		case Platform.OS_WIN32:
+			return  teensyInstall;
+		case Platform.OS_LINUX:
+			return teensyInstallLinux ;
+		}
+		return null;
+	}
+
+	
+	public static String getTeensyBoard_txt(){
+			return  getTeensyPlatform() + "/avr/boards.txt";
+	}
 
 	public static boolean hasBuildErrors(IProject project) throws CoreException {
 		IMarker[] markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);

io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewSketchWizardCodeSelectionPage.java

@@ -136,7 +136,7 @@ public void handleEvent(Event event) {
 	 *       Checkbox settings
 	 */
 	protected void SetControls() {
-		switch (CodeTypes.values()[this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex()]) {
+		switch (CodeTypes.values()[Math.max(0,this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex())]) {
 		case defaultIno:
 			this.mTemplateFolderEditor.setEnabled(false, this.mParentComposite);
 			this.mExampleEditor.setEnabled(false);
@@ -170,7 +170,7 @@ protected void validatePage() {
 		if (this.mCodeSourceOptionsCombo == null) {
 			return;
 		}
-		switch (CodeTypes.values()[this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex()]) {
+		switch (CodeTypes.values()[Math.max(0, this.mCodeSourceOptionsCombo.mCombo.getSelectionIndex())]) {
 		case defaultIno:
 		case defaultCPP:
 			setPageComplete(true);// default always works