From 735eebf8697a8925ed32fdd14a639b9a0072ea97 Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Tue, 9 Jul 2019 07:34:30 +0200 Subject: [PATCH] Core search/list now return boards in a platform Signed-off-by: Christian Weichel --- cli/core/list.go | 2 +- cli/core/search.go | 4 +- commands/core/core.go | 54 ++++++++ commands/core/list.go | 13 +- commands/core/search.go | 10 +- rpc/commands/core.pb.go | 279 ++++++++++++++++++++++------------------ rpc/commands/core.proto | 21 +-- 7 files changed, 229 insertions(+), 154 deletions(-) create mode 100644 commands/core/core.go diff --git a/cli/core/list.go b/cli/core/list.go index a7444d9cb9c..13d92b14440 100644 --- a/cli/core/list.go +++ b/cli/core/list.go @@ -69,7 +69,7 @@ func runListCommand(cmd *cobra.Command, args []string) { } } -func outputInstalledCores(cores []*rpc.InstalledPlatform) { +func outputInstalledCores(cores []*rpc.Platform) { table := output.NewTable() table.AddRow("ID", "Installed", "Latest", "Name") sort.Slice(cores, func(i, j int) bool { diff --git a/cli/core/search.go b/cli/core/search.go index d09978ae4d6..069705926e3 100644 --- a/cli/core/search.go +++ b/cli/core/search.go @@ -71,14 +71,14 @@ func runSearchCommand(cmd *cobra.Command, args []string) { } } -func outputSearchCores(cores []*rpc.SearchOutput) { +func outputSearchCores(cores []*rpc.Platform) { table := output.NewTable() table.AddRow("ID", "Version", "Name") sort.Slice(cores, func(i, j int) bool { return cores[i].ID < cores[j].ID }) for _, item := range cores { - table.AddRow(item.GetID(), item.GetVersion(), item.GetName()) + table.AddRow(item.GetID(), item.GetLatest(), item.GetName()) } fmt.Print(table.Render()) } diff --git a/commands/core/core.go b/commands/core/core.go new file mode 100644 index 00000000000..86845ce9e00 --- /dev/null +++ b/commands/core/core.go @@ -0,0 +1,54 @@ +/* + * This file is part of arduino-cli. + * + * Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + * + * This software is released under the GNU General Public License version 3, + * which covers the main part of arduino-cli. + * The terms of this license can be found at: + * https://www.gnu.org/licenses/gpl-3.0.en.html + * + * You can be released from the requirements of the above licenses by purchasing + * a commercial license. Buying such a license is mandatory if you want to modify or + * otherwise use the software for commercial activities involving the Arduino + * software without disclosing the source code of your own applications. To purchase + * a commercial license, send an email to license@arduino.cc. + */ + +package core + +import ( + "github.com/arduino/arduino-cli/arduino/cores" + rpc "github.com/arduino/arduino-cli/rpc/commands" +) + +// platformReleaseToRPC converts our internal structure to the RPC structure. +// Note: this function does not touch the "Installed" field of rpc.Platform as it's not always clear that the +// platformRelease we're currently converting is actually installed. +func platformReleaseToRPC(platformRelease *cores.PlatformRelease) *rpc.Platform { + boards := make([]*rpc.Board, len(platformRelease.Boards)) + i := 0 + for _, b := range platformRelease.Boards { + boards[i] = &rpc.Board{ + Name: b.Name(), + Fqbn: b.FQBN(), + } + i++ + } + + result := &rpc.Platform{ + ID: platformRelease.Platform.String(), + Name: platformRelease.Platform.Name, + Maintainer: platformRelease.Platform.Package.Maintainer, + Website: platformRelease.Platform.Package.WebsiteURL, + Email: platformRelease.Platform.Package.Email, + Boards: boards, + } + + latest := platformRelease.Platform.GetLatestRelease() + if latest != nil { + result.Latest = latest.Version.String() + } + + return result +} diff --git a/commands/core/list.go b/commands/core/list.go index dd31cb2b683..38a79ff3e69 100644 --- a/commands/core/list.go +++ b/commands/core/list.go @@ -32,7 +32,7 @@ func PlatformList(ctx context.Context, req *rpc.PlatformListReq) (*rpc.PlatformL return nil, errors.New("invalid instance") } - installed := []*rpc.InstalledPlatform{} + installed := []*rpc.Platform{} for _, targetPackage := range pm.GetPackages().Packages { for _, platform := range targetPackage.Platforms { if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil { @@ -41,14 +41,9 @@ func PlatformList(ctx context.Context, req *rpc.PlatformListReq) (*rpc.PlatformL continue } } - p := &rpc.InstalledPlatform{ - ID: platformRelease.String(), - Installed: platformRelease.Version.String(), - Name: platformRelease.Platform.Name, - } - if latest := platformRelease.Platform.GetLatestRelease(); latest != nil { - p.Latest = latest.Version.String() - } + + p := platformReleaseToRPC(platformRelease) + p.Installed = platformRelease.Version.String() installed = append(installed, p) } } diff --git a/commands/core/search.go b/commands/core/search.go index 896e5557ecd..70e03aa6973 100644 --- a/commands/core/search.go +++ b/commands/core/search.go @@ -65,13 +65,9 @@ func PlatformSearch(ctx context.Context, req *rpc.PlatformSearchReq) (*rpc.Platf } } - out := []*rpc.SearchOutput{} - for _, platformRelease := range res { - out = append(out, &rpc.SearchOutput{ - ID: platformRelease.Platform.String(), - Name: platformRelease.Platform.Name, - Version: platformRelease.Version.String(), - }) + out := make([]*rpc.Platform, len(res)) + for i, platformRelease := range res { + out[i] = platformReleaseToRPC(platformRelease) } return &rpc.PlatformSearchResp{SearchOutput: out}, nil } diff --git a/rpc/commands/core.pb.go b/rpc/commands/core.pb.go index 80044e5a8d8..ea34ebf1dac 100644 --- a/rpc/commands/core.pb.go +++ b/rpc/commands/core.pb.go @@ -476,10 +476,10 @@ func (m *PlatformSearchReq) GetSearchArgs() string { } type PlatformSearchResp struct { - SearchOutput []*SearchOutput `protobuf:"bytes,1,rep,name=search_output,json=searchOutput,proto3" json:"search_output,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SearchOutput []*Platform `protobuf:"bytes,1,rep,name=search_output,json=searchOutput,proto3" json:"search_output,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PlatformSearchResp) Reset() { *m = PlatformSearchResp{} } @@ -507,68 +507,13 @@ func (m *PlatformSearchResp) XXX_DiscardUnknown() { var xxx_messageInfo_PlatformSearchResp proto.InternalMessageInfo -func (m *PlatformSearchResp) GetSearchOutput() []*SearchOutput { +func (m *PlatformSearchResp) GetSearchOutput() []*Platform { if m != nil { return m.SearchOutput } return nil } -type SearchOutput struct { - ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` - Version string `protobuf:"bytes,2,opt,name=Version,proto3" json:"Version,omitempty"` - Name string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SearchOutput) Reset() { *m = SearchOutput{} } -func (m *SearchOutput) String() string { return proto.CompactTextString(m) } -func (*SearchOutput) ProtoMessage() {} -func (*SearchOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_ed02318f567db566, []int{10} -} - -func (m *SearchOutput) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SearchOutput.Unmarshal(m, b) -} -func (m *SearchOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SearchOutput.Marshal(b, m, deterministic) -} -func (m *SearchOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SearchOutput.Merge(m, src) -} -func (m *SearchOutput) XXX_Size() int { - return xxx_messageInfo_SearchOutput.Size(m) -} -func (m *SearchOutput) XXX_DiscardUnknown() { - xxx_messageInfo_SearchOutput.DiscardUnknown(m) -} - -var xxx_messageInfo_SearchOutput proto.InternalMessageInfo - -func (m *SearchOutput) GetID() string { - if m != nil { - return m.ID - } - return "" -} - -func (m *SearchOutput) GetVersion() string { - if m != nil { - return m.Version - } - return "" -} - -func (m *SearchOutput) GetName() string { - if m != nil { - return m.Name - } - return "" -} - type PlatformListReq struct { Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"` UpdatableOnly bool `protobuf:"varint,2,opt,name=updatable_only,json=updatableOnly,proto3" json:"updatable_only,omitempty"` @@ -581,7 +526,7 @@ func (m *PlatformListReq) Reset() { *m = PlatformListReq{} } func (m *PlatformListReq) String() string { return proto.CompactTextString(m) } func (*PlatformListReq) ProtoMessage() {} func (*PlatformListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ed02318f567db566, []int{11} + return fileDescriptor_ed02318f567db566, []int{10} } func (m *PlatformListReq) XXX_Unmarshal(b []byte) error { @@ -617,17 +562,17 @@ func (m *PlatformListReq) GetUpdatableOnly() bool { } type PlatformListResp struct { - InstalledPlatform []*InstalledPlatform `protobuf:"bytes,1,rep,name=installed_platform,json=installedPlatform,proto3" json:"installed_platform,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + InstalledPlatform []*Platform `protobuf:"bytes,1,rep,name=installed_platform,json=installedPlatform,proto3" json:"installed_platform,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PlatformListResp) Reset() { *m = PlatformListResp{} } func (m *PlatformListResp) String() string { return proto.CompactTextString(m) } func (*PlatformListResp) ProtoMessage() {} func (*PlatformListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ed02318f567db566, []int{12} + return fileDescriptor_ed02318f567db566, []int{11} } func (m *PlatformListResp) XXX_Unmarshal(b []byte) error { @@ -648,76 +593,155 @@ func (m *PlatformListResp) XXX_DiscardUnknown() { var xxx_messageInfo_PlatformListResp proto.InternalMessageInfo -func (m *PlatformListResp) GetInstalledPlatform() []*InstalledPlatform { +func (m *PlatformListResp) GetInstalledPlatform() []*Platform { if m != nil { return m.InstalledPlatform } return nil } -type InstalledPlatform struct { +type Platform struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` Installed string `protobuf:"bytes,2,opt,name=Installed,proto3" json:"Installed,omitempty"` Latest string `protobuf:"bytes,3,opt,name=Latest,proto3" json:"Latest,omitempty"` Name string `protobuf:"bytes,4,opt,name=Name,proto3" json:"Name,omitempty"` + Maintainer string `protobuf:"bytes,5,opt,name=Maintainer,proto3" json:"Maintainer,omitempty"` + Website string `protobuf:"bytes,6,opt,name=Website,proto3" json:"Website,omitempty"` + Email string `protobuf:"bytes,7,opt,name=Email,proto3" json:"Email,omitempty"` + Boards []*Board `protobuf:"bytes,8,rep,name=Boards,proto3" json:"Boards,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *InstalledPlatform) Reset() { *m = InstalledPlatform{} } -func (m *InstalledPlatform) String() string { return proto.CompactTextString(m) } -func (*InstalledPlatform) ProtoMessage() {} -func (*InstalledPlatform) Descriptor() ([]byte, []int) { - return fileDescriptor_ed02318f567db566, []int{13} +func (m *Platform) Reset() { *m = Platform{} } +func (m *Platform) String() string { return proto.CompactTextString(m) } +func (*Platform) ProtoMessage() {} +func (*Platform) Descriptor() ([]byte, []int) { + return fileDescriptor_ed02318f567db566, []int{12} } -func (m *InstalledPlatform) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_InstalledPlatform.Unmarshal(m, b) +func (m *Platform) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Platform.Unmarshal(m, b) } -func (m *InstalledPlatform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_InstalledPlatform.Marshal(b, m, deterministic) +func (m *Platform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Platform.Marshal(b, m, deterministic) } -func (m *InstalledPlatform) XXX_Merge(src proto.Message) { - xxx_messageInfo_InstalledPlatform.Merge(m, src) +func (m *Platform) XXX_Merge(src proto.Message) { + xxx_messageInfo_Platform.Merge(m, src) } -func (m *InstalledPlatform) XXX_Size() int { - return xxx_messageInfo_InstalledPlatform.Size(m) +func (m *Platform) XXX_Size() int { + return xxx_messageInfo_Platform.Size(m) } -func (m *InstalledPlatform) XXX_DiscardUnknown() { - xxx_messageInfo_InstalledPlatform.DiscardUnknown(m) +func (m *Platform) XXX_DiscardUnknown() { + xxx_messageInfo_Platform.DiscardUnknown(m) } -var xxx_messageInfo_InstalledPlatform proto.InternalMessageInfo +var xxx_messageInfo_Platform proto.InternalMessageInfo -func (m *InstalledPlatform) GetID() string { +func (m *Platform) GetID() string { if m != nil { return m.ID } return "" } -func (m *InstalledPlatform) GetInstalled() string { +func (m *Platform) GetInstalled() string { if m != nil { return m.Installed } return "" } -func (m *InstalledPlatform) GetLatest() string { +func (m *Platform) GetLatest() string { if m != nil { return m.Latest } return "" } -func (m *InstalledPlatform) GetName() string { +func (m *Platform) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Platform) GetMaintainer() string { + if m != nil { + return m.Maintainer + } + return "" +} + +func (m *Platform) GetWebsite() string { + if m != nil { + return m.Website + } + return "" +} + +func (m *Platform) GetEmail() string { + if m != nil { + return m.Email + } + return "" +} + +func (m *Platform) GetBoards() []*Board { + if m != nil { + return m.Boards + } + return nil +} + +type Board struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Fqbn string `protobuf:"bytes,2,opt,name=fqbn,proto3" json:"fqbn,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Board) Reset() { *m = Board{} } +func (m *Board) String() string { return proto.CompactTextString(m) } +func (*Board) ProtoMessage() {} +func (*Board) Descriptor() ([]byte, []int) { + return fileDescriptor_ed02318f567db566, []int{13} +} + +func (m *Board) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Board.Unmarshal(m, b) +} +func (m *Board) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Board.Marshal(b, m, deterministic) +} +func (m *Board) XXX_Merge(src proto.Message) { + xxx_messageInfo_Board.Merge(m, src) +} +func (m *Board) XXX_Size() int { + return xxx_messageInfo_Board.Size(m) +} +func (m *Board) XXX_DiscardUnknown() { + xxx_messageInfo_Board.DiscardUnknown(m) +} + +var xxx_messageInfo_Board proto.InternalMessageInfo + +func (m *Board) GetName() string { if m != nil { return m.Name } return "" } +func (m *Board) GetFqbn() string { + if m != nil { + return m.Fqbn + } + return "" +} + func init() { proto.RegisterType((*PlatformInstallReq)(nil), "cc.arduino.cli.commands.PlatformInstallReq") proto.RegisterType((*PlatformInstallResp)(nil), "cc.arduino.cli.commands.PlatformInstallResp") @@ -729,49 +753,52 @@ func init() { proto.RegisterType((*PlatformUpgradeResp)(nil), "cc.arduino.cli.commands.PlatformUpgradeResp") proto.RegisterType((*PlatformSearchReq)(nil), "cc.arduino.cli.commands.PlatformSearchReq") proto.RegisterType((*PlatformSearchResp)(nil), "cc.arduino.cli.commands.PlatformSearchResp") - proto.RegisterType((*SearchOutput)(nil), "cc.arduino.cli.commands.SearchOutput") proto.RegisterType((*PlatformListReq)(nil), "cc.arduino.cli.commands.PlatformListReq") proto.RegisterType((*PlatformListResp)(nil), "cc.arduino.cli.commands.PlatformListResp") - proto.RegisterType((*InstalledPlatform)(nil), "cc.arduino.cli.commands.InstalledPlatform") + proto.RegisterType((*Platform)(nil), "cc.arduino.cli.commands.Platform") + proto.RegisterType((*Board)(nil), "cc.arduino.cli.commands.Board") } func init() { proto.RegisterFile("commands/core.proto", fileDescriptor_ed02318f567db566) } var fileDescriptor_ed02318f567db566 = []byte{ - // 545 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0x55, 0xba, 0x69, 0xb4, 0x77, 0xdd, 0x47, 0x3d, 0x06, 0x11, 0x42, 0xa2, 0x58, 0x9a, 0xb4, - 0x81, 0x96, 0x4a, 0xf0, 0xcc, 0x03, 0xa8, 0x3c, 0x14, 0x55, 0xac, 0x0a, 0x0c, 0x09, 0x24, 0x54, - 0x5c, 0xc7, 0x64, 0x51, 0x13, 0xdb, 0xd8, 0x0e, 0xd3, 0xfe, 0x0e, 0xe2, 0x81, 0x1f, 0x01, 0xff, - 0x0d, 0x35, 0xb1, 0xd3, 0x8c, 0xd2, 0x3d, 0xa0, 0x3e, 0x94, 0xa7, 0xf6, 0x5e, 0x9f, 0x7b, 0x7c, - 0xee, 0xf1, 0xbd, 0x0a, 0x1c, 0x50, 0x91, 0x65, 0x84, 0x47, 0xba, 0x47, 0x85, 0x62, 0x81, 0x54, - 0xc2, 0x08, 0x74, 0x97, 0xd2, 0x80, 0xa8, 0x28, 0x4f, 0xb8, 0x08, 0x68, 0x9a, 0x04, 0x0e, 0x73, - 0xef, 0xb0, 0x86, 0xce, 0x32, 0xc1, 0x4b, 0x3c, 0xfe, 0xe9, 0x01, 0x1a, 0xa5, 0xc4, 0x7c, 0x16, - 0x2a, 0x1b, 0x70, 0x6d, 0x48, 0x9a, 0x86, 0xec, 0x0b, 0x7a, 0x06, 0xcd, 0x64, 0x16, 0x71, 0xca, - 0x7c, 0xaf, 0xeb, 0x1d, 0x6f, 0x3f, 0x79, 0x18, 0x2c, 0x61, 0x0e, 0x06, 0x16, 0x18, 0x56, 0x25, - 0xe8, 0x04, 0xf6, 0xa5, 0x25, 0x1d, 0x4b, 0x42, 0xa7, 0x24, 0x66, 0x7e, 0xa3, 0xeb, 0x1d, 0xb7, - 0xc2, 0x3d, 0x97, 0x1f, 0x95, 0x69, 0x84, 0xa1, 0x4d, 0x14, 0xbd, 0x48, 0x0c, 0xa3, 0x26, 0x57, - 0xcc, 0xdf, 0x28, 0x60, 0xd7, 0x72, 0xc8, 0x87, 0x5b, 0x5f, 0x99, 0xd2, 0x89, 0xe0, 0xfe, 0x66, - 0x71, 0xec, 0x42, 0xfc, 0xc3, 0x83, 0x83, 0x05, 0xf9, 0x5a, 0xa2, 0x97, 0xd0, 0x94, 0x4a, 0xc4, - 0x8a, 0x69, 0x6d, 0xf5, 0x9f, 0x2c, 0xd5, 0xdf, 0x17, 0x97, 0x3c, 0x15, 0x24, 0x1a, 0xd9, 0x82, - 0xb0, 0x2a, 0x45, 0xaf, 0x60, 0xc7, 0x10, 0x3d, 0x1d, 0x57, 0x5c, 0x8d, 0x82, 0xeb, 0x68, 0x29, - 0xd7, 0x5b, 0xa2, 0xa7, 0x15, 0x4f, 0xdb, 0xd4, 0x22, 0xfc, 0xab, 0x26, 0xd5, 0x5d, 0xf9, 0x3f, - 0x59, 0xfd, 0x11, 0x6e, 0x2f, 0xca, 0x5f, 0x99, 0xd5, 0xf8, 0xbb, 0x37, 0xe7, 0x3f, 0xe7, 0xc9, - 0x9a, 0x8e, 0x22, 0xa6, 0x70, 0xf8, 0x17, 0x95, 0x5a, 0x2e, 0x8e, 0x8a, 0xf7, 0xef, 0xa3, 0xf2, - 0xad, 0xb6, 0x94, 0xe7, 0x32, 0x56, 0x24, 0x62, 0xeb, 0xe7, 0x44, 0x7d, 0xf5, 0x2a, 0x91, 0xeb, - 0xb9, 0x7a, 0x1a, 0x3a, 0x4e, 0xe9, 0x1b, 0x36, 0x6b, 0x62, 0x05, 0x6e, 0x3e, 0x80, 0x6d, 0x5d, - 0x70, 0x8d, 0x89, 0x8a, 0xb5, 0x35, 0x12, 0xca, 0xd4, 0x73, 0x15, 0x6b, 0xfc, 0x69, 0xfe, 0x86, - 0xee, 0xd2, 0x72, 0x4c, 0x6c, 0x99, 0xc8, 0x8d, 0xcc, 0x8d, 0xef, 0x75, 0x37, 0x6e, 0x6c, 0xab, - 0xac, 0x3d, 0x2b, 0xc0, 0x61, 0x5b, 0xd7, 0x22, 0x3c, 0x84, 0x76, 0xfd, 0x14, 0xed, 0x42, 0x63, - 0xd0, 0x2f, 0x7a, 0x69, 0x85, 0x8d, 0x41, 0x7f, 0xb6, 0xcb, 0xef, 0xec, 0x2e, 0x97, 0xf2, 0x5c, - 0x88, 0x10, 0x6c, 0xbe, 0x26, 0x99, 0x7b, 0xd7, 0xe2, 0x3f, 0xbe, 0x84, 0x3d, 0xa7, 0x77, 0x98, - 0x68, 0xb3, 0x02, 0x8b, 0x8e, 0x60, 0x37, 0x97, 0x11, 0x31, 0x64, 0x92, 0xb2, 0xb1, 0xe0, 0xe9, - 0x55, 0x21, 0xa3, 0x19, 0xee, 0x54, 0xd9, 0x33, 0x9e, 0x5e, 0xe1, 0x0c, 0xf6, 0xaf, 0x5f, 0xac, - 0x25, 0x7a, 0x0f, 0xc8, 0x2e, 0x17, 0x8b, 0xc6, 0x6e, 0x3a, 0xad, 0x57, 0x8f, 0x6e, 0xd6, 0x30, - 0x2b, 0x71, 0x7c, 0x61, 0x27, 0xf9, 0x33, 0x85, 0x33, 0xe8, 0x2c, 0xe0, 0x16, 0xac, 0xbb, 0x0f, - 0xad, 0x0a, 0x64, 0xcd, 0x9b, 0x27, 0xd0, 0x1d, 0xd8, 0x1a, 0x12, 0xc3, 0xb4, 0xb1, 0x06, 0xda, - 0xa8, 0xb2, 0x75, 0x73, 0x6e, 0xeb, 0x8b, 0xd3, 0x0f, 0x8f, 0xe3, 0xc4, 0x5c, 0xe4, 0x93, 0x99, - 0xcc, 0x9e, 0x95, 0xed, 0x7e, 0x4f, 0x69, 0x9a, 0xf4, 0x94, 0xa4, 0x3d, 0xd7, 0xc2, 0x64, 0xab, - 0xf8, 0x2c, 0x3f, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x90, 0x87, 0x85, 0xa1, 0xdd, 0x07, 0x00, - 0x00, + // 607 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xdf, 0x6a, 0xd4, 0x4e, + 0x14, 0x26, 0xdb, 0x76, 0xbb, 0x3d, 0xfd, 0x3f, 0x6d, 0x7f, 0xbf, 0x20, 0x52, 0x6b, 0xa0, 0xd0, + 0x22, 0xcd, 0x82, 0x82, 0x77, 0x5e, 0x58, 0x5a, 0x61, 0xa5, 0xda, 0x25, 0x5a, 0x04, 0x51, 0x96, + 0xd9, 0xc9, 0x34, 0x1d, 0x9a, 0xcc, 0x4c, 0x67, 0x26, 0x96, 0xbe, 0x8e, 0x78, 0xe1, 0x43, 0xe8, + 0x1b, 0xf9, 0x10, 0x92, 0xc9, 0x4c, 0x76, 0x4b, 0x5d, 0x11, 0xe9, 0x45, 0xbd, 0xda, 0x39, 0x5f, + 0xce, 0xf9, 0xce, 0xf7, 0x9d, 0x9c, 0xc9, 0xc2, 0x1a, 0x11, 0x45, 0x81, 0x79, 0xaa, 0xbb, 0x44, + 0x28, 0x1a, 0x4b, 0x25, 0x8c, 0x40, 0xff, 0x13, 0x12, 0x63, 0x95, 0x96, 0x8c, 0x8b, 0x98, 0xe4, + 0x2c, 0xf6, 0x39, 0xf7, 0x36, 0xc6, 0xb2, 0x8b, 0x42, 0xf0, 0x3a, 0x3f, 0xfa, 0x16, 0x00, 0xea, + 0xe7, 0xd8, 0x9c, 0x0a, 0x55, 0xf4, 0xb8, 0x36, 0x38, 0xcf, 0x13, 0x7a, 0x81, 0x9e, 0x41, 0x87, + 0x55, 0x11, 0x27, 0x34, 0x0c, 0xb6, 0x82, 0x9d, 0xf9, 0xc7, 0x0f, 0xe3, 0x09, 0xcc, 0x71, 0xcf, + 0x25, 0x26, 0x4d, 0x09, 0xda, 0x85, 0x15, 0xe9, 0x48, 0x07, 0x12, 0x93, 0x73, 0x9c, 0xd1, 0xb0, + 0xb5, 0x15, 0xec, 0xcc, 0x25, 0xcb, 0x1e, 0xef, 0xd7, 0x30, 0x8a, 0x60, 0x01, 0x2b, 0x72, 0xc6, + 0x0c, 0x25, 0xa6, 0x54, 0x34, 0x9c, 0xb2, 0x69, 0xd7, 0x30, 0x14, 0xc2, 0xec, 0x27, 0xaa, 0x34, + 0x13, 0x3c, 0x9c, 0xb6, 0x8f, 0x7d, 0x18, 0x7d, 0x0d, 0x60, 0xed, 0x86, 0x7c, 0x2d, 0xd1, 0x21, + 0x74, 0xa4, 0x12, 0x99, 0xa2, 0x5a, 0x3b, 0xfd, 0xbb, 0x13, 0xf5, 0x1f, 0x88, 0x4b, 0x9e, 0x0b, + 0x9c, 0xf6, 0x5d, 0x41, 0xd2, 0x94, 0xa2, 0x97, 0xb0, 0x68, 0xb0, 0x3e, 0x1f, 0x34, 0x5c, 0x2d, + 0xcb, 0xb5, 0x3d, 0x91, 0xeb, 0x2d, 0xd6, 0xe7, 0x0d, 0xcf, 0x82, 0x19, 0x8b, 0xa2, 0xef, 0x63, + 0x52, 0x7d, 0xcb, 0x7f, 0x69, 0xd4, 0x1f, 0x61, 0xfd, 0xa6, 0xfc, 0x5b, 0x1b, 0x75, 0xf4, 0x25, + 0x18, 0xf1, 0x9f, 0x70, 0x76, 0x47, 0x57, 0x31, 0x22, 0xb0, 0xf1, 0x0b, 0x95, 0x5a, 0xde, 0x5c, + 0x95, 0xe0, 0xef, 0x57, 0xe5, 0xf3, 0xd8, 0xa5, 0x3c, 0x91, 0x99, 0xc2, 0x29, 0xbd, 0x7b, 0x93, + 0x18, 0xbf, 0x7a, 0x8d, 0xc8, 0xbb, 0x79, 0xf5, 0x34, 0xac, 0x7a, 0xa5, 0x6f, 0x68, 0x65, 0xe2, + 0x16, 0xa6, 0xf9, 0x00, 0xe6, 0xb5, 0xe5, 0x1a, 0x60, 0x95, 0x69, 0x37, 0x48, 0xa8, 0xa1, 0xe7, + 0x2a, 0xd3, 0xd1, 0x87, 0xd1, 0x3b, 0xf4, 0x4d, 0xb5, 0x44, 0x2f, 0x60, 0xd1, 0x95, 0x89, 0xd2, + 0xc8, 0xd2, 0x84, 0xc1, 0xd6, 0xd4, 0x6f, 0x5b, 0x7b, 0x8e, 0x64, 0xa1, 0xae, 0x3b, 0xb6, 0x65, + 0xd1, 0x25, 0x2c, 0xfb, 0x27, 0x47, 0x4c, 0x9b, 0x5b, 0x30, 0xb4, 0x0d, 0x4b, 0xa5, 0x4c, 0xb1, + 0xc1, 0xc3, 0x9c, 0x0e, 0x04, 0xcf, 0xaf, 0xac, 0xa7, 0x4e, 0xb2, 0xd8, 0xa0, 0xc7, 0x3c, 0xbf, + 0x8a, 0x52, 0x58, 0xb9, 0xde, 0x58, 0x4b, 0xd4, 0x07, 0xe4, 0xae, 0x02, 0x4d, 0x07, 0x7e, 0x97, + 0xfe, 0xdc, 0xd9, 0x6a, 0x53, 0xec, 0xa1, 0xe8, 0x47, 0x00, 0x1d, 0x1f, 0xa0, 0x25, 0x68, 0xf5, + 0x0e, 0xac, 0xa5, 0xb9, 0xa4, 0xd5, 0x3b, 0x40, 0xf7, 0x61, 0xae, 0xe7, 0x2b, 0xdc, 0xe0, 0x47, + 0x00, 0xfa, 0x0f, 0xda, 0x47, 0xd8, 0x50, 0x6d, 0xdc, 0xd6, 0xba, 0x08, 0x21, 0x98, 0x7e, 0x8d, + 0x0b, 0xea, 0x3e, 0x6b, 0xf6, 0x8c, 0x36, 0x01, 0x5e, 0x61, 0xc6, 0x0d, 0x66, 0x9c, 0xaa, 0x70, + 0xa6, 0x7e, 0x87, 0x23, 0xa4, 0xfa, 0x1a, 0xbe, 0xa3, 0x43, 0xcd, 0x0c, 0x0d, 0xdb, 0xf5, 0xd7, + 0xd0, 0x85, 0x68, 0x1d, 0x66, 0x0e, 0x0b, 0xcc, 0xf2, 0x70, 0xd6, 0xe2, 0x75, 0x80, 0x9e, 0x42, + 0x7b, 0x5f, 0x60, 0x95, 0xea, 0xb0, 0x63, 0xcd, 0x6f, 0x4e, 0x34, 0x6f, 0xd3, 0x12, 0x97, 0x1d, + 0x75, 0x61, 0xc6, 0x9e, 0x2a, 0x91, 0xbc, 0x12, 0x59, 0x9b, 0xb5, 0xe7, 0x0a, 0x3b, 0xbd, 0x18, + 0x72, 0xe7, 0xd4, 0x9e, 0xf7, 0xf7, 0xde, 0x3f, 0xca, 0x98, 0x39, 0x2b, 0x87, 0x15, 0x63, 0xd7, + 0x75, 0xf0, 0xbf, 0x7b, 0x24, 0x67, 0x5d, 0x25, 0x49, 0xd7, 0x77, 0x1b, 0xb6, 0xed, 0x9f, 0xfd, + 0x93, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0xa0, 0xff, 0xb6, 0x33, 0x08, 0x00, 0x00, } diff --git a/rpc/commands/core.proto b/rpc/commands/core.proto index 85a2ce9738f..9786f4edf3c 100644 --- a/rpc/commands/core.proto +++ b/rpc/commands/core.proto @@ -73,13 +73,7 @@ message PlatformSearchReq { } message PlatformSearchResp { - repeated SearchOutput search_output = 1; -} - -message SearchOutput { - string ID = 1; - string Version = 2; - string Name = 3; + repeated Platform search_output = 1; } message PlatformListReq { @@ -88,12 +82,21 @@ message PlatformListReq { } message PlatformListResp { - repeated InstalledPlatform installed_platform = 1; + repeated Platform installed_platform = 1; } -message InstalledPlatform { +message Platform { string ID = 1; string Installed = 2; string Latest = 3; string Name = 4; + string Maintainer = 5; + string Website = 6; + string Email = 7; + repeated Board Boards = 8; } + +message Board { + string name = 1; + string fqbn = 2; +} \ No newline at end of file