Skip to content

Commit c048afa

Browse files
Modify SetSketchDefaults function to set a programmer if specified
1 parent d94ea8c commit c048afa

File tree

3 files changed

+389
-352
lines changed

3 files changed

+389
-352
lines changed

commands/sketch/set_defaults.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func SetSketchDefaults(ctx context.Context, req *rpc.SetSketchDefaultsRequest) (
3535
oldAddress, oldProtocol := sk.GetDefaultPortAddressAndProtocol()
3636
res := &rpc.SetSketchDefaultsResponse{
3737
DefaultFqbn: sk.GetDefaultFQBN(),
38+
DefaultProgrammer: sk.GetDefaultProgrammer(),
3839
DefaultPortAddress: oldAddress,
3940
DefaultPortProtocol: oldProtocol,
4041
}
@@ -45,6 +46,12 @@ func SetSketchDefaults(ctx context.Context, req *rpc.SetSketchDefaultsRequest) (
4546
}
4647
res.DefaultFqbn = fqbn
4748
}
49+
if programmer := req.GetDefaultProgrammer(); programmer != "" {
50+
if err := sk.SetDefaultProgrammer(programmer); err != nil {
51+
return nil, &cmderrors.CantUpdateSketchError{Cause: err}
52+
}
53+
res.DefaultProgrammer = programmer
54+
}
4855
if newAddress, newProtocol := req.GetDefaultPortAddress(), req.GetDefaultPortProtocol(); newAddress != "" {
4956
if err := sk.SetDefaultPort(newAddress, newProtocol); err != nil {
5057
return nil, &cmderrors.CantUpdateSketchError{Cause: err}

0 commit comments

Comments
 (0)