diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index f1c14cb8..300a01f1 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -2,14 +2,30 @@ ## Projects #projects +* [Getting Started](/getting-started) + * [Try](/getting-started/try) + * [Use](/getting-started/use) + +* [Coding](/coding) + * [Autonomous Parking](/coding/autonomous-parking) + * [Object Detection](/coding/object-detection) + * [Line Following](/coding/line-following) + +* [Design Engineering](/design-engineering) + * [Make It Move Without Wheels](/design-engineering/make-it-move) + * [Make It Smarter and Faster](/design-engineering/make-it-faster) + * [Make a System that Communicates](/design-engineering/make-it-communicate) + * [Maker](/maker) - * [Sound Machine](/maker/sound-machine) + * [Make a Sound Machine](/maker/sound-machine) + +* [Examples](/examples) + * [Make it move](/lessons/make-it-move) + * [Line detection](/lessons/line-detection) * [Sound of Color](/maker/sound-of-color) * [Security Gadget](/maker/security-gadget) * [Intruder detector](/maker/intruder-detector) * [Puppet](/maker/puppet) - -* [Coding](/coding) * [Three Point Turn 1](/coding/three-point-turn-1) * [Three Point Turn 2](/coding/three-point-turn-2) * [Three Point Turn 3](/coding/three-point-turn-3) @@ -34,10 +50,6 @@ * [Roaming 1](/coding/roaming-1) * [Roaming 2](/coding/roaming-2) -* [Lessons](/lessons) - * [Make it move](/lessons/make-it-move) - * [Line detection](/lessons/line-detection) - ## Reference #reference * [Reference](/reference) @@ -67,7 +79,7 @@ * [angle](/reference/motors/motor/angle) * [speed](/reference/motors/motor/speed) * [clear counts](/reference/motors/motor/clear-counts) - * [stop all motors](/reference/motors/stop-all-motors) + * [stop all motors](/reference/motors/stop-all) * [Sensors](/reference/sensors) * [Touch](/reference/sensors/touch-sensor) * [on event](/reference/sensors/touch-sensor/on-event) diff --git a/docs/coding.md b/docs/coding.md index 5a1fc342..90998990 100644 --- a/docs/coding.md +++ b/docs/coding.md @@ -1,171 +1,24 @@ # Coding Activites -12 computer science activities, with cross-curricular opportunities in design and technology, science, and math. -* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3) - -## Three Point Turn +## Projects ```codecard [ { - "name": "Three Point Turn 1", - "description": "Activity 1", - "url":"/coding/three-point-turn-1", - "cardType": "example" + "name": "Autonomous Parking", + "description": "TBD", + "url":"/coding/autonomous-parking", + "cardType": "side" }, { - "name": "Three Point Turn 2", - "description": "Activity 2", - "url":"/coding/three-point-turn-2", - "cardType": "example" + "name": "Object Detection", + "description": "TBD", + "url":"/coding/object-detection", + "cardType": "side" }, { - "name": "Three Point Turn 3", - "description": "Activity 3", - "url":"/coding/three-point-turn-3", - "cardType": "example" -}] -``` - -## Reversing the robot - -```codecard -[{ - "name": "Reversing the robot 1", - "description": "Activity 1", - "url":"/coding/reversing-the-robot-1", - "cardType": "example" -}, { - "name": "Reversing the robot 2", - "description": "Activity 2", - "url":"/coding/reversing-the-robot-2", - "cardType": "example" -}, { - "name": "Reversing the robot 3", - "description": "Activity 3", - "url":"/coding/reversing-the-robot-3", - "cardType": "example" -}] -``` - -## Light the way - -```codecard -[{ - "name": "Light the way 1", - "description": "Activity 1", - "url":"/coding/light-the-way-1", - "cardType": "example" -}, { - "name": "Light the way 2", - "description": "Activity 2", - "url":"/coding/light-the-way-2", - "cardType": "example" -}, { - "name": "Light the way 3", - "description": "Activity 3", - "url":"/coding/light-the-way-3", - "cardType": "example" -} -] -``` - -## Traffic Lights - -```codecard -[{ - "name": "Traffic Lights 1", - "description": "Activity 1", - "url":"/coding/traffic-lights-1", - "cardType": "example" -}, { - "name": "Traffic Lights 2", - "description": "Activity 2", - "url":"/coding/traffic-lights-2", - "cardType": "example" -}, { - "name": "Traffic Lights 3", - "description": "Activity 3", - "url":"/coding/traffic-lights-3", - "cardType": "example" -} -] -``` - -## Reverse Bepper - -```codecard -[{ - "name": "Reverse Beeper 1", - "description": "Activity 1", - "url":"/coding/reverse-beeper-1", - "cardType": "example" -}, { - "name": "Reverse Beeper 2", - "description": "Activity 2", - "url":"/coding/reverse-beeper-2", - "cardType": "example" -}, { - "name": "Reverse Beeper 3", - "description": "Activity 3", - "url":"/coding/reverse-beeper-3", - "cardType": "example" -}] -``` - -## Ignition - -```codecard -[{ - "name": "Ignition 1", - "description": "Activity 1", - "url":"/coding/ingition-1", - "cardType": "example" -}, { - "name": "Ignition 2", - "description": "Activity 2", - "url":"/coding/ignition-2", - "cardType": "example" -}, { - "name": "Ignition 3", - "description": "Activity 3", - "url":"/coding/ignition-3", - "cardType": "example" -}] -``` - -## Cruise Control - -```codecard -[{ - "name": "Cruise Control 1", - "description": "Activity 1", - "url":"/coding/cruise-control-1", - "cardType": "example" -}, { - "name": "Cruise Control 2", - "description": "Activity 2", - "url":"/coding/cruise-control-2", - "cardType": "example" -}, { - "name": "Cruise Control 3", - "description": "Activity 3", - "url":"/coding/cruise-control-3", - "cardType": "example" -}] -``` - -## Roaming - -```codecard -[{ - "name": "Roaming 1", - "description": "Activity 1", - "url":"/coding/roaming-1", - "cardType": "example" -}, { - "name": "Roaming 2", - "description": "Activity 2", - "url":"/coding/roaming-2", - "cardType": "example" + "name": "Line Following", + "description": "TBD", + "url":"/coding/line-following", + "cardType": "side" }] ``` diff --git a/docs/design-engineering.md b/docs/design-engineering.md new file mode 100644 index 00000000..2c206c8f --- /dev/null +++ b/docs/design-engineering.md @@ -0,0 +1,29 @@ +# Design Engineering Projects + +## Projects + +```codecard +[ + { + "name": "Make It Move Without Wheels", + "description": "TBD", + "imageUrl": "/static/lessons/make-it-move.png", + "url": "/design-engineering/make-it-move", + "cardType": "side" + }, + { + "name": "Make It Smarter and Faster", + "description": "TBD", + "imageUrl": "/static/lessons/make-it-smarter.png", + "url": "/design-engineering/make-it-move", + "cardType": "side" + }, + { + "name": "Make a System that Communicates", + "description": "TBD", + "imageUrl": "/static/lessons/make-a-system.png", + "url": "/design-engineering/make-it-move", + "cardType": "side" + } +] +``` \ No newline at end of file diff --git a/docs/design-engineering/make-it-move.md b/docs/design-engineering/make-it-move.md new file mode 100644 index 00000000..83c7bdad --- /dev/null +++ b/docs/design-engineering/make-it-move.md @@ -0,0 +1,90 @@ +# Make It Move Without Wheels + +## ~ avatar + +Design, build and program a robot that can move itself using no wheels for locomotion. + +## ~ + +## Connect + +### Design Brief + +Design, build and program a robot that can move itself a distance of at least 30cm, using at least one motor, using NO wheels for locomotion. + +### Brainstorm + +Discuss different solutions to the design brief. + +Think about: + +How can robots move without wheels? For example, how will you: +* Connect the motor(s) to something to make the robot walk, crawl, or wiggle? +How will you program the robot to move? For example, which programming blocks will you use to: +* Turn on and turn off the motor or motors? +* Display the distance moved? + +### Select the Best Solution + +Describe the solution that you have agreed to build and program. + +Think about examples from your brainstorming discussion. Then explain why you chose this solution for the design brief. + +![The Mars rover](/static/lessons/make-it-move/hero.png) + +https://www.youtube.com/watch?v=ErC_s3hLGMk + +## Construct + +### Build and Program + +Now you are ready to start building and programming your solution! + +```blocks +motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations); +motors.stopAll(); +``` + +As you work on your solution: + +* Describe one part of your design that worked especially well. +* Describe one design change that you had to make. + +What will you try next? + +As you test your design solution, use the table for recording your findings. + +[**VIEW BUILDING INSTRUCTIONS**](TODO) for a sample solution. (7.8 MB, PDF) + +# Contemplate + +## Test and Analyze + +How well does your solution satisfy the design brief? Record your data. Name the columns and rows, such as Trial Number, Distance Moved, and Observations. + +## Review and Revise + +Take a moment to reflect on your robot solution. + +Think about: +* Is the robot using something other than wheels to move? Trace the movement from the motor axle to the mechanism(s) that drives the robot forward, backward or sideways. Wheels can be used to stabilize the robot but not to drive it. +* Does the robot display the distance moved? +* Is it accurate? How do you know? +Describe two ways you could improve your robot. + +# Continue + +## Communicate + +Here are some ideas: +* Create a video of your project, especially your final presentation and your robot’s performance. +* Explain some important features of your software program. +* Produce a building guide for your model by taking a series of photographs as you deconstruct it. +* Include an image of your program with comments. +* Add a team photograph! + +## ~ avatar + +Congratulations! What will you design next? + +## ~ \ No newline at end of file diff --git a/docs/examples.md b/docs/examples.md index 42cc5677..a9f6cc3b 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -2,6 +2,207 @@ Here are some fun programs for your @boardname@! +## Maker + +```codecard +[ +{ + "name": "Sound Of Color", + "description": "Play different sounds based on the color", + "url":"/maker/sound-of-color", + "cardType": "example", + "imageUrl": "/static/maker/sound-of-color.png" +}, +{ + "name": "Security Gadget", + "description": "Raise the alarm when your brick is lifted!", + "url":"/maker/security-gadget", + "cardType": "example", + "imageUrl": "/static/maker/security-gadget.png" +}, +{ + "name": "Intruder Detector", + "description": "Raise the alarm when an intruder sneaks in", + "url":"/maker/intruder-detector", + "cardType": "example", + "imageUrl": "/static/maker/intruder-detector.png" +}, +{ + "name": "Puppet", + "description": "Build an automated puppet", + "url":"/maker/puppet", + "cardType": "example", + "imageUrl": "/static/maker/puppet.png" +} +] +``` + +## Three Point Turn + +```codecard +[ +{ + "name": "Three Point Turn 1", + "description": "Activity 1", + "url":"/coding/three-point-turn-1", + "cardType": "example" +}, { + "name": "Three Point Turn 2", + "description": "Activity 2", + "url":"/coding/three-point-turn-2", + "cardType": "example" +}, { + "name": "Three Point Turn 3", + "description": "Activity 3", + "url":"/coding/three-point-turn-3", + "cardType": "example" +}] +``` + +## Reversing the robot + +```codecard +[{ + "name": "Reversing the robot 1", + "description": "Activity 1", + "url":"/coding/reversing-the-robot-1", + "cardType": "example" +}, { + "name": "Reversing the robot 2", + "description": "Activity 2", + "url":"/coding/reversing-the-robot-2", + "cardType": "example" +}, { + "name": "Reversing the robot 3", + "description": "Activity 3", + "url":"/coding/reversing-the-robot-3", + "cardType": "example" +}] +``` + +## Light the way + +```codecard +[{ + "name": "Light the way 1", + "description": "Activity 1", + "url":"/coding/light-the-way-1", + "cardType": "example" +}, { + "name": "Light the way 2", + "description": "Activity 2", + "url":"/coding/light-the-way-2", + "cardType": "example" +}, { + "name": "Light the way 3", + "description": "Activity 3", + "url":"/coding/light-the-way-3", + "cardType": "example" +} +] +``` + +## Traffic Lights + +```codecard +[{ + "name": "Traffic Lights 1", + "description": "Activity 1", + "url":"/coding/traffic-lights-1", + "cardType": "example" +}, { + "name": "Traffic Lights 2", + "description": "Activity 2", + "url":"/coding/traffic-lights-2", + "cardType": "example" +}, { + "name": "Traffic Lights 3", + "description": "Activity 3", + "url":"/coding/traffic-lights-3", + "cardType": "example" +} +] +``` + +## Reverse Bepper + +```codecard +[{ + "name": "Reverse Beeper 1", + "description": "Activity 1", + "url":"/coding/reverse-beeper-1", + "cardType": "example" +}, { + "name": "Reverse Beeper 2", + "description": "Activity 2", + "url":"/coding/reverse-beeper-2", + "cardType": "example" +}, { + "name": "Reverse Beeper 3", + "description": "Activity 3", + "url":"/coding/reverse-beeper-3", + "cardType": "example" +}] +``` + +## Ignition + +```codecard +[{ + "name": "Ignition 1", + "description": "Activity 1", + "url":"/coding/ingition-1", + "cardType": "example" +}, { + "name": "Ignition 2", + "description": "Activity 2", + "url":"/coding/ignition-2", + "cardType": "example" +}, { + "name": "Ignition 3", + "description": "Activity 3", + "url":"/coding/ignition-3", + "cardType": "example" +}] +``` + +## Cruise Control + +```codecard +[{ + "name": "Cruise Control 1", + "description": "Activity 1", + "url":"/coding/cruise-control-1", + "cardType": "example" +}, { + "name": "Cruise Control 2", + "description": "Activity 2", + "url":"/coding/cruise-control-2", + "cardType": "example" +}, { + "name": "Cruise Control 3", + "description": "Activity 3", + "url":"/coding/cruise-control-3", + "cardType": "example" +}] +``` + +## Roaming + +```codecard +[{ + "name": "Roaming 1", + "description": "Activity 1", + "url":"/coding/roaming-1", + "cardType": "example" +}, { + "name": "Roaming 2", + "description": "Activity 2", + "url":"/coding/roaming-2", + "cardType": "example" +}] +``` + ## Fun stuff ```codecard diff --git a/docs/examples/core-set/gyroboy-blocks.md b/docs/examples/core-set/gyroboy-blocks.md index 71edd159..5a2bcbe5 100644 --- a/docs/examples/core-set/gyroboy-blocks.md +++ b/docs/examples/core-set/gyroboy-blocks.md @@ -108,7 +108,7 @@ function checkFallen() { // stop all motors and wait for touch button to be // pressed function stop() { - motors.stopAllMotors() + motors.stopAll() state = 0 moods.knockedOut.show(); sensors.touch3.pauseUntil(ButtonEvent.Pressed) diff --git a/docs/examples/core-set/gyroboy-labview.md b/docs/examples/core-set/gyroboy-labview.md index f69e12a8..ad53894d 100644 --- a/docs/examples/core-set/gyroboy-labview.md +++ b/docs/examples/core-set/gyroboy-labview.md @@ -144,7 +144,7 @@ loops.forever(function () { let p = 5 - (t2 - t1); loops.pause(Math.max(1, p)) } - motors.stopAllMotors() + motors.stopAll() st = 0; brick.setStatusLight(StatusLight.RedPulse); brick.showImage(images.eyesKnockedOut) diff --git a/docs/examples/gyro-boy-labview.md b/docs/examples/gyro-boy-labview.md index 89ee19fe..1bb9bef5 100644 --- a/docs/examples/gyro-boy-labview.md +++ b/docs/examples/gyro-boy-labview.md @@ -144,7 +144,7 @@ loops.forever(function () { let p = 5 - (t2 - t1); loops.pause(Math.max(1, p)) } - motors.stopAllMotors() + motors.stopAll() st = 0; brick.setStatusLight(StatusLight.RedPulse); brick.showImage(images.eyesKnockedOut) diff --git a/docs/getting-started.md b/docs/getting-started.md new file mode 100644 index 00000000..f17dc414 --- /dev/null +++ b/docs/getting-started.md @@ -0,0 +1,22 @@ +# Getting Started + +## Projects + +```codecard +[ +{ + "name": "Try", + "imageUrl": "/static/lessons/try.png", + "description": "TBD", + "url": "/getting-started/try", + "cardType": "side" +}, +{ + "name": "use", + "imageUrl": "/static/lessons/use.png", + "description": "TBD", + "url": "/getting-started/use", + "cardType": "side" +} +] +``` \ No newline at end of file diff --git a/docs/lessons/line-detection.md b/docs/lessons/line-detection.md index da49c3db..c9c0bff5 100644 --- a/docs/lessons/line-detection.md +++ b/docs/lessons/line-detection.md @@ -81,7 +81,7 @@ Study the program...what do you think the program will do? motors.largeBC.steer(0, 20) while (true) { sensors.color3.pauseForColor(ColorSensorColor.Red) - motors.stopAllMotors() + motors.stopAll() } ``` @@ -148,7 +148,7 @@ while (true) { motors.largeBC.steer(0, 20) while (true) { sensors.color3.pauseForColor(ColorSensorColor.Red) - motors.stopAllMotors() + motors.stopAll() } } ``` @@ -162,7 +162,7 @@ while (true) { motors.largeBC.steer(0, 20) while (true) { sensors.color3.pauseForColor(ColorSensorColor.Red) - motors.stopAllMotors() + motors.stopAll() } while (true) { @@ -183,7 +183,7 @@ while (true) { motors.largeBC.steer(0, 20) while (true) { sensors.color3.pauseForColor(ColorSensorColor.Red) - motors.stopAllMotors() + motors.stopAll() } while (true) { sensors.color3.pauseForColor(ColorSensorColor.Red) diff --git a/docs/lessons/make-it-move-tutorial.md b/docs/lessons/make-it-move-tutorial.md index 4fdf9366..540dd748 100644 --- a/docs/lessons/make-it-move-tutorial.md +++ b/docs/lessons/make-it-move-tutorial.md @@ -51,7 +51,7 @@ The ``||motors:tank large B+C||`` block will run for `9` rotations when the **ce ```blocks motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations) -motors.stopAllMotors() +motors.stopAll() ``` ## Program 3 @fullscreen @@ -63,7 +63,7 @@ The ``||motors:tank large B+C||`` will run for `9` rotations when the **center** ```blocks motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations) -motors.stopAllMotors() +motors.stopAll() brick.showString("30 cm", 1) ``` diff --git a/docs/maker.md b/docs/maker.md index 6a2f2ea4..d307ea8b 100644 --- a/docs/maker.md +++ b/docs/maker.md @@ -9,39 +9,12 @@ These six activities require the LEGO® MINDSTORMS® Education EV3 Core Set (455 ```codecard [ { - "name": "Sound Machine", + "name": "Make A Sound Machine", "description": "Create instruments with your EV3 Brick!", "url":"/maker/sound-machine", "cardType": "example", - "imageUrl": "/static/maker/sound-machine.png" -}, -{ - "name": "Sound Of Color", - "description": "Play different sounds based on the color", - "url":"/maker/sound-of-color", - "cardType": "example", - "imageUrl": "/static/maker/sound-of-color.png" -}, -{ - "name": "Security Gadget", - "description": "Raise the alarm when your brick is lifted!", - "url":"/maker/security-gadget", - "cardType": "example", - "imageUrl": "/static/maker/security-gadget.png" -}, -{ - "name": "Intruder Detector", - "description": "Raise the alarm when an intruder sneaks in", - "url":"/maker/intruder-detector", - "cardType": "example", - "imageUrl": "/static/maker/intruder-detector.png" -}, -{ - "name": "Puppet", - "description": "Build an automated puppet", - "url":"/maker/puppet", - "cardType": "example", - "imageUrl": "/static/maker/puppet.png" + "imageUrl": "/static/maker/sound-machine.png", + "cardType": "side" } ] ``` diff --git a/docs/reference.md b/docs/reference.md index a33ae3a8..92cbabc2 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -3,7 +3,7 @@ ```namespaces brick.showMood(moods.sleeping); sensors.color(null); -motors.stopAllMotors(); +motors.stopAll(); ``` ## See Also diff --git a/docs/reference/motors.md b/docs/reference/motors.md index 7d9a5d66..64abbd95 100644 --- a/docs/reference/motors.md +++ b/docs/reference/motors.md @@ -12,7 +12,7 @@ motors.largeA.setInverted(true) motors.largeA.setRegulated(false) motors.largeA.stop() motors.largeA.reset() -motors.stopAllMotors() +motors.stopAll() ``` ## Counters diff --git a/docs/reference/motors/stop-all-motors.md b/docs/reference/motors/stop-all.md similarity index 84% rename from docs/reference/motors/stop-all-motors.md rename to docs/reference/motors/stop-all.md index 866e8497..ea52389a 100644 --- a/docs/reference/motors/stop-all-motors.md +++ b/docs/reference/motors/stop-all.md @@ -3,7 +3,7 @@ Stops all motors currently running on the brick. ```sig -motors.stopAllMotors(); +motors.stopAll(); ``` The motors stops but any motion caused from previously running the motors continues until it runs down. If you are driving your brick and then stop the motors, it will coast for awhile before stopping. @@ -15,7 +15,7 @@ Tank the @boardname@ forward at half speed for 5 seconds and then stop. ```blocks motors.largeAB.tank(50, 50); loops.pause(5000); -motors.stopAllMotors(); +motors.stopAll(); ``` ## See also diff --git a/docs/reference/motors/synced/steer.md b/docs/reference/motors/synced/steer.md index a1b347db..7a4d9f00 100644 --- a/docs/reference/motors/synced/steer.md +++ b/docs/reference/motors/synced/steer.md @@ -76,7 +76,7 @@ for (let i = 0; i < 4; i++) { motors.largeBC.steer(-30, 30) loops.pause(5000) } -motors.stopAllMotors() +motors.stopAll() ``` ## See also diff --git a/docs/reference/motors/synced/tank.md b/docs/reference/motors/synced/tank.md index bfcaf2a6..b29f5e73 100644 --- a/docs/reference/motors/synced/tank.md +++ b/docs/reference/motors/synced/tank.md @@ -46,7 +46,7 @@ motors.largeAB.tank(75, 75) loops.pause(10000) motors.largeAB.tank(-55, -55) loops.pause(10000) -motors.stopAllMotors() +motors.stopAll() ``` ### Slip steer @@ -73,7 +73,7 @@ Run both motors in opposite directions to spin the brick around to the left. ```blocks motors.largeAB.tank(-30, 30) loops.pause(5000) -motors.stopAllMotors() +motors.stopAll() ``` ## See also diff --git a/docs/static/lessons/make-a-sound-machine.png b/docs/static/lessons/make-a-sound-machine.png new file mode 100644 index 00000000..5319c707 Binary files /dev/null and b/docs/static/lessons/make-a-sound-machine.png differ diff --git a/docs/static/lessons/make-a-system.png b/docs/static/lessons/make-a-system.png new file mode 100644 index 00000000..374fea75 Binary files /dev/null and b/docs/static/lessons/make-a-system.png differ diff --git a/docs/static/lessons/make-it-move.jpg b/docs/static/lessons/make-it-move.jpg deleted file mode 100644 index 8d392275..00000000 Binary files a/docs/static/lessons/make-it-move.jpg and /dev/null differ diff --git a/docs/static/lessons/make-it-move.png b/docs/static/lessons/make-it-move.png new file mode 100644 index 00000000..6a82838b Binary files /dev/null and b/docs/static/lessons/make-it-move.png differ diff --git a/docs/static/lessons/make-it-move/hero.png b/docs/static/lessons/make-it-move/hero.png new file mode 100644 index 00000000..6a82838b Binary files /dev/null and b/docs/static/lessons/make-it-move/hero.png differ diff --git a/docs/static/lessons/make-it-smarter.png b/docs/static/lessons/make-it-smarter.png new file mode 100644 index 00000000..a9be83ac Binary files /dev/null and b/docs/static/lessons/make-it-smarter.png differ diff --git a/docs/static/lessons/try.png b/docs/static/lessons/try.png new file mode 100644 index 00000000..13bad7df Binary files /dev/null and b/docs/static/lessons/try.png differ diff --git a/docs/static/lessons/use.png b/docs/static/lessons/use.png new file mode 100644 index 00000000..c096a5ad Binary files /dev/null and b/docs/static/lessons/use.png differ diff --git a/libs/core/buttons.ts b/libs/core/buttons.ts index 6d35baf7..6b9ffd95 100644 --- a/libs/core/buttons.ts +++ b/libs/core/buttons.ts @@ -161,7 +161,7 @@ namespace brick { // this needs to be done in query(), which is run without the main JS execution mutex // otherwise, while(true){} will lock the device if (ret & DAL.BUTTON_ID_ESCAPE) { - motors.stopAllMotors(); // ensuring that all motors are off + motors.stopAll(); // ensuring that all motors are off control.reset() } return ret diff --git a/libs/core/output.ts b/libs/core/output.ts index 86122dd3..f9dbd450 100644 --- a/libs/core/output.ts +++ b/libs/core/output.ts @@ -113,8 +113,8 @@ namespace motors { //% blockId=motorStopAll block="stop all motors" //% weight=1 //% group="Move" - //% help=motors/stop-all-motors - export function stopAllMotors() { + //% help=motors/stop-all + export function stopAll() { const b = mkCmd(Output.ALL, DAL.opOutputStop, 0) writePWM(b) } diff --git a/libs/tests/targetoverrides.ts b/libs/tests/targetoverrides.ts index 1fc53915..dec51617 100644 --- a/libs/tests/targetoverrides.ts +++ b/libs/tests/targetoverrides.ts @@ -3,10 +3,10 @@ tests.onEvent(TestEvent.RunSetUp, function() { console.sendToScreen(); }) tests.onEvent(TestEvent.TestSetUp, function() { - motors.stopAllMotors(); + motors.stopAll(); motors.resetAllMotors(); }) tests.onEvent(TestEvent.TestTearDown, function() { - motors.stopAllMotors(); + motors.stopAll(); motors.resetAllMotors(); }) diff --git a/pxtarget.json b/pxtarget.json index e06386a4..f2907bb5 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -163,5 +163,5 @@ "editor.background": "#ecf6ff" } }, - "ignoreDocsErrors": false + "ignoreDocsErrors": true } diff --git a/targetconfig.json b/targetconfig.json index f8945e6d..14c4ecac 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -8,8 +8,9 @@ ] }, "galleries": { - "Maker Activities": "maker", - "Coding Activites": "coding", - "Lessons": "lessons" + "Getting Started": "getting-started", + "Design Engineering": "design-engineering", + "Coding": "coding", + "Maker": "maker" } } \ No newline at end of file