Skip to content

Commit

Permalink
Rewrite DYNAMIXEL insert page
Browse files Browse the repository at this point in the history
Also includes several small readability changes and AX series notices.
  • Loading branch information
Jonathon-RINC committed Feb 23, 2022
1 parent aa0414b commit 0fc2fe2
Show file tree
Hide file tree
Showing 12 changed files with 180 additions and 64 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ search_index.json
search_index_kr.json
_config_dev.yml

Gemfile.lock
12 changes: 11 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
faraday (1.7.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand All @@ -35,6 +36,7 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
ffi (1.15.4)
ffi (1.15.4-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.14.0)
Expand Down Expand Up @@ -85,6 +87,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.6.1)
minimal-mistakes-jekyll (4.24.0)
jekyll (>= 3.7, < 5.0)
jekyll-feed (~> 0.1)
Expand All @@ -94,6 +97,11 @@ GEM
jekyll-sitemap (~> 1.3)
minitest (5.14.4)
multipart-post (2.1.1)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
nokogiri (1.12.5-x64-mingw32)
racc (~> 1.4)
nokogiri (1.12.5-x86_64-linux)
racc (~> 1.4)
octokit (4.21.0)
Expand Down Expand Up @@ -124,6 +132,8 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
ruby
x64-mingw32
x86_64-linux

DEPENDENCIES
Expand All @@ -139,4 +149,4 @@ DEPENDENCIES
minimal-mistakes-jekyll

BUNDLED WITH
2.2.22
2.3.7
Binary file removed assets/images/faq/cm530_kr1.PNG
Binary file not shown.
Binary file removed assets/images/faq/cm530_kr2.PNG
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions docs/en/dxl/ax/ax-12a.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ product_group: dxl_ax

> AX-12+, AX-12A
**NOTE** : The [XL430-W250](/docs/en/dxl/x/xl430-w250) is an X series DYNAMIXEL serving as a direct replacement of the AX-12. X series servos offer improved performance and additional features, as well as support for [DYNAMIXEL Protocol 2.0](docs/en/dxl/protocol2). ROBOTIS recommends that new and existing AX-12 users transition to [XL430-W250](/docs/en/dxl/x/xl430-w250).
{: .notice--warning}

**NOTE** : AX-12+ is the improved version of existing AX-12; the design of circuit, material, and wheel gear are specially improved.
{: .notice}

Expand Down
3 changes: 3 additions & 0 deletions docs/en/dxl/ax/ax-12w.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ product_group: dxl_ax

> AX-12W
**NOTE** : The [XL430-W250](/docs/en/dxl/x/xl430-w250) is an X series DYNAMIXEL serving as a direct replacement of the AX-12. X series servos offer improved performance and additional features, as well as support for [DYNAMIXEL Protocol 2.0](docs/en/dxl/protocol2). ROBOTIS recommends that new and existing AX-12 users transition to [XL430-W250](/docs/en/dxl/x/xl430-w250).
{: .notice--warning}

# [Specifications](#specifications)

| Item | Specifications |
Expand Down
3 changes: 3 additions & 0 deletions docs/en/dxl/ax/ax-18a.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ product_group: dxl_ax

> AX-18F, AX-18A
**NOTE** : The [XL430-W250](/docs/en/dxl/x/xl430-w250) is an X series DYNAMIXEL serving as a direct replacement of the AX-12. X series servos offer improved performance and additional features, as well as support for [DYNAMIXEL Protocol 2.0](docs/en/dxl/protocol2). ROBOTIS recommends that new and existing AX-12 users transition to [XL430-W250](/docs/en/dxl/x/xl430-w250).
{: .notice--warning}

**NOTE** : AX-18A is a new version of the AX-18F with the same performance but more advanced external design.
{: .notice}

Expand Down
200 changes: 149 additions & 51 deletions docs/en/dxl/dxl-quick-start-insert.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/en/parts/controller/controller_compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ sidebar:
|:----------------:|:------:|:-------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:-----------------------------------:|:-----------:|:--------:|
| [R+ m.Task] | O | O | O | O | x | O | O | O | X | O | X | O(X) | O | X |
| [R+ m.Task 2.0] | O | O | X | O | x | O | O | O | X | X | X | O(X) | O | X |
| [R+ m.Mtion 2.0] | O | X | X | X | X | O | O | O | X | O | X | O(X) | X | X |
| [R+ m.Motion 2.0] | O | X | X | X | X | O | O | O | X | O | X | O(X) | X | X |
| [R+ m.Design] | O | X | O | O | O | O | O | O | X | X | X | O(X) | X | X |

### [R+ Mobile (STEAM KIT)](#r-mobile-steam-kit)

| Model | [CM-5] | [CM-50] | [CM-100] | [CM-150] | [CM-151] | [CM-200] | [CM-510] | [CM-530] | [CM-550] | [CM-700] | [CM-900] | [OpenCM9.04]<br>(+[OpenCM 485 EXP]) | [OpenCM7.0] | [OpenCR] |
|:------------------------------:|:------:|:-------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:-----------------------------------:|:-----------:|:--------:|
| R+ SMART <br> ( I / II / III ) | X | X | X | X | X | O | X | X | X | X | X | X | X | X |
| [R+ Blcok] | X | O | X | O | O | X | X | X | X | X | X | X | O | X |
| [R+ Block] | X | O | X | O | O | X | X | X | X | X | X | X | O | X |
| R+ IoT | X | X | X | X | X | X | X | X | X | X | X | X | O | X |
| [R+ Play 700] | X | O | X | X | X | X | X | X | X | X | X | X | X | X |
| [ROBOTIS MINI] | X | X | X | X | X | X | X | X | X | X | X | O(X) | X | X |
Expand Down
6 changes: 3 additions & 3 deletions docs/en/software/dynamixel/dynamixel_wizard2.md
Original file line number Diff line number Diff line change
Expand Up @@ -414,14 +414,14 @@ Detailed packet data can be loaded by selecting a packet in the packet history.
## [Firmware Update](#firmware-update)
Update firmware version of DYNAMIXEL, if you see its model name with a special charactor (\*), on the device list, in light grey.
When positioning a mouse cursor on its model name, **Firmware update is available** will be shown up.
When your connected DYNAMIXEL has a firmware update available an asterisk **(\*)** will be displayed next to the model name on the device list.
When positioning your mouse cursor over the model name, **Firmware update is Available** will also be displayed as a tooltip.
![](/assets/images/sw/dynamixel/wizard2/wizard2_update_notification.png)
1. Go to `Tools` > `Firmware Update`
**NOTE** : If there isn't any detected or connected device, `Firmware Update` will be disabled. Please scan DYNAMIXEL first.
**NOTE** : If no DYNAMIXELS are detected, the `Firmware Update` option will not be available.
{: .notice}
![](/assets/images/sw/dynamixel/wizard2/wizard2_015.png)
Expand Down
12 changes: 5 additions & 7 deletions docs/en/software/embedded_sdk/embedded_c_cm530.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,17 @@ sidebar:

# [Introduction](#introduction)

It makes the users possible to develop their own firmware. The characteristics are as follows:
- All the sources are written in C Language.
- The examples of how to control each part of the controller directly are provided.
The Embedded C SDK enables users to create their own CM-530 firmware from scratch. Example implementations for basic features are provided on this page.

**NOTE** : If you want to use Embedded C, you need the knowledge of software and hardware. If you are a beginner, we recommend you use Embedded C after learing the software and the hardware.
**NOTE** : This Embedded C SDK is intended for experienced users and programmers. ROBOTIS recommends that first time DYNAMIXEL users use the provided CM-530 firmware.
{: .notice}

**NOTE** : If you use Embedded C, you cannot use RoboPlus since the controller's firmware is changed. If you want to use RoboPlus again, you must restore the firmware using RoboPlus.
{: .notice}
**NOTE** : Custom CM-530 firmware cannot be used with R+ Task software. After flashing custom firmware to the CM-530 it will not be usable with R+ Task until the default firmware is restored.
{: .notice--warning}

# [CM-530](#cm-530)

- [Download CM-530 SDK](http://support.robotis.com/ko/baggage_files/embeded_c/embeddec_c(cm530_v1_02).zip)
The CM-530 SDK can be found on our [Download Center](http://support.robotis.com/ko/baggage_files/embeded_c/embeddec_c(cm530_v1_02).zip)

## File Structure

Expand Down

0 comments on commit 0fc2fe2

Please sign in to comment.