Skip to content

Commit 4a93e51

Browse files
Remove hotfix for arduino:samd
1 parent e9028b9 commit 4a93e51

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

commands/board/details.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ func Details(ctx context.Context, req *rpc.BoardDetailsRequest) (*rpc.BoardDetai
6666

6767
details.DebuggingSupported = boardProperties.ContainsKey("debug.executable") ||
6868
boardPlatformRelease.Properties.ContainsKey("debug.executable") ||
69-
(boardRefPlatform != nil && boardRefPlatform.Properties.ContainsKey("debug.executable")) ||
70-
// HOTFIX: Remove me when the `arduino:samd` core is updated
71-
boardPlatformRelease.String() == "arduino:[email protected]" ||
72-
boardPlatformRelease.String() == "arduino:[email protected]"
69+
(boardRefPlatform != nil && boardRefPlatform.Properties.ContainsKey("debug.executable"))
7370

7471
details.Package = &rpc.Package{
7572
Name: boardPackage.Name,

commands/debug/debug_info.go

-15
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,6 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl
8484
toolProperties.Merge(platformRelease.RuntimeProperties())
8585
toolProperties.Merge(boardProperties)
8686

87-
// HOTFIX: Remove me when the `arduino:samd` core is updated
88-
// (remember to remove it also in arduino/board/details.go)
89-
if !toolProperties.ContainsKey("debug.executable") {
90-
if platformRelease.String() == "arduino:[email protected]" || platformRelease.String() == "arduino:[email protected]" {
91-
toolProperties.Set("debug.executable", "{build.path}/{build.project_name}.elf")
92-
toolProperties.Set("debug.toolchain", "gcc")
93-
toolProperties.Set("debug.toolchain.path", "{runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/")
94-
toolProperties.Set("debug.toolchain.prefix", "arm-none-eabi-")
95-
toolProperties.Set("debug.server", "openocd")
96-
toolProperties.Set("debug.server.openocd.path", "{runtime.tools.openocd-0.10.0-arduino7.path}/bin/openocd")
97-
toolProperties.Set("debug.server.openocd.scripts_dir", "{runtime.tools.openocd-0.10.0-arduino7.path}/share/openocd/scripts/")
98-
toolProperties.Set("debug.server.openocd.script", "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}")
99-
}
100-
}
101-
10287
for _, tool := range pme.GetAllInstalledToolsReleases() {
10388
toolProperties.Merge(tool.RuntimeProperties())
10489
}

internal/integrationtest/board/board_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ func TestBoardDetails(t *testing.T) {
355355
]
356356
}`)
357357

358-
// Download samd core pinned to 1.8.8
359-
_, _, err = cli.Run("core", "install", "arduino:[email protected].8")
358+
// Download samd core pinned to 1.8.10
359+
_, _, err = cli.Run("core", "install", "arduino:[email protected].10")
360360
require.NoError(t, err)
361361

362362
stdout, _, err = cli.Run("board", "details", "-b", "arduino:samd:nano_33_iot", "--format", "json")

0 commit comments

Comments
 (0)