solve problems with bossac commandline

Former-commit-id: 6eb2c83e200c72e96125d5e4e5c50ba9df792f2f [formerly fa679262aa45fb2526907bcff381c24d3b319a38]
Former-commit-id: b13c0f6b25254075d58c57a80b18d7ea50675b06

Author: facchinm

arduino

@@ -674,6 +674,15 @@ func formatCmdline(cmdline string, boardOptions map[string]string) (string, bool
 	return cmdline, true
 }
 
+func containsStr(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}
+
 func assembleCompilerCommand(boardname string, portname string, filePath string) (bool, string, []string) {
 
 	// get executable (self)path and use it as base for all other paths
@@ -706,6 +715,7 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 	}
 
 	boardOptions["serial.port"] = portname
+	boardOptions["serial.port.file"] = portname
 
 	// filepath need special care; the project_name var is the filename minus its extension (hex or bin)
 	// if we are going to modify standard IDE files we also could pass ALL filename
@@ -734,6 +744,10 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 			uploadOptions[arr[0]] = arr[1]
 			arr[0] = strings.Replace(arr[0], "tools."+tool+".", "", 1)
 			boardOptions[arr[0]] = arr[1]
+			// we have a "=" in command line
+			if len(arr) > 2 {
+				boardOptions[arr[0]] = arr[1] + "=" + arr[2]
+			}
 		}
 	}
 	file.Close()
@@ -747,11 +761,12 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 		return false, "", nil
 	}
 
-	boardOptions["runtime.tools.avrdude.path"] = path
+	boardOptions["runtime.tools."+tool+".path"] = path
 
-	cmdline := uploadOptions["tools."+tool+".upload.pattern"]
+	cmdline := boardOptions["upload.pattern"]
 	// remove cmd.path as it is handled differently
 	cmdline = strings.Replace(cmdline, "\"{cmd.path}\"", " ", 1)
+	cmdline = strings.Replace(cmdline, "\"{path}/{cmd}\"", " ", 1)
 	cmdline = strings.Replace(cmdline, "\"", "", -1)
 
 	// split the commandline in substrings and recursively replace mapped strings
@@ -772,15 +787,25 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 
 		mode := &serial.Mode{
 			BaudRate: 1200,
+			Vmin:     1,
+			Vtimeout: 0,
 		}
 		port, err := serial.OpenPort(portname, mode)
 		if err != nil {
 			log.Println(err)
 			return false, "", nil
 		}
-		time.Sleep(time.Second / 2)
+		port.SetDTR(false)
 		port.Close()
-		time.Sleep(time.Second * 2)
+		time.Sleep(time.Second / 4 * 10)
+		// time.Sleep(time.Second / 4)
+		// wait for port to reappear
+		if boardOptions["upload.wait_for_upload_port"] == "true" {
+			ports, _ := serial.GetPortsList()
+			for !(containsStr(ports, portname)) {
+				ports, _ = serial.GetPortsList()
+			}
+		}
 	}
 
 	tool = (filepath.Dir(execPath) + "/" + boardFields[0] + "/tools/" + tool + "/bin/" + tool)
@@ -791,7 +816,15 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 		tool = strings.Replace(tool, "/", "\\", -1)
 	}
 
-	return (tool != ""), tool, cmdlineSlice
+	// remove blanks from cmdlineSlice
+	var cmdlineSliceOut []string
+	for _, element := range cmdlineSlice {
+		if element != "" {
+			cmdlineSliceOut = append(cmdlineSliceOut, element)
+		}
+	}
+
+	return (tool != ""), tool, cmdlineSliceOut
 }
 
 func findPortByName(portname string) (*serport, bool) {