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

Commit 19ce7da

Browse files
Merge pull request #317 from microsoft/dev
Official micro:bit release
2 parents 9248f2a + b71bc27 commit 19ce7da

File tree

186 files changed

+74895
-40568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+74895
-40568
lines changed

Diff for: .github/workflows/ci.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# This workflow will do a clean install of node dependencies, python dependencies, build the source code and run tests
2+
3+
name: CI
4+
5+
on:
6+
push:
7+
branches: [ dev, staging ]
8+
pull_request:
9+
branches: [ dev, staging ]
10+
11+
jobs:
12+
build-and-test:
13+
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
os: [macos-latest, windows-latest, ubuntu-18.04]
20+
node-version: [10.x]
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Install Linux dependencies
25+
if: matrix.os == 'ubuntu-18.04'
26+
run: |
27+
sudo apt-get update
28+
sudo apt-get install g++-multilib
29+
sudo apt-get install -y build-essential
30+
sudo apt-get install libudev-dev
31+
- name: Use Node.js ${{ matrix.node-version }} and install npm dependencies
32+
uses: actions/setup-node@v1
33+
with:
34+
node-version: ${{ matrix.node-version }}
35+
- run: npm install
36+
- name: Setup Python environment
37+
uses: actions/[email protected]
38+
with:
39+
python-version: 3.x
40+
- run: |
41+
python -m pip install --upgrade pip
42+
pip install -r ./src/dev-requirements.txt
43+
- name: Use npm to compile, format-check and test
44+
uses: actions/setup-node@v1
45+
with:
46+
node-version: ${{ matrix.node-version }}
47+
- run: npm run compile
48+
- run: npm run check
49+
- name: Run tests
50+
uses: GabrielBB/[email protected]
51+
with:
52+
run: npm run test

Diff for: .vscode/settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
},
66
"search.exclude": {
77
"out": true // set this to false to include "out" folder in search results
8-
},
8+
}
99
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
10-
"typescript.tsc.autoDetect": "off"
1110
}

Diff for: README.md

+220-127
Large diffs are not rendered by default.
Binary file not shown.

Diff for: assets/readmeFiles/clue/check_preview_mode.gif

476 KB
Loading

Diff for: assets/readmeFiles/clue/clue.png

105 KB
Loading

Diff for: assets/readmeFiles/clue/open_settings.PNG

182 KB
Loading

Diff for: assets/readmeFiles/cpx/cpx-deploy.png

8.65 KB
Loading

Diff for: assets/readmeFiles/cpx/cpx-img.png

93.1 KB
Loading

Diff for: assets/readmeFiles/cpx/cpx-new-file.gif

313 KB
Loading

Diff for: assets/readmeFiles/cpx/cpx-run.gif

324 KB
Loading

Diff for: assets/readmeFiles/deploy.png

4 KB
Loading

Diff for: assets/readmeFiles/getting_started.png

6.8 KB
Loading

Diff for: assets/readmeFiles/microbit/microbit-deploy.png

8.02 KB
Loading

Diff for: assets/readmeFiles/microbit/microbit-new-file.gif

221 KB
Loading

Diff for: assets/readmeFiles/microbit/microbit-run.gif

311 KB
Loading

Diff for: assets/readmeFiles/microbit/microbit.png

37.4 KB
Loading

Diff for: assets/readmeFiles/new_file.gif

367 KB
Loading

Diff for: assets/readmeFiles/run.gif

-6.89 MB
Loading

Diff for: gulpfile.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ gulp.task("clean", () => {
3535

3636
const pythonToMove = [
3737
"./src/adafruit_circuitplayground/*.*",
38-
"./src/microbit/*.*",
39-
"./src/microbit/!(test)/**/*",
38+
"./src/clue/*.*",
39+
"./src/clue/!(test)/**/*",
40+
"./src/base_circuitpython/**/*",
41+
"./src/micropython/*.*",
42+
"./src/micropython/microbit/*.*",
43+
"./src/micropython/microbit/!(test)/**/*",
4044
"./src/*.py",
4145
"./src/common/*.py",
4246
"./src/dev-requirements.txt",

Diff for: locales/en/out/constants.i18n.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"error.debuggerServerInitFailed": "Warning : The Debugger Server cannot be opened. Please try to free the port {0} if it's already in use or select another one in your Settings 'Device Simulator Express: Debugger Server Port' and start another debug session.\n You can still debug your code but you won't be able to use the Simulator.",
1515
"error.debuggingSessionInProgress": "[ERROR] A debugging session is currently in progress, please stop it before running your code. \n",
1616
"error.noDevice": "No plugged in boards detected. Please double check if your board is connected and/or properly formatted",
17-
"error.noFileToRun": "\n[ERROR] We can't find the .py file to run on simulator. Open up a new .py file, or browse through some examples\n",
17+
"error.noFileToRun": "\n[ERROR] We can't find the .py file to run. Open up a new .py file, or browse through some examples\n",
18+
"error.noFileToDeploy": "\n[ERROR] We can't find a Python file to deploy to your device.\n",
1819
"error.noFolderCreated": "In order to use the Serial Monitor, you need to open a folder and reload VS Code.",
1920
"error.noProgramFoundDebug": "Cannot find a program to debug.",
2021
"error.noPythonPath": "We found that you don't have Python 3 installed on your computer, please install the latest version, add it to your PATH and try again.",
@@ -28,6 +29,9 @@
2829
"info.installPythonDependencies": "Do you want us to try and install this extensions dependencies for you?",
2930
"error.invalidFileExtensionDebug": "The file you tried to run isn\\'t a Python file.",
3031
"info.newFile": "New to Python or the Circuit Playground Express? We are here to help!",
32+
"info.noDeviceChosenToDeployTo": "\n[INFO] No device was selected to deploy to.\n",
33+
"info.noDeviceChosenToSimulateTo": "\n[INFO] No device was selected to simulate.\n",
34+
"info.noDeviceChosenForNewFile": "\n[INFO] No device was selected to open a template file for.\n",
3135
"info.redirect": "You are being redirected.",
3236
"info.runningCode": "Running user code",
3337
"info.privacyStatement": "Privacy Statement",

Diff for: locales/en/package.i18n.json

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
{
2-
"deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
3-
"deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
4-
"deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
5-
"deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
6-
"deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
7-
"deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
8-
"deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
9-
"deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
10-
"deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
11-
"deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
12-
"deviceSimulatorExpressExtension.commands.microbit.deployToDevice": "[micro:bit] Deploy to Device",
13-
"deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
14-
"deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
15-
"deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
16-
"deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
17-
"deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
18-
"deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
19-
"deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new micro:bit simulator!"
20-
}
2+
"deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
3+
"deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
4+
"deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
5+
"deviceSimulatorExpressExtension.commands.common.gettingStarted": "Getting Started",
6+
"deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
7+
"deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
8+
"deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
9+
"deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
10+
"deviceSimulatorExpressExtension.commands.common.deployToDevice": "Deploy to Device",
11+
"deviceSimulatorExpressExtension.commands.common.openSimulator": "Open Simulator",
12+
"deviceSimulatorExpressExtension.commands.common.newFile": "New File",
13+
"deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
14+
"deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
15+
"deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
16+
"deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
17+
"deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new Adafruit CLUE simulator!"
18+
}

0 commit comments

Comments
 (0)