From cd0b2a646f1905b80729706789535862c9ab9368 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 19 Jun 2016 05:28:46 -0700 Subject: [PATCH] fixing various doc links --- docs/lessons/charting/quiz-answers.md | 2 +- docs/lessons/night-light/challenges.md | 2 - .../night-light/offset-image/activity.md | 94 ------------------- .../night-light/offset-image/quiz-answers.md | 48 ---------- docs/lessons/night-light/offset-image/quiz.md | 36 ------- docs/lessons/seismograph/challenge.md | 2 +- .../devices/on-signal-strength-changed.md | 3 +- docs/reference/devices/raise-alert-to.md | 2 +- docs/reference/devices/signal-strength.md | 2 +- docs/reference/devices/tell-camera-to.md | 2 +- docs/reference/devices/tell-microphone-to.md | 11 --- .../devices/tell-remote-control-to.md | 2 +- docs/reference/images/create-big-image.md | 2 +- docs/reference/images/show-image.md | 2 +- docs/reference/images/width.md | 2 +- docs/reference/types/number.md | 2 +- .../_locales/microbit-blocks-strings.json | 65 ------------- 17 files changed, 11 insertions(+), 268 deletions(-) delete mode 100644 docs/lessons/night-light/offset-image/activity.md delete mode 100644 docs/lessons/night-light/offset-image/quiz-answers.md delete mode 100644 docs/lessons/night-light/offset-image/quiz.md delete mode 100644 libs/microbit/_locales/microbit-blocks-strings.json diff --git a/docs/lessons/charting/quiz-answers.md b/docs/lessons/charting/quiz-answers.md index 684f44d3..b58dd788 100644 --- a/docs/lessons/charting/quiz-answers.md +++ b/docs/lessons/charting/quiz-answers.md @@ -7,7 +7,7 @@ Measure the acceleration on the micro:bit in the "x" direction. ## Directions -Use this activity document to guide your work in the [glowing pendulum activity](/lessons/charting/acceleration) +Use this activity document to guide your work in the [charting activity](/lessons/charting) Answer the questions while completing the tutorial. Pay attention to the dialogues! diff --git a/docs/lessons/night-light/challenges.md b/docs/lessons/night-light/challenges.md index c12fbe86..aa1d09a0 100644 --- a/docs/lessons/night-light/challenges.md +++ b/docs/lessons/night-light/challenges.md @@ -49,5 +49,3 @@ input.onButtonPressed(Button.B, () => { ### Challenge 3 Add an event handler with `on shake` to change the LED brightness back to a `255`. - -* `Run main` your script to see the LEDs change brightness. diff --git a/docs/lessons/night-light/offset-image/activity.md b/docs/lessons/night-light/offset-image/activity.md deleted file mode 100644 index 6dab515e..00000000 --- a/docs/lessons/night-light/offset-image/activity.md +++ /dev/null @@ -1,94 +0,0 @@ -# offset image challenges - -Coding challenges for the offset image tutorial. - -## Before we get started - -Complete the following exercise. Your code should look like this: - -```blocks -offset = 0 -basic.forever(() => { - if (offset == -4) { - basic.showString("Push button A", 150) - } - images.createImage(` -. . # . . -. . # . . -. . # . . -. # # # . -. . # . . -`).showImage(offset) -}) -input.onButtonPressed(Button.A, () => { - offset = offset + 1 -}) -``` - -### Challenge 1 - -Create a condition for if button `B` is pressed. We want the image to move to the left when button `B` is pressed. - -``` -offset = 0 -basic.forever(() => { - if (offset == -4) { - basic.showString("Push button A", 150) - } - images.createImage(` -. . # . . -. . # . . -. . # . . -. # # # . -. . # . . -`).showImage(offset) -}) -input.onButtonPressed(Button.A, () => { - offset = offset + 1 -}) -input.onButtonPressed(Button.B, () => { - offset = offset - 1 // *** -}) // *** -``` - -* Run the code to see if it works as expected. - -### Challenge 2 - - - -Now we want to make sure that the button does not go off the screen to the right. Add a new line that checks to see if offset = 5 after button `A` is pressed. - -If `offset = 5` then prompt the user to move the image to the left by displaying the text: "Push button B". - -``` -offset = 0 -basic.forever(() => { - if (offset == -4) { - basic.showString("Push button A", 150) - } - if (offset == 5) { - basic.showString("Press Button B", 150) // *** - } - images.createImage(` -. . # . . -. . # . . -. . # . . -. # # # . -. . # . . -`).showImage(offset) -}) -input.onButtonPressed(Button.A, () => { - offset = offset + 1 -}) -input.onButtonPressed(Button.B, () => { - offset = offset - 1 -}) -``` - -* Run the code to see if it works as expected. - -### Challenge 3 - -Now make sure the image does not go off the left side and if it does, prompt the user to push button `A`. - diff --git a/docs/lessons/night-light/offset-image/quiz-answers.md b/docs/lessons/night-light/offset-image/quiz-answers.md deleted file mode 100644 index d9b00e48..00000000 --- a/docs/lessons/night-light/offset-image/quiz-answers.md +++ /dev/null @@ -1,48 +0,0 @@ -# offset image quiz answers - -shift an image horizontally across the display with offset. - -This is the answer key for the [offset image quiz](/lessons/offset-image/quiz). - -## 1. What is a 'if, then, else statement' ? - -
- -An if-then statement will run a block of code if the condition specified is true. The statement will run the "else" block of code if that condition is false. - -## 2. Consider the message - -Write the line of code that that will create the message "Push button A" (Hint: This message appears `if` the offset is equal -4 then the BBC micro:bit will state "Push Button A"). - -
- -``` -if (offset == -4) { - basic.showString("Push Button A", 150) -} -``` - -## 3. Consider the following image - -![](/static/mb/lessons/offset-image-0.png) - -When with this image be displayed? - -
- -When the offset is NOT equal to -4 then the BBC micro:bit will show the image above. - -## 4. Consider the following image - -![](/static/mb/lessons/offset-image-1.png) - -Write the two lines of code that cause the `variable` offset to increase by one when button `A` is pressed. - -
- -``` -input.onButtonPressed(Button.A, () => { - offset = offset + 1 -}) -``` - diff --git a/docs/lessons/night-light/offset-image/quiz.md b/docs/lessons/night-light/offset-image/quiz.md deleted file mode 100644 index 690dd10c..00000000 --- a/docs/lessons/night-light/offset-image/quiz.md +++ /dev/null @@ -1,36 +0,0 @@ -# offset image quiz - -shift an image horizontally across the display with offset. - -## Name - -## Directions - -Use this activity document to guide your work in the [offset image activity](/lessons/offset-image/activity). - -Answer the questions while completing the tutorial. Pay attention to the dialogues! - -## 1. What is an 'if, then, else statement' ? - -
- -## 2. Write the line condition that if true, will display the message "Push button A". This message appears if the offset is equal -4 then the BBC micro:bit will state "Push Button A". - -
- -
- -## 3. Write the one line of code to show this image - -![](/static/mb/lessons/offset-image-0.png) - -
- -
- -## 4. Write the two lines of code that trigger the variable offset to increase by one. - -![](/static/mb/lessons/offset-image-1.png) - -
- diff --git a/docs/lessons/seismograph/challenge.md b/docs/lessons/seismograph/challenge.md index 5bc94e34..8c8134a0 100644 --- a/docs/lessons/seismograph/challenge.md +++ b/docs/lessons/seismograph/challenge.md @@ -106,7 +106,7 @@ Science: Welcome! The activity will teach you how to chart the acceleration of t ## 6. First, notice that moving the 1st micro:bit in the simulator in any direction, you will change the acceleration value of the 2nd micro:bit. Also, notice that by moving the micro:bit simulator, there is a changing acceleration value of the second micro:bit. Second, the flat colored horizontal line will start a waving line on the 2nd micro:bit to display the value of the strength as measured in milli-gravities. Finally, notice that the LED display will fluctate based on the movement of the 2nd micro:bit simulator. -![](/static/mb//lessons/seis_challenge02.png) +![](/static/mb/lessons/seis_challenge02.png) ## 7. diff --git a/docs/reference/devices/on-signal-strength-changed.md b/docs/reference/devices/on-signal-strength-changed.md index ddc6d918..99f91a32 100644 --- a/docs/reference/devices/on-signal-strength-changed.md +++ b/docs/reference/devices/on-signal-strength-changed.md @@ -30,5 +30,4 @@ devices.onSignalStrengthChanged(() => { ### See Also -[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to), [on notified](/reference/devices/on-notified), [signal strength](/reference/devices/signal-strength) - +[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to), [signal strength](/reference/devices/signal-strength) \ No newline at end of file diff --git a/docs/reference/devices/raise-alert-to.md b/docs/reference/devices/raise-alert-to.md index c467e6af..8d82fbbe 100644 --- a/docs/reference/devices/raise-alert-to.md +++ b/docs/reference/devices/raise-alert-to.md @@ -59,5 +59,5 @@ devices.raiseAlertTo("ring alarm") ### See also -[tell remote control to](/reference/devices/tell-remote-control-to), [tell camera to](/reference/devices/tell-camera-to), [on notified](/reference/devices/on-notified) +[tell remote control to](/reference/devices/tell-remote-control-to), [tell camera to](/reference/devices/tell-camera-to) diff --git a/docs/reference/devices/signal-strength.md b/docs/reference/devices/signal-strength.md index 549a2fe7..bb8a9c77 100644 --- a/docs/reference/devices/signal-strength.md +++ b/docs/reference/devices/signal-strength.md @@ -30,5 +30,5 @@ devices.onSignalStrengthChanged(() => { ### See Also -[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to), [on notified](/reference/devices/on-notified), [on signal strength changed](/reference/devices/on-signal-strength-changed) +[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to), [on signal strength changed](/reference/devices/on-signal-strength-changed) diff --git a/docs/reference/devices/tell-camera-to.md b/docs/reference/devices/tell-camera-to.md index 4ac69338..56041304 100644 --- a/docs/reference/devices/tell-camera-to.md +++ b/docs/reference/devices/tell-camera-to.md @@ -76,5 +76,5 @@ devices.tellCameraTo("stop video mode") ### See Also -[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to), [on notified](/reference/devices/on-notified) +[tell remote control to](/reference/devices/tell-remote-control-to), [raise alert to](/reference/devices/raise-alert-to) diff --git a/docs/reference/devices/tell-microphone-to.md b/docs/reference/devices/tell-microphone-to.md index b4b82ddf..52879fef 100644 --- a/docs/reference/devices/tell-microphone-to.md +++ b/docs/reference/devices/tell-microphone-to.md @@ -45,14 +45,3 @@ To tell the connected device to stop recording audio ``` devices.tellMicrophoneTo("stop capture") ``` - -### Other show functions - -* use [tell remote control to](/reference/devices/tell-remote-control-to) to control presentation of media content -* use [tell camera to](/reference/devices/tell-camera-to) to control the photo/video recording of connected devices -* use [raise alert to](/reference/devices/raise-alert-to) to control the microphone of connected devices - -### See also - -[Devices](/reference/devices) - diff --git a/docs/reference/devices/tell-remote-control-to.md b/docs/reference/devices/tell-remote-control-to.md index 25549eeb..5062310c 100644 --- a/docs/reference/devices/tell-remote-control-to.md +++ b/docs/reference/devices/tell-remote-control-to.md @@ -88,5 +88,5 @@ devices.tellRemoteControlTo("volume down") ### See also -[tell camera to](/reference/devices/tell-camera-to), [raise alert to](/reference/devices/raise-alert-to), [on notified](/reference/devices/on-notified) +[tell camera to](/reference/devices/tell-camera-to), [raise alert to](/reference/devices/raise-alert-to) diff --git a/docs/reference/images/create-big-image.md b/docs/reference/images/create-big-image.md index ca4e6416..8ac17640 100644 --- a/docs/reference/images/create-big-image.md +++ b/docs/reference/images/create-big-image.md @@ -40,7 +40,7 @@ input.onButtonPressed(Button.B, () => { ### See also -[Getting Started](/reference/getting-started), [image](/reference/images/image), +[Getting Started](/getting-started), [image](/reference/images/image), [create image](/reference/images/create-image), [show image](/reference/images/show-image), [scroll image](/reference/images/scroll-image), [show animation](/reference/basic/show-animation) diff --git a/docs/reference/images/show-image.md b/docs/reference/images/show-image.md index 3114daff..8ce2f38c 100644 --- a/docs/reference/images/show-image.md +++ b/docs/reference/images/show-image.md @@ -36,7 +36,7 @@ input.onButtonPressed(Button.B, () => { ### See also -[Getting Started](/reference/getting-started), [image](/reference/images/image), +[Getting Started](/getting-started), [image](/reference/images/image), [create image](/reference/images/create-image), [create big image](/reference/images/create-big-image), [scroll image](/reference/images/scroll-image), [show animation](/reference/basic/show-animation) diff --git a/docs/reference/images/width.md b/docs/reference/images/width.md index ed980fe3..41d1f6e0 100644 --- a/docs/reference/images/width.md +++ b/docs/reference/images/width.md @@ -56,5 +56,5 @@ for (let i = 0; i < img2.width() / 5; i++) { ### See also -[show image](/reference/images/show-image), [image](/reference/image/image), [create image](/reference/images/create-image), [scroll image](/reference/images/scroll-image), [show animation](/reference/basic/show-animation) +[show image](/reference/images/show-image), [image](/reference/images/image), [create image](/reference/images/create-image), [scroll image](/reference/images/scroll-image), [show animation](/reference/basic/show-animation) diff --git a/docs/reference/types/number.md b/docs/reference/types/number.md index 970416ae..8d7cde64 100644 --- a/docs/reference/types/number.md +++ b/docs/reference/types/number.md @@ -57,7 +57,7 @@ let brightness = led.brightness() ### Math functions -The [math library](/reference/math) includes math related functions. +The [math library](/blocks/math) includes math related functions. For example, the `absolute` function returns the returns the absolute value of input parameter `x`: ```blocks diff --git a/libs/microbit/_locales/microbit-blocks-strings.json b/libs/microbit/_locales/microbit-blocks-strings.json deleted file mode 100644 index 6e521a8a..00000000 --- a/libs/microbit/_locales/microbit-blocks-strings.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "Math.randomBoolean": "pick random true or false", - "String.fromCharCode": "text from char code %code", - "basic.clearScreen": "clear screen", - "basic.forever": "forever", - "basic.pause": "pause (ms) %pause", - "basic.showLeds": "show leds", - "basic.showNumber": "show|number %number", - "basic.showString": "show|string %text", - "control.inBackground": "run in background", - "control.reset": "reset", - "game.addScore": "change score by|%points", - "game.gameOver": "game over", - "game.score": "score", - "game.startCountdown": "start countdown|(ms) %duration", - "images.createBigImage": "create big image", - "images.createImage": "create image", - "input.acceleration": "acceleration (mg)|%NAME", - "input.buttonIsPressed": "button|%NAME|is pressed", - "input.compassHeading": "compass heading (°)", - "input.lightLevel": "light level", - "input.magneticForce": "magnetic force (µT)|%NAME", - "input.onButtonPressed": "on button|%NAME|pressed", - "input.onGesture": "on |%NAME", - "input.onPinPressed": "on pin|%NAME|pressed", - "input.pinIsPressed": "pin|%NAME|is pressed", - "input.rotation": "rotation (°)|%NAME", - "input.runningTime": "running time (ms)", - "input.setAccelerometerRange": "set accelerometer|range %range", - "input.temperature": "temperature (°C)", - "led.brightness": "brightness", - "led.plot": "plot|x %x|y %y", - "led.plotBarGraph": "plot bar graph of %value |up to %high", - "led.point": "point|x %x|y %y", - "led.setBrightness": "set brightness %value", - "led.stopAnimation": "stop animation", - "led.unplot": "unplot|x %x|y %y", - "music.beat": "%fraction|beat", - "music.changeTempoBy": "change tempo by (bpm)|%value", - "music.noteFrequency": "%note", - "music.playTone": "play|tone %note=device_note|for %duration=device_beat", - "music.rest": "rest(ms)|%duration=device_beat", - "music.ringTone": "ring tone (Hz)|%note=device_note", - "music.setTempo": "set tempo to (bpm)|%value", - "music.tempo": "tempo (bpm)", - "pins.analogReadPin": "analog read|pin %name", - "pins.analogSetPeriod": "analog set period|pin %pin|to (µs)%micros", - "pins.analogWritePin": "analog write|pin %name|to %value", - "pins.digitalReadPin": "digital read|pin %name", - "pins.digitalWritePin": "digital write|pin %name|to %value", - "pins.i2cReadNumber": "i2c read number|at address %address|of format %format=i2c_sizeof", - "pins.i2cWriteNumber": "i2c write number|at address %address|with value %value|of format %format=i2c_sizeof", - "pins.map": "map %value|from low %fromLow|from high %fromHigh|to low %toLow|to high %toHigh", - "pins.onPulsed": "on|pin %pin|pulsed %pulse", - "pins.pulseDuration": "pulse duration (µs)", - "pins.servoSetPulse": "servo set pulse|pin %value|to (µs) %micros", - "pins.servoWritePin": "servo write|pin %name|to %value", - "pins.setPull": "set pull|pin %pin|to %pull", - "serial.readLine": "serial read line", - "serial.redirect": "serial redirect to|TX %tx|RX %rx|at baud rate %rate", - "serial.writeLine": "serial|write line %text", - "serial.writeNumber": "serial|write number %value", - "serial.writeString": "serial write string %text", - "serial.writeValue": "serial|write value %name|= %value" -} \ No newline at end of file