Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Commit c770700

Browse files
authored
Merge pull request #1001 from microsoft/update-node-usb-native
move usb-native to node-usb-native
2 parents f175e41 + 8755a36 commit c770700

File tree

9 files changed

+27
-16
lines changed

9 files changed

+27
-16
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ addons:
2121
branches:
2222
only:
2323
- master
24+
- develop
2425
- /v?[0-9]+\.[0-9]+\.[0-9]+(.*)?/
2526

2627
env:

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## Version 0.3.0
5+
6+
### Fixed
7+
8+
- Support Electron v7. Fix issue of "Unable to use serial port in VS Code Version 1.43.0". [[#980](https://github.com/microsoft/vscode-arduino/issues/980)]
9+
- Fix issue of "Fail to debug on Ubuntu". [[#933](https://github.com/microsoft/vscode-arduino/issues/933)]
10+
- Remove line ending selection. Fix the issue of "Save the last used end of line". [[#952](https://github.com/microsoft/vscode-arduino/issues/952)]
11+
- Fix the issue of "Can't install libraries from VS Code for ESP8266". [[#930](https://github.com/microsoft/vscode-arduino/issues/930)]
12+
- Fix the issue of "Project path can not be changed". [[#978](https://github.com/microsoft/vscode-arduino/issues/978)]
13+
414
## Version 0.2.29
515

616
- Release date: January 2, 2020

package-lock.json

Lines changed: 10 additions & 10 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@
580580
"glob": "^7.1.1",
581581
"iconv-lite": "^0.4.18",
582582
"impor": "^0.1.1",
583+
"node-usb-native": "^0.0.2",
583584
"properties": "^1.2.1",
584-
"usb-native": "^5.0.12",
585585
"uuid": "^3.0.1",
586586
"vscode-extension-telemetry": "0.0.18",
587587
"winreg": "^1.2.3",

src/debug/debuggerManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class DebuggerManager {
4343
}
4444
}
4545
}
46-
this._usbDetector = require("usb-native").detector;
46+
this._usbDetector = require("node-usb-native").detector;
4747
this._debugServerPath = platform.findFile(platform.getExecutableFileName("openocd"),
4848
path.join(this._arduinoSettings.packagePath, "packages"));
4949
if (!util.fileExistsSync(this._debugServerPath)) {

src/serialmonitor/serialportctrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface ISerialPortDetail {
1515
export class SerialPortCtrl {
1616
public static get serialport(): any {
1717
if (!SerialPortCtrl._serialport) {
18-
SerialPortCtrl._serialport = require("usb-native").SerialPort;
18+
SerialPortCtrl._serialport = require("node-usb-native").SerialPort;
1919
}
2020
return SerialPortCtrl._serialport;
2121
}

src/serialmonitor/usbDetector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class UsbDetector {
4545
if (os.platform() === "linux" || !enableUSBDetection) {
4646
return;
4747
}
48-
this._usbDetector = require("usb-native").detector;
48+
this._usbDetector = require("node-usb-native").detector;
4949

5050
if (!this._usbDetector) {
5151
return;

test/extension.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ suite("Arduino: Extension Tests", () => {
6868
// When running test on osx, the vscode instance is hanging there after tests finished and cause mocha timeout.
6969
// As a workaround, closing usb-detection process manually would make test window exit normally.
7070
if (os.platform() !== "linux") {
71-
const usbDector = require("usb-native").detector;
71+
const usbDector = require("node-usb-native").detector;
7272
usbDector.stopMonitoring();
7373
}
7474
});

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function getEntry() {
1212
const mod = JSON.parse(npmListRes);
1313
const unbundledModule = ['impor', 'uuid',
1414
// usb-native modules can not be bundled
15-
'usb-native', 'usb-detection', '@serialport/bindings', 'bindings', 'serialport'];
15+
'node-usb-native', 'usb-detection', '@serialport/bindings', 'bindings', 'serialport'];
1616

1717
for (const mod of unbundledModule) {
1818
const p = 'node_modules/' + mod;

0 commit comments

Comments
 (0)