Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fff8658

Browse files
authored
[skip changelog] Renamed FQBN.Packager -> FQBN.Vendor (#2836)
1 parent 0847849 commit fff8658

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

‎commands/service_board_details.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (s *arduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.Board
4848
details.Name = board.Name()
4949
details.Fqbn = board.FQBN()
5050
details.PropertiesId = board.BoardID
51-
details.Official = fqbn.Packager == "arduino"
51+
details.Official = fqbn.Vendor == "arduino"
5252
details.Version = board.PlatformRelease.Version.String()
5353
details.IdentificationProperties = []*rpc.BoardIdentificationProperties{}
5454
for _, p := range board.GetIdentificationProperties() {

‎commands/service_compile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
125125
if err != nil {
126126
if targetPlatform == nil {
127127
return &cmderrors.PlatformNotFoundError{
128-
Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),
128+
Platform: fmt.Sprintf("%s:%s", fqbn.Vendor, fqbn.Architecture),
129129
Cause: errors.New(i18n.Tr("platform not installed")),
130130
}
131131
}

‎commands/service_upload.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *arduinoCoreServerImpl) SupportedUserFields(ctx context.Context, req *rp
6262
_, platformRelease, _, boardProperties, _, err := pme.ResolveFQBN(fqbn)
6363
if platformRelease == nil {
6464
return nil, &cmderrors.PlatformNotFoundError{
65-
Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),
65+
Platform: fmt.Sprintf("%s:%s", fqbn.Vendor, fqbn.Architecture),
6666
Cause: err,
6767
}
6868
} else if err != nil {
@@ -293,7 +293,7 @@ func (s *arduinoCoreServerImpl) runProgramAction(ctx context.Context, pme *packa
293293
_, boardPlatform, board, boardProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)
294294
if boardPlatform == nil {
295295
return nil, &cmderrors.PlatformNotFoundError{
296-
Platform: fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture),
296+
Platform: fmt.Sprintf("%s:%s", fqbn.Vendor, fqbn.Architecture),
297297
Cause: err,
298298
}
299299
} else if err != nil {

‎internal/arduino/cores/packagemanager/package_manager.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,10 @@ func (pme *Explorer) ResolveFQBN(fqbn *fqbn.FQBN) (
290290
*properties.Map, *cores.PlatformRelease, error) {
291291

292292
// Find package
293-
targetPackage := pme.packages[fqbn.Packager]
293+
targetPackage := pme.packages[fqbn.Vendor]
294294
if targetPackage == nil {
295295
return nil, nil, nil, nil, nil,
296-
errors.New(i18n.Tr("unknown package %s", fqbn.Packager))
296+
errors.New(i18n.Tr("unknown package %s", fqbn.Vendor))
297297
}
298298

299299
// Find platform

‎internal/cli/board/list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (dr listResult) String() string {
161161
var coreName = ""
162162
fqbn, err := fqbn.Parse(b.Fqbn)
163163
if err == nil {
164-
coreName = fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture)
164+
coreName = fmt.Sprintf("%s:%s", fqbn.Vendor, fqbn.Architecture)
165165
}
166166

167167
t.AddRow(address, protocol, protocolLabel, board, fqbn, coreName)
@@ -217,7 +217,7 @@ func (dr watchEventResult) String() string {
217217
var coreName = ""
218218
fqbn, err := fqbn.Parse(b.Fqbn)
219219
if err == nil {
220-
coreName = fmt.Sprintf("%s:%s", fqbn.Packager, fqbn.Architecture)
220+
coreName = fmt.Sprintf("%s:%s", fqbn.Vendor, fqbn.Architecture)
221221
}
222222

223223
t.AddRow(address, protocol, event, board, fqbn, coreName)

‎pkg/fqbn/fqbn.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
// FQBN represents an Fully Qualified Board Name string
2828
type FQBN struct {
29-
Packager string
29+
Vendor string
3030
Architecture string
3131
BoardID string
3232
Configs *properties.Map
@@ -54,7 +54,7 @@ func Parse(fqbnIn string) (*FQBN, error) {
5454
}
5555

5656
fqbn := &FQBN{
57-
Packager: fqbnParts[0],
57+
Vendor: fqbnParts[0],
5858
Architecture: fqbnParts[1],
5959
BoardID: fqbnParts[2],
6060
Configs: properties.NewMap(),
@@ -95,7 +95,7 @@ func Parse(fqbnIn string) (*FQBN, error) {
9595
// Clone returns a copy of this FQBN.
9696
func (fqbn *FQBN) Clone() *FQBN {
9797
return &FQBN{
98-
Packager: fqbn.Packager,
98+
Vendor: fqbn.Vendor,
9999
Architecture: fqbn.Architecture,
100100
BoardID: fqbn.BoardID,
101101
Configs: fqbn.Configs.Clone(),
@@ -122,7 +122,7 @@ func (fqbn *FQBN) Match(target *FQBN) bool {
122122

123123
// StringWithoutConfig returns the FQBN without the Config part
124124
func (fqbn *FQBN) StringWithoutConfig() string {
125-
return fqbn.Packager + ":" + fqbn.Architecture + ":" + fqbn.BoardID
125+
return fqbn.Vendor + ":" + fqbn.Architecture + ":" + fqbn.BoardID
126126
}
127127

128128
// String returns the FQBN as a string

‎pkg/fqbn/fqbn_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestFQBN(t *testing.T) {
2626
a, err := fqbn.Parse("arduino:avr:uno")
2727
require.Equal(t, "arduino:avr:uno", a.String())
2828
require.NoError(t, err)
29-
require.Equal(t, a.Packager, "arduino")
29+
require.Equal(t, a.Vendor, "arduino")
3030
require.Equal(t, a.Architecture, "avr")
3131
require.Equal(t, a.BoardID, "uno")
3232
require.Zero(t, a.Configs.Size())
@@ -35,23 +35,23 @@ func TestFQBN(t *testing.T) {
3535
b1, err := fqbn.Parse("arduino::uno")
3636
require.Equal(t, "arduino::uno", b1.String())
3737
require.NoError(t, err)
38-
require.Equal(t, b1.Packager, "arduino")
38+
require.Equal(t, b1.Vendor, "arduino")
3939
require.Equal(t, b1.Architecture, "")
4040
require.Equal(t, b1.BoardID, "uno")
4141
require.Zero(t, b1.Configs.Size())
4242

4343
b2, err := fqbn.Parse(":avr:uno")
4444
require.Equal(t, ":avr:uno", b2.String())
4545
require.NoError(t, err)
46-
require.Equal(t, b2.Packager, "")
46+
require.Equal(t, b2.Vendor, "")
4747
require.Equal(t, b2.Architecture, "avr")
4848
require.Equal(t, b2.BoardID, "uno")
4949
require.Zero(t, b2.Configs.Size())
5050

5151
b3, err := fqbn.Parse("::uno")
5252
require.Equal(t, "::uno", b3.String())
5353
require.NoError(t, err)
54-
require.Equal(t, b3.Packager, "")
54+
require.Equal(t, b3.Vendor, "")
5555
require.Equal(t, b3.Architecture, "")
5656
require.Equal(t, b3.BoardID, "uno")
5757
require.Zero(t, b3.Configs.Size())
@@ -89,15 +89,15 @@ func TestFQBN(t *testing.T) {
8989
c, err := fqbn.Parse("arduino:avr:uno:cpu=atmega")
9090
require.Equal(t, "arduino:avr:uno:cpu=atmega", c.String())
9191
require.NoError(t, err)
92-
require.Equal(t, c.Packager, "arduino")
92+
require.Equal(t, c.Vendor, "arduino")
9393
require.Equal(t, c.Architecture, "avr")
9494
require.Equal(t, c.BoardID, "uno")
9595
require.Equal(t, "properties.Map{\n \"cpu\": \"atmega\",\n}", c.Configs.Dump())
9696

9797
d, err := fqbn.Parse("arduino:avr:uno:cpu=atmega,speed=1000")
9898
require.Equal(t, "arduino:avr:uno:cpu=atmega,speed=1000", d.String())
9999
require.NoError(t, err)
100-
require.Equal(t, d.Packager, "arduino")
100+
require.Equal(t, d.Vendor, "arduino")
101101
require.Equal(t, d.Architecture, "avr")
102102
require.Equal(t, d.BoardID, "uno")
103103
require.Equal(t, "properties.Map{\n \"cpu\": \"atmega\",\n \"speed\": \"1000\",\n}", d.Configs.Dump())
@@ -122,7 +122,7 @@ func TestFQBN(t *testing.T) {
122122
e, err := fqbn.Parse("arduino:avr:uno:cpu=")
123123
require.Equal(t, "arduino:avr:uno:cpu=", e.String())
124124
require.NoError(t, err)
125-
require.Equal(t, e.Packager, "arduino")
125+
require.Equal(t, e.Vendor, "arduino")
126126
require.Equal(t, e.Architecture, "avr")
127127
require.Equal(t, e.BoardID, "uno")
128128
require.Equal(t, "properties.Map{\n \"cpu\": \"\",\n}", e.Configs.Dump())
@@ -131,7 +131,7 @@ func TestFQBN(t *testing.T) {
131131
f, err := fqbn.Parse("arduino:avr:uno:cpu=atmega,speed=1000,extra=core=arduino")
132132
require.Equal(t, "arduino:avr:uno:cpu=atmega,speed=1000,extra=core=arduino", f.String())
133133
require.NoError(t, err)
134-
require.Equal(t, f.Packager, "arduino")
134+
require.Equal(t, f.Vendor, "arduino")
135135
require.Equal(t, f.Architecture, "avr")
136136
require.Equal(t, f.BoardID, "uno")
137137
require.Equal(t,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /