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
Appearance settings

Commit d82fa4f

Browse filesBrowse files
kittaakoskittaakos
authored
Merge 1731972 into 9a6a457 
2 parents 9a6a457 + 1731972 commit d82fa4f
Copy full SHA for d82fa4f

File tree

77 files changed

+6325
-3461
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

77 files changed

+6325
-3461
lines changed

‎.vscode/launch.json

Copy file name to clipboardExpand all lines: .vscode/launch.json
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@
9494
"--colors",
9595
"**/${fileBasenameNoExtension}.js"
9696
],
97+
"outFiles": [
98+
"${workspaceRoot}/electron-app/src-gen/backend/*.js",
99+
"${workspaceRoot}/electron-app/src-gen/frontend/*.js",
100+
"${workspaceRoot}/electron-app/lib/**/*.js",
101+
"${workspaceRoot}/arduino-ide-extension/lib/**/*.js",
102+
"${workspaceRoot}/node_modules/@theia/**/*.js"
103+
],
97104
"env": {
98105
"TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json",
99106
"IDE2_TEST": "true"

‎arduino-ide-extension/package.json

Copy file name to clipboardExpand all lines: arduino-ide-extension/package.json
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@
123123
"mockdate": "^3.0.5",
124124
"moment": "^2.24.0",
125125
"ncp": "^2.0.0",
126-
"protoc": "^1.0.4",
127126
"rimraf": "^2.6.1",
128127
"shelljs": "^0.8.3",
129128
"uuid": "^3.2.1",
130129
"yargs": "^11.1.0"
131130
},
132131
"optionalDependencies": {
133-
"grpc-tools": "^1.9.0"
132+
"grpc-tools": "^1.9.0",
133+
"protoc": "^1.0.4"
134134
},
135135
"mocha": {
136136
"require": [
@@ -172,10 +172,14 @@
172172
],
173173
"arduino": {
174174
"arduino-cli": {
175-
"version": "0.33.1"
175+
"version": {
176+
"owner": "cmaglie",
177+
"repo": "arduino-cli",
178+
"commitish": "board_port_after_upload"
179+
}
176180
},
177181
"arduino-fwuploader": {
178-
"version": "2.2.2"
182+
"version": "2.3.0"
179183
},
180184
"arduino-language-server": {
181185
"version": "0.7.4"

‎arduino-ide-extension/scripts/utils.js

Copy file name to clipboardExpand all lines: arduino-ide-extension/scripts/utils.js
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ function buildFromGit(command, version, destinationPath, taskName) {
113113
shell.echo(`<<< Checked out ${commitish}.`);
114114
}
115115

116+
exec('git', ['-C', tempRepoPath, 'rev-parse', '--short', 'HEAD'], shell);
117+
116118
shell.echo(`>>> Building the ${taskName}...`);
117119
exec(command, ['build'], shell, { cwd: tempRepoPath, encoding: 'utf8' });
118120
shell.echo(`<<< Done ${taskName} build.`);

‎arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

Copy file name to clipboardExpand all lines: arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import { SketchesServiceClientImpl } from './sketches-service-client-impl';
2727
import { CoreService, CoreServicePath } from '../common/protocol/core-service';
2828
import { BoardsListWidget } from './boards/boards-list-widget';
2929
import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
30-
import { BoardsServiceProvider } from './boards/boards-service-provider';
30+
import {
31+
BoardListDumper,
32+
BoardsServiceProvider,
33+
} from './boards/boards-service-provider';
3134
import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
3235
import { WorkspaceService } from './theia/workspace/workspace-service';
3336
import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
@@ -61,7 +64,6 @@ import {
6164
BoardsConfigDialog,
6265
BoardsConfigDialogProps,
6366
} from './boards/boards-config-dialog';
64-
import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget';
6567
import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution';
6668
import { ScmContribution } from './theia/scm/scm-contribution';
6769
import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
@@ -100,7 +102,7 @@ import {
100102
FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
101103
ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
102104
} from '@theia/core/lib/browser/connection-status-service';
103-
import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
105+
import { BoardsDataMenuUpdater } from './contributions/boards-data-menu-updater';
104106
import { BoardsDataStore } from './boards/boards-data-store';
105107
import { ILogger } from '@theia/core/lib/common/logger';
106108
import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
@@ -445,11 +447,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
445447
bind(BoardsServiceProvider).toSelf().inSingletonScope();
446448
bind(FrontendApplicationContribution).toService(BoardsServiceProvider);
447449
bind(CommandContribution).toService(BoardsServiceProvider);
450+
bind(BoardListDumper).toSelf().inSingletonScope();
448451

449452
// To be able to track, and update the menu based on the core settings (aka. board details) of the currently selected board.
450-
bind(FrontendApplicationContribution)
451-
.to(BoardsDataMenuUpdater)
452-
.inSingletonScope();
453453
bind(BoardsDataStore).toSelf().inSingletonScope();
454454
bind(FrontendApplicationContribution).toService(BoardsDataStore);
455455
// Logger for the Arduino daemon
@@ -478,7 +478,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
478478
bind(OpenHandler).toService(BoardsListWidgetFrontendContribution);
479479

480480
// Board select dialog
481-
bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
482481
bind(BoardsConfigDialog).toSelf().inSingletonScope();
483482
bind(BoardsConfigDialogProps).toConstantValue({
484483
title: nls.localize(
@@ -751,6 +750,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
751750
Contribution.configure(bind, CloudSketchbookContribution);
752751
Contribution.configure(bind, CreateCloudCopy);
753752
Contribution.configure(bind, UpdateArduinoState);
753+
Contribution.configure(bind, BoardsDataMenuUpdater);
754754

755755
bindContributionProvider(bind, StartupTaskProvider);
756756
bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.