jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-24 11:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload with programmer when it's explicitly asked

Browse Source 
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2020-07-22 13:16:43 +02:00
parent 491e0cb6d0
commit f4097b5b24
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,9 @@ export class UploadSketch extends SketchContribution {
registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
execute: () => this.uploadSketch()
});
registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER, {
execute: () => this.uploadSketch(true)
});
registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR, {
isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
execute: () => registry.executeCommand(UploadSketch.Commands.UPLOAD_SKETCH.id)
@ -42,6 +45,11 @@ export class UploadSketch extends SketchContribution {
label: 'Upload',
order: '0'
});
registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
label: 'Upload Using Programmer',
order: '1'
});
}
registerKeybindings(registry: KeybindingRegistry): void {
@ -49,6 +57,10 @@ export class UploadSketch extends SketchContribution {
command: UploadSketch.Commands.UPLOAD_SKETCH.id,
keybinding: 'CtrlCmd+U'
});
registry.registerKeybinding({
command: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
keybinding: 'CtrlCmd+Shift+U'
});
}
registerToolbarItems(registry: TabBarToolbarRegistry): void {
@ -60,7 +72,7 @@ export class UploadSketch extends SketchContribution {
});
}
async uploadSketch(): Promise<void> {
async uploadSketch(usingProgrammer: boolean = false): Promise<void> {
const uri = await this.currentSketchFile();
if (!uri) {
return;
@ -86,12 +98,13 @@ export class UploadSketch extends SketchContribution {
this.boardsDataStore.getData(boardsConfig.selectedBoard.fqbn)
]);
this.outputChannelManager.getChannel('Arduino: upload').clear();
const programmer = usingProgrammer ? data.selectedProgrammer : undefined;
await this.coreService.upload({
sketchUri: uri,
fqbn,
port: selectedPort.address,
optimizeForDebug: this.editorMode.compileForDebug,
programmer: data.selectedProgrammer
programmer
});
this.messageService.info('Done uploading.', { timeout: 1000 });
} catch (e) {
@ -110,6 +123,9 @@ export namespace UploadSketch {
export const UPLOAD_SKETCH: Command = {
id: 'arduino-upload-sketch'
};
export const UPLOAD_SKETCH_USING_PROGRAMMER: Command = {
id: 'arduino-upload-sketch-using-programmer'
};
export const UPLOAD_SKETCH_TOOLBAR: Command = {
id: 'arduino-upload-sketch--toolbar'
};

2
arduino-ide-extension/src/browser/contributions/verify-sketch.ts
View File

@ -36,7 +36,7 @@ export class VerifySketch extends SketchContribution {
registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
commandId: VerifySketch.Commands.VERIFY_SKETCH.id,
label: 'Verify/Compile',
order: '0'
order: '2'
});
}

9
arduino-ide-extension/src/common/protocol/boards-service.ts
View File

@ -287,15 +287,6 @@ export namespace Programmer {
return left.id === right.id && left.name === right.name && left.platform === right.platform;
}
export function toString({ id, platform }: Programmer): string {
// tslint:disable-next-line: whitespace
const [vendor,] = platform.split(':');
if (!vendor) {
throw new Error(`Could not extract vendor from platform: '${platform}'.`);
}
return `${vendor}:${id}`;
}
}
export namespace Board {

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

@ -20,7 +20,7 @@ export namespace CoreService {
readonly sketchUri: string;
readonly fqbn: string;
readonly optimizeForDebug: boolean;
readonly programmer?: Programmer;
readonly programmer?: Programmer | undefined;
}
}

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

@ -2,7 +2,7 @@ import { inject, injectable, postConstruct } from 'inversify';
import { FileSystem } from '@theia/filesystem/lib/common/filesystem';
import { CoreService, CoreServiceClient } from '../common/protocol/core-service';
import { CompileReq, CompileResp } from './cli-protocol/commands/compile_pb';
import { BoardsService, Programmer } from '../common/protocol/boards-service';
import { BoardsService } from '../common/protocol/boards-service';
import { CoreClientProvider } from './core-client-provider';
import * as path from 'path';
import { ToolOutputServiceServer } from '../common/protocol/tool-output-service';
@ -62,7 +62,7 @@ export class CoreServiceImpl implements CoreService {
compilerReq.setVerbose(true);
compilerReq.setQuiet(false);
if (options.programmer) {
compilerReq.setProgrammer(Programmer.toString(options.programmer));
compilerReq.setProgrammer(options.programmer.id);
}
const result = client.compile(compilerReq);
@ -108,7 +108,7 @@ export class CoreServiceImpl implements CoreService {
uploadReq.setFqbn(fqbn);
uploadReq.setPort(options.port);
if (options.programmer) {
uploadReq.setProgrammer(Programmer.toString(options.programmer));
uploadReq.setProgrammer(options.programmer.id);
}
const result = client.upload(uploadReq);