Commit 516a48a

committed

Fix board options not shown for manually installed platforms

1 parent 69ac1f4 commit 516a48aCopy full SHA for 516a48a

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -238,13 +238,11 @@ export class BoardsDataStore implements FrontendApplicationContribution {`
`238`	`238`	`if (!fqbn) {`
`239`	`239`	`return undefined;`
`240`	`240`	`}`
`241`		`- const boardsPackage = await this.boardsService.getContainerBoardPackage({`
`242`		`- fqbn,`
`243`		`- });`
`244`		`- if (!boardsPackage) {`
	`241`	`+ const boardDetails = await this.boardsService.getBoardDetails({ fqbn });`
	`242`	`+ if (!boardDetails) {`
`245`	`243`	`return undefined;`
`246`	`244`	`}`
`247`		`- return boardsPackage.installedVersion;`
	`245`	`+ return boardDetails.version;`
`248`	`246`	`}`
`249`	`247`	`}`
`250`	`248`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,7 @@ export namespace InstalledBoardWithPackage {`
`261`	`261`
`262`	`262`	`export interface BoardDetails {`
`263`	`263`	`readonly fqbn: string;`
	`264`	`+ readonly version: string;`
`264`	`265`	`readonly requiredTools: Tool[];`
`265`	`266`	`readonly configOptions: ConfigOption[];`
`266`	`267`	`readonly programmers: Programmer[];`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ import { InstallWithProgress } from './grpc-installable';`
`45`	`45`	`@injectable()`
`46`	`46`	`export class BoardsServiceImpl`
`47`	`47`	`extends CoreClientAware`
`48`		`- implements BoardsService`
`49`		`-{`
	`48`	`+ implements BoardsService {`
`50`	`49`	`@inject(ILogger)`
`51`	`50`	`protected logger: ILogger;`
`52`	`51`
`@@ -178,8 +177,11 @@ export class BoardsServiceImpl`
`178`	`177`	`PID = prop.get('pid') \|\| '';`
`179`	`178`	`}`
`180`	`179`
	`180`	`+ // This is the platform version this board belongs to`
	`181`	`+ const version = detailsResp.getVersion();`
`181`	`182`	`return {`
`182`	`183`	`fqbn,`
	`184`	`+ version,`
`183`	`185`	`requiredTools,`
`184`	`186`	`configOptions,`
`185`	`187`	`programmers,`

Comments

(0)