Merge branch 'master' into data-logging-doc

This commit is contained in:
Peli de Halleux
2017-10-16 10:02:39 -07:00
committed by GitHub
47 changed files with 959 additions and 154 deletions

View File

@ -1,10 +1,9 @@
# Courses
A collection of courses built for the @boardname@.
A collection of courses and tutorials built for the @boardname@.
## Courses
```codecard
[{
"name": "Intro to CS",
@ -17,15 +16,20 @@ A collection of courses built for the @boardname@.
"url":"https://microbit.org/en/2017-03-07-javascript-block-resources/",
"imageUrl": "https://microbit.org/assets/posts/2017-03-07-rock%20paper%20scissors.png"
}, {
"name": "Kitronik Inventory Kit",
"description": "11 experiments based on the Kitronik Inventor Kit",
"url": "https://www.kitronik.co.uk/blog/inventors-kit-experiment-1-help",
"imageUrl": "https://www.kitronik.co.uk/wp/wp-content/uploads/2016/10/inventors-kit-experiment-1-further-help-870.jpg"
},{
"name": "SparkFun Videos",
"description": "YouTube video tutorials produced by the SparkFun team!",
"url": "https://youtu.be/kaNtg1HGXbY?list=PLBcrWxTa5CS0mWJrytvii8aG5KUqMXvSk",
"imageUrl": "https://i.ytimg.com/vi/kaNtg1HGXbY/hqdefault.jpg"
}, {
"name": "Kitronik University",
"description": "Kits, projects and tutorials",
"url": "https://www.kitronik.co.uk/blog/bbc-microbit-kitronik-university/",
"imageUrl": "https://www.kitronik.co.uk/wp/wp-content/uploads/2015/03/2150_KIT01_banner-kitronikuniversity_002_v1.png"
}, {
"name": "Kitronik Inventory Kit",
"description": "11 experiments based on the Kitronik Inventor Kit",
"url": "https://www.kitronik.co.uk/blog/inventors-kit-experiment-1-help",
"imageUrl": "https://www.kitronik.co.uk/wp/wp-content/uploads/2016/10/inventors-kit-experiment-1-further-help-870.jpg"
},
{
"name": "micro:bit of Things",
@ -37,6 +41,4 @@ A collection of courses built for the @boardname@.
## See Also
[Intro to CS](/courses/csintro),
[Start Coding](http://microbit.org/en/2017-03-07-javascript-block-resources/),
[micro:bit of Things](https://sites.google.com/view/microbitofthings)
[Intro to CS](/courses/csintro)

View File

@ -13,13 +13,12 @@ This course takes approximately 14 weeks to complete, spending about 1 week on e
The entire course is also available as a download. Choose any of these formats:
* [**HTML** - The entire course in a single HTML page that you can print to PDF or paper.](/--docs#book:/courses/csintro/SUMMARY)
[![](/static/courses/csintro/icons/microsoft-onenote-24x24.png) **OneNote** - Intro to CS with MakeCode for micro:bit](https://1drv.ms/o/s!AqsgsTyHBmRBgQvFaUaeANNHbxpC)
[![](/static/courses/csintro/icons/adobe-pdf-file-icon-24x24.png) **PDF** - Intro to CS with MakeCode for micro:bit](https://1drv.ms/b/s!AqsgsTyHBmRBgQ1Fjzm5y5wKG75M)
[![](/static/courses/csintro/icons/apple-itunes-ibook-24x24.png) **iBooks** - Making with micro:bit](https://itunes.apple.com/us/book/making-with-micro-bit/id1255260221?mt=11)
|||
|-|-|
| [![](/static/courses/csintro/icons/html-24x24.png)](/--docs#book:/courses/csintro/SUMMARY) | [- **HTML** - The entire course in a single HTML page that you can print to PDF or paper](/--docs#book:/courses/csintro/SUMMARY) |
| [![](/static/courses/csintro/icons/microsoft-onenote-24x24.png)](https://1drv.ms/o/s!AqsgsTyHBmRBgQvFaUaeANNHbxpC) | [- **OneNote** - Intro to CS with MakeCode for micro:bit](https://1drv.ms/o/s!AqsgsTyHBmRBgQvFaUaeANNHbxpC) |
| [![](/static/courses/csintro/icons/adobe-pdf-file-icon-24x24.png)](https://1drv.ms/b/s!AqsgsTyHBmRBgQ1Fjzm5y5wKG75M) | [- **PDF** - Intro to CS with MakeCode for micro:bit](https://1drv.ms/b/s!AqsgsTyHBmRBgQ1Fjzm5y5wKG75M) |
| [![](/static/courses/csintro/icons/apple-itunes-ibook-24x24.png)](https://itunes.apple.com/us/book/making-with-micro-bit/id1255260221?mt=11) | [- **iBooks** - Making with micro:bit](https://itunes.apple.com/us/book/making-with-micro-bit/id1255260221?mt=11) |
### ~
### Lesson structure

View File

@ -1,4 +1,4 @@
`# Introduction
# Introduction
What is a micro:bit?
The micro:bit was created in 2015 in the UK by the BBC to teach computer science to students. The BBC gave away a micro:bit to every Year 7 student in the UK. You can think of a micro:bit as a mini computer.

View File

@ -30,7 +30,7 @@ by **Colleen Graves**
Inspiring Makers to Experiment, Create, and Learn
![Makerspace Projects Book Cover](/static/courses/csintro/references/makerspace-projects.jpg)
[![Makerspace Projects Book Cover](/static/courses/csintro/references/makerspace-projects.jpg)](https://colleengraves.org/bigmakerbook/)
## Code and Computational Thinking

View File

@ -30,8 +30,7 @@ Fun games to build with your @boardname@.
}, {
"name": "Rock Paper Scissors",
"url":"/projects/rock-paper-scissors",
"imageUrl":"/static/mb/projects/a4-motion.png",
"cardType": "tutorial"
"imageUrl":"/static/mb/projects/a4-motion.png"
}, {
"name": "Magic Button Trick",
"url":"/projects/magic-button-trick",

View File

@ -1,13 +1,5 @@
# Coin Flipper
## ~avatar avatar
Are you trying to choose whether to play soccer or go to the movies
instead, or which toppings to have on your pizza? Build a coin
flipping machine with the @boardname@ to choose for you!
## ~
## Step 1
Place a ``||input:on button pressed||`` block to run code

View File

@ -2,7 +2,7 @@
https://youtu.be/S8NppVT_paw
* Connect a nail to the ``GND`` pin with a croc clip and insert it in the soil
* Connect a nail to the ``3V`` pin with a croc clip and insert it in the soil
* Connect the other nail to the ``P0`` pin with a croc clip and insert it in the soil
That's it!
@ -11,4 +11,4 @@ That's it!
Code
## ~
## ~

View File

@ -21,6 +21,7 @@ input.lightLevel();
input.rotation(Rotation.Pitch);
input.magneticForce(Dimension.X);
input.runningTime();
input.runningTimeMicros();
input.setAccelerometerRange(AcceleratorRange.OneG);
```

View File

@ -8,7 +8,7 @@ input.calibrateCompass();
## Calibration
The calibration will ask you to draw a circle by tilting the
The calibration will ask you to draw a circle or fill the LED screen by tilting the
@boardname@.
If you are calibrating or using the compass near metal, it might

View File

@ -0,0 +1,17 @@
# Running Time Micros
Find how long it has been since the program started in micro-seconds.
```sig
input.runningTimeMicros();
```
## Returns
* the [Number](/types/number) of microseconds since the program started.
(One second is 1000000 microseconds.)
## See also
[show number](/reference/basic/show-number), [pause](/reference/basic/pause)

View File

@ -1,6 +1,6 @@
# Running Time
Find how long it has been since the program started.
Find how long it has been since the program started in milli-seconds.
```sig
input.runningTime();

Binary file not shown.

After

Width:  |  Height:  |  Size: 874 B