From 162902fabc52b82f6723d38e9b0b81613c54405c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 13 Apr 2016 13:02:22 -0700 Subject: [PATCH 1/5] fix quiz --- docs/lessons/bop-it/quiz.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/lessons/bop-it/quiz.md b/docs/lessons/bop-it/quiz.md index 7b072e38..fc6b50c3 100644 --- a/docs/lessons/bop-it/quiz.md +++ b/docs/lessons/bop-it/quiz.md @@ -10,31 +10,29 @@ Use this activity document to guide your work in the [bop it tutorial](/lessons/ Answer the questions while completing the tutorial. Pay attention to the dialogues! -## 1. Write the code that will store the global variable named 'action' and returns a random number between 0 and 2 +### 1. Write the code that will store the global variable named 'action' and returns a random number between 0 and 2
-## 2. Write the code that will display the string, "PUSH A" if the global variable called 'action' is equal to 0 +### 2. Write the code that will display the string, "PUSH A" if the global variable called 'action' is equal to 0
-## 3. Write the code that increments the score if button A is pressed when the global variable called 'action' is equal to 1 +### 3. Write the code that increments the score if button A is pressed when the global variable called 'action' is equal to 1
-## 4. Write the code that will display the string "LOGO DOWN" if the global variable called 'action' is equal to 1 +### 4. Write the code that will display the string "LOGO DOWN" if the global variable called 'action' is equal to 1
-## 5. Write the code that increments the score if the BBC micro:bit logo is tilted down when the global variable called 'action' is equal to 1 +### 5. Write the code that increments the score if the BBC micro:bit logo is tilted down when the global variable called 'action' is equal to 1
-
- -## 6. Write the code that will display the string "SHAKE" if the global variable called 'action' is equal to 2 +### 6. Write the code that will display the string "SHAKE" if the global variable called 'action' is equal to 2
-## 7. Write the code that increments the score if the BBC micro:bit is shaken when the global variable called 'action' is equal to 2 +### 7. Write the code that increments the score if the BBC micro:bit is shaken when the global variable called 'action' is equal to 2 From eb7582bb56963045c5f41972e0eaf2662e9a650c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 13 Apr 2016 13:10:47 -0700 Subject: [PATCH 2/5] added docs logo --- docs/static/docslogo.svg | 1 + pxtarget.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 docs/static/docslogo.svg diff --git a/docs/static/docslogo.svg b/docs/static/docslogo.svg new file mode 100644 index 00000000..e2f5a912 --- /dev/null +++ b/docs/static/docslogo.svg @@ -0,0 +1 @@ +micro:bit logo \ No newline at end of file diff --git a/pxtarget.json b/pxtarget.json index 5b138e21..84fb1a95 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -71,6 +71,7 @@ "appTheme": { "logoUrl": "https://codemicrobit.com/about", "logo": "./static/logo.svg", + "docsLogo": "./static/docslogo.svg", "portraitLogo":"./static/portraitlogo.svg", "footerLogo": "./static/footerlogo.svg", "homeUrl": "https://codemicrobit.com/", From 53724c4b63ee28d6b307e88410ae8530239ff0ce Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 13 Apr 2016 13:37:30 -0700 Subject: [PATCH 3/5] updated about --- docs/about.md | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/docs/about.md b/docs/about.md index e544a76b..f5164ac4 100644 --- a/docs/about.md +++ b/docs/about.md @@ -2,6 +2,24 @@ basic.forever(() => { basic.showString("Hi!"); }) +input.onButtonPressed(Button.A, () => { + led.stopAnimation(); + basic.showLeds(` +. . . . . +. # . # . +. . . . . +# . . . # +. # # # .`); +}); +input.onButtonPressed(Button.B, () => { + led.stopAnimation(); + basic.showLeds(` +. # . # . +# . # . # +# . . . # +. # . # . +. . # . .`); +}); ``` # About @@ -32,34 +50,6 @@ which flashes the micro:bit device with the new program. Before a student compiles her code for the micro:bit, she can run it using the micro:bit simulator, all within the confines of a web browser. The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins. -```sim -input.onButtonPressed(Button.A, () => { - basic.showLeds(` -. . . . . -. # . # . -. . . . . -# . . . # -. # # # .`); -}); -input.onButtonPressed(Button.B, () => { - basic.showLeds(` -. # . # . -# . # . # -# . . . # -. # . # . -. . # . .`); -}); -input.onGesture(Gesture.Shake, () => { - basic.showLeds(` -. . . . . -. # . # . -. . . . . -. # # # . -# . . . #`); -}); -basic.showString("BBC micro:bit"); -``` - ## C++ Runtime The [C++ BBC micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, From 3d813a8716fce04d0f4c5bc4f25f58a0a942268f Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 13 Apr 2016 13:39:38 -0700 Subject: [PATCH 4/5] Bump pxt-core to 0.2.69 --- package.json | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index dba39637..7f91c181 100644 --- a/package.json +++ b/package.json @@ -1,34 +1,34 @@ { - "name": "pxt-microbit", - "version": "0.2.64", - "description": "BBC micro:bit target for PXT", - "keywords": [ - "JavaScript", - "education", - "microbit" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/Microsoft/pxt-microbit.git" - }, - "author": "", - "license": "MIT", - "homepage": "https://github.com/Microsoft/pxt-microbit#readme", - "files": [ - "README.md", - "pxtarget.json", - "built/*.js", - "built/*.json", - "built/*.d.ts", - "sim/public", - "docs/*.md", - "docs/*/*.md", - "docs/*/*/*.md" - ], - "devDependencies": { - "typescript": "^1.8.7" - }, - "dependencies": { - "pxt-core": "0.2.68" - } + "name": "pxt-microbit", + "version": "0.2.64", + "description": "BBC micro:bit target for PXT", + "keywords": [ + "JavaScript", + "education", + "microbit" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/Microsoft/pxt-microbit.git" + }, + "author": "", + "license": "MIT", + "homepage": "https://github.com/Microsoft/pxt-microbit#readme", + "files": [ + "README.md", + "pxtarget.json", + "built/*.js", + "built/*.json", + "built/*.d.ts", + "sim/public", + "docs/*.md", + "docs/*/*.md", + "docs/*/*/*.md" + ], + "devDependencies": { + "typescript": "^1.8.7" + }, + "dependencies": { + "pxt-core": "0.2.69" + } } From aaf1513793c480d1de42341ccc2377edc979a253 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 13 Apr 2016 13:39:40 -0700 Subject: [PATCH 5/5] 0.2.65 --- package.json | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 7f91c181..05b39254 100644 --- a/package.json +++ b/package.json @@ -1,34 +1,34 @@ { - "name": "pxt-microbit", - "version": "0.2.64", - "description": "BBC micro:bit target for PXT", - "keywords": [ - "JavaScript", - "education", - "microbit" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/Microsoft/pxt-microbit.git" - }, - "author": "", - "license": "MIT", - "homepage": "https://github.com/Microsoft/pxt-microbit#readme", - "files": [ - "README.md", - "pxtarget.json", - "built/*.js", - "built/*.json", - "built/*.d.ts", - "sim/public", - "docs/*.md", - "docs/*/*.md", - "docs/*/*/*.md" - ], - "devDependencies": { - "typescript": "^1.8.7" - }, - "dependencies": { - "pxt-core": "0.2.69" - } + "name": "pxt-microbit", + "version": "0.2.65", + "description": "BBC micro:bit target for PXT", + "keywords": [ + "JavaScript", + "education", + "microbit" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/Microsoft/pxt-microbit.git" + }, + "author": "", + "license": "MIT", + "homepage": "https://github.com/Microsoft/pxt-microbit#readme", + "files": [ + "README.md", + "pxtarget.json", + "built/*.js", + "built/*.json", + "built/*.d.ts", + "sim/public", + "docs/*.md", + "docs/*/*.md", + "docs/*/*/*.md" + ], + "devDependencies": { + "typescript": "^1.8.7" + }, + "dependencies": { + "pxt-core": "0.2.69" + } }