Skip to content

Commit fe5826c

Browse files
authored
Merge branch 'master' into programmers_improvement
2 parents ad768aa + ebd03db commit fe5826c

23 files changed

+1014
-292
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ node_js:
66
os:
77
- linux
88
- osx
9-
# dist: trusty # using Ubuntu 14.04.5 LTS
9+
dist: trusty # using Ubuntu 14.04.5 LTS
1010

1111
# fixing https://github.com/Microsoft/vscode/issues/33998
1212
addons:

.vscodeignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ tslint.json
1111
.travis.yml
1212
gulpfile.js
1313
*.vsix
14-
.github/**
14+
.github/**
15+
*.log
16+
webpack.config.js
17+
node_modules/**
18+
vendor/**

CHANGELOG.md

+40-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## Version 0.2.27
5+
6+
- Release date: July 8, 2019
7+
8+
### Fixed
9+
- Fix the issue of "Unable to start serial monitor" [#851](https://github.com/microsoft/vscode-arduino/issues/851) which started after update to VS Code 1.36.0.
10+
11+
Special thanks to [Aboulfad](https://github.com/aboulfad), [szormok](https://github.com/szormok), [MichaelPfezer](https://github.com/MichaelPfezer), [CodeNameHawk](https://github.com/CodeNameHawk), [Rafu](https://github.com/rafalp9728) and [Cube-Line](https://github.com/Cube-Line), thanks for your contributions and feedbacks.
12+
413
## Version 0.2.26
5-
-Release date: May 30, 2019
14+
15+
- Release date: May 30, 2019
616

717
### Added
818
- Add .pde support
@@ -16,7 +26,8 @@ All notable changes to this project will be documented in this file.
1626
Special thanks to [Riz-waan](https://github.com/Riz-waan), [LuisAbrantes](https://github.com/LuisAbrantes), [Christopher Schmitz](https://github.com/chris-schmitz), [Christian](https://github.com/ChriD) and [LMtx](https://github.com/LMtx), thanks for your contributions and feedbacks.
1727

1828
## Version 0.2.25
19-
-Release date: January 10, 2019
29+
30+
- Release date: January 10, 2019
2031

2132
### Added
2233
- Add upload and verify button in action bar [#737](https://github.com/Microsoft/vscode-arduino/pull/737)
@@ -25,7 +36,8 @@ Special thanks to [Riz-waan](https://github.com/Riz-waan), [LuisAbrantes](https:
2536
Special thanks to [Michael Omiccioli](https://github.com/momiccioli) and [MarNwk](https://github.com/MarNwk), thank you for your feedbacks.
2637

2738
## Version 0.2.24
28-
-Release date: December 11, 2018
39+
40+
- Release date: December 11, 2018
2941

3042
### Added
3143
- Add debugging support for cmsis-dap with Keil Software vid [#634](https://github.com/Microsoft/vscode-arduino/pull/634)
@@ -40,7 +52,8 @@ Special thanks to [Michael Omiccioli](https://github.com/momiccioli) and [MarNwk
4052
Special thanks to [Deqing Sun](https://github.com/DeqingSun), thank you for your contributions and feedbacks.
4153

4254
## Version 0.2.23
43-
-Release date: November 22, 2018
55+
56+
- Release date: November 22, 2018
4457

4558
### Added
4659
- Add debugging support for uno [#685](https://github.com/Microsoft/vscode-arduino/pull/685)
@@ -59,6 +72,7 @@ Special thanks to [Deqing Sun](https://github.com/DeqingSun), thank you for your
5972
Special thanks to [Deqing Sun](https://github.com/DeqingSun), [Takashi Matsuoka](https://github.com/matsujirushi), [Chinmay Chandak](https://github.com/CCAtAlvis), [aster94](https://github.com/aster94), [Ajit Panigrahi](https://github.com/AjitZero) and [Konrad Blum](https://github.com/kblum), thank you for your contributions and feedbacks.
6073

6174
## Version 0.2.22
75+
6276
- Release date: October 18, 2018
6377

6478
### Added
@@ -74,19 +88,22 @@ Special thanks to [Deqing Sun](https://github.com/DeqingSun), [Takashi Matsuoka]
7488
Special thanks to [aster94](https://github.com/aster94), [Niels van der Veer](https://github.com/n9iels), [AntoineGirafe](https://github.com/AntoineGirafe), thank you foryour contributions and feedbacks.
7589

7690
## Version 0.2.20
91+
7792
- Release date: August 16, 2018
7893

7994
### Changed
8095
- Add arduino.defaultBaudRate option [#616](https://github.com/Microsoft/vscode-arduino/issues/616)
8196
- Pop up a message to help the user figure out what settings are wrong [#611](https://github.com/Microsoft/vscode-arduino/issues/611)
8297

8398
## Version 0.2.19
99+
84100
- Release date: July 31, 2018
85101

86102
### Changed
87103
- Dependency upgrade
88104

89105
## Version 0.2.18
106+
90107
- Release date: July 17, 2018
91108

92109
### Added
@@ -100,6 +117,7 @@ Special thanks to [aster94](https://github.com/aster94), [Niels van der Veer](ht
100117
Special thanks to [Takashi Matsuoka](https://github.com/matsujirushi), [Andrew Churchill](https://github.com/xxaxdxcxx), [Pharap](https://github.com/Pharap), thank you for your contributions and feedbacks.
101118

102119
## Version 0.2.17
120+
103121
- Release date: June 15, 2018
104122

105123
### Fixed
@@ -108,6 +126,7 @@ Special thanks to [Takashi Matsuoka](https://github.com/matsujirushi), [Andrew C
108126
- Fix g++ not find issue when upgrade the board sdk to a new version [#586](https://github.com/Microsoft/vscode-arduino/issues/586)
109127

110128
## Version 0.2.16
129+
111130
- Release date: June 6, 2018
112131

113132
### Added
@@ -120,6 +139,7 @@ Special thanks to [Takashi Matsuoka](https://github.com/matsujirushi), [Andrew C
120139
Special thanks to [Thad House](https://github.com/ThadHouse), [Carlos Gomez](https://github.com/Kurolox), [Johannes Henninger](https://github.com/jhenninger), thank you for your contributions and feedbacks.
121140

122141
## Version 0.2.15
142+
123143
- Release date: May 14, 2018
124144

125145
### Added
@@ -136,12 +156,14 @@ Special thanks to [Thad House](https://github.com/ThadHouse), [Carlos Gomez](htt
136156
Special thanks to [Joel Santos](https://github.com/mundodisco8), [John](https://github.com/VashJuan), [mybayern1974](https://github.com/mybayern1974), [Maxime Paquatte](https://github.com/maxime-paquatte), [Joe Saavedra](https://github.com/jmsaavedra), [Kye Burchard](https://github.com/kyeb), [Laurent Haas - F6FVY](https://github.com/f6fvy), thank you for your feedbacks.
137157

138158
## Version 0.2.14
159+
139160
- Release date: May 4, 2018
140161

141162
### Fixed
142163
- Fix install board command issue
143164

144165
## Version 0.2.13
166+
145167
- Release date: April 26, 2018
146168

147169
### Fixed
@@ -154,6 +176,7 @@ Special thanks to [Joel Santos](https://github.com/mundodisco8), [John](https://
154176
- Disable auto popup get started page for IoT Devkit
155177

156178
## Version 0.2.12
179+
157180
- Release date: April 8, 2018
158181

159182
### Fixed
@@ -167,6 +190,7 @@ Special thanks to [Joel Santos](https://github.com/mundodisco8), [John](https://
167190
Special thanks to [Felix Uhl](https://github.com/iFreilicht), [emontnemery](https://github.com/emontnemery), [tsalinger](https://github.com/tsalinger), [Diego Medeiros](https://github.com/Medeirox), [vphuoc](https://github.com/vphuoc), [Nuno Sousa](https://github.com/nuno407), thank you for your feedbacks.
168191

169192
## Version 0.2.11
193+
170194
- Release date: March 7, 2018
171195

172196
### Fixed
@@ -175,25 +199,29 @@ Special thanks to [Felix Uhl](https://github.com/iFreilicht), [emontnemery](http
175199
Special thanks to [GarethE](https://github.com/keyoke), thank you for your contributions and feedbacks.
176200

177201
## Version 0.2.10
202+
178203
- Release date: October 27, 2017
179204

180205
### Changed
181206
- Adopt the new VSCode Debug API [#432](https://github.com/Microsoft/vscode-arduino/pull/432), [#435](https://github.com/Microsoft/vscode-arduino/pull/435)
182207
- Popup the example view when detecting new device is connected [#431](https://github.com/Microsoft/vscode-arduino/pull/431)
183208

184209
## Version 0.2.8
210+
185211
- Release date: October 10, 2017
186212

187213
### Changed
188214
- Thanks to [Matthew Simms](https://github.com/brndmg) that fixes the regression from the usage react-select control in the [PR#421](https://github.com/Microsoft/vscode-arduino/pull/421)
189215

190216
## Version 0.2.7
217+
191218
- Release date: September 29, 2017
192219

193220
### Changed
194221
- Default baud rate from 9600 to 115200
195222

196223
## Version 0.2.6
224+
197225
- Release date: September 1, 2017
198226

199227
### Added
@@ -203,6 +231,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
203231
- Fix html/md preview issue
204232

205233
## Version 0.2.5
234+
206235
- Release date: August 24, 2017
207236

208237
### Added
@@ -220,6 +249,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
220249
- [Atalanttore](https://github.com/Microsoft/vscode-arduino/pull/381),
221250

222251
## Version 0.2.4
252+
223253
- Release date: July 3, 2017
224254

225255
### Added
@@ -230,6 +260,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
230260
- The extension is ready for opening issue on github
231261

232262
## Version 0.2.3
263+
233264
- Release date: May 27, 2017
234265

235266
### Changed
@@ -240,13 +271,15 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
240271
- Fix issue #289 #324 #327
241272

242273
## Version 0.2.2
274+
243275
- Release date: May 19, 2017
244276

245277
### Added
246278
- Support debug for a few boards: arduino zero/M0 Pro, AZ3166, Adafruit Feather M0, Adafruit WICED Feather
247279
- Support debug for stlink, jlink
248280

249281
## Version 0.1.3
282+
250283
- Release date: May 12, 2017
251284

252285
### Added
@@ -263,6 +296,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
263296

264297

265298
## Version 0.1.2
299+
266300
- Release date: April 28, 2017
267301

268302
### Added
@@ -286,9 +320,11 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
286320
- Avoid verify/upload reentry issue
287321

288322
## Version 0.1.1
323+
289324
- HotFix: Update display tag.
290325

291326
## Version 0.1.0
327+
292328
- Release date: April 14, 2017
293329
- Release status: Public Preview
294330

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
6262
| `arduino.commandPath` | Path to an executable (or script) relative to `arduino.path`. The default value is `arduino_debug.exe` for windows,`Contents/MacOS/Arduino` for Mac and `arduino` for Linux, You also can use a custom launch script to run Arduino by modifying this setting. (Requires a restart after change) Example: `run-arduino.bat` for Windows, `Contents/MacOS/run-arduino.sh` for Mac and `bin/run-arduino.sh` for Linux. |
6363
| `arduino.additionalUrls` | Additional Boards Manager URLs for 3rd party packages. You can have multiple URLs in one string with a comma(`,`) as separator, or have a string array. The default value is empty. |
6464
| `arduino.logLevel` | CLI output log level. Could be info or verbose. The default value is `"info"`. |
65+
| `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Ardiuno. Note that this will break Processing code. Default value is `false`. |
6566
| `arduino.enableUSBDetection` | Enable/disable USB detection from the VSCode Arduino extension. The default value is `true`. When your device is plugged in to your computer, it will pop up a message "`Detected board ****, Would you like to switch to this board type`". After clicking the `Yes` button, it will automatically detect which serial port (COM) is connected a USB device. If your device does not support this feature, please provide us with the PID/VID of your device; the code format is defined in `misc/usbmapping.json`.To learn more about how to list the vid/pid, use the following tools: https://github.com/EmergingTechnologyAdvisors/node-serialport `npm install -g serialport` `serialport-list -f jsonline`|
6667
| `arduino.disableTestingOpen` | Enable/disable automatic sending of a test message to the serial port for checking the open status. The default value is `false` (a test message will be sent). |
6768
| `arduino.skipHeaderProvider` | Enable/disable the extension providing completion items for headers. This functionality is included in newer versions of the C++ extension. The default value is `false`.|
@@ -74,6 +75,7 @@ The following Visual Studio Code settings are available for the Arduino extensio
7475
"arduino.path": "C:/Program Files (x86)/Arduino",
7576
"arduino.commandPath": "arduino_debug.exe",
7677
"arduino.logLevel": "info",
78+
"arduino.allowPDEFiletype": false,
7779
"arduino.enableUSBDetection": true,
7880
"arduino.disableTestingOpen": false,
7981
"arduino.skipHeaderProvider": false,

gulpfile.js

+26-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const runSequence = require('run-sequence');
99
const del = require('del');
1010

1111
const fs = require("fs");
12+
const fsp = require('fs-plus');
1213
const path = require("path");
1314
const childProcess = require("child_process");
1415

@@ -43,6 +44,23 @@ gulp.task("html-webpack", (done) => {
4344
});
4445
});
4546

47+
gulp.task("node_modules-webpack", (done) => {
48+
const config = require("./webpack.config.js");
49+
config.context = `${__dirname}`;
50+
return webpack(config, (err, stats) => {
51+
const statsJson = stats.toJson();
52+
if (err || (statsJson.errors && statsJson.errors.length)) {
53+
statsJson.errors.forEach(webpackError => {
54+
gutil.log(gutil.colors.red(`Error (webpack): ${webpackError}`));
55+
});
56+
57+
throw new gutil.PluginError('webpack', JSON.stringify(err || statsJson.errors));
58+
}
59+
gutil.log('[webpack]', stats.toString());
60+
done();
61+
});
62+
});
63+
4664
gulp.task("ts-compile", () => {
4765
const tsProject = ts.createProject("./tsconfig.json");
4866
return tsProject.src()
@@ -78,6 +96,11 @@ gulp.task("genAikey", (done) => {
7896
}
7997
});
8098

99+
gulp.task("copyVendor", (done) => {
100+
fsp.copySync('vendor', 'out/vendor');
101+
done();
102+
});
103+
81104
gulp.task("test", (done) => {
82105
function removeExtensionDependencies() {
83106
const packageJson = JSON.parse(fs.readFileSync("package.json"));
@@ -117,13 +140,14 @@ gulp.task("test", (done) => {
117140
if (code === 0) {
118141
done();
119142
} else {
143+
gutil.log("exit code: " + code);
120144
done(code);
121145
}
122146
});
123147
});
124148

125149
gulp.task("build", (done) => {
126-
return runSequence("clean", "ts-compile", "html-webpack", done);
150+
return runSequence("clean", "ts-compile", "html-webpack", "node_modules-webpack", "copyVendor", done);
127151
});
128152

129153
gulp.task("build_without_view", (done) => {
@@ -133,4 +157,4 @@ gulp.task("build_without_view", (done) => {
133157
gulp.task("watch", () => {
134158
gulp.watch(["./src/**/*", "./test/**/*", "!./src/views/**/*"], ["ts-compile"]);
135159
gulp.watch(["./src/views/**/*", "!./src/views/node_modules/**"], ["html-webpack"]);
136-
});
160+
});

0 commit comments

Comments
 (0)