jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-20 01:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

#374: ensure compile verbose pref is included on upload (#1237)

Browse Source 
* ensure compile verbose pref is included on upload

* better verbose typings

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Co-authored-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Dave Simpson 2022-07-26 14:05:12 +02:00 committed by GitHub
parent 5087ff08f2
commit 9373a0bcaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arduino-ide-extension/src/browser/contributions/upload-sketch.ts
View File

@ -214,9 +214,10 @@ export class UploadSketch extends CoreServiceContribution {
fqbn, fqbn,
{ selectedProgrammer }, { selectedProgrammer },
verify, verify,
verbose, uploadVerbose,
sourceOverride, sourceOverride,
optimizeForDebug, optimizeForDebug,
compileVerbose,
] = await Promise.all([ ] = await Promise.all([
this.boardsDataStore.appendConfigToFqbn( this.boardsDataStore.appendConfigToFqbn(
boardsConfig.selectedBoard?.fqbn boardsConfig.selectedBoard?.fqbn
@ -228,8 +229,10 @@ export class UploadSketch extends CoreServiceContribution {
this.commandService.executeCommand<boolean>( this.commandService.executeCommand<boolean>(
'arduino-is-optimize-for-debug' 'arduino-is-optimize-for-debug'
), ),
this.preferences.get('arduino.compile.verbose'),
]); ]);
const verbose = { compile: compileVerbose, upload: uploadVerbose };
const board = { const board = {
...boardsConfig.selectedBoard, ...boardsConfig.selectedBoard,
name: boardsConfig.selectedBoard?.name || '', name: boardsConfig.selectedBoard?.name || '',

3
arduino-ide-extension/src/common/protocol/core-service.ts
View File

@ -84,11 +84,12 @@ export namespace CoreService {
} }
export namespace Upload { export namespace Upload {
export interface Options extends Compile.Options { export interface Options extends Omit<Compile.Options, 'verbose'> {
readonly port?: Port; readonly port?: Port;
readonly programmer?: Programmer | undefined; readonly programmer?: Programmer | undefined;
readonly verify: boolean; readonly verify: boolean;
readonly userFields: BoardUserField[]; readonly userFields: BoardUserField[];
readonly verbose: { compile: boolean; upload: boolean };
} }
} }

8
arduino-ide-extension/src/node/core-service-impl.ts
View File

@ -200,7 +200,11 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
) => ApplicationError<number, CoreError.ErrorLocation[]>, ) => ApplicationError<number, CoreError.ErrorLocation[]>,
task: string task: string
): Promise<void> { ): Promise<void> {
await this.compile(Object.assign(options, { exportBinaries: false })); await this.compile({
...options,
verbose: options.verbose.compile,
exportBinaries: false,
});
const coreClient = await this.coreClient; const coreClient = await this.coreClient;
const { client, instance } = coreClient; const { client, instance } = coreClient;
@ -262,7 +266,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
if (programmer) { if (programmer) {
request.setProgrammer(programmer.id); request.setProgrammer(programmer.id);
} }
request.setVerbose(options.verbose); request.setVerbose(options.verbose.upload);
request.setVerify(options.verify); request.setVerify(options.verify);
options.userFields.forEach((e) => { options.userFields.forEach((e) => {