8000 [pluggable monitor] various minor refactors by cmaglie · Pull Request #1501 · arduino/arduino-cli · GitHub
[go: up one dir, main page]
Skip to content

[pluggable monitor] various minor refactors #1501

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 7 commits into from
Oct 8, 2021
Merged

[pluggable monitor] various minor refactors #1501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c8b2d00
Factored pluggable monitor creation
cmaglie Oct 7, 2021
4d70ace
Factored out code duplication
cmaglie Oct 8, 2021
280d936
EnumerateMonitorPortSettings does require only protocol
cmaglie Oct 8, 2021
592ae78
Monitor.Open does require only address and protocol
cmaglie Oct 8, 2021
945f67e
Added GetPortAddressAndProtocol helper
cmaglie Oct 8, 2021
4d0cb19
fix i18n
cmaglie Oct 8, 2021
168a316
Apply suggestions from code review
cmaglie Oct 8, 2021
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
fix i18n
  • Loading branch information
@cmaglie
cmaglie committed Oct 8, 2021
commit 4d0cb1975badc7237b6f864f94f6c87b1fa2c344
32 changes: 16 additions & 16 deletions i18n/data/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ msgstr "Configuring platform."
msgid "Connected"
msgstr "Connected"

#: cli/monitor/monitor.go:181
#: cli/monitor/monitor.go:172
msgid "Connected to %s! Press CTRL-C to exit."
msgstr "Connected to %s! Press CTRL-C to exit."

Expand Down Expand Up @@ -504,7 +504,7 @@ msgstr "Debugging not supported for board %s"
msgid "Debugging supported:"
msgstr "Debugging supported:"

#: cli/monitor/monitor.go:199
#: cli/monitor/monitor.go:190
msgid "Default"
msgstr "Default"

Expand Down Expand Up @@ -790,7 +790,7 @@ msgstr "Error getting information for library %s"
msgid "Error getting libraries info: %v"
msgstr "Error getting libraries info: %v"

#: cli/monitor/monitor.go:86
#: cli/monitor/monitor.go:85
msgid "Error getting port settings details: %s"
msgstr "Error getting port settings details: %s"

Expand Down Expand Up @@ -1138,7 +1138,7 @@ msgstr "Global variables use {0} bytes of dynamic memory."

#: cli/core/list.go:84
#: cli/core/search.go:114
#: cli/monitor/monitor.go:199
#: cli/monitor/monitor.go:190
#: cli/outdated/outdated.go:62
msgid "ID"
msgstr "ID"
Expand Down Expand Up @@ -1475,7 +1475,7 @@ msgstr "Missing sketch path"
msgid "Monitor '%s' not found"
msgstr "Monitor '%s' not found"

#: cli/monitor/monitor.go:147
#: cli/monitor/monitor.go:138
msgid "Monitor port settings:"
msgstr "Monitor port settings:"

Expand Down Expand Up @@ -1731,8 +1731,8 @@ msgstr "Platform size (bytes):"
msgid "Port"
msgstr "Port"

#: cli/monitor/monitor.go:168
#: cli/monitor/monitor.go:175
#: cli/monitor/monitor.go:159
#: cli/monitor/monitor.go:166
msgid "Port closed:"
msgstr "Port closed:"

Expand Down Expand Up @@ -1873,7 +1873,7 @@ msgstr "Sets a setting value."
msgid "Sets where to save the configuration file."
msgstr "Sets where to save the configuration file."

#: cli/monitor/monitor.go:199
#: cli/monitor/monitor.go:190
msgid "Setting"
msgstr "Setting"

Expand Down Expand Up @@ -2348,7 +2348,7 @@ msgstr "VERSION"
msgid "VERSION_NUMBER"
msgstr "VERSION_NUMBER"

#: cli/monitor/monitor.go:199
#: cli/monitor/monitor.go:190
msgid "Values"
msgstr "Values"

Expand Down Expand Up @@ -2503,7 +2503,7 @@ msgstr "cleaning build path"
msgid "command"
msgstr "command"

#: arduino/monitor/monitor.go:150
#: arduino/monitor/monitor.go:149
msgid "command '%[1]s' failed: %[2]s"
msgstr "command '%[1]s' failed: %[2]s"

Expand All @@ -2516,7 +2516,7 @@ msgstr "command '%[1]s' failed: %[2]s"
msgid "command failed: %s"
msgstr "command failed: %s"

#: arduino/monitor/monitor.go:147
#: arduino/monitor/monitor.go:146
msgid "communication out of sync, expected '%[1]s', received '%[2]s'"
msgstr "communication out of sync, expected '%[1]s', received '%[2]s'"

Expand Down Expand Up @@ -2855,11 +2855,11 @@ msgstr "invalid platform archive size: %s"
msgid "invalid pluggable monitor reference: %s"
msgstr "invalid pluggable monitor reference: %s"

#: cli/monitor/monitor.go:130
#: cli/monitor/monitor.go:121
msgid "invalid port configuration value for %s: %s"
msgstr "invalid port configuration value for %s: %s"

#: cli/monitor/monitor.go:139
#: cli/monitor/monitor.go:130
msgid "invalid port configuration: %s"
msgstr "invalid port configuration: %s"

Expand Down Expand Up @@ -3106,11 +3106,11 @@ msgstr "pluggable discovery already added: %s"
msgid "port"
msgstr "port"

#: cli/arguments/port.go:122
#: cli/arguments/port.go:137
msgid "port not found: %[1]s %[2]s"
msgstr "port not found: %[1]s %[2]s"

#: arduino/monitor/monitor.go:239
#: arduino/monitor/monitor.go:238
msgid "protocol version not supported: requested %[1]d, got %[2]d"
msgstr "protocol version not supported: requested %[1]d, got %[2]d"

Expand Down Expand Up @@ -3300,7 +3300,7 @@ msgstr "the platform has no releases"
msgid "the server responded with status %s"
msgstr "the server responded with status %s"

#: arduino/monitor/monitor.go:140
#: arduino/monitor/monitor.go:139
msgid "timeout waiting for message"
msgstr "timeout waiting for message"

Expand Down
8 changes: 4 additions & 4 deletions i18n/rice-box.go
View file
Open in desktop

Large diffs are not rendered by default.

0