Merge branch 'master' into v1

This commit is contained in:
Sam El-Husseini 2018-05-31 10:07:01 -07:00
commit 42328777bc
6 changed files with 62 additions and 6 deletions

35
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
Add screenshots to help explain your problem. You can copy paste the screenshot in the github report. The .gif screen recording is very useful as well.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

View File

@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -17,10 +17,10 @@ The local server lets you to run the editor and serve the documentation from you
### Setup
This section explains how to setup your development environment for pxt-microbit, whether that be to run a copy locally or to make source changes.
Note that pxt-microbit can not be run without its main depandancy, [pxt](https://github.com/Microsoft/pxt). Below explains how to setup both.
Note that pxt-microbit can not be run without its main dependancy, [pxt](https://github.com/Microsoft/pxt). Below explains how to setup both.
The following commands perform a one-time setup after synching the repo on your machine.
* Note for any editing of the .cpp files, Yotta must be installed. Do do so, follow the instructions on [their site](http://docs.yottabuild.org/).
* Note for any editing of the `.cpp` files, Yotta must be installed. To do so, follow the instructions on [their site](http://docs.yottabuild.org/).
* Install node.js 8.9.4 or higher.
* Install requirements for [pxt](https://github.com/Microsoft/pxt). Note the v0 branch must be used for pxt-microbit (add ``sudo`` for Mac/Linux shells).
```

View File

@ -37,7 +37,6 @@ The lesson series includes:
* [Soil Moisture Tester](/courses/ucp-science/soil-moisture)
* [Gravity, Motion and Waves](/courses/ucp-science/gravity)
* [Body Electrical & Waves](/courses/ucp-science/body-electrical)
* Magnetic Forces - Coming soon...
* [Electricity - Battery Tester](/courses/ucp-science/electricity)
The [Science Experiments](https://sites.google.com/view/utahcodingproject/csta/microbit-science-experiments) lesson series is generously provided by the [Utah Coding Project](https://sites.google.com/view/utahcodingproject/home) and is developed by [Carl Lyman](mailto:utahcoding@outlook.com).

View File

@ -73,7 +73,7 @@
"cardType": "package"
}, {
"name": "Sparkfun Gamer:bit",
"url":"pkg/sparkfun/pxt-gamer-bit",
"url":"/pkg/sparkfun/pxt-gamer-bit",
"cardType": "package"
}, {
"name": "Sparkfun Moto:bit",
@ -81,7 +81,7 @@
"cardType": "package"
}, {
"name": "Sparkfun Weather:bit",
"url":"/pkg/sparkfun/pxt-moto-bit",
"url":"/pkg/sparkfun/pxt-weather-bit",
"cardType": "package"
}, {
"name": "Minode Kit",
@ -131,6 +131,10 @@
"name": "SBRICK",
"url":"/pkg/vengit/pxt-sbrick",
"cardType": "package"
}, {
"name": "Annikken Andee",
"url":"/pkg/Annikken/pxt-Andee",
"cardType": "package"
}]
```

View File

@ -26,7 +26,8 @@
"4tronix/BitBot",
"pimoroni/pxt-scrollbit",
"emwta/pxt-iBit",
"vengit/pxt-sbrick"
"vengit/pxt-sbrick",
"Annikken/pxt-Andee"
],
"preferredRepos": [