8000 Allow port, protocol and port settings to be specified in profiles. by cmaglie · Pull Request #2717 · arduino/arduino-cli · GitHub
[go: up one dir, main page]
Skip to content

Allow port, protocol and port settings to be specified in profiles. #2717

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

Allow port, protocol and port settings to be specified in profiles. #2717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
373aa18
Allow port/protocol keys in sketch profile
cmaglie Oct 2, 2024
53b6c88
Allow port/protocol in profiles
cmaglie Oct 2, 2024
e22b2a1
Added port settings in sketch profile
cmaglie Oct 3, 2024
59af89d
Allow port configuration from sketch profile
cmaglie Oct 3, 2024
0271d36
Added docs
cmaglie Oct 3, 2024
776736a
fix: Moved port-from-profile logic in args.Port.GetPort(...)
cmaglie Oct 4, 2024
2194a37
Fixed FQBN selection logic in monitor/arg command
cmaglie Oct 7, 2024
e13d66e
Fixed incorrect tests
cmaglie Oct 7, 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
Fixed incorrect tests 
The previous fixes now let the CLI to produce the correct output.
  • Loading branch information
@cmaglie
cmaglie committed Oct 7, 2024
commit e13d66ebffdf128c4fd94dcf836ecac40a5d6d9f
27 changes: 11 additions & 16 deletions internal/integrationtest/monitor/monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,30 +287,25 @@ yun.serial.disableDTR=true
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndFQBN)
require.NoError(t, err)
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
require.Contains(t, string(stdout), "Configuration rts = off")
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
require.Contains(t, string(stdout), "Configuration dtr = on")
})

t.Run("WithDefaultPortAndConfig", func(t *testing.T) {
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfig)
require.NoError(t, err)
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
require.Contains(t, string(stdout), "Configuration rts = off")
require.Contains(t, string(stdout), "Configuration dtr = on")
require.Contains(t, string(stdout), "Configuration baudrate = 57600")
require.Contains(t, string(stdout), "Configuration bits = 9")
require.Contains(t, string(stdout), "Configuration parity = none")
require.Contains(t, string(stdout), "Configuration stop_bits = 1")
_, stderr, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfig)
require.Error(t, err)
require.Contains(t, string(stderr), "Profile 'profile1' not found")
require.Contains(t, string(stderr), "Unknown FQBN: unknown package arduino")
})

t.Run("WithDefaultPortAndConfigAndProfile", func(t *testing.T) {
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndConfigAndProfile)
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-b", "arduino:avr:uno", "--raw", "--profile", "uno", sketchWithPortAndConfigAndProfile)
require.NoError(t, err)
require.Contains(t, string(stdout), "Opened port: /dev/ttyDEF")
require.Contains(t, string(stdout), "Configuration rts = off")
require.Contains(t, string(stdout), "Opened port: /dev/ttyPROF")
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
require.Contains(t, string(stdout), "Configuration dtr = on")
require.Contains(t, string(stdout), "Configuration baudrate = 57600")
require.Contains(t, string(stdout), "Configuration bits = 9")
require.Contains(t, string(stdout), "Configuration baudrate = 19200")
require.Contains(t, string(stdout), "Configuration bits = 8")
require.Contains(t, string(stdout), "Configuration parity = none")
require.Contains(t, string(stdout), "Configuration stop_bits = 1")
})
Expand Down Expand Up @@ -377,7 +372,7 @@ yun.serial.disableDTR=true
stdout, _, err := cli.RunWithCustomInput(quitMonitor(), "monitor", "-p", "/dev/ttyARGS", "-b", "arduino:avr:uno", "--raw", "--profile", "profile1", sketchWithPortAndFQBN)
require.NoError(t, err)
require.Contains(t, string(stdout), "Opened port: /dev/ttyARGS")
require.Contains(t, string(stdout), "Configuration rts = off")
require.Contains(t, string(stdout), "Configuration rts = on") // This is taken from profile-downloaded platform that is not patched for test
require.Contains(t, string(stdout), "Configuration dtr = on")
})
})
Expand Down
7 changes: 5 additions & 2 deletions internal/integrationtest/monitor/testdata/SketchWithDefaultPortAndFQBN/sketch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
default_port: /dev/ttyDEF
default_fqbn: arduino:avr:yun
profiles:
profile1:
fqbn: "broken_fqbn"
platforms:
- platform: arduino:avr (1.8.6)

default_port: /dev/ttyDEF
default_fqbn: arduino:avr:yun
Loading
0