File tree 1 file changed +5
-6
lines changed
arduino/cores/packagemanager
1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -453,20 +453,19 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
453
453
}
454
454
455
455
boardsTxtPath := platform .InstallDir .Join ("boards.txt" )
456
- boardsProperties , err := properties .LoadFromPath (boardsTxtPath )
456
+ allBoardsProperties , err := properties .LoadFromPath (boardsTxtPath )
457
457
if err != nil {
458
458
return err
459
459
}
460
460
461
461
boardsLocalTxtPath := platform .InstallDir .Join ("boards.local.txt" )
462
- if localProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
463
- boardsProperties .Merge (localProperties )
462
+ if boardsLocalProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
463
+ allBoardsProperties .Merge (boardsLocalProperties )
464
464
} else {
465
465
return err
466
466
}
467
467
468
- propertiesByBoard := boardsProperties .FirstLevelOf ()
469
-
468
+ propertiesByBoard := allBoardsProperties .FirstLevelOf ()
470
469
if menus , ok := propertiesByBoard ["menu" ]; ok {
471
470
platform .Menus = menus
472
471
} else {
@@ -479,7 +478,7 @@ func (pm *PackageManager) loadBoards(platform *cores.PlatformRelease) error {
479
478
skippedBoards := []string {}
480
479
for boardID , boardProperties := range propertiesByBoard {
481
480
var board * cores.Board
482
- for key := range boardProperties .AsMap () {
481
+ for _ , key := range boardProperties .Keys () {
483
482
if ! strings .HasPrefix (key , "menu." ) {
484
483
continue
485
484
}
You can’t perform that action at this time.
0 commit comments