@@ -22,6 +22,7 @@ import (
22
22
"os/signal"
23
23
"sort"
24
24
25
+ "github.com/arduino/arduino-cli/arduino/sketch"
25
26
"github.com/arduino/arduino-cli/cli/arguments"
26
27
"github.com/arduino/arduino-cli/cli/errorcodes"
27
28
"github.com/arduino/arduino-cli/cli/feedback"
@@ -38,7 +39,7 @@ import (
38
39
39
40
var (
40
41
fqbn string
41
- port string
42
+ port arguments. Port
42
43
verbose bool
43
44
verify bool
44
45
interpreter string
@@ -60,7 +61,7 @@ func NewCommand() *cobra.Command {
60
61
}
61
62
62
63
debugCommand .Flags ().StringVarP (& fqbn , "fqbn" , "b" , "" , tr ("Fully Qualified Board Name, e.g.: arduino:avr:uno" ))
63
- debugCommand . Flags (). StringVarP ( & port , "port" , "p" , "" , tr ( "Debug port, e.g.: COM10 or /dev/ttyACM0" ) )
64
+ port . AddToCommand ( debugCommand )
64
65
debugCommand .Flags ().StringVarP (& programmer , "programmer" , "P" , "" , tr ("Programmer to use for debugging" ))
65
66
debugCommand .Flags ().StringVar (& interpreter , "interpreter" , "console" , fmt .Sprintf (tr ("Debug interpreter e.g.: %s, %s, %s, %s, %s" ), "console" , "mi" , "mi1" , "mi2" , "mi3" ))
66
67
debugCommand .Flags ().StringVarP (& importDir , "input-dir" , "" , "" , tr ("Directory containing binaries for debug." ))
@@ -77,12 +78,21 @@ func run(command *cobra.Command, args []string) {
77
78
path = args [0 ]
78
79
}
79
80
sketchPath := arguments .InitSketchPath (path )
80
-
81
+ sk , err := sketch .New (sketchPath )
82
+ if err != nil {
83
+ feedback .Errorf (tr ("Error during Debug: %v" ), err )
84
+ os .Exit (errorcodes .ErrGeneric )
85
+ }
86
+ discoveryPort , err := port .GetPort (instance , sk )
87
+ if err != nil {
88
+ feedback .Errorf (tr ("Error during Debug: %v" ), err )
89
+ os .Exit (errorcodes .ErrGeneric )
90
+ }
81
91
debugConfigRequested := & dbg.DebugConfigRequest {
82
92
Instance : instance ,
83
93
Fqbn : fqbn ,
84
94
SketchPath : sketchPath .String (),
85
- Port : port ,
95
+ Port : discoveryPort . ToRPC () ,
86
96
Interpreter : interpreter ,
87
97
ImportDir : importDir ,
88
98
Programmer : programmer ,
0 commit comments