change GetFQBN and SetFQBN function because fqbn.getFQBN was improvable

Author: umbynos

cli/arguments/fqbn.go

@@ -32,12 +32,12 @@ func (f *Fqbn) AddToCommand(cmd *cobra.Command) {
 	})
 }
 
-// GetFQBN returns the fqbn
-func (f *Fqbn) GetFQBN() string {
+// String returns the fqbn
+func (f *Fqbn) String() string {
 	return f.fqbn
 }
 
-// SetFQBN sets the fqbn
-func (f *Fqbn) SetFQBN(fqbn string) {
+// Set sets the fqbn
+func (f *Fqbn) Set(fqbn string) {
 	f.fqbn = fqbn
 }

cli/board/attach.go

@@ -67,8 +67,8 @@ func runAttachCommand(cmd *cobra.Command, args []string) {
 	// a more meaningful fix would be to fix board.Attach
 	var boardURI string
 	discoveryPort, _ := port.GetPort(instance, nil)
-	if fqbn.GetFQBN() != "" {
-		boardURI = fqbn.GetFQBN()
+	if fqbn.String() != "" {
+		boardURI = fqbn.String()
 	} else if discoveryPort != nil {
 		boardURI = discoveryPort.Address
 	}

cli/board/details.go

@@ -63,7 +63,7 @@ func runDetailsCommand(cmd *cobra.Command, args []string) {
 
 	res, err := board.Details(context.Background(), &rpc.BoardDetailsRequest{
 		Instance: inst,
-		Fqbn:     fqbn.GetFQBN(),
+		Fqbn:     fqbn.String(),
 	})
 
 	if err != nil {

cli/burnbootloader/burnbootloader.go

@@ -76,7 +76,7 @@ func runBootloaderCommand(command *cobra.Command, args []string) {
 
 	if _, err := upload.BurnBootloader(context.Background(), &rpc.BurnBootloaderRequest{
 		Instance:   instance,
-		Fqbn:       fqbn.GetFQBN(),
+		Fqbn:       fqbn.String(),
 		Port:       discoveryPort.ToRPC(),
 		Verbose:    verbose,
 		Verify:     verify,

cli/compile/compile.go

@@ -152,7 +152,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 
 	compileRequest := &rpc.CompileRequest{
 		Instance:                      inst,
-		Fqbn:                          fqbn.GetFQBN(),
+		Fqbn:                          fqbn.String(),
 		SketchPath:                    sketchPath.String(),
 		ShowProperties:                showProperties,
 		Preprocess:                    preprocess,
@@ -188,7 +188,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 
 		userFieldRes, err := upload.SupportedUserFields(context.Background(), &rpc.SupportedUserFieldsRequest{
 			Instance: inst,
-			Fqbn:     fqbn.GetFQBN(),
+			Fqbn:     fqbn.String(),
 			Protocol: discoveryPort.Protocol,
 		})
 		if err != nil {
@@ -204,7 +204,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 
 		uploadRequest := &rpc.UploadRequest{
 			Instance:   inst,
-			Fqbn:       fqbn.GetFQBN(),
+			Fqbn:       fqbn.String(),
 			SketchPath: sketchPath.String(),
 			Port:       discoveryPort.ToRPC(),
 			Verbose:    verbose,

cli/debug/debug.go

@@ -77,7 +77,7 @@ func runDebugCommand(command *cobra.Command, args []string) {
 	sketchPath, _, discoveryPort := arguments.SketchPathCalculation(path, port, instance, false)
 	debugConfigRequested := &dbg.DebugConfigRequest{
 		Instance:    instance,
-		Fqbn:        fqbn.GetFQBN(),
+		Fqbn:        fqbn.String(),
 		SketchPath:  sketchPath.String(),
 		Port:        discoveryPort.ToRPC(),
 		Interpreter: interpreter,

cli/lib/examples.go

@@ -67,7 +67,7 @@ func runExamplesCommand(cmd *cobra.Command, args []string) {
 		Instance: instance,
 		All:      true,
 		Name:     name,
-		Fqbn:     fqbn.GetFQBN(),
+		Fqbn:     fqbn.String(),
 	})
 	if err != nil {
 		feedback.Errorf(tr("Error getting libraries info: %v"), err)

cli/lib/list.go

@@ -70,19 +70,19 @@ func runListCommand(cmd *cobra.Command, args []string) {
 		All:       all,
 		Updatable: updatable,
 		Name:      name,
-		Fqbn:      fqbn.GetFQBN(),
+		Fqbn:      fqbn.String(),
 	})
 	if err != nil {
 		feedback.Errorf(tr("Error listing Libraries: %v"), err)
 		os.Exit(errorcodes.ErrGeneric)
 	}
 
 	libs := []*rpc.InstalledLibrary{}
-	if fqbn.GetFQBN() == "" {
+	if fqbn.String() == "" {
 		libs = res.GetInstalledLibraries()
 	} else {
 		for _, lib := range res.GetInstalledLibraries() {
-			if lib.Library.CompatibleWith[fqbn.GetFQBN()] {
+			if lib.Library.CompatibleWith[fqbn.String()] {
 				libs = append(libs, lib)
 			}
 		}

cli/monitor/monitor.go

@@ -84,7 +84,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
 	enumerateResp, err := monitor.EnumerateMonitorPortSettings(context.Background(), &rpc.EnumerateMonitorPortSettingsRequest{
 		Instance:     instance,
 		PortProtocol: portProtocol,
-		Fqbn:         fqbn.GetFQBN(),
+		Fqbn:         fqbn.String(),
 	})
 	if err != nil {
 		feedback.Error(tr("Error getting port settings details: %s", err))
@@ -148,7 +148,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
 	portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorRequest{
 		Instance:          instance,
 		Port:              &rpc.Port{Address: portAddress, Protocol: portProtocol},
-		Fqbn:              fqbn.GetFQBN(),
+		Fqbn:              fqbn.String(),
 		PortConfiguration: configuration,
 	})
 	if err != nil {

cli/upload/upload.go

@@ -78,15 +78,15 @@ func runUploadCommand(command *cobra.Command, args []string) {
 	}
 	sketchPath, sk, discoveryPort := arguments.SketchPathCalculation(path, port, instance, true)
 
-	if fqbn.GetFQBN() == "" && sk != nil && sk.Metadata != nil {
+	if fqbn.String() == "" && 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.SetFQBN(sk.Metadata.CPU.Fqbn)
+		fqbn.Set(sk.Metadata.CPU.Fqbn)
 	}
 
 	userFieldRes, err := upload.SupportedUserFields(context.Background(), &rpc.SupportedUserFieldsRequest{
 		Instance: instance,
-		Fqbn:     fqbn.GetFQBN(),
+		Fqbn:     fqbn.String(),
 		Protocol: discoveryPort.Protocol,
 	})
 	if err != nil {
@@ -106,7 +106,7 @@ func runUploadCommand(command *cobra.Command, args []string) {
 
 	if _, err := upload.Upload(context.Background(), &rpc.UploadRequest{
 		Instance:   instance,
-		Fqbn:       fqbn.GetFQBN(),
+		Fqbn:       fqbn.String(),
 		SketchPath: path,
 		Port:       discoveryPort.ToRPC(),
 		Verbose:    verbose,