Merge branch 'dev' into users/t-anmah/sensor-integration

microsoft · Feb 12, 2020 · 3da2fd1 · 3da2fd1
2 parents df5edaf + a8cd70d
commit 3da2fd1
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 37 deletions.
diff --git a/locales/en/package.i18n.json b/locales/en/package.i18n.json
@@ -1,16 +1,17 @@
-{
-  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
-  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
-  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
-  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
-  "deviceSimulatorExpressExtension.commands.newFile": "New File",
-  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
-  "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
-}
+{
+  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
+  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.newFile": "New File",
+  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
+  "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
+  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
+}
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
         "Adafruit"
     ],
     "activationEvents": [
+        "onCommand:deviceSimulatorExpress.installDependencies",
         "onCommand:deviceSimulatorExpress.openSerialMonitor",
         "onCommand:deviceSimulatorExpress.openSimulator",
         "onCommand:deviceSimulatorExpress.runSimulator",
@@ -51,8 +52,13 @@
                 "category": "%deviceSimulatorExpressExtension.commands.label%"
             },
             {
-                "command": "deviceSimulatorExpress.openSerialMonitor",
-                "title": "%deviceSimulatorExpressExtension.commands.openSerialMonitor%",
+                "command": "deviceSimulatorExpress.closeSerialMonitor",
+                "title": "%deviceSimulatorExpressExtension.commands.closeSerialMonitor%",
+                "category": "%deviceSimulatorExpressExtension.commands.label%"
+            },
+            {
+                "command": "deviceSimulatorExpress.installDependencies",
+                "title": "%deviceSimulatorExpressExtension.commands.installDependencies%",
                 "category": "%deviceSimulatorExpressExtension.commands.label%"
             },
             {
@@ -363,4 +369,4 @@
     "extensionDependencies": [
         "ms-python.python"
     ]
-}
+}
diff --git a/package.nls.json b/package.nls.json
@@ -1,16 +1,17 @@
-{
-  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
-  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
-  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
-  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
-  "deviceSimulatorExpressExtension.commands.newFile": "New File",
-  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
-  "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
-}
+{
+  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
+  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.newFile": "New File",
+  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
+  "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
+  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
+  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
+}
diff --git a/src/constants.ts b/src/constants.ts
@@ -114,7 +114,7 @@ export const CONSTANTS = {
     INFO: {
         ARE_YOU_SURE: localize(
             "info.areYouSure",
-            "Are you sure you don't want to install the dependencies? The extension can't run without installing it"
+            "Are you sure you don't want to install the dependencies? The extension can't run without installing them."
         ),
         CLOSED_SERIAL_PORT: (port: string) => {
             return localize(

diff --git a/src/extension.ts b/src/extension.ts
@@ -355,6 +355,22 @@ export async function activate(context: vscode.ExtensionContext) {
         }
     );
 
+    const installDependencies: vscode.Disposable = vscode.commands.registerCommand(
+        "deviceSimulatorExpress.installDependencies",
+        () => {
+            const pathToLibs: string = utils.getPathToScript(
+                context,
+                CONSTANTS.FILESYSTEM.OUTPUT_DIRECTORY,
+                CONSTANTS.FILESYSTEM.PYTHON_LIBS_DIR
+            );
+            return utils.installPythonDependencies(
+                context,
+                pythonExecutableName,
+                pathToLibs
+            );
+        }
+    );
+
     const killProcessIfRunning = () => {
         if (childProcess !== undefined) {
             if (currentPanel) {
@@ -910,6 +926,7 @@ export async function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
         changeBaudRate,
         closeSerialMonitor,
+        installDependencies,
         openSerialMonitor,
         openSimulator,
         newFile,

diff --git a/src/extension_utils/utils.ts b/src/extension_utils/utils.ts
@@ -304,7 +304,7 @@ export const promptInstallPythonDependencies = (
                     pythonExecutable,
                     pathToLibs
                 );
-            } else if (selection === DialogResponses.NO) {
+            } else {
                 return vscode.window
                     .showInformationMessage(
                         CONSTANTS.INFO.ARE_YOU_SURE,