File tree 1 file changed +6
-6
lines changed
arduino/cores/packagemanager
1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -458,27 +458,27 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
458
458
}
459
459
460
460
boardsTxtPath := platform .InstallDir .Join ("boards.txt" )
461
- boardsProperties , err := properties .LoadFromPath (boardsTxtPath )
461
+ allBoardsProperties , err := properties .LoadFromPath (boardsTxtPath )
462
462
if err != nil {
463
463
return err
464
464
}
465
465
466
466
boardsLocalTxtPath := platform .InstallDir .Join ("boards.local.txt" )
467
- if localProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
468
- boardsProperties .Merge (localProperties )
467
+ if boardsLocalProperties , err := properties .SafeLoadFromPath (boardsLocalTxtPath ); err == nil {
468
+ allBoardsProperties .Merge (boardsLocalProperties )
469
469
} else {
470
470
return err
471
471
}
472
472
473
- platform .Menus = boardsProperties .SubTree ("menu" )
473
+ platform .Menus = allBoardsProperties .SubTree ("menu" )
474
474
475
475
// Build to boards structure following the boards.txt board ordering
476
- for _ , boardID := range boardsProperties .FirstLevelKeys () {
476
+ for _ , boardID := range allBoardsProperties .FirstLevelKeys () {
477
477
if boardID == "menu" {
478
478
// This is not a board id so we remove it to correctly set all other boards properties
479
479
continue
480
480
}
481
- boardProperties := boardsProperties .SubTree (boardID )
481
+ boardProperties := allBoardsProperties .SubTree (boardID )
482
482
var board * cores.Board
483
483
if ! platform .PluggableDiscoveryAware {
484
484
convertVidPidIdentificationPropertiesToPluggableDiscovery (boardProperties )
You can’t perform that action at this time.
0 commit comments