Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit 4361a23

Browse files
authored
Updated code owners, fixed some spelling errors and improved sections of README (#168)
* Fixed some spelling errors and improved sections of README and other docs * Updated quotation marks to be consistent * Updated developers section to be more understandable * Updated code owners to include Garage coaches
1 parent 1a9ad58 commit 4361a23

File tree

9 files changed

+64
-65
lines changed

9 files changed

+64
-65
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# At least one of the code owners below will be required on each PR:
22

3-
* @markAtMicrosoft @smmatte @adclements @abmahdy @LukeSlev @iennae
3+
* @markAtMicrosoft @smmatte @adclements @abmahdy @iennae @nasadigital @isadorasophia @sagarmanchanda

README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Circuit Playground Express (CPX) projects! Test and debug your code on the devic
55
result when you plug in your actual microcontroller. Curious about the output of the device, the serial
66
monitor allows you to observe the device output.
77

8-
![CircuitPlayground Express](https://www.microsoft.com/en-us/garage/wp-content/uploads/sites/5/2019/08/cpx.jpg)
8+
<img alt='CircuitPlayground Express' src=https://raw.githubusercontent.com/microsoft/vscode-python-devicesimulator/dev/assets/readmeFiles/cpx.jpg>
99

1010
## Features
1111

@@ -29,7 +29,7 @@ monitor allows you to observe the device output.
2929
- Temperature sensor
3030
- 7 Capacitive Touch sensors
3131

32-
The simulator supports most of the sensors on CPX except **IR transmitter & Receiver**, **Sound Sensor (microphone)**, **Speaker (Play Tone)** and the **tap on Motion Sensor**.
32+
The simulator supports most of the sensors on CPX except **IR transmitter & Receiver**, **Sound Sensor (microphone)**, **Speaker (Play Tone)** and the **"tap" on Motion Sensor**.
3333
The code related to these sensors can still run on the actual CPX board and be deployed using Device Simulator Express.
3434
As we only support CPX library now, other libraries (i.e. simpleio) can’t run on the simulator. But they will work on the actual device!
3535

@@ -58,38 +58,38 @@ The following dependecies can be installed for you by the extension by clicking
5858
install by typing the following commands in a console: `pip install applicationinsights`
5959

6060
## Useful Links
61-
6261
- Tutorials and Example Code for Adafruit CPX:
63-
- Adafruit CPX library tutorial: (https://learn.adafruit.com/circuitpython-made-easy-on-circuit-playground-express/circuit-playground-express-library)
64-
- Adafruit CPX Examples on GitHub: (https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground/tree/master/examples)
65-
- Adafruit CPX Guided Tour (Intro for the Hardware) (https://learn.adafruit.com/adafruit-circuit-playground-express/guided-tour)
62+
- [Adafruit CPX library tutorial](https://learn.adafruit.com/circuitpython-made-easy-on-circuit-playground-express/circuit-playground-express-library)
63+
- [Adafruit CPX Examples on GitHub](https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground/tree/master/examples)
64+
- [Adafruit CPX Guided Tour (Intro for the Hardware)](https://learn.adafruit.com/adafruit-circuit-playground-express/guided-tour)
6665
- Format Adafruit CPX device:
67-
- Tutorial for formatting Adafruit CPX for CircuitPython (https://learn.adafruit.com/welcome-to-circuitpython/installing-circuitpython)
68-
- Download Firmware .uf2 file (https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart)
69-
- Download the latest version of the Adafruit CPX library (link: https://learn.adafruit.com/welcome-to-circuitpython/circuitpython-libraries)
66+
- [Tutorial for formatting Adafruit CPX for CircuitPython](https://learn.adafruit.com/welcome-to-circuitpython/installing-circuitpython)
67+
- [Download Firmware .uf2 file](https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart)
68+
- [Download the latest version of the Adafruit CPX library](https://learn.adafruit.com/welcome-to-circuitpython/circuitpython-libraries)
69+
- For developers:
70+
- [Steps to run the extension locally](/docs/developers-setup.md)
7071

7172
## How to use
7273

7374
To use Device Simulator Express, install the extension from the marketplace and reload VS Code.
7475

75-
### 1. Start with the New File Command.
76+
### 1. Start with the "New File" Command.
7677

77-
1. Type in Device Simulator Express: New File” in the command palette(`CTRL+SHIFT+P`to open the command palette).
78-
!["New File" animation](https://www.microsoft.com/en-us/garage/wp-content/uploads/sites/5/2019/08/newFile.gif)
79-
2. Name and save your file somewhere, and we’re good to go!(3)
80-
3. Start with some examples: you can find examples files and tutorials inside the comments,
81-
as well as in the notification pop up when you run the `“Device Simulator Express: New File”` Command.
78+
1. Type in `"Device Simulator Express: New File"` in the command palette (`CTRL+SHIFT+P` to open the command palette).
79+
<img alt='"New File" animation' src=https://raw.githubusercontent.com/microsoft/vscode-python-devicesimulator/dev/assets/readmeFiles/newFile.gif>
80+
2. Name and save your file somewhere, and we’re good to go! (3)
81+
3. Start with some examples: you can find examples files and tutorials inside the comments, as well as in the notification pop up when you run the `"Device Simulator Express: New File"` Command.
8282

83-
![How to find example code screenshot](https://www.microsoft.com/en-us/garage/wp-content/uploads/sites/5/2019/08/findExamples.jpg)
83+
<img alt='How to find example code screenshot' src=https://raw.githubusercontent.com/microsoft/vscode-python-devicesimulator/dev/assets/readmeFiles/findExamples.jpg>
8484

8585
### 2. Start from an existing python file.
8686

8787
1. Open the folder or your .py file in Visual Studio Code.
8888
2. Run `open Simulator` from the command palette or icon in the editor toolbar.
8989

90-
### 3. Run your code on the simulator .
90+
### 3. Run your code on the simulator.
9191

92-
![How to run the simulator animation](https://www.microsoft.com/en-us/garage/wp-content/uploads/sites/5/2019/08/run.gif)
92+
<img alt='How to run the simulator animation' src='https://github.com/microsoft/vscode-python-devicesimulator/blob/dev/assets/readmeFiles/run.gif?raw=true'>
9393

9494
- Run `Run Simulator` from the command palette or icon in the editor toolbar.
9595
- You can use the `Play` or `Refresh` button on the simulator webview.
@@ -100,14 +100,14 @@ Before deploying the python code to your CPX device, you need to format your dev
100100

101101
1. Download the firmware with the .uf2 file (link: https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart)
102102
2. Download the lastest version of the cpx library (link: https://learn.adafruit.com/welcome-to-circuitpython/circuitpython-libraries).
103-
**_Note:_** Make sure you name your file main.py or code.py: the device automatically runs the first file that is likely named.
103+
**_Note:_** Make sure you name your file `main.py` or `code.py`: the device automatically runs the first file that is likely named. This is the convention for CircuitPython ([source](https://learn.adafruit.com/welcome-to-circuitpython/creating-and-editing-code#naming-your-program-file-7-32)).
104104

105-
!["Deploy to Device" example](https://www.microsoft.com/en-us/garage/wp-content/uploads/sites/5/2019/08/deployToBoard.png)
105+
<img alt="Deploy to Device" src=https://raw.githubusercontent.com/microsoft/vscode-python-devicesimulator/dev/assets/readmeFiles/deployToBoard.png>
106106

107-
### 5. Use the Serial Monitor for your Adafruit CPX device(available Windows and Mac only)
107+
### 5. Use the Serial Monitor for your Adafruit CPX device (available on Windows and Mac only)
108108

109109
1. Plug in your CPX device (make sure it’s formatted properly already)
110-
2. Run the command `Device Simulator Express: Open Serial Monitor`
110+
2. Run the command `"Device Simulator Express: Open Serial Monitor"`
111111
3. Select your baud rate for the serial port
112112
4. The print() statements in your code will show in the output console
113113

@@ -129,7 +129,7 @@ or by using the toolbar.
129129

130130
Device Simulator Express provides several commands in the Command Palette (F1 or Ctrl + Shift + P/ Cmd + Shift + P for Mac OS) for working with \*.py files:
131131

132-
- `Device Simulator Express: New File`: Opens an unsaved .py file with template code, also open the simulator.
132+
- `Device Simulator Express: New File`: Opens an unsaved .py file with template code, also opens the simulator.
133133
- `Device Simulator Express: Open Simulator`: Opens the simulator in the webView
134134
- `Device Simulator Express: Run on Simulator`: Runs python code on the simulator
135135
- `Device Simulator Express: Deploy to Device`: Copies & Pastes the code.py or main.py file to CIRCUITPY drive if detected a CPX is plugged in
@@ -186,7 +186,7 @@ A `ThirdPartyNotices.txt` file is provided in the extension's source code listin
186186
- To open the output panel again after closing it go to VS Code menu: `View->Output`.
187187
- If you have pylint enabled, it might underline the import of the adafruit_circuitplayground library, but it will work correctly.
188188
- If you try to deploy to the device while it's plugged in but you still get an error saying it cannot find the board, make sure your Circuit Playground Express is formatted correctly and that its name matches `CIRCUITPY`.
189-
- If you can't get the Simulator communication working while debugging, try to open your `Settings` and check the port used under `'Device Simulator Express: Debugger Server Port'`. You can either change it (usually ports above 5000 should work) or try to free it, then start debugging again.
189+
- If you can't get the Simulator communication working while debugging, try to open your `Settings` and check the port used under `"Device Simulator Express: Debugger Server Port"`. You can either change it (usually ports above 5000 should work) or try to free it, then start debugging again.
190190
- When you are using the serial monitor, if you get some unusual error messages, unplug the device and reload the VS Code windows.
191191

192192
## License
@@ -217,6 +217,6 @@ A `ThirdPartyNotices.txt` file is provided in the extension's source code listin
217217

218218
## Notes
219219

220-
(1) Note: the easiest way to do it is to select the "Add to PATH" option directly when you install Python. Otherwise you can search how to insert it manually, but make sure that when you type _python_ in a terminal, the command is recognized and have the correct version.
221-
(2) You can chose to see to see the prompt or not by changing the extension configirations.
222-
(3) To be able to run the file from your physical device, it should either be named code.py or main.py.
220+
1. Make sure that when you type _python_ in a terminal, the command is recognized and you have the correct version. The easiest way to do it is to select the "Add to PATH" option directly when you install Python. Otherwise you can search how to insert it manually.
221+
2. You can choose to see the prompt or not by changing the extension configurations.
222+
3. To be able to run the file on your physical device, it should either be named code.py or main.py.

docs/developers-setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- **Note:** On extension activation you will be prompted a popup asking if you want the modules to be automatically installed for you, **except** `pywin32` which is needed only on Windows platform.
2020
- Playsound
2121
- Run the command in a console : `pip install playsound`
22-
- pytest
22+
- Pytest
2323
- Run the command in a console : `pip install pytest`
2424
- Pywin32
2525
- **Note:** This is only needed for Windows computers. You must install it manually with the above command!
@@ -35,7 +35,7 @@
3535

3636
* Python extension for VS Code (download from VS Code market place)
3737

38-
## Steps to Get Started Running the Extension in Debug Mode
38+
## Steps to Get Started Running the Extension Locally
3939

4040
1. Make sure you have all the dependencies installed (Node, Python, Playsound, VS Code, Python VS Code extension)
4141

@@ -47,12 +47,12 @@
4747

4848
5. Run the command : `npm run compile`
4949

50-
6. Start debugging the extension by pressing F5 or going to VS Code Debug menu and select 'Start debugging'
50+
6. Start running the extension locally by pressing F5 or going to VS Code Debug menu and select 'Start debugging'
5151

5252
## Notes on how to use it
5353

5454
- [Documentation to use the Extension](/docs/how-to-use.md)
55-
- Debugging the extension opens a new VS Code window with the extension installed
55+
- Debugging the extension opens a new VS Code window with the local build of the extension
5656
- From the original VS Code window (opened in our repository) you can see outputs in the Debug Console
5757
- In the new VS Code window, you can access the commands provided by the extension from the Commands Palette (Ctrl+Shift+P)
5858
listed as 'Device Simulator Express : ...'

docs/how-to-use.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Commands are accessible through :
44

5-
- **The command palette** (`Ctrl+shift+P` or `View->Command Palette`) and type 'Device Simulator Express : `command_name`'
5+
- **The command palette** (`Ctrl+Shift+P` or `View->Command Palette`) and type 'Device Simulator Express : `command_name`'
66
- **The extension buttons** available on the top right of the Text Editor Panel when you have a Python file open (1)
77

88
## Available commands
@@ -12,11 +12,11 @@ Commands are accessible through :
1212
- **New File** : opens an unsaved file with links to help you and a code snippet that you can save as `code.py` / `main.py`.
1313
_(**Note :** will open the simulator webview if it's not open yet)_.
1414

15-
- **Run Simulator** : run the code you have open on the simulator (make sure you've clicked on a valid code file).
15+
- **Run Simulator** : runs the code you have opened in the simulator (make sure you've clicked on a valid code file).
1616
_(**Note :** will open the simulator webview if it's not open yet)_.
1717

1818
- **Deploy to Device** : saves the code to a Circuit Playground Express.
19-
_(**Note :** the board needs to be correctly formatted to a `CIRCUITPY` drive first if it's not the case : [Installing CircuitPython](https://learn.adafruit.com/welcome-to-circuitpython/installing-circuitpython))_.
19+
_(**Note :** the board needs to be correctly formatted to a `CIRCUITPY` drive first. If that's not the case check [Installing CircuitPython](https://learn.adafruit.com/welcome-to-circuitpython/installing-circuitpython) to correctly format it)_.
2020

2121
* **Select Serial Port** : selects the serial port of the board you want the serial monitor to interact with. (2)
2222
_(**Note :** USB detection must be enabled in the extension settings.)_

docs/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _Note: You need to install all the dependencies in order to use the extension._
2323
- [Python VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
2424
- **Note:** This extension is installed automatically from the marketplace when you install our extension
2525
- Python Modules
26-
- **Note:** On extension activation you will be prompted a popup asking if you want the modules to be automatically installed for you, **except** `pywin32` which is needed only on Windows platform.
26+
- **Note:** On extension activation a popup will be prompted asking if you want the modules to be automatically installed for you, **except** `pywin32` which is needed only on Windows platform.
2727
- Playsound : `pip install playsound`
2828
- Pywin32 : `pip install pywin32`
2929
- **Note:** This is only needed for Windows computers. You must install it manually with the above command!

locales/en/out/constants.i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"info.privacyStatement": "Privacy Statement",
3636
"info.successfulInstall": "Successfully installed Python dependencies.",
3737
"info.thirdPartyWebsite": "By clicking \"Agree and Proceed\" you will be redirected to adafruit.com, a third party website not managed by Microsoft. Please note that your activity on adafruit.com is subject to Adafruit's privacy policy",
38-
"info.welcomeOutputTab": "Welcome to the Adafruit Simulator output tab !\n\n",
38+
"info.welcomeOutputTab": "Welcome to the Adafruit Simulator output tab!\n\n",
3939
"label.webviewPanel": "Device Simulator Express",
4040
"name": "Device Simulator Express",
4141

package.json

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
],
1515
"preview": true,
1616
"license": "MIT",
17-
"homepage": "https://github.com/microsoft/vscode-python-devicesimulator",
18-
"repository": {
19-
"type": "git",
20-
"url": "https://github.com/microsoft/vscode-python-devicesimulator"
21-
},
22-
"bugs": {
23-
"url": "https://github.com/microsoft/vscode-python-devicesimulator/issues"
24-
},
25-
"keywords": [
26-
"python",
27-
"CircuitPython",
28-
"Adafruit"
29-
],
30-
"activationEvents": [
31-
"onCommand:deviceSimulatorExpress.openSerialMonitor",
32-
"onCommand:deviceSimulatorExpress.openSimulator",
33-
"onCommand:deviceSimulatorExpress.runSimulator",
34-
"onCommand:deviceSimulatorExpress.newFile",
35-
"onCommand:deviceSimulatorExpress.runDevice",
36-
"onCommand:deviceSimulatorExpress.runSimulatorEditorButton",
37-
"onCommand:deviceSimulatorExpress.selectSerialPort",
38-
"onDebug"
39-
],
17+
"homepage": "https://github.com/microsoft/vscode-python-devicesimulator",
18+
"repository": {
19+
"type": "git",
20+
"url": "https://github.com/microsoft/vscode-python-devicesimulator"
21+
},
22+
"bugs": {
23+
"url": "https://github.com/microsoft/vscode-python-devicesimulator/issues"
24+
},
25+
"keywords": [
26+
"python",
27+
"CircuitPython",
28+
"Adafruit"
29+
],
30+
"activationEvents": [
31+
"onCommand:deviceSimulatorExpress.openSerialMonitor",
32+
"onCommand:deviceSimulatorExpress.openSimulator",
33+
"onCommand:deviceSimulatorExpress.runSimulator",
34+
"onCommand:deviceSimulatorExpress.newFile",
35+
"onCommand:deviceSimulatorExpress.runDevice",
36+
"onCommand:deviceSimulatorExpress.runSimulatorEditorButton",
37+
"onCommand:deviceSimulatorExpress.selectSerialPort",
38+
"onDebug"
39+
],
4040
"main": "./out/extension.js",
4141
"contributes": {
4242
"commands": [
@@ -174,13 +174,12 @@
174174
"default": true,
175175
"scope": "resource"
176176
},
177-
"pacifica.showNewFilePopup": {
177+
"deviceSimulatorExpress.showNewFilePopup": {
178178
"type": "boolean",
179179
"default": true,
180180
"scope": "resource"
181181
},
182182
"deviceSimulatorExpress.debuggerServerPort": {
183-
184183
"type": "number",
185184
"default": 5577,
186185
"description": "%deviceSimulatorExpressExtension.configuration.properties.debuggerPort%",

src/adafruit_circuitplayground/express.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def touch_A7(self):
137137

138138
def adjust_touch_threshold(self, adjustement):
139139
"""Not implemented!
140-
The Pacifica Simulator doesn't use capacitive touch threshold.
140+
The CPX Simulator doesn't use capacitive touch threshold.
141141
"""
142142
telemetry_py.send_telemetry("ADJUST_THRESHOLD")
143143
raise NotImplementedError(

src/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const localize: nls.LocalizeFunc = nls.config({
1818

1919
export const CONFIG = {
2020
SHOW_DEPENDENCY_INSTALL: "deviceSimulatorExpress.showDependencyInstall",
21-
SHOW_NEW_FILE_POPUP: "pacifica.showNewFilePopup"
21+
SHOW_NEW_FILE_POPUP: "deviceSimulatorExpress.showNewFilePopup"
2222
};
2323

2424
export const CONSTANTS = {
@@ -191,7 +191,7 @@ export const CONSTANTS = {
191191
),
192192
WELCOME_OUTPUT_TAB: localize(
193193
"info.welcomeOutputTab",
194-
"Welcome to the Adafruit Simulator output tab !\n\n"
194+
"Welcome to the Adafruit Simulator output tab!\n\n"
195195
)
196196
},
197197
LABEL: {

0 commit comments

Comments
 (0)