From 948d0d13eb8c26910c29a0575b5a5a5f34f9e176 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 21 Oct 2015 20:06:29 -0400 Subject: [PATCH] Bug 480115 - Pick a board any board If Uno isn't installed, pick the first board in the installed board list instead so we have something and don't NPE. Change-Id: I691c1a743d374a1950d00c084e74ff8a174efdc0 --- .../core/internal/ArduinoProjectGenerator.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/ArduinoProjectGenerator.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/ArduinoProjectGenerator.java index 05c24cc48be..0cdf16f6270 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/ArduinoProjectGenerator.java +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/ArduinoProjectGenerator.java @@ -11,6 +11,7 @@ package org.eclipse.cdt.arduino.core.internal; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.eclipse.cdt.arduino.core.internal.board.ArduinoBoard; @@ -64,7 +65,16 @@ public class ArduinoProjectGenerator { IBuildConfiguration config = project.getBuildConfig("uno"); //$NON-NLS-1$ ArduinoBuildConfiguration arduinoConfig = config.getAdapter(ArduinoBuildConfiguration.class); ArduinoBoard board = ArduinoManager.instance.getBoard("Arduino/Genuino Uno", "Arduino AVR Boards", "arduino"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - arduinoConfig.setBoard(board); + if (board == null) { + // Just find one + List boards = ArduinoManager.instance.getInstalledBoards(); + if (!boards.isEmpty()) { + board = boards.get(0); + } + } + if (board != null) { + arduinoConfig.setBoard(board); + } // Generate files ArduinoTemplateGenerator templateGen = new ArduinoTemplateGenerator();