Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-cli
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Operations
Operations
Metrics
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-cli
Commits
dd2c548c
Commit
dd2c548c
authored
Nov 18, 2021
by
Umberto Baldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
factor out the programmer flag handling
parent
394fab7e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
6 deletions
+41
-6
cli/arguments/programmer.go
cli/arguments/programmer.go
+38
-0
cli/burnbootloader/burnbootloader.go
cli/burnbootloader/burnbootloader.go
+3
-6
No files found.
cli/arguments/programmer.go
0 → 100644
View file @
dd2c548c
// This file is part of arduino-cli.
//
// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
//
// This software is released under the GNU General Public License version 3,
// which covers the main part of arduino-cli.
// The terms of this license can be found at:
// https://www.gnu.org/licenses/gpl-3.0.en.html
//
// You can be released from the requirements of the above licenses by purchasing
// a commercial license. Buying such a license is mandatory if you want to
// modify or otherwise use the software for commercial activities involving the
// Arduino software without disclosing the source code of your own applications.
// To purchase a commercial license, send an email to license@arduino.cc.
package
arguments
import
"github.com/spf13/cobra"
// Programmer contains the programmer flag data.
// This is useful so all flags used by commands that need
// this information are consistent with each other.
type
Programmer
struct
{
programmer
string
}
// AddToCommand adds the flags used to set the programmer to the specified Command
func
(
p
*
Programmer
)
AddToCommand
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
StringVarP
(
&
p
.
programmer
,
"programmer"
,
"P"
,
""
,
tr
(
"Programmer to use, e.g: atmel_ice"
))
cmd
.
RegisterFlagCompletionFunc
(
"programmer"
,
func
(
cmd
*
cobra
.
Command
,
args
[]
string
,
toComplete
string
)
([]
string
,
cobra
.
ShellCompDirective
)
{
return
GetInstalledProgrammers
(),
cobra
.
ShellCompDirectiveDefault
})
}
// String returns the programmer
func
(
p
*
Programmer
)
String
()
string
{
return
p
.
programmer
}
cli/burnbootloader/burnbootloader.go
View file @
dd2c548c
...
@@ -34,7 +34,7 @@ var (
...
@@ -34,7 +34,7 @@ var (
port
arguments
.
Port
port
arguments
.
Port
verbose
bool
verbose
bool
verify
bool
verify
bool
programmer
string
programmer
arguments
.
Programmer
dryRun
bool
dryRun
bool
tr
=
i18n
.
Tr
tr
=
i18n
.
Tr
)
)
...
@@ -52,12 +52,9 @@ func NewCommand() *cobra.Command {
...
@@ -52,12 +52,9 @@ func NewCommand() *cobra.Command {
fqbn
.
AddToCommand
(
burnBootloaderCommand
)
fqbn
.
AddToCommand
(
burnBootloaderCommand
)
port
.
AddToCommand
(
burnBootloaderCommand
)
port
.
AddToCommand
(
burnBootloaderCommand
)
programmer
.
AddToCommand
(
burnBootloaderCommand
)
burnBootloaderCommand
.
Flags
()
.
BoolVarP
(
&
verify
,
"verify"
,
"t"
,
false
,
tr
(
"Verify uploaded binary after the upload."
))
burnBootloaderCommand
.
Flags
()
.
BoolVarP
(
&
verify
,
"verify"
,
"t"
,
false
,
tr
(
"Verify uploaded binary after the upload."
))
burnBootloaderCommand
.
Flags
()
.
BoolVarP
(
&
verbose
,
"verbose"
,
"v"
,
false
,
tr
(
"Turns on verbose mode."
))
burnBootloaderCommand
.
Flags
()
.
BoolVarP
(
&
verbose
,
"verbose"
,
"v"
,
false
,
tr
(
"Turns on verbose mode."
))
burnBootloaderCommand
.
Flags
()
.
StringVarP
(
&
programmer
,
"programmer"
,
"P"
,
""
,
tr
(
"Use the specified programmer to upload."
))
burnBootloaderCommand
.
RegisterFlagCompletionFunc
(
"programmer"
,
func
(
cmd
*
cobra
.
Command
,
args
[]
string
,
toComplete
string
)
([]
string
,
cobra
.
ShellCompDirective
)
{
return
arguments
.
GetInstalledProgrammers
(),
cobra
.
ShellCompDirectiveDefault
})
burnBootloaderCommand
.
Flags
()
.
BoolVar
(
&
dryRun
,
"dry-run"
,
false
,
tr
(
"Do not perform the actual upload, just log out actions"
))
burnBootloaderCommand
.
Flags
()
.
BoolVar
(
&
dryRun
,
"dry-run"
,
false
,
tr
(
"Do not perform the actual upload, just log out actions"
))
burnBootloaderCommand
.
Flags
()
.
MarkHidden
(
"dry-run"
)
burnBootloaderCommand
.
Flags
()
.
MarkHidden
(
"dry-run"
)
...
@@ -80,7 +77,7 @@ func run(command *cobra.Command, args []string) {
...
@@ -80,7 +77,7 @@ func run(command *cobra.Command, args []string) {
Port
:
discoveryPort
.
ToRPC
(),
Port
:
discoveryPort
.
ToRPC
(),
Verbose
:
verbose
,
Verbose
:
verbose
,
Verify
:
verify
,
Verify
:
verify
,
Programmer
:
programmer
,
Programmer
:
programmer
.
String
()
,
DryRun
:
dryRun
,
DryRun
:
dryRun
,
},
os
.
Stdout
,
os
.
Stderr
);
err
!=
nil
{
},
os
.
Stdout
,
os
.
Stderr
);
err
!=
nil
{
feedback
.
Errorf
(
tr
(
"Error during Upload: %v"
),
err
)
feedback
.
Errorf
(
tr
(
"Error during Upload: %v"
),
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment