Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8f03dee

Browse files
wip
1 parent a883679 commit 8f03dee

File tree

3 files changed

+42
-43
lines changed

3 files changed

+42
-43
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ function createBoardsPackage(
585585
if (!actualRelease) {
586586
return undefined;
587587
}
588-
const { name, typeList, boardsList, deprecated, compatible } = actualRelease;
588+
const { name, typesList, boardsList, deprecated, compatible } = actualRelease;
589589
if (!compatible) {
590590
return undefined; // never show incompatible platforms
591591
}
@@ -602,7 +602,7 @@ function createBoardsPackage(
602602
),
603603
description: boardsList.map(({ name }) => name).join(', '),
604604
boards: boardsList,
605-
types: typeList,
605+
types: typesList,
606606
moreInfoLink: website,
607607
author: maintainer,
608608
deprecated,

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

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
2121
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
2222
import { deepClone, nls } from '@theia/core';
2323
import { ErrnoException } from './utils/errors';
24-
import {
25-
SettingsMergeRequest,
26-
SettingsWriteRequest,
27-
} from './cli-protocol/cc/arduino/cli/commands/v1/settings_pb';
28-
import { createArduinoCoreServiceClient } from './arduino-core-service-client';
24+
// import {
25+
// SettingsMergeRequest,
26+
// SettingsWriteRequest,
27+
// } from './cli-protocol/cc/arduino/cli/commands/v1/settings_pb';
2928

3029
const deepmerge = require('deepmerge');
3130

@@ -73,6 +72,7 @@ export class ConfigServiceImpl
7372

7473
// Used by frontend to update the config.
7574
async setConfiguration(config: Config): Promise<void> {
75+
debugger;
7676
await this.ready.promise;
7777
if (Config.sameAs(this.config.config, config)) {
7878
return;
@@ -291,47 +291,49 @@ export class ConfigServiceImpl
291291
}
292292

293293
private async updateDaemon(
294-
port: number | number,
294+
_: number | number,
295295
config: DefaultCliConfig
296296
): Promise<void> {
297-
const client = createArduinoCoreServiceClient({ port });
298-
const req = new SettingsMergeRequest();
297+
// const client = createArduinoCoreServiceClient({ port });
298+
// const req = new SettingsMergeRequest();
299299
const json = JSON.stringify(config, null, 2);
300-
req.setJsonData(json);
300+
// req.setJsonData(json);
301301
this.logger.info(`Updating daemon with 'data': ${json}`);
302302
return new Promise<void>((resolve, reject) => {
303-
client.settingsMerge(req, (error) => {
304-
try {
305-
if (error) {
306-
reject(error);
307-
return;
308-
}
309-
resolve();
310-
} finally {
311-
client.close();
312-
}
313-
});
303+
reject('failed to update settings...');
304+
305+
// client.settingsMerge(req, (error) => {
306+
// try {
307+
// if (error) {
308+
// reject(error);
309+
// return;
310+
// }
311+
// resolve();
312+
// } finally {
313+
// client.close();
314+
// }
315+
// });
314316
});
315317
}
316318

317-
private async writeDaemonState(port: number | number): Promise<void> {
318-
const client = createArduinoCoreServiceClient({ port });
319-
const req = new SettingsWriteRequest();
320-
const cliConfigUri = await this.getCliConfigFileUri();
321-
const cliConfigPath = FileUri.fsPath(cliConfigUri);
322-
req.setFilePath(cliConfigPath);
319+
private async writeDaemonState(_: number | number): Promise<void> {
320+
// const client = createArduinoCoreServiceClient({ port });
321+
// const req = new SettingsWriteRequest();
322+
// const cliConfigUri = await this.getCliConfigFileUri();
323+
// const cliConfigPath = FileUri.fsPath(cliConfigUri);
324+
// req.setFilePath(cliConfigPath);
323325
return new Promise<void>((resolve, reject) => {
324-
client.settingsWrite(req, (error) => {
325-
try {
326-
if (error) {
327-
reject(error);
328-
return;
329-
}
330-
resolve();
331-
} finally {
332-
client.close();
333-
}
334-
});
326+
// client.settingsWrite(req, (error) => {
327+
// try {
328+
// if (error) {
329+
// reject(error);
330+
// return;
331+
// }
332+
// resolve();
333+
// } finally {
334+
// client.close();
335+
// }
336+
// });
335337
});
336338
}
337339

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { Mutable } from '@theia/core/lib/common/types';
1111
import { FileUri } from '@theia/core/lib/node/file-uri';
1212
import { inject, injectable } from '@theia/core/shared/inversify';
1313
import * as jspb from 'google-protobuf';
14-
import { BoolValue } from 'google-protobuf/google/protobuf/wrappers_pb';
1514
import path from 'node:path';
1615
import {
1716
UploadResponse as ApiUploadResponse,
@@ -195,9 +194,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
195194
request.setVerbose(options.verbose);
196195
request.setQuiet(false);
197196
if (typeof options.exportBinaries === 'boolean') {
198-
const exportBinaries = new BoolValue();
199-
exportBinaries.setValue(options.exportBinaries);
200-
request.setExportBinaries(exportBinaries);
197+
request.setExportBinaries(options.exportBinaries);
201198
}
202199
this.mergeSourceOverrides(request, options);
203200
return request;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /