Skip to content

Commit 8596d13

Browse files
authored
Merge pull request #1 from BertvanHoekelen/master
Merge OTA
2 parents c4b5396 + 2074a4c commit 8596d13

File tree

8 files changed

+521
-378
lines changed

8 files changed

+521
-378
lines changed

.vscode/tasks.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,27 @@
77
// ${cwd}: the current working directory of the spawned process
88
// A task runner that calls a custom npm script that compiles the extension.
99
{
10-
"version": "0.1.0",
10+
"version": "2.0.0",
1111
"command": "gulp",
12-
"isShellCommand": true,
12+
"type": "shell",
1313
"args": [
1414
"--no-color"
1515
],
1616
"tasks": [
1717
{
18-
"taskName": "build",
18+
"label": "build",
1919
"args": [],
20-
"isBuildCommand": true,
20+
"group": "build",
2121
"isBackground": false,
2222
"problemMatcher": [
2323
"$tsc"
2424
]
2525
},
2626
{
27-
"taskName": "build_without_view",
27+
28+
"label": "build_without_view",
2829
"args": [],
29-
"isBuildCommand": true,
30+
"group": "build",
3031
"isBackground": false,
3132
"problemMatcher": [
3233
"$tsc"

package-lock.json

Lines changed: 41 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@
548548
"express": "^4.14.1",
549549
"glob": "^7.1.1",
550550
"iconv-lite": "^0.4.18",
551+
"mdns-js": "^1.0.1",
551552
"properties": "^1.2.1",
552553
"uuid": "^3.0.1",
553554
"vscode-extension-telemetry": "0.0.18",

src/arduino/arduino.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ export class ArduinoApp {
135135
}
136136

137137
const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
138-
const args = ["--upload", "--board", boardDescriptor, "--port", dc.port, appPath];
138+
const args = ["--pref", `runtime.pwd.${dc.port}=${dc.password}`, "--upload", "--board", boardDescriptor, "--port", dc.port, appPath];
139+
139140
if (VscodeSettings.getInstance().logLevel === "verbose") {
140141
args.push("--verbose");
141142
}

0 commit comments

Comments
 (0)