pxt-microbit 5.1.1 → 5.1.3

package/docs/SUMMARY.md

@@ -295,6 +295,8 @@
         * [on data received](/reference/serial/on-data-received)
         * [redirect](/reference/serial/redirect)
         * [redirect to usb](/reference/serial/redirect-to-usb)
+        * [set baud rate](/reference/serial/set-baud-rate)
+        * [set write line padding](/reference/serial/set-write-line-padding)
         * [write buffer](/reference/serial/write-buffer)
         * [read buffer](/reference/serial/read-buffer)
     * [Control](/reference/control)

package/docs/device/pins.md

@@ -1,64 +1,96 @@
 # micro:bit pins
 
-The micro:bit pins 
+The micro:bit has **25** external connections on the edge connector of the board, which are referred to as 'pins'. The edge connector is the gold area on the right side of board as shown the figure below.
 
-![](/static/mb/device/pins-0.png)
+![micro:bit v1 pins](/static/mb/device/pins-v1-v2.png)
 
-The micro:bit has 25 external connections on the edge connector of the board, which we refer to as ‘pins’.  The edge connector is the grey area on the right side of the figure above.
-
-There are five large pins, that are also connected to holes in the board labelled: 0, 1, 2, 3V, and GND. And along the same edge, there are 20 small pins that you can use when plugging the micro:bit into an edge connector.
+There are **5 large pins** that are also connected to holes in the board labelled: **0**, **1**, **2**, **3V**, and **GND**. And along the same edge, there are **20 small pins** that you can use when plugging the micro:bit into an edge connector.
 
 ## Large pins
 
-You can easily attach crocodile clips or 4mm banana plugs to the five large pins.
+You can easily attach crocodile clips or 4mm banana plugs to the **5** large pins.
 
-The first three, labelled 0, 1 and 2 are flexible and can be used for many different things - which means they are often called ‘general purpose input and output’ (shortened to GPIO). These three pins also have the ability to read analogue voltages using something called an analogue-to-digital converter (ADC). They all have the same function:
+The first three, labelled **0**, **1** and **2** are flexible and can be used for many different things - which means they are often called "general purpose input and output" (shortened to GPIO). These three pins also have the ability to read analog voltages using something called an analog-to-digital converter (ADC). They all have the same function:
 
-* **0**: GPIO (general purpose digital input and output) with analogue to digital convertor (ADC).
+* **0**: GPIO (general purpose digital input and output) with analog-to-digital convertor (ADC).
 * **1**: GPIO with ADC
 * **2**: GPIO with ADC
 
-The other two large pins (3V and GND) are very different!
+With the micro:bit V2, pins **0**, **1**, **2**, and the **LOGO** can also be set to work as [capacitive touch](/reference/pins/touch-set-mode) buttons.
+
+### Power pins
+
+The other two large pins (**3V** and **GND**) are very different!
 
-## ~hint 
+### ~hint 
 
-Watch out! The pins labelled 3V and GND relate to the power supply of the board, and they should NEVER be connected together.
-For details on the power, current and voltage limitations of the board, see [Power Supply](https://tech.microbit.org/hardware/powersupply/)
+#### Be careful with the power pins
 
-## ~
+Watch out! The pins labelled **3V** and **GND** relate to the power supply of the board, and they should NEVER be connected together.
 
-*power input*: If the micro:bit is powered by USB or a battery, then you can use the 3V pin as a *power output* to power peripherals with.
+For details on the power, current and voltage limitations of the board, see [Power Supply](https://tech.microbit.org/hardware/powersupply/).
 
-* **3V**: *3 volt power output* or *power input*.  (1) *power output*: If the micro:bit is powered by USB or a battery, then you can use the 3V pin as a power output to power peripherals with; (2) *power input*: If the micro:bit is not being powered by USB or battery, you can use the 3V pin as a power input to power the micro:bit
-* **GND**: attaches to ground in order to complete a circuit (required when using the 3V pin)
+### ~
 
-If you hold the ‘GND’ pin with one hand, you can program the microbit to detect yourself touching the 0,1 or 2 pins with your other hand, giving you three more buttons to experiment with (you just used your body to complete an electrical circuit).
+
+* **3V**: 3 volt *power output* or *power input*:
+>* *power output*: If the micro:bit is powered by USB or a battery, then you can use the **3V** pin as a power output to power peripherals with.
+>* *power input*: If the micro:bit is NOT being powered by USB or battery, you can use the **3V** pin to supply power input to the micro:bit.
+* **GND**: attaches to ground in order to complete a circuit (required when using the **3V** pin)
+
+If you hold the **GND** pin with one hand, you can program the microbit to detect yourself touching the **0**, **1** or **2** pins with your other hand, giving you three more buttons to experiment with (you just used your body to complete an electrical circuit to make "resistive touch" buttons).
 
 ## Small pins
 
-There are 20 small pins numbered sequentially from 3-22 (these pins are not labeled on the micro:bit, however, they are labelled in the picture above).
-
-Unlike the three large pins that are dedicated to being used for external connections, some of the small pins are shared with other components on the micro:bit board. For example, pin 3 is shared with some of the LEDs on the screen of the micro:bit, so if you are using the screen to scroll messages, you can’t use this pin as well.
-
-* **pin 3**: GPIO shared with LED Col 1 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off.
-* **pin 4**: GPIO shared with LED Col 2 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off.
-* **pin 5**: GPIO shared with Button A. This lets you trigger or detect a button "A" click externally. This pin has a pull-up resistor, which means that by default it is at voltage of 3V. To replace button A on the micro:bit with an external button, connect one end of the external button to pin 5 and the other end to GND. When the button is pressed, the voltage on pin 5 is pulled down to 0, which generates a button click event.
-* **pin 6**: GPIO shared with LED Col 9 of the LED screen;  can be used for digital I/O when the LED screen is turned off.
-* **pin 7**: GPIO shared with LED Col 8 of the LED screen; can be used for digital I/O when the LED screen is turned off.
-* **pin 8**: Dedicated GPIO, for sending and sensing digital signals.
-* **pin 9**: GPIO shared with LED Col 7 of the LED screen;  can be used for digital I/O when the LED screen is turned off.
-* **pin 10**: GPIO shared with LED Col 3 of the LED screen;  can be used for ADC and digital I/O when the LED screen is turned off.
-* **pin 11**: GPIO shared with Button B. This lets you trigger or detect a button “B” click externally.
-* **pin 12**: this GPIO pin has been reserved to provide support for accessibility.
-* **pin 13**: GPIO that is conventionally used for the serial clock (SCK) signal of the 3-wire Serial Peripheral Interface (SPI) bus.
-* **pin 14**: GPIO that is conventionally used for the Master In Slave Out (MISO) signal of the SPI bus.
-* **pin 15**: GPIO that is conventionally used for the Master Out Slave In (MOSI) signal of the SPI bus.
-* **pin 16**: Dedicated GPIO (conventionally also used for SPI ‘Chip Select’ function).
-* **pins 17 and 18**: these pins are wired to the 3V supply, like the large ‘3V’ pad.
-* **pins 19 and 20**: implement the clock signal (SCL) and data line (SDA) of the I2C bus communication protocol. With I2C, several devices can be connected on the same bus and send/read messages to and from the CPU. Internally, the accelerometer and the compass are connected to i2c.
-* **pins 21 and 22**: these pins are wired to the GND pin and serve no other function
+The **20** small pins are numbered sequentially from **3-22** (these pins are not labeled on the micro:bit, however, they are labelled in the picture above).
+
+Unlike the three large pins that are dedicated to being used for external connections, some of the small pins are shared with other components on the micro:bit board. For example, pin **3** is shared with some of the LEDs on the screen of the micro:bit, so if you are using the screen to scroll messages, you can’t use this pin as well.
+
+There are some differences in function assignments for the small pins between the micro:bit versions. The following pin tables describe the pin functions for each version.
+
+### V1 pin map
+
+| Pin | Description |
+| - | - |
+| **3**  | GPIO shared with LED Col 1 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off. |
+| **4** | GPIO shared with LED Col 2 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off. |
+| **5** | GPIO shared with Button A. This lets you trigger or detect a button "A" click externally. This pin has a pull-up resistor, which means that by default it is at voltage of 3V. To replace button A on the micro:bit with an external button, connect one end of the external button to pin 5 and the other end to GND. When the button is pressed, the voltage on pin 5 is pulled down to 0, which generates a button click event. |
+| **6** | GPIO shared with LED Col 9 of the LED screen;  can be used for digital I/O when the LED screen is turned off. |
+| **7** | GPIO shared with LED Col 8 of the LED screen; can be used for digital I/O when the LED screen is turned off. |
+| **8** | Dedicated GPIO, for sending and sensing digital signals.
+| **9** | GPIO shared with LED Col 7 of the LED screen;  can be used for digital I/O when the LED screen is turned off. |
+| **10** | GPIO shared with LED Col 3 of the LED screen;  can be used for ADC and digital I/O when the LED screen is turned off.|
+| **11** | GPIO shared with Button B. This lets you trigger or detect a button "B" click externally. |
+| **12** | This GPIO pin has been reserved to provide support for accessibility. |
+| **13** | GPIO that is conventionally used for the serial clock (SCK) signal of the 3-wire Serial Peripheral Interface (SPI) bus. |
+| **14** | GPIO that is conventionally used for the Master In Slave Out (MISO) signal of the SPI bus. |
+| **15** | GPIO that is conventionally used for the Master Out Slave In (MOSI) signal of the SPI bus. |
+| **16** | Dedicated GPIO (conventionally also used for SPI 'Chip Select' function). |
+| **17, 18** | These pins are wired to the 3V supply, like the large '3V' pad. |
+| **19, 20** | Implement the clock signal (SCL) and data line (SDA) of the I2C bus communication protocol. With I2C, several devices can be connected on the same bus and send/read messages to and from the CPU. Internally, the accelerometer and the compass are connected to i2c. |
+| **21, 22** | These pins are wired to the GND pin and serve no other function. |
+
+### V2 pin map
+
+| Pin  | Description |
+| - | - |
+| **3** | GPIO shared with LED Col 3 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off. |
+| **4** | GPIO shared with LED Col 1 of the LED screen; can be used for ADC and digital I/O when the LED screen is turned off. |
+| **5** | GPIO shared with Button A. This lets you trigger or detect a button "A" click externally. This pin has a pull-up resistor, which means that by default it is at voltage of 3V. To replace button A on the micro:bit with an external button, connect one end of the external button to pin 5 and the other end to GND. When the button is pressed, the voltage on pin 5 is pulled down to 0, which generates a button click event. |
+| **6** | GPIO shared with LED Col 2 of the LED screen; can be used for digital I/O when the LED screen is turned off. |
+| **7** | GPIO shared with LED Col 4 of the LED screen; can be used for digital I/O when the LED screen is turned off. |
+| **8, 9** | Dedicated GPIO, for sending and sensing digital signals; can also be configured for NFC. |
+| **10** | GPIO shared with LED Col 5 of the LED screen;  can be used for ADC and digital I/O when the LED screen is turned off.|
+| **11** | GPIO shared with Button B. This lets you trigger or detect a button "B" click externally. |
+| **12** | This GPIO pin has been reserved to provide support for accessibility. |
+| **13** | GPIO that is conventionally used for the serial clock (SCK) signal of the 3-wire Serial Peripheral Interface (SPI) bus. |
+| **14** | GPIO that is conventionally used for the Master In Slave Out (MISO) signal of the SPI bus. |
+| **15** | GPIO that is conventionally used for the Master Out Slave In (MOSI) signal of the SPI bus. |
+| **16** | Dedicated GPIO (conventionally also used for SPI 'Chip Select' function). |
+| **17, 18** | These pins are wired to the 3V supply, like the large '3V' pad. |
+| **19, 20** | Implement the clock signal (SCL) and data line (SDA) of the I2C bus communication protocol. With I2C, several devices can be connected on the same bus and send/read messages to and from the CPU. Internally, the accelerometer and the compass are connected to i2c. |
+| **21, 22** | These pins are wired to the GND pin and serve no other function. |
 
 ## Connecting to the small pins
 
-It is recommended that an edge connector be acquired to connect to the small pins. More information on compatible edge connectors will be available later.
-
+It is recommended that an edge connector designed for the micro:bit be used for connections to the small pins. For available edge connectors, put "edge eonnectors for the micro:bit" into your internet search engine to find an accessory supplier.

package/docs/device/v2.md

@@ -58,7 +58,7 @@ The first thing to know is whether you have a micro:bit v1 or micro:bit v2 at ha
 ![micro:bit v1 and micro:bit v2 front side by side](/static/v2/front.jpg)
 
 * red power LED next to the USB connect
-* large black microphone component centrally located in the back and rotated by 45 degrees
+* large black speaker component centrally located in the back and rotated by 45 degrees
 * slanted radio antenna
 
 ![micro:bit v1 and micro:bit v2 back side by side](/static/v2/back.jpg)

package/docs/extensions.md

@@ -303,6 +303,10 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
     "name": "HTS221 Humidity and temperature",
     "url": "/pkg/makecode-extensions/HTS221",
     "cardType": "package"
+}, {
+    "name": "gator:UV UV Light sensor",
+    "url":"/pkg/sparkfun/pxt-gator-UV",
+    "cardType": "package"
 }]
 ```
 
@@ -310,6 +314,10 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
 
 ```codecard
 [{
+  "name": "DFRobot IoT Cloud Kit",
+  "url":"/pkg/DFRobot/pxt-DFRobot_IoT_Cloud_Kit",
+  "cardType": "package"
+}, {
   "name": "iClass IoT",
   "url":"/pkg/KelieLeung/pxt-iClassIoT",
   "cardType": "package"
@@ -411,6 +419,10 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
   "name": "Minode Kit",
   "url":"/pkg/minodekit/pxt-minode",
   "cardType": "package"
+}, {
+  "name": "DFRobot Boson Kit",
+  "url":"/pkg/dfrobot/pxt-dfrobot_bosonkit",
+  "cardType": "package"
 }]
 ```
 
@@ -481,6 +493,14 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
 
 ```codecard
 [{
+  "name": "MAKE&LEARN Didacbot",
+  "url":"/pkg/MakeAndLearn/pxt-didacbot",
+  "cardType": "package"
+}, {
+  "name": "Resolute Apprentice Car",
+  "url":"/pkg/resolute-support/pxt-apprentice_Car",
+  "cardType": "package"
+}, {
   "name": "Elecfreaks XGO",
   "url":"/pkg/elecfreaks/pxt-xgo",
   "cardType": "package"
@@ -632,6 +652,10 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
   "name": "ReroKit rero:micro",
   "url":"/pkg/ReRoKit/pxt-reromicro",
   "cardType": "package"
+}, {
+  "name": "PLEN bit full",
+  "url":"/pkg/plenprojectcompany/pxt-PLENbit_full",
+  "cardType": "package"
 }, {
   "name": "PLEN bit",
   "url":"/pkg/plenprojectcompany/pxt-PLENbit",
@@ -735,6 +759,14 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
 
 ```codecard
 [{
+    "name": "Joy IT RFID Module MFRC-522",
+    "url": "/pkg/joy-it/pxt-rfid-mfrc522",
+    "cardType": "package"
+}, {
+  "name": "Joy-IT ADS1115",
+  "url":"/pkg/joy-it/pxt-ads1115",
+    "cardType": "package"
+}, {
   "name": "DFRobot Environment Science Board ",
   "url":"/pkg/DFRobot/pxt-DFRobot_Environment_Science",
   "cardType": "package"
@@ -864,6 +896,14 @@ Check out [the accessories pages on microbit.org](https://microbit.org/buy/acces
 ## Utilities
 ```codecard
 [{
+  "name": "Button clicks",
+  "url": "/pkg/bsiever/microbit-pxt-clicks",
+  "cardType": "package"
+}, {
+  "name": "Rotate Display",
+  "url":"/pkg/bsiever/microbit-pxt-rotate",
+  "cardType": "package"
+}, {
   "name": "Bluetooth HID",
   "url":"/pkg/bsiever/microbit-pxt-blehid",
   "cardType": "package"

package/docs/jacdac.md

@@ -0,0 +1,60 @@
+# Jacdac
+
+Connect and Code. Instantly.
+
+## Getting started
+
+[Jacdac](https://aka.ms/jacdac) is a plug-and-play hardware accessory system that provides simulation and physical device twin in MakeCode.
+
+```codecard
+[{
+  "name": "Getting started",
+  "description": "Connect and Code. Instantly in MakeCode.",
+  "url":"https://microsoft.github.io/jacdac-docs/clients/makecode/",
+  "imageUrl": "/static/jacdac/getting-started.jpg"
+}]
+```
+
+## Projects
+
+```codecard
+[
+    {
+        "name": "Button smasher",
+        "description": "How many times can you smash the button in 10 seconds?",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/button-smasher/",
+        "imageUrl": "/static/jacdac/button-smasher.jpg",
+        "youTubeId": "rlK_8oqMAmo"
+    },
+    {
+        "name": "Slider Sound Bender",
+        "description": "Create twisted sounds using a slider module.",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/",
+        "imageUrl": "/static/jacdac/slider-sound-bender.jpg"
+    },
+    {
+        "name": "Light Sound Bender",
+        "description": "Create twisted sounds using light levels",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/",
+        "imageUrl": "/static/jacdac/light-sound-bender.jpg"
+    },
+    {
+        "name": "Rotary Sound Bender",
+        "description": "Create twisted sounds using a rotary encoder module.",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/",
+        "imageUrl": "/static/jacdac/rotary-sound-bender.jpg"
+    },
+    {
+        "name": "Sound LED",
+        "description": "Show the sound level on a LED ring",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/sound-led/",
+        "imageUrl": "/static/jacdac/sound-led.jpg"
+    },
+    {
+        "name": "Magnetic Sound Bender",
+        "description": "Create twisted sounds using a magnet",
+        "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/",
+        "imageUrl": "/static/jacdac/magnetic-sound-bender.jpg"
+    }
+]
+```

package/docs/microcode.md

@@ -0,0 +1,27 @@
+# MicroCode
+
+[MicroCode](https://aka.ms/m9) is an experimental tile-based language and editor for young coders and coders with disabilities on the BBC micro:bit V2 (V1 not supported), inspired by Kodu Game Lab.
+
+## Getting started
+
+```codecard
+[{
+        "name": "Getting Started",
+        "description": "MicroCode is an experimental tile-based language and editor for young coders and coders with disabilities on the BBC micro:bit V2 (V1 not supported), inspired by Kodu Game Lab.",
+        "url":"https://microsoft.github.io/microcode",
+        "imageUrl": "/static/microcode/home.png"
+    },
+    {
+        "name": "User Guide",
+        "description": "Learn how to use MicroCode editor and language.",
+        "url": "https://microsoft.github.io/microcode/docs/manual",
+        "imageUrl": "/static/microcode/userguide.png"
+    },
+    {
+        "name": "Samples",
+        "description": "Annotated MicroCode programs with screen animations, sounds, radio messages and more.",
+        "url": "https://microsoft.github.io/microcode/docs/samples",
+        "imageUrl": "/static/microcode/samples.png"
+    }
+]
+```

package/docs/projects/SUMMARY.md

@@ -13,6 +13,7 @@
   * [Morse Chat](/projects/v2-morse-chat)
   * [Clap Lights](/projects/v2-clap-lights)
   * [Blow Away](/projects/v2-blow-away)
+  * [Cat Napping](/projects/v2-cat-napping)
 * [Live Coding](/live-coding)
   * [Flashing Heart](https://youtu.be/NvEOKZ8wh9s)
   * [Name Tag](https://youtu.be/xpRI5jjQ31E)
@@ -49,6 +50,7 @@
   * [PlayList](https://www.youtube.com/playlist?list=PLMMBk9hE-SepocOwueEtTDyOPI_TBE9yC)
 * [Games](/projects/games)
   * [Rock Paper Scissors](/projects/rock-paper-scissors)
+  * [Rock Paper Scissors V2](/projects/rock-paper-scissors-v2)
   * [Coin Flipper](/projects/coin-flipper)
   * [7 seconds](/projects/7-seconds)
   * [Hot Potato](/projects/hot-potato)
@@ -83,6 +85,8 @@
   * [Hack Your Headphones](/projects/hack-your-headphones)
   * [Banana Keyboard](/projects/banana-keyboard)
   * [Guitar](/projects/guitar)
+  * [Jonny's Bird](/projects/jonnys-bird)
+  * [Electric Guitar](/projects/electric-guitar)
 * [Toys](/projects/toys)
   * [Inchworm](/projects/inchworm)
   * [Milk Carton Robot](/projects/milk-carton-robot)
@@ -138,6 +142,18 @@
   * [Kitronik Inventor Kit](https://www.kitronik.co.uk/blog/inventors-kit-experiment-1-help)
   * [micro:bit of Things](https://sites.google.com/view/microbitofthings)
   * [A-Z Robotics](https://tinkerspark.teachable.com/)
+* [Jacdac](/jacdac)
+  * [Getting started](https://microsoft.github.io/jacdac-docs/clients/makecode/)
+  * [Button smasher](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/button-smasher/)
+  * [Slider Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/)
+  * [Light Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/)
+  * [Rotary Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/)
+  * [Sound LED](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/sound-led/)
+  * [Magnetic Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/)
+* [MicroCode for the new micro:bit (V2)](/microcode)
+  * [Getting Started](https://microsoft.github.io/microcode)
+  * [User Guide](https://microsoft.github.io/microcode/docs/manual)
+  * [Samples](https://microsoft.github.io/microcode/docs/samples)
 * [Behind the MakeCode Hardware](/behind-the-makecode-hardware)
   * [LEDs](https://youtu.be/qqBmvHD5bCw)
   * [Buttons](https://youtu.be/t_Qujjd_38o)

package/docs/projects/electric-guitar/code.md

@@ -0,0 +1,42 @@
+# Code
+
+Let's add code so that whenever we press or touch the foil chords it will produce sound.
+
+From the [Make](/projects/electric-guitar/make.md) project, we know that whenever user touches the chords, sound will be produced and diffrent chords will produce diffrent sounds.
+
+## Code your electric guitar
+
+Download this code to your micro:bit. It creates the tones that play when you press the foil strips on the guitar.
+
+```blocks
+input.onButtonPressed(Button.A, function () {
+    F = F / 2
+    A = A / 2
+    C = C / 2
+    E = E / 2
+})
+input.onPinPressed(TouchPin.P2, function () {
+    music.playTone(988, music.beat(BeatFraction.Whole))
+    music.playTone(165, music.beat(BeatFraction.Whole))
+    music.playTone(932, music.beat(BeatFraction.Whole))
+})
+input.onButtonPressed(Button.B, function () {
+    F = F * 2
+    A = A * 2
+    C = C * 2
+    E = E * 2
+})
+input.onPinPressed(TouchPin.P1, function () {
+    music.playTone(F, music.beat(BeatFraction.Half))
+    music.playTone(A, music.beat(BeatFraction.Half))
+    music.playTone(C, music.beat(BeatFraction.Half))
+})
+let E = 0
+let C = 0
+let A = 0
+let F = 0
+F = 349
+A = 440
+C = 523
+E = 659
+```

package/docs/projects/electric-guitar/make.md

@@ -0,0 +1,40 @@
+# Make
+
+A guitar is a plucked stringed musical instrument. Normally, the guitar is an expensive instrument, but here we create a cheap and convenient DIY instrument that can help you enjoy and play real chords on an electric micro:bit guitar. Have fun and enjoy playing the micro:bit guitar by shifting the pitch up and down octaves.
+
+## How it Works?
+
+When you touch pin **1** or pin **2** and **GND** it will play a broken chord, but now you can move the chord down an octave (lowering its pitch) by pressing button **A** and move it up an octave (raising its pitch) by pressing button **B**.
+
+The pitch (frequency) of a note doubles when you move up one octave: `middle A` has a frequency of 440Hz (440 vibrations per second), `high A` has a frequency of 880Hz. This is why making the vibrating part of guitar strings different lengths with your fingers changes the pitch of the note being played.
+
+## Materials you need
+
+* micro:bit and optional battery pack
+* 4 crocodile clip leads
+* cardboard, scissors, glue, tin foil
+* headphones, buzzer, or powered speaker
+
+## How to build and play your electric guitar
+
+Watch this video to see how to make your electric guitar and play it:
+
+https://youtu.be/Yocsl_80YsY
+
+You can connect the electric guitar to some headphones with some crocodile clips you attach to the phone jack.
+
+![Output connections for sound](/static/mb/projects/electric-guitar/connections.jpg)
+
+Here are two pictures of the finished electric guitar with its connections:
+
+![Electric guitar project 1](/static/mb/projects/electric-guitar/guitar-board1.jpg)
+
+![Electric guitar project 2](/static/mb/projects/electric-guitar/guitar-board2.jpg)
+
+Let's go on to code the guitar!
+
+### ~button /projects/electric-guitar/code
+
+Code
+
+### ~

package/docs/projects/electric-guitar.md

@@ -0,0 +1,27 @@
+# Electric Guitar
+
+## ~avatar avatar
+
+Make an electric guitar that you can play real chords with using the micro:bit.
+
+## ~
+
+https://youtu.be/Yocsl_80YsY
+
+## Materials
+
+* micro:bit and optional battery pack
+* 4 crocodile clip leads
+* cardboard, scissors, glue, tin foil
+* headphones, buzzer, or powered speaker
+
+## Activities
+
+* [Make](/projects/electric-guitar/make)  
+* [Code](/projects/electric-guitar/code)
+
+## ~button /projects/electric-guitar/make
+
+Let's get started!
+
+## ~

package/docs/projects/games.md

@@ -24,6 +24,12 @@ Fun games to build with your @boardname@.
     "cardType": "tutorial"
   }]
 }, {
+  "name": "Rock Paper Scissors V2",
+  "url":"/projects/rock-paper-scissors-v2",
+  "description": "Rock Paper Scissors with Sounds for micro:bit V2!",
+  "imageUrl":"/static/mb/projects/a4-motion-v2.png",
+  "cardType": "tutorial"
+},{
   "name": "Coin Flipper",
   "url":"/projects/coin-flipper",
   "description": "Guess the coin toss and see if you're lucky.",

package/docs/projects/jonnys-bird.md

@@ -0,0 +1,110 @@
+# Jonny's Bird
+
+The ``||music:play sound||`` block lets you create and play complex sounds beyond the simple sequence of tones in a melody. You can choose a sound waveform, change its frequency or volume, and add custom effects. Here's a program you can code to create fun bird sounds when you shake or tilt the @boardname@!
+
+## Use acceleration to set frequency
+
+The acceleration in the `X`and `Y` dimensions are used to set the frequencies of the sound. Make two variables named ``||variables:currFreq||`` and ``||variables:lastFreq||``. One variable will hold the value for the current freqency as an input of accleration in the `X` direction. The other will remember the previous frequency value.
+
+Get a ``||loops:forever||`` block and pull the ``||variables:set currFreq||`` and ``||variables:set lastFreq||`` blocks into it. Change the value for ``||variables:set lastFreq||`` from `0` to ``||variables:currFreq||``.
+
+```blocks
+let currfreq = 0
+let lastfreq = 0
+basic.forever(function () {
+    currfreq = 0
+    lastfreq = currfreq
+})
+```
+
+Pull a ``||math:map from to||`` block into the value slot of the ``||variables:set currFreq||``. Use ``||input:acceleration (mg) x||`` as the mapping value, set the `from` value range as `-1024` and `1023`. Set the `to` value range as `0` and `5000`.
+
+```blocks
+let currfreq = 0
+let lastfreq = 0
+basic.forever(function () {
+    currfreq = Math.map(input.acceleration(Dimension.X), -1024, 1023, 1, 5000)
+    lastfreq = currfreq
+})
+```
+
+Go get a ``||music:play sound until done||`` block and place it in between the ``||variables:set currFreq||`` and ``||variables:set lastFreq||``.
+
+```blocks
+let currFreq = 0
+let lastFreq = 0
+basic.forever(function () {
+    currFreq = Math.map(input.acceleration(Dimension.X), -1024, 1023, 0, 5000)
+    music.playSoundEffect(music.createSoundEffect(WaveShape.Sine, 5000, 0, 255, 0, 500, SoundExpressionEffect.None, InterpolationCurve.Linear), SoundExpressionPlayMode.UntilDone)
+    lastFreq = currFreq
+})
+```
+
+Expand the sound effect parameters in ``||music:play sound until done||`` by clicking the **(+)** symbol. Duplicate **2** ``||math:map from to||`` blocks from ``||variables:set currFreq||`` and place one in the `start frequency` value and the other in the `end frequency` value. Change the acceleration direction in the `end frequency` value to the `y` direction.
+
+```blocks
+let currFreq = 0
+let lastFreq = 0
+basic.forever(function () {
+    currFreq = Math.map(input.acceleration(Dimension.X), -1024, 1023, 0, 5000)
+    music.playSoundEffect(music.createSoundEffect(WaveShape.Sine,
+        Math.map(input.acceleration(Dimension.X), -1024, 1023, 0, 5000),
+        Math.map(input.acceleration(Dimension.Y), -1024, 1023, 0, 5000),
+        255,
+        0,
+        500,
+        SoundExpressionEffect.None, InterpolationCurve.Linear), SoundExpressionPlayMode.UntilDone)
+    lastFreq = currFreq
+})
+```
+
+## Add duration and volume
+
+Click the **(+)** symbol again on the sound effect block inside of ``||music:play sound until done||``. This will show the volume parameters.
+
+Pull out **3** ``||math:pick random||`` blocks and put them in for the values of `duration`, `start volume`, and `end volume`. For `duration`, use a range of `40` to `100`. For both `start volume` and `end volume`, use a random range of `0` to `1024`. 
+
+```blocks
+let currFreq = 0
+let lastFreq = 0
+basic.forever(function () {
+    currFreq = Math.map(input.acceleration(Dimension.X), -1024, 1023, 0, 5000)
+    music.playSoundEffect(music.createSoundEffect(WaveShape.Sine,
+        Math.map(input.acceleration(Dimension.X), -1024, 1023, 0, 5000),
+        Math.map(input.acceleration(Dimension.Y), -1024, 1023, 0, 5000),
+        randint(0, 1024),
+        randint(0, 1024),
+        randint(40, 100),
+        SoundExpressionEffect.None, InterpolationCurve.Linear), SoundExpressionPlayMode.UntilDone)
+    lastFreq = currFreq
+})
+```
+
+## Set the effects
+
+Once again, click the **(+)** symbol again on the sound effect block inside of ``||music:play sound until done||``. The effects parameters will appear. Change the setting for `effect` to `vibrato` and change `interpolation` to `curve`.
+
+
+```blocks
+let currfreq = 0
+let lastfreq = 0
+basic.forever(function () {
+    currfreq = Math.map(input.acceleration(Dimension.X), -1024, 1023, 1, 5000)
+    music.playSoundEffect(music.createSoundEffect(
+    WaveShape.Sine,
+    Math.map(input.acceleration(Dimension.X), -1024, 1023, 1, 5000),
+    Math.map(input.acceleration(Dimension.Y), -1024, 1023, 1, 5000),
+    randint(0, 1024),
+    randint(0, 1024),
+    randint(40, 100),
+    SoundExpressionEffect.Vibrato,
+    InterpolationCurve.Curve
+    ), 
+    SoundExpressionPlayMode.UntilDone)
+    lastfreq = currfreq
+})
+```
+
+## Birds are singing!
+
+Transfer you program to the @boardname@, shake and tilt it. The birds are singing!

package/docs/projects/magic-button-trick.md

@@ -8,8 +8,6 @@ Build a magic trick that uses the @boardname@'s compass to detect a nearby magne
 
 This is a simple magic trick you can perform to amaze your friends! When you move the sticky labels on your @boardname@'s **A** and **B** button, you appear to make the buttons really switch over. To see the trick performed watch the video below.
 
-https://youtu.be/-9KvmPopov8
-
 ## How the trick works
 
 The **magic** here is really in the code. This trick uses a magnet, hidden in your hand, to tell the @boardname@ to swap over the buttons. When the magnet is near the @boardname@, the **A** button starts working like the **B** button and the **B** button starts working like the **A** button. Tricky!