Board details now shows pluggable discovery identification props

Author: cmaglie

cli/board/details.go

@@ -130,13 +130,13 @@ func (dr detailsResult) String() string {
 			table.NewCell("✔", color.New(color.FgGreen)))
 	}
 
-	for i, idp := range details.IdentificationPrefs {
-		if i == 0 {
-			t.AddRow() // get some space from above
-			t.AddRow(tr("Identification properties:"), "VID:"+idp.UsbId.Vid+" PID:"+idp.UsbId.Pid)
-			continue
+	for _, idp := range details.GetIdentificationProperties() {
+		t.AddRow() // get some space from above
+		header := tr("Identification properties:")
+		for k, v := range idp.GetProperties() {
+			t.AddRow(header, k+"="+v)
+			header = ""
 		}
-		t.AddRow("", "VID:"+idp.UsbId.Vid+" PID:"+idp.UsbId.Pid)
 	}
 
 	t.AddRow() // get some space from above
@@ -159,14 +159,14 @@ func (dr detailsResult) String() string {
 
 	t.AddRow() // get some space from above
 	for _, tool := range details.ToolsDependencies {
-		t.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, "", tool.Version)
+		t.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version)
 		if showFullDetails {
 			for _, sys := range tool.Systems {
-				t.AddRow("", tr("OS:"), "", sys.Host)
-				t.AddRow("", tr("File:"), "", sys.ArchiveFilename)
-				t.AddRow("", tr("Size (bytes):"), "", fmt.Sprint(sys.Size))
-				t.AddRow("", tr("Checksum:"), "", sys.Checksum)
-				t.AddRow("", "URL:", "", sys.Url)
+				t.AddRow("", tr("OS:"), sys.Host)
+				t.AddRow("", tr("File:"), sys.ArchiveFilename)
+				t.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size))
+				t.AddRow("", tr("Checksum:"), sys.Checksum)
+				t.AddRow("", "URL:", sys.Url)
 				t.AddRow() // get some space from above
 			}
 		}

commands/board/details.go

@@ -50,6 +50,12 @@ func Details(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetai
 	details.PropertiesId = board.BoardID
 	details.Official = fqbn.Package == "arduino"
 	details.Version = board.PlatformRelease.Version.String()
+	details.IdentificationProperties = []*rpc.BoardIdentificationProperties{}
+	for _, p := range board.GetIdentificationProperties() {
+		details.IdentificationProperties = append(details.IdentificationProperties, &rpc.BoardIdentificationProperties{
+			Properties: p.AsMap(),
+		})
+	}
 
 	details.DebuggingSupported = boardProperties.ContainsKey("debug.executable") ||
 		boardPlatform.Properties.ContainsKey("debug.executable") ||
@@ -80,16 +86,6 @@ func Details(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetai
 		details.Platform.Size = boardPlatform.Resource.Size
 	}
 
-	details.IdentificationPrefs = []*rpc.IdentificationPref{}
-	vids := board.Properties.SubTree("vid")
-	pids := board.Properties.SubTree("pid")
-	for id, vid := range vids.AsMap() {
-		if pid, ok := pids.GetOk(id); ok {
-			idPref := rpc.IdentificationPref{UsbId: &rpc.USBID{Vid: vid, Pid: pid}}
-			details.IdentificationPrefs = append(details.IdentificationPrefs, &idPref)
-		}
-	}
-
 	details.ConfigOptions = []*rpc.ConfigOption{}
 	options := board.GetConfigOptions()
 	for _, option := range options.Keys() {