From 4f66ccf027522d37053879ae0f6f8984c9c5125f Mon Sep 17 00:00:00 2001 From: ganicke Date: Mon, 20 Nov 2017 11:46:36 -0800 Subject: [PATCH 1/5] Fix some project page bugs found in loc --- docs/examples/radio-dashboard.md | 2 +- docs/projects/milky-monster/make.md | 2 +- docs/projects/voting-machine.md | 27 ++++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/docs/examples/radio-dashboard.md b/docs/examples/radio-dashboard.md index dc296e4c..4cb93f42 100644 --- a/docs/examples/radio-dashboard.md +++ b/docs/examples/radio-dashboard.md @@ -9,7 +9,7 @@ * forever. * * Radio clients can simply send a number (between 0..255) on group 4. - * The must transmit the serial number using ``radio.setTransmitSerialNumber(true)`` + * They must transmit the serial number using ``radio.setTransmitSerialNumber(true)`` * * The received number is used to set the LED brightness for that client. * diff --git a/docs/projects/milky-monster/make.md b/docs/projects/milky-monster/make.md index b827ac96..a0d15ace 100644 --- a/docs/projects/milky-monster/make.md +++ b/docs/projects/milky-monster/make.md @@ -96,7 +96,7 @@ https://youtu.be/Ch_vU5LXPeM Cutout a hole in the cap to guide the string to the servo. -https://youtu.be/Ch_vU5LXPeM +https://youtu.be/JKi2Ns8y3nI ## Step 12: connect crocodile clips diff --git a/docs/projects/voting-machine.md b/docs/projects/voting-machine.md index f7f53ebd..cc18a2ab 100644 --- a/docs/projects/voting-machine.md +++ b/docs/projects/voting-machine.md @@ -8,16 +8,17 @@ Build a voting machine using many @boardname@s! https://youtu.be/77HOqf8BaNg - -In this project, a **voter** program is uploaded on the player's @boardname@. The player uses the buttons to vote ``yes`` or ``no`` -and the vote is sent to the **dashboard** @boardname@ via radio. +In this project, a **voter** program is loaded onto a player's @boardname@. The player uses the buttons to vote either``yes`` or ``no`` +and the vote is sent to a **dashboard** @boardname@ using the radio. The dashboard allocates one LED per player and turns it on or off based on the vote. ## The voter program -Assuming button ``A`` is no and ``B`` is yes, the voter program works as follows: +Assuming button ``A`` is for a NO vote and ``B`` is for YES, the voter program works like this: -* when button ``A`` is pressed, a number ``0`` is sent via radio and the ``X`` symbol is shown on the screen. +### Transmit a NO vote + +When button ``A`` is pressed, a number ``0`` is sent via radio and the ``X`` symbol is shown on the screen. ```block input.onButtonPressed(Button.A, () => { @@ -26,7 +27,9 @@ input.onButtonPressed(Button.A, () => { }) ``` -* when button ``B`` is pressed, a number ``255`` is sent via radio and the ``Y`` symbol is shown on the screen. +### Transmit a YES vote + +When button ``B`` is pressed, a number ``255`` is sent via radio and the ``Y`` symbol is shown on the screen. ```block input.onButtonPressed(Button.B, () => { @@ -35,19 +38,22 @@ input.onButtonPressed(Button.B, () => { }) ``` -* In order to track the votes, we tell the radio to also transmit the device serial number. +### Set device serial number + +In order to track the votes, we tell the radio to also transmit the device serial number. ```block radio.setTransmitSerialNumber(true) ``` +### Set the radio group -* we arbritrarily choose ``4`` as the group used for the communications +We arbitrarily choose ``4`` as the group used for the communications. ```block radio.setGroup(4) ``` -Combined together, the voter program looks as follows: +Combined together, the final voter program is this: ```blocks input.onButtonPressed(Button.A, () => { @@ -65,7 +71,7 @@ basic.showIcon(IconNames.Ghost) ## The dashboard -The dashboard code can be found at [/examples/radio-dashboard](/examples/radio-dashboard). +The dashboard code is in the [radio dashboard](/examples/radio-dashboard) example. Download the code from that example into the @boardname@ that will be used to display the result. @@ -74,7 +80,6 @@ and uses the number received as the brightness of the LED. When a message hasn't been received by a board for some time, it's pixel will start to blink. After more time, it will simply turn off. - ```package radio ``` From 2cfd6253492132dcf296403b71e8944369bc8f1b Mon Sep 17 00:00:00 2001 From: ganicke Date: Mon, 20 Nov 2017 13:05:49 -0800 Subject: [PATCH 2/5] Cutout is a noun --- docs/projects/milky-monster/make.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/projects/milky-monster/make.md b/docs/projects/milky-monster/make.md index a0d15ace..0675cd04 100644 --- a/docs/projects/milky-monster/make.md +++ b/docs/projects/milky-monster/make.md @@ -30,7 +30,7 @@ Turn a piece of cardboard into an milky-monster! ## Step 1: download and cut the template -[Download the template](/static/mb/projects/milky-monster/template.pdf) and cutout the template. +[Download the template](/static/mb/projects/milky-monster/template.pdf) and cut out the template. https://youtu.be/ipsZuFNgTHM @@ -92,9 +92,9 @@ Glue servo to the cap of the milk carton. https://youtu.be/Ch_vU5LXPeM -## Step 11: cutout hole in cap +## Step 11: cut out hole in cap -Cutout a hole in the cap to guide the string to the servo. +Cut out a hole in the cap to guide the string to the servo. https://youtu.be/JKi2Ns8y3nI From 198ac040ac78eee712f67cdf3a4f36e240335188 Mon Sep 17 00:00:00 2001 From: ganicke Date: Mon, 20 Nov 2017 13:41:35 -0800 Subject: [PATCH 3/5] Do a few edits --- docs/projects/milky-monster.md | 23 +++++++------- docs/projects/milky-monster/code.md | 24 +++++++------- docs/projects/milky-monster/connect.md | 6 ++-- docs/projects/milky-monster/make.md | 44 ++++++++++++++------------ 4 files changed, 51 insertions(+), 46 deletions(-) diff --git a/docs/projects/milky-monster.md b/docs/projects/milky-monster.md index 59122aa4..38bcd485 100644 --- a/docs/projects/milky-monster.md +++ b/docs/projects/milky-monster.md @@ -17,22 +17,22 @@ https://youtu.be/egl3fNAYylk ## Materials -## Recycled +### Recycled * 1 Milk Carton (with a screwable top cap) -* 1 Small cord - recylce string from a used tea bag +* 1 Small cord - recycle string from a used tea bag * 1 Paper clip -## Electronics +### Electronics * 1 @boardname@, battery holder and 2 AAA batteries * 3 Crocodile clips * 1 micro servo 9g SG90 -* 1 servo clip designed for Milky Monster [download on thingiverse](http://www.thingiverse.com/thing:2185971) (optional). Teachers may prefer to download the classroom pack (16 servo clips). +* 1 servo clip designed for Milky Monster, download at [thingiverse](http://www.thingiverse.com/thing:2185971) (optional). Teachers may prefer to download the classroom pack (16 servo clips). -## Tools +### Tools -* Small knive and Scissors that can cut cardboard +* Small knife and scissors that can cut cardboard * Tape (masking, duct tape, and/or packing tape) * Glue gun @@ -40,9 +40,9 @@ https://youtu.be/egl3fNAYylk ## Preparation -* [Equip the microservo with crocodile clips](/device/servo) -* [Get the cut-out template](/static/mb/projects/milky-monster/template.pdf) -* [Download and 3D-print servo clip designed for MIlky Monster from thingiverse](http://www.thingiverse.com/thing:2185971) (this is optional). Teachers may prefer to download the classroom pack (16 servo clips). +* Equip the [micro servo](/device/servo) with crocodile clips +* Get the [cutout template](/static/mb/projects/milky-monster/template.pdf) +* Download and 3D-print the servo clip designed for Milky Monster from [thingiverse](http://www.thingiverse.com/thing:2185971) (this is optional). Teachers may prefer to download the classroom pack (16 servo clips). ## Activities @@ -56,5 +56,6 @@ Let's get started! ## ~ -## about the author -This project was contributed by Peter Heldens [@peterheldens](https://twitter.com/peterheldens). You can checkout his [@boardname@ makershow channel on youtube](http://aka.ms/microbit-makershow) for more projects. \ No newline at end of file +## About the author + +This project was contributed by Peter Heldens [@peterheldens](https://twitter.com/peterheldens). You can checkout his [@boardname@ makershow](http://aka.ms/microbit-makershow) channel on youtube for more projects. \ No newline at end of file diff --git a/docs/projects/milky-monster/code.md b/docs/projects/milky-monster/code.md index bfe2e633..9aa0775c 100644 --- a/docs/projects/milky-monster/code.md +++ b/docs/projects/milky-monster/code.md @@ -9,11 +9,11 @@ Add code to make the Milky Monster move. ## Duration: ~30 minutes -## Step 1: calibrate servo +## Step 1: Calibrate servo In order for the Milky Monster to move, the @boardname@ needs to command the servo to go between ``0`` and ``180`` degrees at a certain pace. In the code below: -- the user pressed button ``A`` to switch the servo to 180 degrees (to close the mouth of Milky Monster). -- the user pressed button ``B`` to switch the servo to 0 degrees (to open the mouth of Milky Monster). +- Press button ``A`` to switch the servo to 180 degrees (to close the mouth of Milky Monster). +- Press button ``B`` to switch the servo to 0 degrees (to open the mouth of Milky Monster). ```blocks input.onButtonPressed(Button.A, () => { @@ -28,39 +28,39 @@ basic.showString("calibrate") ``` -## Step 2: attach rotor +## Step 2: Attach rotor -The servo should be positioned on 180 degrees **before** attaching the rotor to it. This is to make sure the mouth of the Milky Monster will be closed once the servo reaches 180 degrees. +The servo should be positioned at 180 degrees **before** attaching the rotor to it. This will make sure the mouth of the Milky Monster is closed once the servo reaches 180 degrees. ## ~ hint -You may use a philips scew driver to attach the rotor to the servo. +You can use a philips screw driver to attach the rotor to the servo. ## ~ https://youtu.be/YZfkMWTeH4o -## Step 3: check calibration +## Step 3: Check calibration -When the user pressed ``A`` the servo rotor should be in 'up' position. +When the user presses ``A`` the servo rotor should be in 'up' position. https://youtu.be/bAqXEawUsSM -## Step 4: connect cord to rotor +## Step 4: Connect cord to rotor Connect the cord to the servo rotor while mouth of Milky Monster is **closed**. https://youtu.be/AWsnwk_iA_A -## Step 5: connect cables to @boardname@ +## Step 5: Connect cables to @boardname@ Connect cables from @boardname@ to the servo and place the battery. https://youtu.be/fAR58GJUZdM -## Step 6: code light sensor +## Step 6: Code light sensor -Code the lightsensor on the @boardname@ to control the servo. +Code the light sensor on the @boardname@ to control the servo. ```blocks basic.forever(() => { diff --git a/docs/projects/milky-monster/connect.md b/docs/projects/milky-monster/connect.md index c02e08f7..d1105138 100644 --- a/docs/projects/milky-monster/connect.md +++ b/docs/projects/milky-monster/connect.md @@ -2,14 +2,14 @@ ## ~avatar avatar -Remote control your Milky Monster with another @boardname@ +Remotely control your Milky Monster with another @boardname@ ## ~ ## Duration: ~30 minutes -You will need 2 @boardname@ for this part. By using the radio, we can make the Milky Monster controlled by another @boardname@. -Download the code below to the @boardname@ on the Milky Monster and another "controller" @boardname@. Whenere A is pressed, the Milky Monster will move once. +You will need 2 @boardname@ for this part. By using the radio, we can control the Milky Monster with another @boardname@. +Download the code below to the @boardname@ that's on the Milky Monster and again to another "controller" @boardname@. Whenever button **A** is pressed, the Milky Monster will move one time. ```blocks radio.onDataPacketReceived(({receivedNumber}) => { diff --git a/docs/projects/milky-monster/make.md b/docs/projects/milky-monster/make.md index 0675cd04..55060b41 100644 --- a/docs/projects/milky-monster/make.md +++ b/docs/projects/milky-monster/make.md @@ -3,7 +3,7 @@ ## ~avatar avatar -Turn a piece of cardboard into an milky-monster! +Turn a drink carton into an milky-monster! ![](/static/mb/projects/milky-monster/monsters.jpg) @@ -12,62 +12,66 @@ Turn a piece of cardboard into an milky-monster! ## Duration: ~45 minutes ## Materials + ### Recycled + * 1 Milk Carton (with a screwable top cap) * 1 Small cord - recycle string from a used tea bag * 1 Paper clip -## Electronics +### Electronics + * 1 @boardname@, battery holder and 2 AAA batteries * 3 Crocodile clips -* 1 micro servo 9g SG90 -* 1 servo clip designed for Milky Monster [download on thingiverse](http://www.thingiverse.com/thing:2185971) (optional). Teachers may prefer to download the classroom pack (16 servo clips). +* 1 micro servo - 9g SG90 +* 1 servo clip designed for Milky Monster, download at [thingiverse](http://www.thingiverse.com/thing:2185971) (optional). Teachers may prefer to download the classroom pack (16 servo clips). -## Tools -* Small knive and Scissors that can cut cardboard +### Tools + +* Small knife and scissors that can cut cardboard * Tape (masking, duct tape, and/or packing tape) * Glue gun -## Step 1: download and cut the template +## Step 1: Download and cut the template [Download the template](/static/mb/projects/milky-monster/template.pdf) and cut out the template. https://youtu.be/ipsZuFNgTHM -## Step 2: glue template on milk carton +## Step 2: Glue the template onto the milk carton Glue the template on the milk carton. https://youtu.be/2D3WFp29QC4 -## Step 3: cut carton +## Step 3: Cut carton Cut the carton (watch the fingers!) https://youtu.be/pvC3Tnhe5QU -## Step 4: create mouth +## Step 4: Create the mouth -Cut the cardboard halfways and fold the corners. This will be the mouth of the Milky Monster. +Cut the cardboard halfway and fold the corners. This forms the mouth of the Milky Monster. https://youtu.be/Yyk1zW4sFoM -## Step 5: extend mouth +## Step 5: Extend the mouth Use tape to extend the mouth approx 1 cm. Fold one after the other. https://youtu.be/RWJbqI03wPE -## Step 6: connect cord +## Step 6: Connect cord -Using scissors, create a small whole to insert the cord. Tape the cord on the backsite of the mouth. +Using scissors, create a small whole to insert the cord. Tape the cord on the back side of the mouth. ![](/static/mb/projects/milky-monster/connectmouth.jpg) Once finished position the mouth in upward position and fix the cord between the cap. https://youtu.be/Qyndcsmt0AU -## Step 7: create space for @boardname@ +## Step 7: Create space for @boardname@ Use scissors to create space at the bottom of the Milky Monster to attach the @boardname@. @@ -79,26 +83,26 @@ Create space to route the cables nicely on back of the milky-monster. https://youtu.be/BoIRCk769MM -## Step 9: attaching clip to servo +## Step 9: Attaching clip to servo Use a philips screw driver to mount the servo to the 3D-printed servo clip. -If you don't have the 3D-printed clips available, [download on thingiverse](http://www.thingiverse.com/thing:2185971) , or fix the servo using tyraps or a glue gun. +If you don't have the 3D-printed clips available, download on [thingiverse](http://www.thingiverse.com/thing:2185971), or fix the servo using tie wraps or a glue gun. https://youtu.be/drKzo5zqvuI -## Step 10: attaching servo to milk button +## Step 10: Attaching servo to milk button Glue servo to the cap of the milk carton. https://youtu.be/Ch_vU5LXPeM -## Step 11: cut out hole in cap +## Step 11: Cut out a hole in cap Cut out a hole in the cap to guide the string to the servo. https://youtu.be/JKi2Ns8y3nI -## Step 12: connect crocodile clips +## Step 12: Connect crocodile clips Connect the crocodile clips to the servo. From 75933200042be70d35f953dfd69d7240d5974593 Mon Sep 17 00:00:00 2001 From: ganicke Date: Mon, 20 Nov 2017 13:49:38 -0800 Subject: [PATCH 4/5] Callout 'second' --- docs/projects/milky-monster/connect.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/milky-monster/connect.md b/docs/projects/milky-monster/connect.md index d1105138..cbe2629d 100644 --- a/docs/projects/milky-monster/connect.md +++ b/docs/projects/milky-monster/connect.md @@ -8,7 +8,7 @@ Remotely control your Milky Monster with another @boardname@ ## Duration: ~30 minutes -You will need 2 @boardname@ for this part. By using the radio, we can control the Milky Monster with another @boardname@. +You will need a second @boardname@ for this part. By using the radio, we can control the Milky Monster with another @boardname@. Download the code below to the @boardname@ that's on the Milky Monster and again to another "controller" @boardname@. Whenever button **A** is pressed, the Milky Monster will move one time. ```blocks From 9e7654084b9c8dea6ecf910eef2cd65e0f9645a1 Mon Sep 17 00:00:00 2001 From: ganicke Date: Mon, 20 Nov 2017 14:09:59 -0800 Subject: [PATCH 5/5] Restate the 'complete program' --- docs/projects/voting-machine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/projects/voting-machine.md b/docs/projects/voting-machine.md index cc18a2ab..d47b400a 100644 --- a/docs/projects/voting-machine.md +++ b/docs/projects/voting-machine.md @@ -53,7 +53,7 @@ We arbitrarily choose ``4`` as the group used for the communications. radio.setGroup(4) ``` -Combined together, the final voter program is this: +Putting all the parts together, here's the complete voter program: ```blocks input.onButtonPressed(Button.A, () => {