Fix the name of ZeroTier VPN
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
@@ -77,7 +77,7 @@ If everything is done correctly, every time the system restarts, the service cli
|
||||
|
||||
<!-- -->
|
||||
|
||||
> **Hint** Alternatively we recommend to use the [ZeroTier](zerotire_vpn.md) VPN-service.
|
||||
> **Hint** Alternatively we recommend to use the [ZeroTier](zerotier_vpn.md) VPN-service.
|
||||
|
||||
## Copter control via QGroundControl
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
* [Model files for parts](models.md)
|
||||
* [ROS Melodic installation](ros-install.md)
|
||||
* [Camera calibration](camera_calibration.md)
|
||||
* [VPN ZeroTire Connection](zerotire_vpn.md)
|
||||
* [VPN ZeroTier Connection](zerotier_vpn.md)
|
||||
* [Quadcopter control with 4G communication](4g.md)
|
||||
* [Clover and Jetson Nano](jetson_nano.md)
|
||||
* [Remote control app](rc.md)
|
||||
|
||||
@@ -4,35 +4,35 @@
|
||||
|
||||
1. Go to [ZeroTier](https://www.zerotier.com/) website.
|
||||
|
||||
<img src="../assets/zerotire/login_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/login_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Sign up on ZeroTier.
|
||||
|
||||
<img src="../assets/zerotire/login_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/login_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Go to your account.
|
||||
|
||||
4. Click on the *Create A Network*.
|
||||
|
||||
<img src="../assets/zerotire/network_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_1.png" width=300 class="zoom border center">
|
||||
|
||||
5. After that, you will see the network you created, its ID and name. Click on the network to configure it.
|
||||
|
||||
<img src="../assets/zerotire/network_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_2.png" width=300 class="zoom border center">
|
||||
|
||||
6. In the window that appears you can change the network name and connection privacy.
|
||||
|
||||
<img src="../assets/zerotire/network_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_3.png" width=300 class="zoom border center">
|
||||
|
||||
7. Scroll down to the *Members* column. It will say that there are no users on the network.
|
||||
|
||||
<img src="../assets/zerotire/network_4.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_4.png" width=300 class="zoom border center">
|
||||
|
||||
8. Devices connected to the network will be displayed in this column. To allow them to connect to the network, activate the *Auth?* checkbox. The connected device will automatically be given an internal IP address, which will then be used to communicate with this device.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/network_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/network_6.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/network_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/network_6.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
> **Hint** specify names for new devices, it will help you distinguish them from each other in the future.
|
||||
@@ -47,17 +47,17 @@
|
||||
|
||||
1. Go to the ZeroTier website.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Click on the Windows icon.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Download and run the `ZeroTier One.msi` file.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/windows_1.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/windows_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/windows_1.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/windows_2.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
### Network connection
|
||||
@@ -68,11 +68,11 @@
|
||||
|
||||
3. Click on the *Join Network...* to connect to the network.
|
||||
|
||||
<img src="../assets/zerotire/windows_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/windows_3.png" width=300 class="zoom border center">
|
||||
|
||||
4. In the window that appears, enter your network ID and click *Join*.
|
||||
|
||||
<img src="../assets/zerotire/windows_4.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/windows_4.png" width=300 class="zoom border center">
|
||||
|
||||
5. Allow using the new network.
|
||||
|
||||
@@ -82,11 +82,11 @@
|
||||
|
||||
1. Go to the ZeroTier website.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Click on the iOS icon.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Install the *ZeroTier One* app.
|
||||
|
||||
@@ -96,23 +96,23 @@
|
||||
|
||||
2. Click on *+* to add a new connection.
|
||||
|
||||
<img src="../assets/zerotire/ios_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_1.png" width=300 class="zoom border center">
|
||||
|
||||
3. Confirm the privacy policy.
|
||||
|
||||
<img src="../assets/zerotire/ios_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_2.png" width=300 class="zoom border center">
|
||||
|
||||
4. Enter your network ID and click *Add Network*.
|
||||
|
||||
<img src="../assets/zerotire/ios_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_3.png" width=300 class="zoom border center">
|
||||
|
||||
5. Confirm adding the new VPN configuration.
|
||||
|
||||
6. Connect to the VPN network by sliding the network activation slider.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/ios_4.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/ios_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/ios_4.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/ios_5.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
## Setup on Linux (PC, Raspberry Pi)
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
2. Enter the command `sudo zerotier-cli join network-id`, where `network-id` is your network ID.
|
||||
|
||||
<img src="../assets/zerotire/linux_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/linux_1.png" width=300 class="zoom border center">
|
||||
|
||||
3. If the connection is successful, the corresponding message will be displayed in the console.
|
||||
|
||||
@@ -143,11 +143,11 @@
|
||||
|
||||
1. Go to the ZeroTier website.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Click on the macOS icon.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Download and run `ZeroTier One.pkg` file.
|
||||
|
||||
@@ -161,23 +161,23 @@
|
||||
|
||||
3. In the window that appears, click on *Join Network...*.
|
||||
|
||||
<img src="../assets/zerotire/macos_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/macos_1.png" width=300 class="zoom border center">
|
||||
|
||||
4. In the *Enter Network ID* field, enter your network ID.
|
||||
|
||||
<img src="../assets/zerotire/macos_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/macos_2.png" width=300 class="zoom border center">
|
||||
|
||||
## Connecting to the copter
|
||||
|
||||
1. Make sure that ZeroTier is working and connected to the network on the drone and control device. To do this, make sure that these have an *Online* status.
|
||||
|
||||
<img src="../assets/zerotire/qgc_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/qgc_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Make sure that all devices have local IP addresses - *Managed IPs*.
|
||||
|
||||
3. Open GQC and in the *Comm Links* tab add a TCP connection specifying the IP of the drone. Read more about remote connection [here](gcs_bridge.md).
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/qgc_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/qgc_3.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/qgc_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/qgc_3.png" width=300 class="zoom border">
|
||||
</div>
|
||||
@@ -77,7 +77,7 @@ sudo systemctl enable openvpn-client@config-name
|
||||
|
||||
<!-- -->
|
||||
|
||||
> **Hint** В качестве удобной альтернативы вы можете воспользоваться VPN-сервисом [ZeroTier](zerotire_vpn.md).
|
||||
> **Hint** В качестве удобной альтернативы вы можете воспользоваться VPN-сервисом [ZeroTier](zerotier_vpn.md).
|
||||
|
||||
## Управление коптером через QGroundControl
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
* [Docker-контейнер с симулятором](sitl_docker.md)
|
||||
* [Установка ROS Melodic](ros-install.md)
|
||||
* [Калибровка камеры](camera_calibration.md)
|
||||
* [Подключение к VPN ZeroTire](zerotire_vpn.md)
|
||||
* [Подключение к VPN ZeroTier](zerotier_vpn.md)
|
||||
* [Подключение к VPN Hamachi](hamachi_vpn.md)
|
||||
* [Управление мультикоптером при помощи 4G связи](4g.md)
|
||||
* [Пакеты Клевера на Jetson Nano](jetson_nano.md)
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
# Создание виртуальной сети ZeroTire и подключение к ней
|
||||
# Создание виртуальной сети ZeroTier и подключение к ней
|
||||
|
||||
## Создание и настройка сети ZeroTier
|
||||
|
||||
1. Зайдите на сайт [ZeroTier](https://www.zerotier.com/).
|
||||
|
||||
<img src="../assets/zerotire/login_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/login_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Зарегистрируйтесь в ZeroTier.
|
||||
|
||||
<img src="../assets/zerotire/login_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/login_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Зайдите в свой аккаунт.
|
||||
|
||||
4. Нажмите кнопку *Create A Network*.
|
||||
|
||||
<img src="../assets/zerotire/network_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_1.png" width=300 class="zoom border center">
|
||||
|
||||
5. После этого вы увидите созданную вами сеть, ее ID и название. Для настройки сети нажмите на нее.
|
||||
|
||||
<img src="../assets/zerotire/network_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_2.png" width=300 class="zoom border center">
|
||||
|
||||
6. В открывшемся окне можно изменить имя сети и приватность подключения.
|
||||
|
||||
<img src="../assets/zerotire/network_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_3.png" width=300 class="zoom border center">
|
||||
|
||||
7. Пролистайте ниже, до графы *Members*. В ней будет написано о том, что в сети нету пользователей.
|
||||
|
||||
<img src="../assets/zerotire/network_4.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/network_4.png" width=300 class="zoom border center">
|
||||
|
||||
8. Устройства подключенные к сети будут отображаться в данной графе, для того, чтобы позволить им подключиться к сети, активируйте чекбокс *Auth?*. При этом, подключенному устройству автоматически выдастся внутренний IP адрес, в дальнейшем он будет использоваться для связи с данным устройством.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/network_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/network_6.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/network_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/network_6.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
> **Hint** Указывайте имена для новых устройств, этом поможет вам в дальнейшем отличать их друг от друга.
|
||||
@@ -47,17 +47,17 @@
|
||||
|
||||
1. Перейдите на сайт ZeroTier.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Нажмите на иконку Windows.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Скачайте и запустите файл `ZeroTier One.msi`.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/windows_1.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/windows_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/windows_1.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/windows_2.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
### Подключение к сети
|
||||
@@ -68,15 +68,15 @@
|
||||
|
||||
3. Нажмите на кнопку *Join Network...* для подключения к сети.
|
||||
|
||||
<img src="../assets/zerotire/windows_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/windows_3.png" width=300 class="zoom border center">
|
||||
|
||||
4. В появившемся окне введите ID вашей сети и нажмите кнопку *Join*.
|
||||
|
||||
<img src="../assets/zerotire/windows_4.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/windows_4.png" width=300 class="zoom border center">
|
||||
|
||||
5. Разрешите использование новой сети.
|
||||
|
||||
<img src="../assets/zerotire/windows_5.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/windows_5.png" width=300 class="zoom border center">
|
||||
|
||||
## Настройка на iOS
|
||||
|
||||
@@ -84,11 +84,11 @@
|
||||
|
||||
1. Перейдите на сайт ZeroTier.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Нажмите на иконку iOS.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Установите приложение *ZeroTier One*.
|
||||
|
||||
@@ -98,23 +98,23 @@
|
||||
|
||||
2. Нажмите на *+* для добавления нового подключения.
|
||||
|
||||
<img src="../assets/zerotire/ios_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_1.png" width=300 class="zoom border center">
|
||||
|
||||
3. Подтвердите политику конфиденциальности.
|
||||
|
||||
<img src="../assets/zerotire/ios_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_2.png" width=300 class="zoom border center">
|
||||
|
||||
4. Введите ID вашей сети и нажмите кнопку *Add Network*.
|
||||
|
||||
<img src="../assets/zerotire/ios_3.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/ios_3.png" width=300 class="zoom border center">
|
||||
|
||||
5. Подтвердите добавление новой конфигурации VPN.
|
||||
|
||||
6. Подключитесь к VPN сети, сдвинув ползунок активации сети.
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/ios_4.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/ios_5.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/ios_4.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/ios_5.png" width=300 class="zoom border">
|
||||
</div>
|
||||
|
||||
## Настройка на Linux (PC, Raspberry Pi)
|
||||
@@ -135,7 +135,7 @@
|
||||
|
||||
2. Введите команду `sudo zerotier-cli join network-id`, где `network-id` это ID вашей сети.
|
||||
|
||||
<img src="../assets/zerotire/linux_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/linux_1.png" width=300 class="zoom border center">
|
||||
|
||||
3. При успешном подключении, в консоль будет выведено соответствующее сообщение.
|
||||
|
||||
@@ -145,11 +145,11 @@
|
||||
|
||||
1. Перейдите на сайт ZeroTier.
|
||||
|
||||
<img src="../assets/zerotire/download_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Нажмите на иконку macOS.
|
||||
|
||||
<img src="../assets/zerotire/download_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/download_2.png" width=300 class="zoom border center">
|
||||
|
||||
3. Скачайте и запустите файл `ZeroTier One.pkg`.
|
||||
|
||||
@@ -163,23 +163,23 @@
|
||||
|
||||
3. В открывшемся окне нажмите *Join Network...*.
|
||||
|
||||
<img src="../assets/zerotire/macos_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/macos_1.png" width=300 class="zoom border center">
|
||||
|
||||
4. В поле *Enter Network ID* введите ID вашей сети.
|
||||
|
||||
<img src="../assets/zerotire/macos_2.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/macos_2.png" width=300 class="zoom border center">
|
||||
|
||||
## Подключение к коптеру
|
||||
|
||||
1. Убедитесь, что ZeroTier работает и имеет соединение с сетью на дроне и управляющем устройстве. Для этого убедитесь, что интересующие вас устройства имеют статус *Online*.
|
||||
|
||||
<img src="../assets/zerotire/qgc_1.png" width=300 class="zoom border center">
|
||||
<img src="../assets/zerotier/qgc_1.png" width=300 class="zoom border center">
|
||||
|
||||
2. Убедитесь, что у всех устройств есть локальные IP адреса - *Managed IPs*.
|
||||
|
||||
3. Откройте GQC и во вкладке *Comm Links* добавьте TCP подключение, указав IP дрона. Подробнее про удаленное подключение читайте [тут](gcs_bridge.md).
|
||||
|
||||
<div class="image-group">
|
||||
<img src="../assets/zerotire/qgc_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotire/qgc_3.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/qgc_2.png" width=300 class="zoom border">
|
||||
<img src="../assets/zerotier/qgc_3.png" width=300 class="zoom border">
|
||||
</div>
|
||||
@@ -69,5 +69,7 @@
|
||||
{ "from": "en/microsd_images.html", "to": "image.html" },
|
||||
{ "from": "ru/px4_parameters.html", "to": "parameters.html" },
|
||||
{ "from": "en/px4_parameters.html", "to": "parameters.html" }
|
||||
{ "from": "ru/zerotire_vpn.html", "to": "zerotier_vpn.html" },
|
||||
{ "from": "en/zerotire_vpn.html", "to": "zerotier_vpn.html" }
|
||||
]
|
||||
}
|
||||
|
||||