Serial Monitor Fix (#282)

locales/en/out/constants.i18n.json

@@ -2,6 +2,7 @@
   "dialogResponses.agreeAndRun": "Agree and Run",
   "dialogResponses.acceptPrivacy": "Got it",
   "dialogResponses.cancel": "Cancel",
+  "dialogResponses.select": "Select",
   "dialogResponses.dontShowAgain": "Don't Show Again",
   "dialogResponses.exampleCode": "Example Code on GitHub",
   "dialogResponses.help": "I need help",

package.json

@@ -7,7 +7,7 @@
     "instrumentationKey": "__AIKEY__",
     "icon": "assets/icon.png",
     "engines": {
-        "vscode": "^1.34.0"
+        "vscode": "^1.43.0"
     },
     "categories": [
         "Other"
@@ -353,6 +353,7 @@
         "socket.io": "^2.2.0",
         "svg-inline-react": "^3.1.0",
         "ts-jest": "^25.0.0",
+        "usb-native": "^5.0.1",
         "util": "^0.12.1",
         "vscode-extension-telemetry": "^0.1.1",
         "vscode-nls": "^4.1.0"

src/constants.ts

@@ -403,6 +403,9 @@ export namespace DialogResponses {
     export const CANCEL: MessageItem = {
         title: localize("dialogResponses.cancel", "Cancel"),
     };
+    export const SELECT: MessageItem = {
+        title: localize("dialogResponses.select", "Select"),
+    };
     export const HELP: MessageItem = {
         title: localize("dialogResponses.help", "I need help"),
     };

src/serialMonitor.ts

@@ -11,7 +11,7 @@ import { logToOutputChannel } from "./extension_utils/utils";
 import { SerialPortControl } from "./serialPortControl";
 
 export interface ISerialPortDetail {
-    comName: string;
+    path: string;
     manufacturer: string;
     vendorId: string;
     productId: string;
@@ -127,7 +127,7 @@ export class SerialMonitor implements vscode.Disposable {
                 foundPort &&
                 !(this._serialPortControl && this._serialPortControl.isActive)
             ) {
-                this.updatePortListStatus(foundPort.comName);
+                this.updatePortListStatus(foundPort.path);
             }
         } else {
             const chosen = await vscode.window.showQuickPick(
@@ -136,7 +136,7 @@ export class SerialMonitor implements vscode.Disposable {
                         (port: ISerialPortDetail): vscode.QuickPickItem => {
                             return {
                                 description: port.manufacturer,
-                                label: port.comName,
+                                label: port.path,
                             };
                         }
                     )
@@ -160,10 +160,10 @@ export class SerialMonitor implements vscode.Disposable {
         if (!this._currentPort) {
             const ans = await vscode.window.showInformationMessage(
                 CONSTANTS.WARNING.NO_SERIAL_PORT_SELECTED,
-                DialogResponses.YES,
-                DialogResponses.NO
+                DialogResponses.SELECT,
+                DialogResponses.CANCEL
             );
-            if (ans === DialogResponses.YES) {
+            if (ans === DialogResponses.SELECT) {
                 await this.selectSerialPort(null, null);
             }
             if (!this._currentPort) {

src/serialPortControl.ts

@@ -9,7 +9,7 @@ import { CONSTANTS } from "./constants";
 import { logToOutputChannel } from "./extension_utils/utils";
 
 interface ISerialPortDetail {
-    comName: string;
+    path: string;
     manufacturer: string;
     vendorId: string;
     productId: string;
@@ -18,21 +18,16 @@ interface ISerialPortDetail {
 export class SerialPortControl {
     public static get serialport(): any {
         if (!SerialPortControl._serialport) {
-            SerialPortControl._serialport = require("../vendor/node-usb-native").SerialPort;
+            SerialPortControl._serialport = require("usb-native").SerialPort;
         }
         return SerialPortControl._serialport;
     }
 
     public static list(): Promise<ISerialPortDetail[]> {
         return new Promise((resolve, reject) => {
-            SerialPortControl.serialport.list(
-                (error: any, ports: ISerialPortDetail[]) => {
-                    if (error) {
-                        reject(error);
-                    } else {
-                        resolve(ports);
-                    }
-                }
+            SerialPortControl.serialport.list().then(
+                ports => resolve(ports),
+                err => reject(err)
             );
         });
     }
@@ -53,7 +48,7 @@ export class SerialPortControl {
     }
 
     public get isActive(): boolean {
-        return this._currentSerialPort && this._currentSerialPort.isOpen();
+        return this._currentSerialPort && this._currentSerialPort.isOpen;
     }
 
     public get currentPort(): string {
@@ -66,7 +61,7 @@ export class SerialPortControl {
             CONSTANTS.INFO.OPENING_SERIAL_PORT(this._currentPort)
         );
         return new Promise((resolve, reject) => {
-            if (this._currentSerialPort && this._currentSerialPort.isOpen()) {
+            if (this._currentSerialPort && this._currentSerialPort.isOpen) {
                 this._currentSerialPort.close((err: any) => {
                     if (err) {
                         return reject(err);
@@ -89,8 +84,7 @@ export class SerialPortControl {
                 this._outputChannel.show();
                 this._currentSerialPort.on("open", () => {
                     this._currentSerialPort.write(
-                        CONSTANTS.MISC.SERIAL_MONITOR_TEST_IF_OPEN,
-                        "Both NL & CR",
+                        CONSTANTS.MISC.SERIAL_MONITOR_TEST_IF_OPEN + os.EOL,
                         (err: any) => {
                             if (
                                 err &&

src/usbDetector.ts

@@ -42,7 +42,7 @@ export class UsbDetector {
         if (os.platform() === "linux" || !enableUSBDetection) {
             return;
         }
-        this._usbDetector = require("../vendor/node-usb-native").detector;
+        this._usbDetector = require("usb-native").detector;
 
         if (!this._usbDetector) {
             return;