Add shortcut to open FirmwareUpdater sketch

Author: facchinm

src/cc/arduino/plugins/wifi101/UpdaterImpl.java

@@ -178,6 +178,17 @@ public void run() {
 		}.start();
 	}
 
+	@Override
+	protected void openFirmwareUpdaterSketch() {
+		Flasher fw = (Flasher) getFirmwareSelector().getSelectedItem();
+		try {
+			fw.openFirmwareUpdaterSketch(getSelectedPort());
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	@Override
 	protected void updateFirmware() {
 		BoardPort port = getSelectedPort();

src/cc/arduino/plugins/wifi101/UpdaterJFrame.java

@@ -51,6 +51,7 @@
 import javax.swing.event.ListSelectionListener;
 
 import cc.arduino.plugins.wifi101.flashers.Flasher;
+import processing.app.Base;
 
 @SuppressWarnings("serial")
 public class UpdaterJFrame extends JFrame {
@@ -72,6 +73,7 @@ public class UpdaterJFrame extends JFrame {
 	private JButton addCertificateButton;
 	private JButton updateFirmwareButton;
 	private JButton testConnectionButton;
+	private JButton openFirmwareUpdaterSketchButton;
 
 	public static void main(String[] args) {
 		EventQueue.invokeLater(new Runnable() {
@@ -130,13 +132,13 @@ public UpdaterJFrame() {
 
 		serialPortList = new JList<String>();
 		JScrollPane sp = new JScrollPane(serialPortList);
-		serialPortList.setMaximumSize(new Dimension(300, 50));
+		serialPortList.setMaximumSize(new Dimension(300, 100));
 		GridBagConstraints gbc_serialPortList = new GridBagConstraints();
 		gbc_serialPortList.insets = new Insets(5, 5, 5, 5);
 		gbc_serialPortList.fill = GridBagConstraints.BOTH;
 		gbc_serialPortList.gridx = 0;
 		gbc_serialPortList.gridy = 1;
-		gbc_serialPortList.gridheight = 2;
+		gbc_serialPortList.gridheight = 5;
 		panel_1.add(sp, gbc_serialPortList);
 		serialPortList.addListSelectionListener(new ListSelectionListener() {
 			public void valueChanged(ListSelectionEvent e) {
@@ -153,9 +155,9 @@ public void actionPerformed(ActionEvent e) {
 		});
 		GridBagConstraints gbc_refreshListButton = new GridBagConstraints();
 		gbc_refreshListButton.fill = GridBagConstraints.HORIZONTAL;
-		gbc_refreshListButton.insets = new Insets(5, 5, 5, 5);
+		gbc_refreshListButton.insets = new Insets(0,0,0,0);
 		gbc_refreshListButton.gridx = 1;
-		gbc_refreshListButton.gridy = 1;
+		gbc_refreshListButton.gridy = 2;
 		panel_1.add(refreshListButton, gbc_refreshListButton);
 
 		testConnectionButton = new JButton("Test connection");
@@ -166,11 +168,24 @@ public void actionPerformed(ActionEvent e) {
 		});
 
 		GridBagConstraints gbc_testConnectionButton = new GridBagConstraints();
-		gbc_testConnectionButton.insets = new Insets(5, 5, 5, 5);
+		gbc_testConnectionButton.insets = new Insets(0,0,0,0);
 		gbc_testConnectionButton.gridx = 1;
-		gbc_testConnectionButton.gridy = 2;
+		gbc_testConnectionButton.gridy = 3;
 		panel_1.add(testConnectionButton, gbc_testConnectionButton);
 
+		openFirmwareUpdaterSketchButton = new JButton("Open Updater sketch");
+		openFirmwareUpdaterSketchButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				openFirmwareUpdaterSketch();
+			}
+		});
+
+		GridBagConstraints gbc_openFirmwareUpdaterSketchButton = new GridBagConstraints();
+		gbc_openFirmwareUpdaterSketchButton.insets = new Insets(0,0,0,0);
+		gbc_openFirmwareUpdaterSketchButton.gridx = 1;
+		gbc_openFirmwareUpdaterSketchButton.gridy = 1;
+		panel_1.add(openFirmwareUpdaterSketchButton, gbc_openFirmwareUpdaterSketchButton);
+
 		panel = new JPanel();
 		panel.setBorder(new TitledBorder(new LineBorder(new Color(184, 207, 229)), "2. Update firmware", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(51, 51, 51)));
 		panel.setMinimumSize(new Dimension(500, 150));
@@ -367,6 +382,10 @@ protected void testConnection() {
 		// To be overridden
 	}
 
+	protected void openFirmwareUpdaterSketch() {
+		// To be overridden
+	}
+
 	protected void refreshSerialPortList() {
 		// To be overridden
 	}

src/cc/arduino/plugins/wifi101/flashers/Flasher.java

@@ -31,9 +31,19 @@
 import java.util.List;
 import java.util.Arrays;
 
+import javax.swing.JMenuItem;
 import javax.swing.JProgressBar;
+import javax.swing.JRadioButtonMenuItem;
 
+import cc.arduino.packages.BoardPort;
 import cc.arduino.plugins.wifi101.flashers.java.FlasherSerialClient;
+import processing.app.Editor;
+import processing.app.debug.TargetBoard;
+import processing.app.packages.LibraryList;
+import processing.app.packages.UserLibrary;
+import processing.app.packages.UserLibraryFolder.Location;
+import processing.app.Base;
+import processing.app.BaseNoGui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -101,6 +111,31 @@ public void testConnection(String port, int baudrate) throws Exception {
 		}
 	}
 
+	public void openFirmwareUpdaterSketch(BoardPort port) throws Exception {
+		LibraryList allLibraries = BaseNoGui.librariesIndexer.getInstalledLibraries();
+		String firmwareUpdaterExamplePath = "";
+		String nameToSearchFor = "";
+		String pathToSketch = "";
+		if (modulename.contains("NINA")) {
+			nameToSearchFor = "WiFiNINA";
+			pathToSketch = "examples/Tools/FirmwareUpdater/FirmwareUpdater.ino";
+		}
+		if (modulename.contains("WINC")) {
+			nameToSearchFor = "WiFi101";
+			pathToSketch = "examples/FirmwareUpdater/FirmwareUpdater.ino";
+		}
+		for (UserLibrary lib : allLibraries) {
+		  if (lib.getName().equals(nameToSearchFor)) {
+			  firmwareUpdaterExamplePath = lib.getInstalledFolder().getAbsolutePath() + "/" + pathToSketch;
+		  }
+		}
+		if (firmwareUpdaterExamplePath != "" && port != null) {
+			BaseNoGui.selectSerialPort(port.getAddress());
+			Base.INSTANCE.onBoardOrPortChange();
+			Base.INSTANCE.handleOpen(new File(firmwareUpdaterExamplePath));
+		}
+	}
+
 	public void updateFirmware(String port) throws Exception {
 		// To be overridden
 	}
@@ -151,6 +186,9 @@ public void setFileName(String _filename) {
 	}
 
 	public boolean isCompatible(String boardName) {
+		if (boardName == null) {
+			return false;
+		}
 		for (String name : compatibleBoard) {
 			if (name.toLowerCase().equals(boardName.toLowerCase())) {
 				return true;