diff --git a/src/_data/poplink.yml b/src/_data/poplink.yml index 8e460414..422e9278 100644 --- a/src/_data/poplink.yml +++ b/src/_data/poplink.yml @@ -48,3 +48,11 @@ poplinks: title: Qi 1.2 wireless charging deck default-link: /products/qi-1_2-charger-deck/ content: qi-1-2-wireless-charging-deck.md + active-marker-deck: + title: Active marker deck + default-link: /products/active-marker-deck + content: active-marker-deck.md + motion-capture-marker-deck: + title: Motion capture marker deck + default-link: /products/motion-capture-marker-deck + content: motion-capture-marker-deck.md diff --git a/src/_poplink/active-marker-deck.md b/src/_poplink/active-marker-deck.md new file mode 100644 index 00000000..6f62d22f --- /dev/null +++ b/src/_poplink/active-marker-deck.md @@ -0,0 +1,9 @@ +[Buy in store](https://store.bitcraze.io/products/active-marker-deck) + +[Product page](/products/active-marker-deck/) + +[Other deck compatibility](/documentation/system/platform/cf2-expansiondecks/#deck---deck) + +[Parameters](/documentation/repository/crazyflie-firmware/master/api/params/#activemarker) + +[Motion Capture Positioning](/documentation/system/positioning/mocap-positioning/) diff --git a/src/_poplink/flow-deck.md b/src/_poplink/flow-deck.md index 7a89fdae..73819ce7 100644 --- a/src/_poplink/flow-deck.md +++ b/src/_poplink/flow-deck.md @@ -8,5 +8,5 @@ [STEM Tutorial](/documentation/tutorials/getting-started-with-stem-drone-bundle/) -[Logging](https://www.bitcraze.io/documentation/repository/crazyflie-firmware/master/api/logs/#motion) +[Logging](/documentation/repository/crazyflie-firmware/master/api/logs/#motion) diff --git a/src/_poplink/motion-capture-marker-deck.md b/src/_poplink/motion-capture-marker-deck.md new file mode 100644 index 00000000..47af2f87 --- /dev/null +++ b/src/_poplink/motion-capture-marker-deck.md @@ -0,0 +1,7 @@ +[Buy in store](https://store.bitcraze.io/products/motion-capture-marker-deck) + +[Product page](/products/motion-capture-marker-deck/) + +[Other deck compatibility](/documentation/system/platform/cf2-expansiondecks/#deck---deck) + +[Motion Capture Positioning](/documentation/system/positioning/mocap-positioning/) diff --git a/src/_poplink/multi-ranger-deck.md b/src/_poplink/multi-ranger-deck.md index b1e745aa..c7dfda46 100644 --- a/src/_poplink/multi-ranger-deck.md +++ b/src/_poplink/multi-ranger-deck.md @@ -6,5 +6,5 @@ [STEM Tutorial](/documentation/tutorials/getting-started-with-stem-ranging-bundle/) -[Logging](https://www.bitcraze.io/documentation/repository/crazyflie-firmware/master/api/logs/#range) +[Logging](/documentation/repository/crazyflie-firmware/master/api/logs/#range) diff --git a/src/documentation/system/platform/cf2-expansiondecks.md b/src/documentation/system/platform/cf2-expansiondecks.md index c2bb9215..04a37c08 100644 --- a/src/documentation/system/platform/cf2-expansiondecks.md +++ b/src/documentation/system/platform/cf2-expansiondecks.md @@ -20,8 +20,8 @@ Here is a list of expansion decks that are available for the Crazyflie 2.X: | {% poplink sd-card-deck %}|Expansion deck to read, write files to SD-card| [datasheet](/documentation/hardware/sd_card_deck/sd_card_deck-datasheet.pdf), [schematics](/documentation/hardware/sd_card_deck/sdcard_revb.pdf) | [Data Logging](/documentation/repository/crazyflie-firmware/master/userguides/decks/micro-sd-card-deck/) | | {% poplink z-ranger-deck %}|Expansion deck for precise height control.| [datasheet](/documentation/hardware/z_ranger_deck_2/z_ranger_deck_2-datasheet.pdf), [schematics](/documentation/hardware/z_ranger_deck_2/z-ranger_v2_reva.pdf) | | | {% poplink lighthouse-deck %}|Expansion deck that supports the SteamVR Lighthouse positioning| [datasheet](/documentation/hardware/lighthouse_deck/lighthouse_deck-datasheet.pdf), [schematics](/documentation/hardware/lighthouse_deck/lighthouse_deck-datasheet.pdf) | {% id_link lh-deck-other-hardware %} | -| {% 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 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) | | +| {% poplink 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/)| | {% 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)| | @@ -109,11 +109,11 @@ Deck info | 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 | {% 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 | 0x0D | bcMocap | {% poplink motion-capture-marker-deck %} | 1.6g | 0mA | Above | [link](https://store.bitcraze.io/products/motion-capture-marker-deck) | | 0xBC | 0x0E | bcZRanger2 | {% poplink z-ranger-deck %} | 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) | | 0xBC | 0x10 | bcLighthouse4 | {% poplink lighthouse-deck %} | 2.7g | ~40mA | Above | [link](https://store.bitcraze.io/products/lighthouse-positioning-deck) | -| 0xBC | 0x11 | bcActiveM | Active marker deck | 3.3g | ~40mA | Above | [link](https://store.bitcraze.io/products/active-marker-deck) | +| 0xBC | 0x11 | bcActiveM | {% poplink active-marker-deck %} | 3.3g | ~40mA | Above | [link](https://store.bitcraze.io/products/active-marker-deck) | | 0xBC | 0x12 | bcAI | AI deck | 4.4g | depending on deck app | Above | [link](https://store.bitcraze.io/products/ai-deck-1-1) | |------|------|---------------|--------------------|--------|----------------------------|----------------|--------------------------------------------------------------------------| @@ -144,9 +144,9 @@ two decks where the connections collide. | **{% poplink flow-deck %}, Flow deck V1** | | | X | X | | *(X)* | X | | | | X | X | X | | | VCC | | **bcOA** | | | X | X | | | | | | | | | | | | VCC | | **{% poplink multi-ranger-deck%}** | | | X | X | | | | | | | | | | | | VCOM | -| **bcMocap** | | | | | | *(X)* | *(X)* | | | | | | | | | N/A | +| **{% poplink motion-capture-marker-deck %}** | | | | | | *(X)* | *(X)* | | | | | | | | | N/A | | **{% poplink lighthouse-deck %}** | X | X | X | X | | | | | | | | | | | | N/A | -| **bcActiveM** | | | X | X | | | | | | | | | | | | N/A | +| **{% poplink active-marker-deck %}** | | | X | X | | | | | | | | | | | | N/A | | **bcAI** | X | X | X | X | X | | | X | X | X | | | | | | VCOM | |---------------------------|-------|-------|-------|-------|----------|----------|----------|---------|-------|-------|-------|-------|-------|----------|----------|------| @@ -169,9 +169,9 @@ This table shows which deck that works on which platform. | **{% poplink z-ranger-deck %}, Z-ranger deck V1** | yes | yes | | **{% poplink flow-deck %}, Flow deck V1** | yes | yes | | **{% poplink multi-ranger-deck%}** | yes | yes | -| **Mocap marker deck** | yes | yes | +| **{% poplink motion-capture-marker-deck %}** | yes | yes | | **{% poplink lighthouse-deck %}** | yes | *2 | -| **Active marker** | yes | yes | +| **{% poplink active-marker-deck %}** | yes | yes | | **AI deck** | yes | yes | |---------------------------|----------------|-----------| @@ -198,9 +198,9 @@ compatible. | **{% poplink z-ranger-deck %}, Z-ranger V1** | | | 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 | | **{% 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 | + | **{% poplink motion-capture-marker-deck %}** | yes | yes | yes | yes | yes | yes | yes | yes | yes | yes | - | yes | | yes | | **{% poplink lighthouse-deck %}** | 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 | + | **{% poplink active-marker-deck %}** | yes | yes | yes | yes | yes | yes | yes | yes | yes | yes | | | - | yes | | **AI deck** | yes | yes | yes | *2 | yes | yes | yes | yes | yes | yes | yes | *3 | yes | - | |---------------------------|----------|------------|----------|------------------|----------|--------|-------|----------|---------|--------------|-------------------|--------------|---------------|---------| diff --git a/src/documentation/system/positioning/index.md b/src/documentation/system/positioning/index.md index 055ad03e..53eb5ad3 100644 --- a/src/documentation/system/positioning/index.md +++ b/src/documentation/system/positioning/index.md @@ -40,7 +40,7 @@ The crazyflie can detect its position by means of our Loco Positioning System. H {% row_image_text_links Motion Capture Positioning; /images/documentation/overview/motioncapture.png %} {% row_text %} -The Crazyflie can be positioned using reflective markers and infrared motion capture cameras. We use [Qualysis](https://www.qualisys.com/) in our own office but researchers and hobbiest have used the Crazyflie with MCS cameras of [Vicon](https://www.vicon.com/) and [Optitrack](https://optitrack.com/) as well. The main principle of using the MCS for positioning is that the cameras emit infrared light, which are reflected back by special reflective markers. This will enable the IR-cameras to detect the location of the marker, which the MPC software on an external computer will calculate the actual position from. This information can then send to the Crazyflie through the Crazyradio PA. Also, check out our [motion capture marker deck](https://store.bitcraze.io/collections/decks/products/motion-capture-marker-deck). +The Crazyflie can be positioned using reflective markers and infrared motion capture cameras. We use [Qualysis](https://www.qualisys.com/) in our own office but researchers and hobbiest have used the Crazyflie with MCS cameras of [Vicon](https://www.vicon.com/) and [Optitrack](https://optitrack.com/) as well. The main principle of using the MCS for positioning is that the cameras emit infrared light, which are reflected back by special reflective markers. This will enable the IR-cameras to detect the location of the marker, which the MPC software on an external computer will calculate the actual position from. This information can then send to the Crazyflie through the Crazyradio PA. Also, check out our {% poplink motion-capture-marker-deck %}. {% endrow_text %} {% row_links %} diff --git a/src/documentation/system/positioning/mocap-positioning.md b/src/documentation/system/positioning/mocap-positioning.md index 64dc1a1d..b4f958cd 100644 --- a/src/documentation/system/positioning/mocap-positioning.md +++ b/src/documentation/system/positioning/mocap-positioning.md @@ -67,7 +67,7 @@ even though there are multiple object with the same pyhsical marker configuratio {% endrow_text %} {% row_links %} * {% id_link product-motion-capture-marker-deck %} -* {% id_link product-active-marker-deck %} +* {% poplink active-marker-deck %} {% endrow_links %} {% endrow_image_text_links %} @@ -82,9 +82,9 @@ Motion capture systems typically have very high accuracy/precission, often under {% row_text %} It is possible to glue markers to a Crazyflie but we have developed two types of marker decks to simplify the task of using the Crazyflie with MoCap systems. The first is the -[Motion capture marker deck](https://store.bitcraze.io/collections/decks/products/motion-capture-marker-deck) +{% poplink motion-capture-marker-deck %} which is a deck where passive markers easily can be attached in various configurations. The other is the -[Active marker deck](https://store.bitcraze.io/collections/decks/products/active-marker-deck) which has 4 IR-LEDs that can +{% poplink active-marker-deck %} which has 4 IR-LEDs that can be configured in various ways. Together with a Qualisys Mocap system it also provides the possibility to transmit different ids for each marker. @@ -92,9 +92,9 @@ For more information on how to combine the components of the Crazyflie ecosystem {% endrow_text %} {% row_links %} * {% id_link product-crazyflie-2-1 %} -* {% id_link product-motion-capture-marker-deck %} +* [Motion capture marker deck](https://store.bitcraze.io/products/motion-capture-marker-deck/) * [Reflective marker kit](https://store.bitcraze.io/collections/positioning/products/reflective-markers) -* {% id_link product-active-marker-deck %} +* [Active marker deck](https://store.bitcraze.io/products/active-marker-deck/) {% endrow_links %} {% endrow_image_text_links %} diff --git a/src/products/active-marker-deck.md b/src/products/active-marker-deck.md index 4bca52dd..d9beaa21 100644 --- a/src/products/active-marker-deck.md +++ b/src/products/active-marker-deck.md @@ -18,7 +18,7 @@ Long distance and solid tracking; Compatible with Qualisys tracking systems and QTM %} -The active marker deck together with Qualisys QTM gives you long distance and solid tracking. Thanks to the 4 high-power LEDs you can set up to 4 +The {% poplink active-marker-deck %} together with Qualisys QTM gives you long distance and solid tracking. Thanks to the 4 high-power LEDs you can set up to 4 different IDs giving you the possibility to uniqly identify a large number of rigid bodies, without the need of many reflective markers. The hardware comes pre-programmed for Qualisys tracking systems, but can be re-programmed for other applications. diff --git a/src/products/motion-capture-marker-deck.md b/src/products/motion-capture-marker-deck.md index 5e46576e..e2ba077a 100644 --- a/src/products/motion-capture-marker-deck.md +++ b/src/products/motion-capture-marker-deck.md @@ -18,7 +18,7 @@ Add motion capture markers; Add reflective markers with ease %} -The Motion capture marker deck makes it easy to attach reflective markers to a +The {% poplink motion-capture-marker-deck %} makes it easy to attach reflective markers to a Crazyflie for tracking in a motion capture system. The markers are tracked by cameras in the motion capture system and the system uses the information to calculate the current position of the Crazyflie. The position can be used for precise