Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use default programmer if no other value is specified
  • Loading branch information
MatteoPologruto committed Jan 18, 2024
commit c7cda032298e03a6ad818928aea917bb38d3a7c0
3 changes: 3 additions & 0 deletions commands/upload/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er
if programmer == "" && pme.GetProfile() != nil {
programmer = pme.GetProfile().Programmer
}
if programmer == "" {
programmer = sk.GetDefaultProgrammer()
}

updatedPort, err := runProgramAction(
pme,
Expand Down
3 changes: 3 additions & 0 deletions internal/cli/compile/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
if prog == "" || programmer.GetProgrammer() != "" {
prog = programmer.String(inst, fqbn)
}
if prog == "" {
prog = sk.GetDefaultProgrammer()
}

uploadRequest := &rpc.UploadRequest{
Instance: inst,
Expand Down
3 changes: 3 additions & 0 deletions internal/cli/debug/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
if prog == "" || programmer.GetProgrammer() != "" {
prog = programmer.String(inst, fqbn)
}
if prog == "" {
prog = sk.GetDefaultProgrammer()
}

debugConfigRequested := &rpc.GetDebugConfigRequest{
Instance: inst,
Expand Down
3 changes: 3 additions & 0 deletions internal/cli/upload/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
if prog == "" || programmer.GetProgrammer() != "" {
prog = programmer.String(inst, fqbn)
}
if prog == "" {
prog = sketch.GetDefaultProgrammer()
}

stdOut, stdErr, stdIOResult := feedback.OutputStreams()
req := &rpc.UploadRequest{
Expand Down