Commit a5bf56f

committed

feat: upload using programmer by default if board requires it

1 parent 2de8bd1 commit a5bf56fCopy full SHA for a5bf56f

File tree

3 files changed

+48

-3

lines changed

arduino-ide-extension/src
- browser/contributions
  - upload-sketch.ts
- common/protocol
  - core-service.ts
- node
  - core-service-impl.ts

3 files changed

+48

-3

lines changed

`‎arduino-ide-extension/src/browser/contributions/upload-sketch.ts‎`

Lines changed: 29 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ export class UploadSketch extends CoreServiceContribution {`
`127`	`127`	`usingProgrammer,`
`128`	`128`	`verifyOptions`
`129`	`129`	`);`
	`130`	`+`
`130`	`131`	`if (!uploadOptions) {`
`131`	`132`	`return;`
`132`	`133`	`}`
`@@ -137,11 +138,37 @@ export class UploadSketch extends CoreServiceContribution {`
`137`	`138`
`138`	`139`	`const uploadResponse = await this.doWithProgress({`
`139`	`140`	`progressText: nls.localize('arduino/sketch/uploading', 'Uploading...'),`
`140`		`- task: (progressId, coreService, token) =>`
`141`		`- coreService.upload({ ...uploadOptions, progressId }, token),`
	`141`	`+ task: async (progressId, coreService, token) => {`
	`142`	`+ try {`
	`143`	`+ return await coreService.upload(`
	`144`	`+ { ...uploadOptions, progressId },`
	`145`	`+ token`
	`146`	`+ );`
	`147`	`+ } catch (err) {`
	`148`	`+ if (err.code === 4005) {`
	`149`	`+ const uploadWithProgrammerOptions = await this.uploadOptions(`
	`150`	`+ true,`
	`151`	`+ verifyOptions`
	`152`	`+ );`
	`153`	`+ if (uploadWithProgrammerOptions) {`
	`154`	`+ return coreService.upload(`
	`155`	`+ { ...uploadWithProgrammerOptions, progressId },`
	`156`	`+ token`
	`157`	`+ );`
	`158`	`+ }`
	`159`	`+ } else {`
	`160`	`+ throw err;`
	`161`	`+ }`
	`162`	`+ }`
	`163`	`+ },`
`142`	`164`	`keepOutput: true,`
`143`	`165`	`cancelable: true,`
`144`	`166`	`});`
	`167`	`+`
	`168`	`+ if (!uploadResponse) {`
	`169`	`+ return;`
	`170`	`+ }`
	`171`	`+`
`145`	`172`	`// the port update is NOOP if nothing has changed`
`146`	`173`	`this.boardsServiceProvider.updateConfig(uploadResponse.portAfterUpload);`
`147`	`174`

`‎arduino-ide-extension/src/common/protocol/core-service.ts‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,18 @@ export namespace CoreError {`
`71`	`71`	`Upload: 4002,`
`72`	`72`	`UploadUsingProgrammer: 4003,`
`73`	`73`	`BurnBootloader: 4004,`
	`74`	`+ UploadRequiresProgrammer: 4005,`
`74`	`75`	`};`
`75`	`76`	`export const VerifyFailed = declareCoreError(Codes.Verify);`
`76`	`77`	`export const UploadFailed = declareCoreError(Codes.Upload);`
`77`	`78`	`export const UploadUsingProgrammerFailed = declareCoreError(`
`78`	`79`	`Codes.UploadUsingProgrammer`
`79`	`80`	`);`
`80`	`81`	`export const BurnBootloaderFailed = declareCoreError(Codes.BurnBootloader);`
	`82`	`+ export const UploadRequiresProgrammer = declareCoreError(`
	`83`	`+ Codes.UploadRequiresProgrammer`
	`84`	`+ );`
	`85`	`+`
`81`	`86`	`export function is(`
`82`	`87`	`error: unknown`
`83`	`88`	`): error is ApplicationError<number, ErrorLocation[]> {`

`‎arduino-ide-extension/src/node/core-service-impl.ts‎`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type{ ClientReadableStream } from '@grpc/grpc-js';`
	`1`	`+import {type ClientReadableStream } from '@grpc/grpc-js';`
`2`	`2`	`import { ApplicationError } from '@theia/core/lib/common/application-error';`
`3`	`3`	`import type { CancellationToken } from '@theia/core/lib/common/cancellation';`
`4`	`4`	`import { CommandService } from '@theia/core/lib/common/command';`
`@@ -41,6 +41,7 @@ import { Port as RpcPort } from './cli-protocol/cc/arduino/cli/commands/v1/port_`
`41`	`41`	`import {`
`42`	`42`	`BurnBootloaderRequest,`
`43`	`43`	`BurnBootloaderResponse,`
	`44`	`+ ProgrammerIsRequiredForUploadError,`
`44`	`45`	`UploadRequest,`
`45`	`46`	`UploadResponse,`
`46`	`47`	`UploadUsingProgrammerRequest,`
`@@ -295,12 +296,24 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {`
`295`	`296`	`reject(UserAbortApplicationError());`
`296`	`297`	`return;`
`297`	`298`	`}`
	`299`	`+`
	`300`	`+ if (`
	`301`	`+ ServiceError.isInstanceOf(`
	`302`	`+ error,`
	`303`	`+ ProgrammerIsRequiredForUploadError`
	`304`	`+ )`
	`305`	`+ ) {`
	`306`	`+ reject(CoreError.UploadRequiresProgrammer());`
	`307`	`+ return;`
	`308`	`+ }`
	`309`	`+`
`298`	`310`	`const message = nls.localize(`
`299`	`311`	`'arduino/upload/error',`
`300`	`312`	`'{0} error: {1}',`
`301`	`313`	`firstToUpperCase(task),`
`302`	`314`	`error.details`
`303`	`315`	`);`
	`316`	`+`
`304`	`317`	`this.sendResponse(error.details, OutputMessage.Severity.Error);`
`305`	`318`	`reject(`
`306`	`319`	`errorCtor(`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit a5bf56f

File tree

3 files changed

3 files changed

`‎arduino-ide-extension/src/browser/contributions/upload-sketch.ts‎`

`‎arduino-ide-extension/src/common/protocol/core-service.ts‎`

`‎arduino-ide-extension/src/node/core-service-impl.ts‎`

0 commit comments