Update branch with dev

microsoft · Feb 19, 2020 · ffecbf6 · ffecbf6
2 parents 297dd87 + 4a7bea5
commit ffecbf6
Show file tree

Hide file tree

Showing 12 changed files with 4,151 additions and 4,286 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,25 @@
 # Device Simulator Express, a Microsoft Garage project
 
+<a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/Python-3.7%2B-blue.svg" alt="Python versions: 3.7+" /></a> <img src="https://www.repostatus.org/badges/latest/active.svg" alt="Project Status: Active – The project has reached a stable, usable state and is being actively developed." /> <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License: We are using the MIT License"></a> <a href="CONTRIBUTING.md"><img src="https://img.shields.io/badge/PRs-Welcome-brightgreen.svg" alt="We are welcoming PRS!"></a>  <img src="https://img.shields.io/badge/platform-win%20%7C%20osx-lightgrey.svg" alt="Platforms Supported: Windows, MacOSX"/>
+
+<a href="https://microsoftgarage.visualstudio.com/002806e2-ebaa-4672-9d2e-5fe5d29154ef/_boards/board/t/227906bb-31ac-4b07-8626-3d757754a616/Microsoft.RequirementCategory/"><img src="https://microsoftgarage.visualstudio.com/002806e2-ebaa-4672-9d2e-5fe5d29154ef/227906bb-31ac-4b07-8626-3d757754a616/_apis/work/boardbadge/73f82653-3da1-4a6f-bb79-c91c9eecec28" alt="Azure DevOps Board Badge" /></a>
+
 Make without limit! Device Simulator Express, a Microsoft Garage project, allows you to code in CircuitPython for your awesome
 Circuit Playground Express (CPX) projects! Test and debug your code on the device simulator and see the same
 result when you plug in your actual microcontroller. Curious about the output of the device, the serial
 monitor allows you to observe the device output.
 
 <img alt='CircuitPlayground Express' src=https://raw.githubusercontent.com/microsoft/vscode-python-devicesimulator/dev/assets/readmeFiles/cpx.jpg>
 
+## Build Status
+
+| Branch  |                                                                                                                Build Status                                                                                                                 |
+| :------ | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
+| dev     |    [![Build Status](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_apis/build/status/Adafruit/Pacifica-CI?branchName=dev)](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_build/latest?definitionId=304&branchName=dev)    |
+| staging |   [![Build Status](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_apis/build/status/Adafruit/Pacifica-CI?branchName=staging)](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_build/latest?definitionId=304&branchName=staging)    |
+| master  | [![Build Status](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_apis/build/status/Adafruit/Pacifica-CI?branchName=master)](https://microsoftgarage.visualstudio.com/Intern%20GitHub/_build/latest?definitionId=304&branchName=master) |
+
+
 ## Features
 
 - IntelliSense and syntax highlighting for CircuitPython code (only supports CPX Express library)

diff --git a/locales/en/package.i18n.json b/locales/en/package.i18n.json
@@ -1,17 +1,16 @@
 {
-  "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.commands.common.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.changeBaudRate": "[Circuit Playground Express] Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor": "[Circuit Playground Express] Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor": "[Circuit Playground Express] Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
+  "deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.cpx.selectSerialPort": "[Circuit Playground Express] Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
   "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
@@ -25,89 +25,79 @@
     "keywords": [
         "python",
         "CircuitPython",
-        "Adafruit"
+        "Adafruit",
+        "microbit",
+        "MicroPython"
     ],
     "activationEvents": [
-        "onCommand:deviceSimulatorExpress.installDependencies",
-        "onCommand:deviceSimulatorExpress.openSerialMonitor",
-        "onCommand:deviceSimulatorExpress.openSimulator",
-        "onCommand:deviceSimulatorExpress.runSimulator",
-        "onCommand:deviceSimulatorExpress.newFileCPX",
-        "onCommand:deviceSimulatorExpress.newFileMicrobit",
-        "onCommand:deviceSimulatorExpress.runDevice",
-        "onCommand:deviceSimulatorExpress.runSimulatorEditorButton",
-        "onCommand:deviceSimulatorExpress.selectSerialPort",
+        "onCommand:deviceSimulatorExpress.common.installDependencies",
+        "onCommand:deviceSimulatorExpress.common.runSimulator",
+        "onCommand:deviceSimulatorExpress.cpx.deployToDevice",
+        "onCommand:deviceSimulatorExpress.cpx.newFile",
+        "onCommand:deviceSimulatorExpress.cpx.openSerialMonitor",
+        "onCommand:deviceSimulatorExpress.cpx.openSimulator",
+        "onCommand:deviceSimulatorExpress.cpx.selectSerialPort",
+        "onCommand:deviceSimulatorExpress.microbit.newFile",
+        "onCommand:deviceSimulatorExpress.microbit.openSimulator",
         "onDebug"
     ],
     "main": "./out/extension.js",
     "contributes": {
         "commands": [
             {
-                "command": "deviceSimulatorExpress.changeBaudRate",
-                "title": "%deviceSimulatorExpressExtension.commands.changeBaudRate%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.common.installDependencies",
+                "title": "%deviceSimulatorExpressExtension.commands.common.installDependencies%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.closeSerialMonitor",
-                "title": "%deviceSimulatorExpressExtension.commands.closeSerialMonitor%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.common.runSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.common.runSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.openSerialMonitor",
-                "title": "%deviceSimulatorExpressExtension.commands.openSerialMonitor%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.changeBaudRate",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.changeBaudRate%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.installDependencies",
-                "title": "%deviceSimulatorExpressExtension.commands.installDependencies%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.closeSerialMonitor",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.openSimulator",
-                "title": "%deviceSimulatorExpressExtension.commands.openSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/open-simulator.svg",
-                    "dark": "./assets/dark-theme/open-simulator.svg"
-                }
+                "command": "deviceSimulatorExpress.cpx.deployToDevice",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.deployToDevice%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runSimulator",
-                "title": "%deviceSimulatorExpressExtension.commands.runSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.newFile",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.newFile%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                "title": "%deviceSimulatorExpressExtension.commands.runSimulator%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/run-on-simulator.svg",
-                    "dark": "./assets/dark-theme/run-on-simulator.svg"
-                }
+                "command": "deviceSimulatorExpress.cpx.openSerialMonitor",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.newFileCPX",
-                "title": "%deviceSimulatorExpressExtension.commands.newFileCPX%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.openSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.openSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.newFileMicrobit",
-                "title": "%deviceSimulatorExpressExtension.commands.newFileMicrobit%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.cpx.selectSerialPort",
+                "title": "%deviceSimulatorExpressExtension.commands.cpx.selectSerialPort%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.runDevice",
-                "title": "%deviceSimulatorExpressExtension.commands.runDevice%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%",
-                "icon": {
-                    "light": "./assets/light-theme/save-to-board.svg",
-                    "dark": "./assets/dark-theme/save-to-board.svg"
-                }
+                "command": "deviceSimulatorExpress.microbit.openSimulator",
+                "title": "%deviceSimulatorExpressExtension.commands.microbit.openSimulator%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             },
             {
-                "command": "deviceSimulatorExpress.selectSerialPort",
-                "title": "%deviceSimulatorExpressExtension.commands.selectSerialPort%",
-                "category": "%deviceSimulatorExpressExtension.commands.label%"
+                "command": "deviceSimulatorExpress.microbit.newFile",
+                "title": "%deviceSimulatorExpressExtension.commands.microbit.newFile%",
+                "category": "%deviceSimulatorExpressExtension.commands.common.label%"
             }
         ],
         "colors": [
@@ -130,31 +120,6 @@
                 }
             }
         ],
-        "menus": {
-            "commandPalette": [
-                {
-                    "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                    "when": "false"
-                }
-            ],
-            "editor/title": [
-                {
-                    "when": "editorLangId==python  && config.deviceSimulatorExpress.showOpenIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.openSimulator",
-                    "group": "navigation@1"
-                },
-                {
-                    "when": "editorLangId==python && config.deviceSimulatorExpress.showSimulatorIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.runSimulatorEditorButton",
-                    "group": "navigation@2"
-                },
-                {
-                    "when": "editorLangId==python && config.deviceSimulatorExpress.showDeviceIconInEditorTitleMenu",
-                    "command": "deviceSimulatorExpress.runDevice",
-                    "group": "navigation@3"
-                }
-            ]
-        },
         "configuration": {
             "type": "object",
             "title": "%deviceSimulatorExpressExtension.configuration.title%",
@@ -163,24 +128,6 @@
                     "type": "boolean",
                     "default": true
                 },
-                "deviceSimulatorExpress.showOpenIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.open%",
-                    "scope": "resource"
-                },
-                "deviceSimulatorExpress.showSimulatorIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.simulator%",
-                    "scope": "resource"
-                },
-                "deviceSimulatorExpress.showDeviceIconInEditorTitleMenu": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "%deviceSimulatorExpressExtension.configuration.properties.device%",
-                    "scope": "resource"
-                },
                 "deviceSimulatorExpress.showDependencyInstall": {
                     "type": "boolean",
                     "default": true,

diff --git a/package.nls.json b/package.nls.json
@@ -1,19 +1,16 @@
 {
-  "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.newFileCPX": "New Circuit Playground Express File",
-  "deviceSimulatorExpressExtension.commands.newFileMicrobit": "New micro:bit File",
-  "deviceSimulatorExpressExtension.commands.newFile": "New File",
-  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.changeBaudRate": "[Circuit Playground Express] Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor": "[Circuit Playground Express] Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor": "[Circuit Playground Express] Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
+  "deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.cpx.selectSerialPort": "[Circuit Playground Express] Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
   "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."
 }