Use sketch project file to determine default fqbn and port

Author: cmaglie

Diff for: arduino/sketch/sketch.go

@@ -296,6 +296,18 @@ func (s *Sketch) GetProjectPath() *paths.Path {
 	return projectFile
 }
 
+// GetDefaultFQBN returns the default FQBN for the sketch (from the sketch.yaml project file), or the
+// empty string if not set.
+func (s *Sketch) GetDefaultFQBN() string {
+	return s.Project.DefaultFqbn
+}
+
+// GetDefaultPortAddressAndProtocol returns the default port address and port protocol for the sketch
+// (from the sketch.yaml project file), or empty strings if not set.
+func (s *Sketch) GetDefaultPortAddressAndProtocol() (string, string) {
+	return s.Project.DefaultPort, s.Project.DefaultProtocol
+}
+
 // InvalidSketchFolderNameError is returned when the sketch directory doesn't match the sketch name
 type InvalidSketchFolderNameError struct {
 	SketchFolder *paths.Path

Diff for: cli/arguments/fqbn.go

@@ -69,17 +69,15 @@ func (f *Fqbn) Set(fqbn string) {
 // - it tries to autodetect the board connected to the given port flags
 // If all above methods fails, it returns the empty string.
 // The Port metadata are always returned except if:
-// - the port is not found, in this case nil is returned
-// - the FQBN autodetection fail, in this case the function prints an error and
-//   terminates the execution
+//   - the port is not found, in this case nil is returned
+//   - the FQBN autodetection fail, in this case the function prints an error and
+//     terminates the execution
 func CalculateFQBNAndPort(portArgs *Port, fqbnArg *Fqbn, instance *rpc.Instance, sk *sketch.Sketch) (string, *rpc.Port) {
 	// TODO: REMOVE sketch.Sketch from here
 
 	fqbn := fqbnArg.String()
-	if fqbn == "" && sk != nil && sk.Metadata != nil {
-		// If the user didn't specify an FQBN and a sketch.json file is present
-		// read it from there.
-		fqbn = sk.Metadata.CPU.Fqbn
+	if fqbn == "" && sk != nil {
+		fqbn = sk.GetDefaultFQBN()
 	}
 	if fqbn == "" {
 		if portArgs == nil || portArgs.address == "" {

Diff for: cli/arguments/port.go

@@ -17,7 +17,6 @@ package arguments
 
 import (
 	"fmt"
-	"net/url"
 	"os"
 	"time"
 
@@ -80,18 +79,8 @@ func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Po
 	address := p.address
 	protocol := p.protocol
 
-	if address == "" && sk != nil && sk.Metadata != nil {
-		// This is for compatibility with old sketch.json where the address
-		// for serial ports was stored as URL like serial:///dev/ttyACM0, so we
-		// check if we have a URI and the scheme is "serial". In all other
-		// cases we pick the address as is.
-		deviceURI, err := url.Parse(sk.Metadata.CPU.Port)
-		if err == nil && deviceURI.Scheme == "serial" {
-			address = deviceURI.Host + deviceURI.Path
-		} else {
-			address = sk.Metadata.CPU.Port
-		}
-		protocol = sk.Metadata.CPU.Protocol
+	if address == "" && sk != nil {
+		address, protocol = sk.GetDefaultPortAddressAndProtocol()
 	}
 	if address == "" {
 		// If no address is provided we assume the user is trying to upload

Diff for: commands/compile/compile.go

@@ -76,8 +76,8 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	}
 
 	fqbnIn := req.GetFqbn()
-	if fqbnIn == "" && sk != nil && sk.Metadata != nil {
-		fqbnIn = sk.Metadata.CPU.Fqbn
+	if fqbnIn == "" && sk != nil {
+		fqbnIn = sk.GetDefaultFQBN()
 	}
 	if fqbnIn == "" {
 		return nil, &arduino.MissingFQBNError{}

Diff for: commands/debug/debug_info.go

@@ -54,8 +54,8 @@ func getDebugProperties(req *debug.DebugConfigRequest, pme *packagemanager.Explo
 
 	// XXX Remove this code duplication!!
 	fqbnIn := req.GetFqbn()
-	if fqbnIn == "" && sk != nil && sk.Metadata != nil {
-		fqbnIn = sk.Metadata.CPU.Fqbn
+	if fqbnIn == "" && sk != nil {
+		fqbnIn = sk.GetDefaultFQBN()
 	}
 	if fqbnIn == "" {
 		return nil, &arduino.MissingFQBNError{}