ATL-301: Made port optional when using programmer

When uploading using a programmer, the port is ignored by the CLI.
Also removed `programmer` from compile request [arduino/arduino-cli#861]

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta
2020-07-23 16:10:52 +02:00
parent 6661f661c7
commit 4a9a975dca
3 changed files with 38 additions and 25 deletions

View File

@@ -61,9 +61,6 @@ export class CoreServiceImpl implements CoreService {
compilerReq.setPreprocess(false);
compilerReq.setVerbose(true);
compilerReq.setQuiet(false);
if (options.programmer) {
compilerReq.setProgrammer(options.programmer.id);
}
const result = client.compile(compilerReq);
try {
@@ -106,8 +103,9 @@ export class CoreServiceImpl implements CoreService {
uploadReq.setInstance(instance);
uploadReq.setSketchPath(sketchpath);
uploadReq.setFqbn(fqbn);
uploadReq.setPort(options.port);
if (options.programmer) {
if ('port' in options) {
uploadReq.setPort(options.port);
} else {
uploadReq.setProgrammer(options.programmer.id);
}
const result = client.upload(uploadReq);