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 d106588

Browse files
feat: use Arduino CLI 1.1.0
1 parent 8773bd6 commit d106588

File tree

18 files changed

+1035
-520
lines changed

18 files changed

+1035
-520
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
],
172172
"arduino": {
173173
"arduino-cli": {
174-
"version": "1.0.4"
174+
"version": "1.1.0"
175175
},
176176
"arduino-fwuploader": {
177177
"version": "2.4.1"

‎arduino-ide-extension/src/browser/contributions/debug.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ export class Debug
289289
): Promise<boolean> {
290290
if (err instanceof Error) {
291291
try {
292-
const tempBuildPaths = await this.sketchesService.tempBuildPath(sketch);
293-
return tempBuildPaths.some((tempBuildPath) =>
292+
const buildPaths = await this.sketchesService.getBuildPath(sketch);
293+
return buildPaths.some((tempBuildPath) =>
294294
err.message.includes(tempBuildPath)
295295
);
296296
} catch {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,14 @@ export interface SketchesService {
141141
/**
142142
* This is the JS/TS re-implementation of [`GenBuildPath`](https://github.com/arduino/arduino-cli/blob/c0d4e4407d80aabad81142693513b3306759cfa6/arduino/sketch/sketch.go#L296-L306) of the CLI.
143143
* Pass in a sketch and get the build temporary folder filesystem path calculated from the main sketch file location. Can be multiple ones. This method does not check the existence of the sketch.
144+
* Since CLI v1.1.0 the default sketch folder is the os user cache dir. See https://github.com/arduino/arduino-cli/pull/2673/commits/d2ffeb06ca6360a211d5aa7ddd11505212ffb1b9
144145
*
145146
* The case sensitivity of the drive letter on Windows matters when the CLI calculates the MD5 hash of the temporary build folder.
146147
* IDE2 does not know and does not want to rely on how the CLI treats the paths: with lowercase or uppercase drive letters.
147148
* Hence, IDE2 has to provide multiple build paths on Windows. This hack will be obsolete when the CLI can provide error codes:
148149
* https://github.com/arduino/arduino-cli/issues/1762.
149150
*/
150-
tempBuildPath(sketch: SketchRef): Promise<string[]>;
151+
getBuildPath(sketch: SketchRef): Promise<string[]>;
151152
}
152153

153154
export interface SketchRef {

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
import * as grpc from "@grpc/grpc-js";
88
import * as cc_arduino_cli_commands_v1_commands_pb from "../../../../../cc/arduino/cli/commands/v1/commands_pb";
9-
import * as google_rpc_status_pb from "../../../../../google/rpc/status_pb";
10-
import * as cc_arduino_cli_commands_v1_common_pb from "../../../../../cc/arduino/cli/commands/v1/common_pb";
119
import * as cc_arduino_cli_commands_v1_board_pb from "../../../../../cc/arduino/cli/commands/v1/board_pb";
10+
import * as cc_arduino_cli_commands_v1_common_pb from "../../../../../cc/arduino/cli/commands/v1/common_pb";
1211
import * as cc_arduino_cli_commands_v1_compile_pb from "../../../../../cc/arduino/cli/commands/v1/compile_pb";
1312
import * as cc_arduino_cli_commands_v1_core_pb from "../../../../../cc/arduino/cli/commands/v1/core_pb";
1413
import * as cc_arduino_cli_commands_v1_debug_pb from "../../../../../cc/arduino/cli/commands/v1/debug_pb";
15-
import * as cc_arduino_cli_commands_v1_monitor_pb from "../../../../../cc/arduino/cli/commands/v1/monitor_pb";
16-
import * as cc_arduino_cli_commands_v1_upload_pb from "../../../../../cc/arduino/cli/commands/v1/upload_pb";
1714
import * as cc_arduino_cli_commands_v1_lib_pb from "../../../../../cc/arduino/cli/commands/v1/lib_pb";
15+
import * as cc_arduino_cli_commands_v1_monitor_pb from "../../../../../cc/arduino/cli/commands/v1/monitor_pb";
1816
import * as cc_arduino_cli_commands_v1_settings_pb from "../../../../../cc/arduino/cli/commands/v1/settings_pb";
17+
import * as cc_arduino_cli_commands_v1_upload_pb from "../../../../../cc/arduino/cli/commands/v1/upload_pb";
18+
import * as google_rpc_status_pb from "../../../../../google/rpc/status_pb";
1919

2020
interface IArduinoCoreServiceService extends grpc.ServiceDefinition<grpc.UntypedServiceImplementation> {
2121
create: IArduinoCoreServiceService_ICreate;

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb.js‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
//
2020
'use strict';
2121
var cc_arduino_cli_commands_v1_commands_pb = require('../../../../../cc/arduino/cli/commands/v1/commands_pb.js');
22-
var google_rpc_status_pb = require('../../../../../google/rpc/status_pb.js');
23-
var cc_arduino_cli_commands_v1_common_pb = require('../../../../../cc/arduino/cli/commands/v1/common_pb.js');
2422
var cc_arduino_cli_commands_v1_board_pb = require('../../../../../cc/arduino/cli/commands/v1/board_pb.js');
23+
var cc_arduino_cli_commands_v1_common_pb = require('../../../../../cc/arduino/cli/commands/v1/common_pb.js');
2524
var cc_arduino_cli_commands_v1_compile_pb = require('../../../../../cc/arduino/cli/commands/v1/compile_pb.js');
2625
var cc_arduino_cli_commands_v1_core_pb = require('../../../../../cc/arduino/cli/commands/v1/core_pb.js');
2726
var cc_arduino_cli_commands_v1_debug_pb = require('../../../../../cc/arduino/cli/commands/v1/debug_pb.js');
28-
var cc_arduino_cli_commands_v1_monitor_pb = require('../../../../../cc/arduino/cli/commands/v1/monitor_pb.js');
29-
var cc_arduino_cli_commands_v1_upload_pb = require('../../../../../cc/arduino/cli/commands/v1/upload_pb.js');
3027
var cc_arduino_cli_commands_v1_lib_pb = require('../../../../../cc/arduino/cli/commands/v1/lib_pb.js');
28+
var cc_arduino_cli_commands_v1_monitor_pb = require('../../../../../cc/arduino/cli/commands/v1/monitor_pb.js');
3129
var cc_arduino_cli_commands_v1_settings_pb = require('../../../../../cc/arduino/cli/commands/v1/settings_pb.js');
30+
var cc_arduino_cli_commands_v1_upload_pb = require('../../../../../cc/arduino/cli/commands/v1/upload_pb.js');
31+
var google_rpc_status_pb = require('../../../../../google/rpc/status_pb.js');
3232

3333
function serialize_cc_arduino_cli_commands_v1_ArchiveSketchRequest(arg) {
3434
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.ArchiveSketchRequest)) {
@@ -1109,9 +1109,9 @@ function deserialize_cc_arduino_cli_commands_v1_ZipLibraryInstallResponse(buffer
11091109
}
11101110

11111111

1112-
// The main Arduino Platform service API
1112+
// The main Arduino Platform service API.
11131113
var ArduinoCoreServiceService = exports['cc.arduino.cli.commands.v1.ArduinoCoreService'] = {
1114-
// Create a new Arduino Core instance
1114+
// Create a new Arduino Core instance.
11151115
create: {
11161116
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Create',
11171117
requestStream: false,
@@ -1124,7 +1124,7 @@ create: {
11241124
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_CreateResponse,
11251125
},
11261126
// Initializes an existing Arduino Core instance by loading platforms and
1127-
// libraries
1127+
// libraries.
11281128
init: {
11291129
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Init',
11301130
requestStream: false,
@@ -1136,7 +1136,7 @@ init: {
11361136
responseSerialize: serialize_cc_arduino_cli_commands_v1_InitResponse,
11371137
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_InitResponse,
11381138
},
1139-
// Destroy an instance of the Arduino Core Service
1139+
// Destroy an instance of the Arduino Core Service.
11401140
destroy: {
11411141
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Destroy',
11421142
requestStream: false,
@@ -1148,7 +1148,7 @@ destroy: {
11481148
responseSerialize: serialize_cc_arduino_cli_commands_v1_DestroyResponse,
11491149
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_DestroyResponse,
11501150
},
1151-
// Update package index of the Arduino Core Service
1151+
// Update package index of the Arduino Core Service.
11521152
updateIndex: {
11531153
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/UpdateIndex',
11541154
requestStream: false,
@@ -1160,7 +1160,7 @@ updateIndex: {
11601160
responseSerialize: serialize_cc_arduino_cli_commands_v1_UpdateIndexResponse,
11611161
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_UpdateIndexResponse,
11621162
},
1163-
// Update libraries index
1163+
// Update libraries index.
11641164
updateLibrariesIndex: {
11651165
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/UpdateLibrariesIndex',
11661166
requestStream: false,
@@ -1184,7 +1184,7 @@ version: {
11841184
responseSerialize: serialize_cc_arduino_cli_commands_v1_VersionResponse,
11851185
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_VersionResponse,
11861186
},
1187-
// Create a new Sketch
1187+
// Create a new Sketch.
11881188
newSketch: {
11891189
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/NewSketch',
11901190
requestStream: false,
@@ -1196,7 +1196,7 @@ newSketch: {
11961196
responseSerialize: serialize_cc_arduino_cli_commands_v1_NewSketchResponse,
11971197
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_NewSketchResponse,
11981198
},
1199-
// Returns all files composing a Sketch
1199+
// Returns all files composing a Sketch.
12001200
loadSketch: {
12011201
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/LoadSketch',
12021202
requestStream: false,
@@ -1208,7 +1208,7 @@ loadSketch: {
12081208
responseSerialize: serialize_cc_arduino_cli_commands_v1_LoadSketchResponse,
12091209
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_LoadSketchResponse,
12101210
},
1211-
// Creates a zip file containing all files of specified Sketch
1211+
// Creates a zip file containing all files of specified Sketch.
12121212
archiveSketch: {
12131213
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/ArchiveSketch',
12141214
requestStream: false,
@@ -1234,10 +1234,7 @@ setSketchDefaults: {
12341234
responseSerialize: serialize_cc_arduino_cli_commands_v1_SetSketchDefaultsResponse,
12351235
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_SetSketchDefaultsResponse,
12361236
},
1237-
// BOARD COMMANDS
1238-
// --------------
1239-
//
1240-
// Requests details about a board
1237+
// Requests details about a board.
12411238
boardDetails: {
12421239
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/BoardDetails',
12431240
requestStream: false,
@@ -1469,7 +1466,7 @@ libraryUpgrade: {
14691466
responseSerialize: serialize_cc_arduino_cli_commands_v1_LibraryUpgradeResponse,
14701467
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_LibraryUpgradeResponse,
14711468
},
1472-
// Install a library from a Zip File
1469+
// Install a library from a Zip File.
14731470
zipLibraryInstall: {
14741471
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/ZipLibraryInstall',
14751472
requestStream: false,
@@ -1481,7 +1478,7 @@ zipLibraryInstall: {
14811478
responseSerialize: serialize_cc_arduino_cli_commands_v1_ZipLibraryInstallResponse,
14821479
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_ZipLibraryInstallResponse,
14831480
},
1484-
// Download and install a library from a git url
1481+
// Download and install a library from a git url.
14851482
gitLibraryInstall: {
14861483
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/GitLibraryInstall',
14871484
requestStream: false,
@@ -1554,7 +1551,7 @@ libraryList: {
15541551
responseSerialize: serialize_cc_arduino_cli_commands_v1_LibraryListResponse,
15551552
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_LibraryListResponse,
15561553
},
1557-
// Open a monitor connection to a board port
1554+
// Open a monitor connection to a board port.
15581555
monitor: {
15591556
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Monitor',
15601557
requestStream: true,
@@ -1566,7 +1563,7 @@ monitor: {
15661563
responseSerialize: serialize_cc_arduino_cli_commands_v1_MonitorResponse,
15671564
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_MonitorResponse,
15681565
},
1569-
// Returns the parameters that can be set in the MonitorRequest calls
1566+
// Returns the parameters that can be set in the MonitorRequest calls.
15701567
enumerateMonitorPortSettings: {
15711568
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/EnumerateMonitorPortSettings',
15721569
requestStream: false,
@@ -1638,7 +1635,7 @@ cleanDownloadCacheDirectory: {
16381635
responseSerialize: serialize_cc_arduino_cli_commands_v1_CleanDownloadCacheDirectoryResponse,
16391636
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_CleanDownloadCacheDirectoryResponse,
16401637
},
1641-
// Writes the settings currently stored in memory in a YAML file
1638+
// Writes the settings currently stored in memory in a YAML file.
16421639
configurationSave: {
16431640
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/ConfigurationSave',
16441641
requestStream: false,
@@ -1650,7 +1647,7 @@ configurationSave: {
16501647
responseSerialize: serialize_cc_arduino_cli_commands_v1_ConfigurationSaveResponse,
16511648
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_ConfigurationSaveResponse,
16521649
},
1653-
// Read the settings from a YAML file
1650+
// Read the settings from a YAML file.
16541651
configurationOpen: {
16551652
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/ConfigurationOpen',
16561653
requestStream: false,
@@ -1662,7 +1659,8 @@ configurationOpen: {
16621659
responseSerialize: serialize_cc_arduino_cli_commands_v1_ConfigurationOpenResponse,
16631660
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_ConfigurationOpenResponse,
16641661
},
1665-
configurationGet: {
1662+
// Get the current configuration.
1663+
configurationGet: {
16661664
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/ConfigurationGet',
16671665
requestStream: false,
16681666
responseStream: false,
@@ -1673,7 +1671,7 @@ configurationOpen: {
16731671
responseSerialize: serialize_cc_arduino_cli_commands_v1_ConfigurationGetResponse,
16741672
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_ConfigurationGetResponse,
16751673
},
1676-
// Enumerate all the keys/values pairs available in the configuration
1674+
// Enumerate all the keys/values pairs available in the configuration.
16771675
settingsEnumerate: {
16781676
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/SettingsEnumerate',
16791677
requestStream: false,
@@ -1685,7 +1683,7 @@ settingsEnumerate: {
16851683
responseSerialize: serialize_cc_arduino_cli_commands_v1_SettingsEnumerateResponse,
16861684
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_SettingsEnumerateResponse,
16871685
},
1688-
// Get a single configuration value
1686+
// Get a single configuration value.
16891687
settingsGetValue: {
16901688
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/SettingsGetValue',
16911689
requestStream: false,
@@ -1697,7 +1695,7 @@ settingsGetValue: {
16971695
responseSerialize: serialize_cc_arduino_cli_commands_v1_SettingsGetValueResponse,
16981696
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_SettingsGetValueResponse,
16991697
},
1700-
// Set a single configuration value
1698+
// Set a single configuration value.
17011699
settingsSetValue: {
17021700
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/SettingsSetValue',
17031701
requestStream: false,

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_pb.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
/* eslint-disable */
66

77
import * as jspb from "google-protobuf";
8-
import * as google_rpc_status_pb from "../../../../../google/rpc/status_pb";
9-
import * as cc_arduino_cli_commands_v1_common_pb from "../../../../../cc/arduino/cli/commands/v1/common_pb";
108
import * as cc_arduino_cli_commands_v1_board_pb from "../../../../../cc/arduino/cli/commands/v1/board_pb";
9+
import * as cc_arduino_cli_commands_v1_common_pb from "../../../../../cc/arduino/cli/commands/v1/common_pb";
1110
import * as cc_arduino_cli_commands_v1_compile_pb from "../../../../../cc/arduino/cli/commands/v1/compile_pb";
1211
import * as cc_arduino_cli_commands_v1_core_pb from "../../../../../cc/arduino/cli/commands/v1/core_pb";
1312
import * as cc_arduino_cli_commands_v1_debug_pb from "../../../../../cc/arduino/cli/commands/v1/debug_pb";
14-
import * as cc_arduino_cli_commands_v1_monitor_pb from "../../../../../cc/arduino/cli/commands/v1/monitor_pb";
15-
import * as cc_arduino_cli_commands_v1_upload_pb from "../../../../../cc/arduino/cli/commands/v1/upload_pb";
1613
import * as cc_arduino_cli_commands_v1_lib_pb from "../../../../../cc/arduino/cli/commands/v1/lib_pb";
14+
import * as cc_arduino_cli_commands_v1_monitor_pb from "../../../../../cc/arduino/cli/commands/v1/monitor_pb";
1715
import * as cc_arduino_cli_commands_v1_settings_pb from "../../../../../cc/arduino/cli/commands/v1/settings_pb";
16+
import * as cc_arduino_cli_commands_v1_upload_pb from "../../../../../cc/arduino/cli/commands/v1/upload_pb";
17+
import * as google_rpc_status_pb from "../../../../../google/rpc/status_pb";
1818

1919
export class CreateRequest extends jspb.Message {
2020

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_pb.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ var global = (function() {
2121
return Function('return this')();
2222
}.call(null));
2323

24-
var google_rpc_status_pb = require('../../../../../google/rpc/status_pb.js');
25-
goog.object.extend(proto, google_rpc_status_pb);
26-
var cc_arduino_cli_commands_v1_common_pb = require('../../../../../cc/arduino/cli/commands/v1/common_pb.js');
27-
goog.object.extend(proto, cc_arduino_cli_commands_v1_common_pb);
2824
var cc_arduino_cli_commands_v1_board_pb = require('../../../../../cc/arduino/cli/commands/v1/board_pb.js');
2925
goog.object.extend(proto, cc_arduino_cli_commands_v1_board_pb);
26+
var cc_arduino_cli_commands_v1_common_pb = require('../../../../../cc/arduino/cli/commands/v1/common_pb.js');
27+
goog.object.extend(proto, cc_arduino_cli_commands_v1_common_pb);
3028
var cc_arduino_cli_commands_v1_compile_pb = require('../../../../../cc/arduino/cli/commands/v1/compile_pb.js');
3129
goog.object.extend(proto, cc_arduino_cli_commands_v1_compile_pb);
3230
var cc_arduino_cli_commands_v1_core_pb = require('../../../../../cc/arduino/cli/commands/v1/core_pb.js');
3331
goog.object.extend(proto, cc_arduino_cli_commands_v1_core_pb);
3432
var cc_arduino_cli_commands_v1_debug_pb = require('../../../../../cc/arduino/cli/commands/v1/debug_pb.js');
3533
goog.object.extend(proto, cc_arduino_cli_commands_v1_debug_pb);
36-
var cc_arduino_cli_commands_v1_monitor_pb = require('../../../../../cc/arduino/cli/commands/v1/monitor_pb.js');
37-
goog.object.extend(proto, cc_arduino_cli_commands_v1_monitor_pb);
38-
var cc_arduino_cli_commands_v1_upload_pb = require('../../../../../cc/arduino/cli/commands/v1/upload_pb.js');
39-
goog.object.extend(proto, cc_arduino_cli_commands_v1_upload_pb);
4034
var cc_arduino_cli_commands_v1_lib_pb = require('../../../../../cc/arduino/cli/commands/v1/lib_pb.js');
4135
goog.object.extend(proto, cc_arduino_cli_commands_v1_lib_pb);
36+
var cc_arduino_cli_commands_v1_monitor_pb = require('../../../../../cc/arduino/cli/commands/v1/monitor_pb.js');
37+
goog.object.extend(proto, cc_arduino_cli_commands_v1_monitor_pb);
4238
var cc_arduino_cli_commands_v1_settings_pb = require('../../../../../cc/arduino/cli/commands/v1/settings_pb.js');
4339
goog.object.extend(proto, cc_arduino_cli_commands_v1_settings_pb);
40+
var cc_arduino_cli_commands_v1_upload_pb = require('../../../../../cc/arduino/cli/commands/v1/upload_pb.js');
41+
goog.object.extend(proto, cc_arduino_cli_commands_v1_upload_pb);
42+
var google_rpc_status_pb = require('../../../../../google/rpc/status_pb.js');
43+
goog.object.extend(proto, google_rpc_status_pb);
4444
goog.exportSymbol('proto.cc.arduino.cli.commands.v1.ArchiveSketchRequest', null, global);
4545
goog.exportSymbol('proto.cc.arduino.cli.commands.v1.ArchiveSketchResponse', null, global);
4646
goog.exportSymbol('proto.cc.arduino.cli.commands.v1.CheckForArduinoCLIUpdatesRequest', null, global);

0 commit comments

Comments
(0)

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