Skip to content

Add programmer field to sketch profile and --profile flag to debug command #2505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 5, 2024
Merged

Add programmer field to sketch profile and --profile flag to debug command #2505

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1915dbb
Add programmer field to rpc.SketchProfile
MatteoPologruto Jan 17, 2024
c0a84fc
Add programmer to the sketch profile
MatteoPologruto Jan 17, 2024
23a1152
Retrieve programmer's information from the profile if the flag is not…
MatteoPologruto Jan 17, 2024
e4668e7
Add profile flag to debug command
MatteoPologruto Jan 17, 2024
69513ad
Add default_programmer field to sketch project
MatteoPologruto Jan 18, 2024
0e4b25f
Add default_programmer to rpc.Sketch
MatteoPologruto Jan 18, 2024
d94ea8c
Add methods to set and retrieve default_programmer from a sketch
MatteoPologruto Jan 18, 2024
c048afa
Modify SetSketchDefaults function to set a programmer if specified
MatteoPologruto Jan 18, 2024
c7c0367
Modify board attach command to set a default programmer
MatteoPologruto Jan 18, 2024
c7cda03
Use default programmer if no other value is specified
MatteoPologruto Jan 18, 2024
db8bed0
Update docs
MatteoPologruto Jan 17, 2024
c3baa80
Update TestBoardAttach to test that a programmer is correctly written…
MatteoPologruto Jan 18, 2024
1f36816
Add TestDebugProfile to integration tests
MatteoPologruto Jan 17, 2024
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
Add profile flag to debug command
  • Loading branch information
@MatteoPologruto
MatteoPologruto committed Jan 18, 2024
commit e4668e74a7004930f707ec8dfd89fc4d9c25a64d
32 changes: 26 additions & 6 deletions internal/cli/debug/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func NewCommand() *cobra.Command {
var (
fqbnArg arguments.Fqbn
portArgs arguments.Port
profileArg arguments.Profile
interpreter string
importDir string
printInfo bool
Expand All @@ -56,14 +57,15 @@ func NewCommand() *cobra.Command {
Example: " " + os.Args[0] + " debug -b arduino:samd:mkr1000 -P atmel_ice /home/user/Arduino/MySketch",
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
runDebugCommand(args, &portArgs, &fqbnArg, interpreter, importDir, &programmer, printInfo)
runDebugCommand(args, &portArgs, &fqbnArg, interpreter, importDir, &programmer, printInfo, &profileArg)
},
}

debugCommand.AddCommand(newDebugCheckCommand())
fqbnArg.AddToCommand(debugCommand)
portArgs.AddToCommand(debugCommand)
programmer.AddToCommand(debugCommand)
profileArg.AddToCommand(debugCommand)
debugCommand.Flags().StringVar(&interpreter, "interpreter", "console", tr("Debug interpreter e.g.: %s", "console, mi, mi1, mi2, mi3"))
debugCommand.Flags().StringVarP(&importDir, "input-dir", "", "", tr("Directory containing binaries for debug."))
debugCommand.Flags().BoolVarP(&printInfo, "info", "I", false, tr("Show metadata about the debug session instead of starting the debugger."))
Expand All @@ -72,8 +74,7 @@ func NewCommand() *cobra.Command {
}

func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments.Fqbn,
interpreter string, importDir string, programmer *arguments.Programmer, printInfo bool) {
instance := instance.CreateAndInit()
interpreter string, importDir string, programmer *arguments.Programmer, printInfo bool, profileArg *arguments.Profile) {
logrus.Info("Executing `arduino-cli debug`")

path := ""
Expand All @@ -88,15 +89,34 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
}
feedback.WarnAboutDeprecatedFiles(sk)

fqbn, port := arguments.CalculateFQBNAndPort(portArgs, fqbnArg, instance, sk.GetDefaultFqbn(), sk.GetDefaultPort(), sk.GetDefaultProtocol())
var inst *rpc.Instance
var profile *rpc.SketchProfile

if profileArg.Get() == "" {
inst, profile = instance.CreateAndInitWithProfile(sk.GetDefaultProfile().GetName(), sketchPath)
} else {
inst, profile = instance.CreateAndInitWithProfile(profileArg.Get(), sketchPath)
}

if fqbnArg.String() == "" {
fqbnArg.Set(profile.GetFqbn())
}

fqbn, port := arguments.CalculateFQBNAndPort(portArgs, fqbnArg, inst, sk.GetDefaultFqbn(), sk.GetDefaultPort(), sk.GetDefaultProtocol())

prog := profile.GetProgrammer()
if prog == "" || programmer.GetProgrammer() != "" {
prog = programmer.String(inst, fqbn)
}

debugConfigRequested := &rpc.GetDebugConfigRequest{
Instance: instance,
Instance: inst,
Fqbn: fqbn,
SketchPath: sketchPath.String(),
Port: port,
Interpreter: interpreter,
ImportDir: importDir,
Programmer: programmer.String(instance, fqbn),
Programmer: prog,
}

if printInfo {
Expand Down