From 724e9b915bc77da9c2fccf9ab77e076fe69749da Mon Sep 17 00:00:00 2001 From: knmcguire Date: Tue, 10 Aug 2021 13:52:17 +0200 Subject: [PATCH] (#92) poplinks for multiranger --- src/_data/poplink.yml | 4 ++++ src/_poplink/multi-ranger-deck.md | 10 ++++++++++ src/buy/buyers-guide.md | 4 ++-- .../system/platform/cf2-expansiondecks.md | 10 +++++----- .../getting-started-with-stem-ranging-bundle.md | 6 +++--- src/products/multi-ranger-deck.md | 4 ++-- 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 src/_poplink/multi-ranger-deck.md diff --git a/src/_data/poplink.yml b/src/_data/poplink.yml index ad5eb9c3..c750c261 100644 --- a/src/_data/poplink.yml +++ b/src/_data/poplink.yml @@ -16,3 +16,7 @@ poplinks: title: Flow deck V2 default-link: /products/flow-deck-v2/ content: flow-deck.md + multi-ranger-deck: + title: Multi-ranger deck + default-link: /products/multi-ranger-deck/ + content: multi-ranger-deck.md diff --git a/src/_poplink/multi-ranger-deck.md b/src/_poplink/multi-ranger-deck.md new file mode 100644 index 00000000..b1e745aa --- /dev/null +++ b/src/_poplink/multi-ranger-deck.md @@ -0,0 +1,10 @@ +[Buy in store](https://store.bitcraze.io/products/multi-ranger-deck) + +[Product Page](/products/multi-ranger-deck/) + +[Other deck compatibility](/documentation/system/platform/cf2-expansiondecks/#deck---deck) + +[STEM Tutorial](/documentation/tutorials/getting-started-with-stem-ranging-bundle/) + +[Logging](https://www.bitcraze.io/documentation/repository/crazyflie-firmware/master/api/logs/#range) + diff --git a/src/buy/buyers-guide.md b/src/buy/buyers-guide.md index 38ea0bff..8448f116 100644 --- a/src/buy/buyers-guide.md +++ b/src/buy/buyers-guide.md @@ -235,7 +235,7 @@ Note: gamepad is not included {% row_image_text_links I want to add awareness of the surroundings to the Crazyflie %} {% row_text %} -The Multi-ranger deck measures the distance to objects forward/back/left/right and up. +The {% poplink multi-ranger-deck%} measures the distance to objects forward/back/left/right and up. It can be used for obstacle avoidance, mapping a room or games where the Crazyflie 2.X "bounces" between the walls of a room. Combine with a {% poplink flow-deck %} to measure the distance to the floor as well and @@ -286,7 +286,7 @@ the equipment home for extended studies and insights. {% row_image_text_links The STEM ranging bundle %} {% row_text %} The STEM ranging bundle contains everything in the STEM drone bundle with the -addition of the Multi-ranger deck. The Multi-ranger makes it possible to interact +addition of the {% poplink multi-ranger-deck%}. The Multi-ranger deck makes it possible to interact with the Crazyflie 2.X or use it to map a room. {% endrow_text %} {% row_links %} diff --git a/src/documentation/system/platform/cf2-expansiondecks.md b/src/documentation/system/platform/cf2-expansiondecks.md index a2a0290a..fe055186 100644 --- a/src/documentation/system/platform/cf2-expansiondecks.md +++ b/src/documentation/system/platform/cf2-expansiondecks.md @@ -23,7 +23,7 @@ Here is a list of expansion decks that are available for the Crazyflie 2.X: | {% id_link product-motion-capture-marker-deck %}|Expansion deck where motion capture markers can easily be mounted|[datasheet](/documentation/hardware/passive_marker_deck/passive_marker_deck-datasheet.pdf), [schematics](/documentation/hardware/passive_marker_deck/passive-marker-deck-revc.pdf) | | | {% id_link product-active-marker-deck %}|Expansion deck with active IR LED for motion capture markers | [datasheet](/documentation/hardware/active_marker_deck/active_marker_deck-datasheet.pdf), [schematics](/documentation/hardware/active_marker_deck/active-marker-deck_revd.pdf)| | | {% poplink loco-positioning-deck %}|Expansion deck for the Loco positioning system | [datasheet](/documentation/hardware/loco_deck/loco_deck-datasheet.pdf), [schematics](/documentation/hardware/loco_deck/loco_deck_revd.pdf) | [Modes explanation](/documentation/repository/crazyflie-firmware/master/userguides/decks/active-marker-deck/)| -| {% id_link product-multi-ranger-deck %}|Expansion deck for detecting obstacles | [datasheet](/documentation/hardware/multi_ranger_deck/multi_ranger_deck-datasheet.pdf), schematics [1](/documentation/hardware/multi_ranger_deck/multi-ranger-daughter-board-reve.pdf), [2](/documentation/hardware/multi_ranger_deck/multi-ranger-reve.pdf) | | +| {% poplink multi-ranger-deck %}|Expansion deck for detecting obstacles | [datasheet](/documentation/hardware/multi_ranger_deck/multi_ranger_deck-datasheet.pdf), schematics [1](/documentation/hardware/multi_ranger_deck/multi-ranger-daughter-board-reve.pdf), [2](/documentation/hardware/multi_ranger_deck/multi-ranger-reve.pdf) | | | {% poplink flow-deck %} | Expansion deck for detecting flow and height | [datasheet](/documentation/hardware/flow_deck_2/flow_deck_2-datasheet.pdf), [schematics](/documentation/hardware/flow_deck_2/flow-deck-v2-reva.pdf)| | ### Additional information @@ -108,7 +108,7 @@ Deck info | 0xBC | 0x09 | bcZRanger | Z-Ranger | 1.3g | ~15mA | Under | [link](https://store.bitcraze.io/products/z-ranger-deck) | | 0xBC | 0x0A | bcFlow | Flow deck V1 | 1.6g | ~40mA | Under | [link](https://store.bitcraze.io/products/flow-deck) | | 0xBC | 0x0B | bcOA | Obstacle Avoidance | N/A | ~0.3mA | Above | N/A | -| 0xBC | 0x0C | bcMultiranger | Multi-ranger | 2.3g | ~90mA (depending on mode) | Above | [link](https://store.bitcraze.io/products/multi-ranger-deck) | +| 0xBC | 0x0C | bcMultiranger | {% poplink multi-ranger-deck%} | 2.3g | ~90mA (depending on mode) | Above | [link](https://store.bitcraze.io/products/multi-ranger-deck) | | 0xBC | 0x0D | bcMocap | Mocap marker deck | 1.6g | 0mA | Above | [link](https://store.bitcraze.io/products/motion-capture-marker-deck) | | 0xBC | 0x0E | bcZRanger2 | Z-Ranger v2 | 1.3g | ~15mA | Under | [link](https://store.bitcraze.io/products/z-ranger-deck-v2) | | 0xBC | 0x0F | bcFlow2 | {% poplink flow-deck %} | 1.6g | ~40mA | Under | [link](https://store.bitcraze.io/products/flow-deck-v2) | @@ -143,7 +143,7 @@ two decks where the connections collide. | **bcZRanger, bcZRanger2** | | | X | X | | *(X)* | | | | | | | | | | VCC | | **{% poplink flow-deck %}, Flow deck V1** | | | X | X | | *(X)* | X | | | | X | X | X | | | VCC | | **bcOA** | | | X | X | | | | | | | | | | | | VCC | -| **bcMultiranger** | | | X | X | | | | | | | | | | | | VCOM | +| **{% poplink multi-ranger-deck%}** | | | X | X | | | | | | | | | | | | VCOM | | **bcMocap** | | | | | | *(X)* | *(X)* | | | | | | | | | N/A | | **bcLighthouse4** | X | X | X | X | | | | | | | | | | | | N/A | | **bcActiveM** | | | X | X | | | | | | | | | | | | N/A | @@ -168,7 +168,7 @@ This table shows which deck that works on which platform. | **bcESP** | yes | yes | | **Z-Ranger, Z-Ranger V2** | yes | yes | | **{% poplink flow-deck %}, Flow deck V1** | yes | yes | -| **Multi-ranger** | yes | yes | +| **{% poplink multi-ranger-deck%}** | yes | yes | | **Mocap marker deck** | yes | yes | | **Lighthouse-4** | yes | *2 | | **Active marker** | yes | yes | @@ -197,7 +197,7 @@ compatible. | **bcESP** | yes | yes | yes | yes | | | - | yes | yes | yes | yes | yes | yes | yes | | **Z-Ranger, Z-Ranger V2** | | | yes | yes | yes | yes | yes | - | | yes | yes | yes | yes | yes | | **{% poplink flow-deck %}, Flow deck V1** | | | yes *1 | yes | | yes | yes | | - | yes | yes | yes | yes | yes | - | **Multi-ranger** | yes | yes | yes | yes | yes | yes | yes | yes | yes | - | yes | yes | yes | yes | + | **{% poplink multi-ranger-deck%}** | yes | yes | yes | yes | yes | yes | yes | yes | yes | - | yes | yes | yes | yes | | **Mocap marker deck** | yes | yes | yes | yes | yes | yes | yes | yes | yes | yes | - | yes | | yes | | **Lighthouse-4** | yes | yes | yes | *2 | *2 | yes | yes | yes | yes | yes | yes | - | | *3 | | **Active marker** | yes | yes | yes | yes | yes | yes | yes | yes | yes | yes | | | - | yes | diff --git a/src/documentation/tutorials/getting-started-with-stem-ranging-bundle.md b/src/documentation/tutorials/getting-started-with-stem-ranging-bundle.md index ac92a1f1..284f16ee 100644 --- a/src/documentation/tutorials/getting-started-with-stem-ranging-bundle.md +++ b/src/documentation/tutorials/getting-started-with-stem-ranging-bundle.md @@ -7,7 +7,7 @@ redirects: --- {% si_intro The STEM ranging bundle %} -The STEM (Science Technology Engineering Mathematics) ranging bundle is based on a Crazyflie 2.X with a {% poplink flow-deck %} and a Multi-ranger deck. +The STEM (Science Technology Engineering Mathematics) ranging bundle is based on a Crazyflie 2.X with a {% poplink flow-deck %} and a {% poplink multi-ranger-deck%}. It is an autonomous drone that can be controlled from a simple python script to explore and operate a robot in 3 dimensions. It has the ability to detect obstacles around it. @@ -18,7 +18,7 @@ This getting started guide will help you set up the system and make your first a * 1 x Crazyflie 2.X Kit * 1 x Crazyradio PA * 1 x {% poplink flow-deck %} -* 1 x Multi-ranger deck +* 1 x {% poplink multi-ranger-deck%} {% endsi_step %} {% si_step prerequisites %} @@ -28,7 +28,7 @@ This guide also requires that you have updated the Crazyflie to the latest firmw {% endsi_step %} {% si_step mounting the Flow V2 deck %} -Mount the {% poplink flow-deck %} underneath and the Multi-ranger deck above the Crazyflie 2.X using the long pin-headers supplied with the Crazyflie 2.X Kit. +Mount the {% poplink flow-deck %} underneath and the {% poplink multi-ranger-deck%} above the Crazyflie 2.X using the long pin-headers supplied with the Crazyflie 2.X Kit. {% img Mounting the Flow V2 deck; wide; /images/tutorials/getting_started_stem_ranging/getting_started_with_stem_ranging_770px.jpg %} {% img Mounting the Flow V2 deck; wide; /images/tutorials/getting_started_stem_ranging/getting_started_with_stem_ranging_770px-2.jpg %} diff --git a/src/products/multi-ranger-deck.md b/src/products/multi-ranger-deck.md index c6287f89..483caa20 100644 --- a/src/products/multi-ranger-deck.md +++ b/src/products/multi-ranger-deck.md @@ -18,7 +18,7 @@ Laser ranging; Measure distances to objects all round %} -The Multi-ranger deck uses 5 laser sensors to measure the distance in the directions front/back/left/right/up. +The {% poplink multi-ranger-deck%} uses 5 laser sensors to measure the distance in the directions front/back/left/right/up. This enables the Crazyflie to detect proximity to objects at up to four meters. {% product_highlight @@ -27,7 +27,7 @@ Interactivity; Interact with the world around %} -With the Multi-ranger deck and the {% poplink flow-deck %}, the Crazyflie becomes an interactive autonomous platform. +With the {% poplink multi-ranger-deck%} and the {% poplink flow-deck %}, the Crazyflie becomes an interactive autonomous platform. It gets the capability to sense the space around it and could react when something is close and for instance avoid obstacles. It also allows to start working on environment-aware problems like Simultaneous Localization And Mapping (SLAM) algorithms.