Select (first) target board when port is selected and has known board

Author: sandeepmistry

app/src/cc/arduino/view/preferences/Preferences.java

@@ -134,6 +134,7 @@ private void initComponents() {
     verifyUploadBox = new javax.swing.JCheckBox();
     externalEditorBox = new javax.swing.JCheckBox();
     cacheCompiledCore = new javax.swing.JCheckBox();
+    autoselectBoard = new javax.swing.JCheckBox();
     checkUpdatesBox = new javax.swing.JCheckBox();
     updateExtensionBox = new javax.swing.JCheckBox();
     saveVerifyUploadBox = new javax.swing.JCheckBox();
@@ -284,6 +285,9 @@ public void mouseEntered(java.awt.event.MouseEvent evt) {
     cacheCompiledCore.setText(tr("Aggressively cache compiled core"));
     checkboxesContainer.add(cacheCompiledCore);
 
+    autoselectBoard.setText(tr("Automatically use the correct target when selecting a known serial port"));
+    checkboxesContainer.add(autoselectBoard);
+
     checkUpdatesBox.setText(tr("Check for updates on startup"));
     checkboxesContainer.add(checkUpdatesBox);
 
@@ -736,6 +740,7 @@ private void autoScaleCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//
   private javax.swing.JButton extendedAdditionalUrlFieldWindow;
   private javax.swing.JCheckBox externalEditorBox;
   private javax.swing.JCheckBox cacheCompiledCore;
+  private javax.swing.JCheckBox autoselectBoard;
   private javax.swing.JTextField fontSizeField;
   private javax.swing.JLabel fontSizeLabel;
   private javax.swing.JLabel jLabel1;
@@ -843,6 +848,8 @@ private void savePreferencesData() {
 
     PreferencesData.setBoolean("compiler.cache_core", cacheCompiledCore.isSelected());
 
+    PreferencesData.setBoolean("editor.autoselectboard", autoselectBoard.isSelected());
+
     PreferencesData.setBoolean("update.check", checkUpdatesBox.isSelected());
 
     PreferencesData.setBoolean("editor.update_extension", updateExtensionBox.isSelected());
@@ -917,6 +924,8 @@ private void showPreferencesData() {
 
     cacheCompiledCore.setSelected(PreferencesData.get("compiler.cache_core") == null || PreferencesData.getBoolean("compiler.cache_core"));
 
+    autoselectBoard.setSelected(PreferencesData.getBoolean("editor.autoselectboard"));
+
     checkUpdatesBox.setSelected(PreferencesData.getBoolean("update.check"));
 
     updateExtensionBox.setSelected(PreferencesData.get("editor.update_extension") == null || PreferencesData.getBoolean("editor.update_extension"));

app/src/processing/app/Base.java

@@ -116,6 +116,8 @@ public class Base {
   //  int editorCount;
   List<Editor> editors = Collections.synchronizedList(new ArrayList<Editor>());
   Editor activeEditor;
+  
+  private static JMenu boardMenu;
 
   // these menus are shared so that the board and serial port selections
   // are the same for all windows (since the board and serial port that are
@@ -1308,6 +1310,28 @@ public void rebuildExamplesMenu(JMenu menu) {
 
   private static String priorPlatformFolder;
   private static boolean newLibraryImported;
+  
+  public void selectTargetBoard(TargetBoard targetBoard) {
+    for (int i = 0; i < boardMenu.getItemCount(); i++) {
+      JMenuItem menuItem = boardMenu.getItem(i);
+      if (!(menuItem instanceof JRadioButtonMenuItem)) {
+        continue;
+      }
+      
+      JRadioButtonMenuItem radioButtonMenuItem = ((JRadioButtonMenuItem) menuItem);
+      if (targetBoard.getName().equals(radioButtonMenuItem.getText())) {
+        radioButtonMenuItem.setSelected(true);
+        break;
+      }
+    }
+    
+    BaseNoGui.selectBoard(targetBoard);
+    filterVisibilityOfSubsequentBoardMenus(boardsCustomMenus, targetBoard, 1);
+  
+    onBoardOrPortChange();
+    rebuildImportMenu(Editor.importMenu);
+    rebuildExamplesMenu(Editor.examplesMenu);
+  }
 
   public synchronized void onBoardOrPortChange() {
     BaseNoGui.onBoardOrPortChange();
@@ -1402,7 +1426,7 @@ public void rebuildBoardsMenu() throws Exception {
     boardsCustomMenus = new LinkedList<>();
 
     // The first custom menu is the "Board" selection submenu
-    JMenu boardMenu = new JMenu(tr("Board"));
+    boardMenu = new JMenu(tr("Board"));
     boardMenu.putClientProperty("removeOnWindowDeactivation", true);
     MenuScroller.setScrollerFor(boardMenu).setTopFixedCount(1);
 
@@ -1520,12 +1544,7 @@ public void run() {
                     } catch (InterruptedException e) {}
                   }
               }
-
-              BaseNoGui.selectBoard((TargetBoard) getValue("b"));
-              filterVisibilityOfSubsequentBoardMenus(boardsCustomMenus, (TargetBoard) getValue("b"), 1);
-              onBoardOrPortChange();
-              rebuildImportMenu(Editor.importMenu);
-              rebuildExamplesMenu(Editor.examplesMenu);
+              selectTargetBoard((TargetBoard) getValue("b"));
             }
         }.start();
       }

app/src/processing/app/Editor.java

@@ -94,6 +94,9 @@
 import cc.arduino.view.findreplace.FindReplace;
 import jssc.SerialPortException;
 import processing.app.debug.RunnerException;
+import processing.app.debug.TargetBoard;
+import processing.app.debug.TargetPackage;
+import processing.app.debug.TargetPlatform;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.DocumentTextChangeListener;
 import processing.app.helpers.Keys;
@@ -1013,7 +1016,7 @@ private void addInternalTools(JMenu menu) {
   }
 
 
-  private void selectSerialPort(String name) {
+  private void selectSerialPort(String name, String boardId) {
     if(portMenu == null) {
       System.out.println(tr("serialMenu is null"));
       return;
@@ -1064,7 +1067,13 @@ class BoardPortJCheckBoxMenuItem extends JCheckBoxMenuItem {
     public BoardPortJCheckBoxMenuItem(BoardPort port) {
       super(port.getLabel());
       addActionListener(e -> {
-        selectSerialPort(port.getAddress());
+        selectSerialPort(port.getAddress(), port.getBoardId());
+        if (port.getBoardId() != null && PreferencesData.getBoolean("editor.autoselectboard")) {
+          TargetBoard targetBoard = BaseNoGui.getPlatform().resolveBoardById(BaseNoGui.packages, port.getBoardId());
+          if (targetBoard != null) {
+            base.selectTargetBoard(targetBoard);
+          }
+        }
         base.onBoardOrPortChange();
       });
       this.port = port;

arduino-core/src/cc/arduino/packages/BoardPort.java

@@ -36,6 +36,7 @@ public class BoardPort {
   private String address;
   private String protocol;
   private String boardName;
+  private String boardId;
   private String vid;
   private String pid;
   private String iserial;
@@ -71,6 +72,14 @@ public void setBoardName(String boardName) {
     this.boardName = boardName;
   }
 
+  public String getBoardId() {
+    return boardId;
+  }
+
+  public void setBoardId(String boardId) {
+    this.boardId = boardId;
+  }
+  
   public PreferencesMap getPrefs() {
     return prefs;
   }

arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -122,6 +122,7 @@ public void serviceResolved(ServiceEvent serviceEvent) {
 
       port.setAddress(address);
       port.setBoardName(name);
+      port.setBoardId(board);
       port.setProtocol("network");
       port.setLabel(label);
 

arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java

@@ -155,6 +155,7 @@ public synchronized void retriggerDiscovery(boolean polled) {
             label += " (" + boardName + ")";
           }
           boardPort.setBoardName(boardName);
+          boardPort.setBoardId(board.getId());
         }
       } else {
         if (!parts[1].equals("0000")) {

arduino-core/src/processing/app/Platform.java

@@ -269,21 +269,29 @@ public synchronized Map<String, Object> resolveDeviceByVendorIdProductId(String
     return null;
   }
 
-  public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {
+  public TargetBoard resolveBoardById(Map<String, TargetPackage> packages, String boardId) {
     assert packages != null;
     assert boardId != null;
     for (TargetPackage targetPackage : packages.values()) {
       for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {
         for (TargetBoard board : targetPlatform.getBoards().values()) {
           if (boardId.equals(board.getId())) {
-            return board.getName();
+            return board;
           }
         }
       }
     }
     return null;
   }
 
+  public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {
+    TargetBoard targetBoard = resolveBoardById(packages, boardId);
+    if (targetBoard != null) {
+      return targetBoard.getName();
+    }
+    return null;
+  }
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
   public String getName() {