Merge remote-tracking branch 'origin/master'

This commit is contained in:
Matthias L. Jugel 2016-10-12 17:54:39 +02:00
commit c2a1668d55

View File

@ -1,11 +1,11 @@
# micro:bit target for PXT # Calliope target for PXT
This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using This target allow to program a [Calliope](http://calliope.cc/) using
PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)). PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
* [Try it live](https://codethemicrobit.com) [![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit) ![](http://calliope.cc/content/1-ueber-mini/mini_board.png)
## Local server ## Local server
@ -18,8 +18,8 @@ The following commands are a 1-time setup after synching the repo on your machin
* if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/) * if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
* [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder * [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
``` ```
git clone https://github.com/microsoft/pxt-microbit git clone https://github.com/microsoft/pxt-calliope
cd pxt-microbit cd pxt-calliope
``` ```
* install the PXT command line (add ``sudo`` for Mac/Linux shells). * install the PXT command line (add ``sudo`` for Mac/Linux shells).
``` ```
@ -32,14 +32,15 @@ npm install
### Running ### Running
Run this command to open a local web server (add ``sudo`` for Mac/Linux shells) Run this command to open a local web server (add ``sudo`` for Mac/Linux shells).
``` ```
pxt serve pxt serve
``` ```
If the local server opens in the wrong browser, make sure to copy the URL containing the local token. If the local server opens in the wrong browser, make sure to copy the URL containing the local token.
Otherwise, the editor will not be able to load the projects. Otherwise, the editor will not be able to load the projects.
If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells): If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells). On Windows, you must be running
from the ``Run Yotta`` command prompt.
``` ```
pxt serve -yt pxt serve -yt
``` ```
@ -53,11 +54,6 @@ pxt update
More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost
### Building
* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project.
## Testing ## Testing
The build automatically runs the following: The build automatically runs the following:
@ -66,7 +62,6 @@ The build automatically runs the following:
* `pxt run` in `libs/lang-test*` - this will run the test in command line runner; * `pxt run` in `libs/lang-test*` - this will run the test in command line runner;
there is a number of asserts in both of these there is a number of asserts in both of these
* `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files * `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files
* run the TD->TS converter on a number of test scripts from `microbit.co.uk` and make sure the results compile
To test something on the device: To test something on the device: