Commit 428615e7 authored by Cristian Maglie's avatar Cristian Maglie

Renamed field Board.BoardId -> Board.BoardID

parent bb11af80
......@@ -26,7 +26,7 @@ import (
// Board represents a board loaded from an installed platform
type Board struct {
BoardId string
BoardID string
Properties properties.Map `json:"-"`
PlatformRelease *PlatformRelease `json:"-"`
}
......@@ -53,7 +53,7 @@ func (b *Board) Name() string {
// FQBN return the Fully-Qualified-Board-Name for the default configuration of this board
func (b *Board) FQBN() string {
platform := b.PlatformRelease.Platform
return platform.Package.Name + ":" + platform.Architecture + ":" + b.BoardId
return platform.Package.Name + ":" + platform.Architecture + ":" + b.BoardID
}
func (b *Board) String() string {
......
......@@ -177,7 +177,7 @@ func (release *PlatformRelease) GetOrCreateBoard(boardID string) *Board {
return board
}
board := &Board{
BoardId: boardID,
BoardID: boardID,
Properties: properties.Map{},
PlatformRelease: release,
}
......
......@@ -108,7 +108,7 @@ func (pm *PackageManager) FindBoardsWithID(id string) []*cores.Board {
for _, targetPlatform := range targetPackage.Platforms {
if platform := targetPlatform.GetInstalled(); platform != nil {
for _, board := range platform.Boards {
if board.BoardId == id {
if board.BoardID == id {
res = append(res, board)
}
}
......
......@@ -48,14 +48,14 @@ func (*AddBuildBoardPropertyIfMissing) Run(ctx *types.Context) error {
for _, platformRelease := range platform.Releases {
for _, board := range platformRelease.Boards {
if board.Properties["build.board"] == "" {
board.Properties["build.board"] = strings.ToUpper(platform.Architecture + "_" + board.BoardId)
board.Properties["build.board"] = strings.ToUpper(platform.Architecture + "_" + board.BoardID)
logger.Fprintln(
os.Stdout,
constants.LOG_LEVEL_WARN,
constants.MSG_MISSING_BUILD_BOARD,
aPackage.Name,
platform.Architecture,
board.BoardId,
board.BoardID,
board.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
}
}
......
......@@ -57,7 +57,7 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
core = core[strings.Index(core, ":")+1:]
if ctx.Verbose {
logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_BOARD, targetBoard.BoardId, targetPlatform.InstallDir)
logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_BOARD, targetBoard.BoardID, targetPlatform.InstallDir)
logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_USING_CORE, core, actualPlatform.InstallDir)
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment