Merge branch 'master' of https://github.com/samigamer1999/Arduino

Author: samigamer1999

app/src/processing/app/Base.java

@@ -1704,18 +1704,20 @@ public void rebuildProgrammerMenu() {
     ButtonGroup group = new ButtonGroup();
 
     TargetBoard board = BaseNoGui.getTargetBoard();
-    TargetPlatform boardPlatform = board.getContainerPlatform();
-    TargetPlatform corePlatform = null;
+    if (board != null) {
+      TargetPlatform boardPlatform = board.getContainerPlatform();
+      TargetPlatform corePlatform = null;
 
-    String core = board.getPreferences().get("build.core");
-    if (core != null && core.contains(":")) {
-      String[] split = core.split(":", 2);
-      corePlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
-    }
+      String core = board.getPreferences().get("build.core");
+      if (core != null && core.contains(":")) {
+        String[] split = core.split(":", 2);
+        corePlatform = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
+      }
 
-    addProgrammersForPlatform(boardPlatform, programmerMenus, group);
-    if (corePlatform != null)
-      addProgrammersForPlatform(corePlatform, programmerMenus, group);
+      addProgrammersForPlatform(boardPlatform, programmerMenus, group);
+      if (corePlatform != null)
+        addProgrammersForPlatform(corePlatform, programmerMenus, group);
+    }
 
     if (programmerMenus.isEmpty()) {
       JMenuItem item = new JMenuItem(tr("No programmers available for this board"));

app/src/processing/app/EditorToolbar.java

@@ -62,7 +62,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
    * Titles for each button when the shift key is pressed.
    */
   private static final String[] titleShift = {
-    tr("Verify"), tr("Upload Using Programmer"), tr("New"), tr("Open"), tr("Save As..."), tr("Serial Monitor")
+    tr("Verify"), tr("Upload Using Programmer"), tr("New"), tr("Open"), tr("Save As..."), tr("Serial Plotter")
   };
 
   private static final int BUTTON_COUNT = title.length;
@@ -500,7 +500,11 @@ private void handleSelectionPressed(int sel, boolean isShiftDown, int x, int y)
         break;
 
       case SERIAL:
-        editor.handleSerial();
+        if (isShiftDown) {
+          editor.handlePlotter();
+        } else {
+          editor.handleSerial();
+        }
         break;
 
       default: