Merge remote-tracking branch 'upstream/master' into buildfix

Author: NicoHood

app/src/processing/app/Base.java

@@ -1444,6 +1444,8 @@ public void actionPerformed(ActionEvent actionevent) {
 
         // Cycle through all boards of this platform
         for (TargetBoard board : targetPlatform.getBoards().values()) {
+          if (board.getPreferences().get("hide") != null)
+            continue;
           JMenuItem item = createBoardMenusAndCustomMenus(boardsCustomMenus, menuItemsToClickAfterStartup,
                   buttonGroupsMap,
                   board, targetPlatform, targetPackage);

app/src/processing/app/Editor.java

@@ -1306,15 +1306,15 @@ public void actionPerformed(ActionEvent e) {
     JMenuItem copyForumItem = newJMenuItemShift(tr("Copy for Forum"), 'C');
     copyForumItem.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          getCurrentTab().handleHTMLCopy();
+          getCurrentTab().handleDiscourseCopy();
         }
       });
     menu.add(copyForumItem);
 
     JMenuItem copyHTMLItem = newJMenuItemAlt(tr("Copy as HTML"), 'C');
     copyHTMLItem.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          getCurrentTab().handleDiscourseCopy();
+          getCurrentTab().handleHTMLCopy();
         }
       });
     menu.add(copyHTMLItem);
@@ -2106,6 +2106,7 @@ public boolean handleSaveAs() {
 
       // Update editor window title in case of "Save as..."
       updateTitle();
+      header.rebuild();
     }
 
     return true;

arduino-core/src/cc/arduino/Compiler.java

@@ -156,8 +156,6 @@ public String build(CompilerProgressListener progListener, boolean exportHex) th
       runActions("hooks.savehex.postsavehex", prefs);
     }
 
-    size(prefs);
-
     return sketch.getPrimaryFile().getFileName();
   }
 
@@ -296,56 +294,6 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
     }
   }
 
-  private void size(PreferencesMap prefs) throws RunnerException {
-    String maxTextSizeString = prefs.get("upload.maximum_size");
-    String maxDataSizeString = prefs.get("upload.maximum_data_size");
-
-    if (maxTextSizeString == null) {
-      return;
-    }
-
-    long maxTextSize = Integer.parseInt(maxTextSizeString);
-    long maxDataSize = -1;
-
-    if (maxDataSizeString != null) {
-      maxDataSize = Integer.parseInt(maxDataSizeString);
-    }
-
-    Sizer sizer = new Sizer(prefs);
-    long[] sizes;
-    try {
-      sizes = sizer.computeSize();
-    } catch (RunnerException e) {
-      System.err.println(I18n.format(tr("Couldn't determine program size: {0}"), e.getMessage()));
-      return;
-    }
-
-    long textSize = sizes[0];
-    long dataSize = sizes[1];
-    System.out.println();
-    System.out.println(I18n.format(tr("Sketch uses {0} bytes ({2}%%) of program storage space. Maximum is {1} bytes."), textSize, maxTextSize, textSize * 100 / maxTextSize));
-    if (dataSize >= 0) {
-      if (maxDataSize > 0) {
-        System.out.println(I18n.format(tr("Global variables use {0} bytes ({2}%%) of dynamic memory, leaving {3} bytes for local variables. Maximum is {1} bytes."), dataSize, maxDataSize, dataSize * 100 / maxDataSize, maxDataSize - dataSize));
-      } else {
-        System.out.println(I18n.format(tr("Global variables use {0} bytes of dynamic memory."), dataSize));
-      }
-    }
-
-    if (textSize > maxTextSize) {
-      throw new RunnerException(tr("Sketch too big; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it."));
-    }
-
-    if (maxDataSize > 0 && dataSize > maxDataSize) {
-      throw new RunnerException(tr("Not enough memory; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing your footprint."));
-    }
-
-    int warnDataPercentage = Integer.parseInt(prefs.get("build.warn_data_percentage"));
-    if (maxDataSize > 0 && dataSize > maxDataSize * warnDataPercentage / 100) {
-      System.err.println(tr("Low memory available, stability problems may occur."));
-    }
-  }
-
   private void saveHex(PreferencesMap prefs) throws RunnerException {
     List<String> compiledSketches = new ArrayList<>(prefs.subTree("recipe.output.tmp_file", 1).values());
     List<String> copyOfCompiledSketches = new ArrayList<>(prefs.subTree("recipe.output.save_file", 1).values());

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

@@ -132,8 +132,8 @@ protected boolean executeUploadCommand(String command[]) throws Exception {
       new MessageSiphon(process.getErrorStream(), this, 100);
 
       // wait for the process to finish, but not forever
-      // kill the flasher process after 2 minutes to avoid 100% cpu spinning
-      if (!process.waitFor(2, TimeUnit.MINUTES)) {
+      // kill the flasher process after 5 minutes to avoid 100% cpu spinning
+      if (!process.waitFor(5, TimeUnit.MINUTES)) {
         process.destroyForcibly();
       }
       if (!process.isAlive()) {

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

@@ -38,9 +38,9 @@
 public class BaseNoGui {
 
   /** Version string to be used for build */
-  public static final int REVISION = 10614;
+  public static final int REVISION = 10800;
   /** Extended version string displayed on GUI */
-  public static final String VERSION_NAME = "1.6.14";
+  public static final String VERSION_NAME = "1.8.0";
   public static final String VERSION_NAME_LONG;
 
   // Current directory to use for relative paths specified on the
@@ -884,11 +884,22 @@ static public String sanitizeName(String origName) {
   }
 
   /**
-   * Spew the contents of a String object out to a file.
+   * Save the content of a String into a file
+   * - Save the content into a temp file
+   * - Find the canonical path of the file (if it's a symlink, follow it)
+   * - Remove the original file
+   * - Move temp file to original path
+   * This ensures that the file is not getting truncated if the disk is full
    */
   static public void saveFile(String str, File file) throws IOException {
     File temp = File.createTempFile(file.getName(), null, file.getParentFile());
     PApplet.saveStrings(temp, new String[] { str });
+
+    try {
+      file = file.getCanonicalFile();
+    } catch (IOException e) {
+    }
+
     if (file.exists()) {
       boolean result = file.delete();
       if (!result) {

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

@@ -236,14 +236,29 @@ public synchronized Map<String, Object> resolveDeviceByVendorIdProductId(String
           List<String> vids = new LinkedList<>(board.getPreferences().subTree("vid", 1).values());
           if (!vids.isEmpty()) {
             List<String> pids = new LinkedList<>(board.getPreferences().subTree("pid", 1).values());
+            List<String> descriptors = new LinkedList<>(board.getPreferences().subTree("descriptor", 1).values());
             for (int i = 0; i < vids.size(); i++) {
               String vidPid = vids.get(i) + "_" + pids.get(i);
               if (vid_pid_iSerial.toUpperCase().contains(vidPid.toUpperCase())) {
+                if (!descriptors.isEmpty()) {
+                  boolean matched = false;
+                  for (int j = 0; j < descriptors.size(); j++) {
+                    if (vid_pid_iSerial.toUpperCase().contains(descriptors.get(j).toUpperCase())) {
+                      matched = true;
+                      break;
+                    }
+                  }
+                  if (matched == false) {
+                    continue;
+                  }
+                }
                 Map<String, Object> boardData = new HashMap<>();
                 boardData.put("board", board);
                 boardData.put("vid", vids.get(i));
                 boardData.put("pid", pids.get(i));
-                boardData.put("iserial", vid_pid_iSerial.substring(vidPid.length()+1));
+                String extrafields = vid_pid_iSerial.substring(vidPid.length()+1);
+                String[] parts = extrafields.split("_");
+                boardData.put("iserial", parts[0]);
                 return boardData;
               }
             }

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

@@ -298,5 +298,6 @@ public void saveAs(File newFile) throws IOException {
 
     BaseNoGui.saveFile(storage.getText(), newFile);
     renamedTo(newFile);
+    storage.clearModified();
   }
 }