diff --git a/source/conf.json b/source/conf.json
index b880889..7363512 100644
--- a/source/conf.json
+++ b/source/conf.json
@@ -105,20 +105,41 @@
},
{
"name": "定位循迹",
- "items": [
- {
- "name": "快速上手",
- "uri": "version_two/location/guide/doc"
- },
- {
- "name": "了解定位系统",
- "uri": "version_two/location/marvelmind/doc"
- },
- {
- "name": "Dashboard 说明",
- "uri": "version_two/location/dashboard/doc"
- }
- ]
+ "items": [
+ {
+ "name": "快速上手",
+ "uri": "version_two/location/guide/doc"
+ },
+ {
+ "name": "了解定位系统",
+ "uri": "version_two/location/marvelmind/doc"
+ },
+ {
+ "name": "Dashboard 说明",
+ "uri": "version_two/location/dashboard/doc"
+ }
+ ]
+ },
+ {
+ "name": "远程连接",
+ "items": [
+ {
+ "name": "连接说明",
+ "uri": "version_two/network/setting"
+ },
+ {
+ "name": "内网连接",
+ "uri": "version_two/network/inner-connect"
+ },
+ {
+ "name": "外网连接",
+ "uri": "version_two/network/outer-connect"
+ },
+ {
+ "name": "远程控制-键盘插件",
+ "uri": "version_two/network/keyboard-plugin"
+ }
+ ]
}
]
},
diff --git a/source/version_two/network/imgs/connect.png b/source/version_two/network/imgs/connect.png
new file mode 100644
index 0000000..0c70799
Binary files /dev/null and b/source/version_two/network/imgs/connect.png differ
diff --git a/source/version_two/network/imgs/create_map.png b/source/version_two/network/imgs/create_map.png
new file mode 100644
index 0000000..1518d88
Binary files /dev/null and b/source/version_two/network/imgs/create_map.png differ
diff --git a/source/version_two/network/imgs/intro2.png b/source/version_two/network/imgs/intro2.png
new file mode 100644
index 0000000..8503a69
Binary files /dev/null and b/source/version_two/network/imgs/intro2.png differ
diff --git a/source/version_two/network/imgs/intro3.png b/source/version_two/network/imgs/intro3.png
new file mode 100644
index 0000000..0334631
Binary files /dev/null and b/source/version_two/network/imgs/intro3.png differ
diff --git a/source/version_two/network/imgs/intro4.png b/source/version_two/network/imgs/intro4.png
new file mode 100644
index 0000000..09f066a
Binary files /dev/null and b/source/version_two/network/imgs/intro4.png differ
diff --git a/source/version_two/network/imgs/intro5.png b/source/version_two/network/imgs/intro5.png
new file mode 100644
index 0000000..e9a1ceb
Binary files /dev/null and b/source/version_two/network/imgs/intro5.png differ
diff --git a/source/version_two/network/imgs/network-1.png b/source/version_two/network/imgs/network-1.png
new file mode 100644
index 0000000..7548127
Binary files /dev/null and b/source/version_two/network/imgs/network-1.png differ
diff --git a/source/version_two/network/imgs/network-10.png b/source/version_two/network/imgs/network-10.png
new file mode 100644
index 0000000..30c345a
Binary files /dev/null and b/source/version_two/network/imgs/network-10.png differ
diff --git a/source/version_two/network/imgs/network-11.png b/source/version_two/network/imgs/network-11.png
new file mode 100644
index 0000000..e5b9849
Binary files /dev/null and b/source/version_two/network/imgs/network-11.png differ
diff --git a/source/version_two/network/imgs/network-12.png b/source/version_two/network/imgs/network-12.png
new file mode 100644
index 0000000..9b108bb
Binary files /dev/null and b/source/version_two/network/imgs/network-12.png differ
diff --git a/source/version_two/network/imgs/network-16.png b/source/version_two/network/imgs/network-16.png
new file mode 100644
index 0000000..360e5f4
Binary files /dev/null and b/source/version_two/network/imgs/network-16.png differ
diff --git a/source/version_two/network/imgs/network-17.png b/source/version_two/network/imgs/network-17.png
new file mode 100644
index 0000000..c7b58c8
Binary files /dev/null and b/source/version_two/network/imgs/network-17.png differ
diff --git a/source/version_two/network/imgs/network-18.png b/source/version_two/network/imgs/network-18.png
new file mode 100644
index 0000000..ff61fd8
Binary files /dev/null and b/source/version_two/network/imgs/network-18.png differ
diff --git a/source/version_two/network/imgs/network-19.png b/source/version_two/network/imgs/network-19.png
new file mode 100644
index 0000000..08c1906
Binary files /dev/null and b/source/version_two/network/imgs/network-19.png differ
diff --git a/source/version_two/network/imgs/network-2.png b/source/version_two/network/imgs/network-2.png
new file mode 100644
index 0000000..8e6410b
Binary files /dev/null and b/source/version_two/network/imgs/network-2.png differ
diff --git a/source/version_two/network/imgs/network-20.png b/source/version_two/network/imgs/network-20.png
new file mode 100644
index 0000000..39280d1
Binary files /dev/null and b/source/version_two/network/imgs/network-20.png differ
diff --git a/source/version_two/network/imgs/network-21.png b/source/version_two/network/imgs/network-21.png
new file mode 100644
index 0000000..f0b982f
Binary files /dev/null and b/source/version_two/network/imgs/network-21.png differ
diff --git a/source/version_two/network/imgs/network-22.png b/source/version_two/network/imgs/network-22.png
new file mode 100644
index 0000000..88d9c5f
Binary files /dev/null and b/source/version_two/network/imgs/network-22.png differ
diff --git a/source/version_two/network/imgs/network-23.png b/source/version_two/network/imgs/network-23.png
new file mode 100644
index 0000000..9743ed9
Binary files /dev/null and b/source/version_two/network/imgs/network-23.png differ
diff --git a/source/version_two/network/imgs/network-24.png b/source/version_two/network/imgs/network-24.png
new file mode 100644
index 0000000..4eadb89
Binary files /dev/null and b/source/version_two/network/imgs/network-24.png differ
diff --git a/source/version_two/network/imgs/network-25.png b/source/version_two/network/imgs/network-25.png
new file mode 100644
index 0000000..91d9e29
Binary files /dev/null and b/source/version_two/network/imgs/network-25.png differ
diff --git a/source/version_two/network/imgs/network-26.png b/source/version_two/network/imgs/network-26.png
new file mode 100644
index 0000000..26818b9
Binary files /dev/null and b/source/version_two/network/imgs/network-26.png differ
diff --git a/source/version_two/network/imgs/network-27.png b/source/version_two/network/imgs/network-27.png
new file mode 100644
index 0000000..b6cbbe5
Binary files /dev/null and b/source/version_two/network/imgs/network-27.png differ
diff --git a/source/version_two/network/imgs/network-28.png b/source/version_two/network/imgs/network-28.png
new file mode 100644
index 0000000..4f2e302
Binary files /dev/null and b/source/version_two/network/imgs/network-28.png differ
diff --git a/source/version_two/network/imgs/network-29.png b/source/version_two/network/imgs/network-29.png
new file mode 100644
index 0000000..c175a15
Binary files /dev/null and b/source/version_two/network/imgs/network-29.png differ
diff --git a/source/version_two/network/imgs/network-3.png b/source/version_two/network/imgs/network-3.png
new file mode 100644
index 0000000..b01a5b5
Binary files /dev/null and b/source/version_two/network/imgs/network-3.png differ
diff --git a/source/version_two/network/imgs/network-30.png b/source/version_two/network/imgs/network-30.png
new file mode 100644
index 0000000..e4f5bde
Binary files /dev/null and b/source/version_two/network/imgs/network-30.png differ
diff --git a/source/version_two/network/imgs/network-31.png b/source/version_two/network/imgs/network-31.png
new file mode 100644
index 0000000..c40110a
Binary files /dev/null and b/source/version_two/network/imgs/network-31.png differ
diff --git a/source/version_two/network/imgs/network-32.png b/source/version_two/network/imgs/network-32.png
new file mode 100644
index 0000000..2fec587
Binary files /dev/null and b/source/version_two/network/imgs/network-32.png differ
diff --git a/source/version_two/network/imgs/network-33.png b/source/version_two/network/imgs/network-33.png
new file mode 100644
index 0000000..31dd139
Binary files /dev/null and b/source/version_two/network/imgs/network-33.png differ
diff --git a/source/version_two/network/imgs/network-34.png b/source/version_two/network/imgs/network-34.png
new file mode 100644
index 0000000..167eded
Binary files /dev/null and b/source/version_two/network/imgs/network-34.png differ
diff --git a/source/version_two/network/imgs/network-35.png b/source/version_two/network/imgs/network-35.png
new file mode 100644
index 0000000..68641be
Binary files /dev/null and b/source/version_two/network/imgs/network-35.png differ
diff --git a/source/version_two/network/imgs/network-36.png b/source/version_two/network/imgs/network-36.png
new file mode 100644
index 0000000..a374890
Binary files /dev/null and b/source/version_two/network/imgs/network-36.png differ
diff --git a/source/version_two/network/imgs/network-37.png b/source/version_two/network/imgs/network-37.png
new file mode 100644
index 0000000..45b5465
Binary files /dev/null and b/source/version_two/network/imgs/network-37.png differ
diff --git a/source/version_two/network/imgs/network-38.png b/source/version_two/network/imgs/network-38.png
new file mode 100644
index 0000000..9f7ba59
Binary files /dev/null and b/source/version_two/network/imgs/network-38.png differ
diff --git a/source/version_two/network/imgs/network-39.png b/source/version_two/network/imgs/network-39.png
new file mode 100644
index 0000000..86a40d8
Binary files /dev/null and b/source/version_two/network/imgs/network-39.png differ
diff --git a/source/version_two/network/imgs/network-40.png b/source/version_two/network/imgs/network-40.png
new file mode 100644
index 0000000..0d7915c
Binary files /dev/null and b/source/version_two/network/imgs/network-40.png differ
diff --git a/source/version_two/network/imgs/network-41.png b/source/version_two/network/imgs/network-41.png
new file mode 100644
index 0000000..53b883a
Binary files /dev/null and b/source/version_two/network/imgs/network-41.png differ
diff --git a/source/version_two/network/imgs/network-42.png b/source/version_two/network/imgs/network-42.png
new file mode 100644
index 0000000..1451bce
Binary files /dev/null and b/source/version_two/network/imgs/network-42.png differ
diff --git a/source/version_two/network/imgs/network-43.png b/source/version_two/network/imgs/network-43.png
new file mode 100644
index 0000000..2587a73
Binary files /dev/null and b/source/version_two/network/imgs/network-43.png differ
diff --git a/source/version_two/network/imgs/network-44.png b/source/version_two/network/imgs/network-44.png
new file mode 100644
index 0000000..2c395e0
Binary files /dev/null and b/source/version_two/network/imgs/network-44.png differ
diff --git a/source/version_two/network/imgs/network-45.png b/source/version_two/network/imgs/network-45.png
new file mode 100644
index 0000000..83536c3
Binary files /dev/null and b/source/version_two/network/imgs/network-45.png differ
diff --git a/source/version_two/network/imgs/network-46.png b/source/version_two/network/imgs/network-46.png
new file mode 100644
index 0000000..5294f51
Binary files /dev/null and b/source/version_two/network/imgs/network-46.png differ
diff --git a/source/version_two/network/imgs/network-47.png b/source/version_two/network/imgs/network-47.png
new file mode 100644
index 0000000..fd1ed47
Binary files /dev/null and b/source/version_two/network/imgs/network-47.png differ
diff --git a/source/version_two/network/imgs/network-48.png b/source/version_two/network/imgs/network-48.png
new file mode 100644
index 0000000..2bdccad
Binary files /dev/null and b/source/version_two/network/imgs/network-48.png differ
diff --git a/source/version_two/network/imgs/network-49.png b/source/version_two/network/imgs/network-49.png
new file mode 100644
index 0000000..7023b77
Binary files /dev/null and b/source/version_two/network/imgs/network-49.png differ
diff --git a/source/version_two/network/imgs/network-50.png b/source/version_two/network/imgs/network-50.png
new file mode 100644
index 0000000..103127e
Binary files /dev/null and b/source/version_two/network/imgs/network-50.png differ
diff --git a/source/version_two/network/imgs/network-53.png b/source/version_two/network/imgs/network-53.png
new file mode 100644
index 0000000..d9a5850
Binary files /dev/null and b/source/version_two/network/imgs/network-53.png differ
diff --git a/source/version_two/network/imgs/network-8.png b/source/version_two/network/imgs/network-8.png
new file mode 100644
index 0000000..476ab25
Binary files /dev/null and b/source/version_two/network/imgs/network-8.png differ
diff --git a/source/version_two/network/imgs/network-9.png b/source/version_two/network/imgs/network-9.png
new file mode 100644
index 0000000..3f8d33c
Binary files /dev/null and b/source/version_two/network/imgs/network-9.png differ
diff --git a/source/version_two/network/imgs/slam.png b/source/version_two/network/imgs/slam.png
new file mode 100644
index 0000000..7736fb7
Binary files /dev/null and b/source/version_two/network/imgs/slam.png differ
diff --git a/source/version_two/network/imgs/企业微信截图_20200715112904.png b/source/version_two/network/imgs/企业微信截图_20200715112904.png
new file mode 100644
index 0000000..242df9b
Binary files /dev/null and b/source/version_two/network/imgs/企业微信截图_20200715112904.png differ
diff --git a/source/version_two/network/inner-connect.md b/source/version_two/network/inner-connect.md
new file mode 100644
index 0000000..47332d0
--- /dev/null
+++ b/source/version_two/network/inner-connect.md
@@ -0,0 +1,109 @@
+# 远程连接
+
+## 局域网连接
+
+步骤:
+
+1. 连接无线网络
+2. 获得车载电脑IP地址
+3. 连接设备
+
+### 一、连接无线网络
+
+ 1. 将车载电脑与用户端主机连接至同一无线网络
+
+ 2. 在系统终端中执行 `ipconfig`(windows) 或 `ifconfig` (linux) 查看车载与本机 IP 是否在同一网段,例以 `192.168.18.XX` 开头,最末的`XX`为不同数值,这样确保两个主机在同一网络中。
+
+
+### 二、获得远程连接地址
+
+根据远程操作界面的不同,可选择 远程桌面软件 或 远程命令访问/SSH 两种方式。
+
+在车载电脑的terminal中执行 `ifconfig`,获取 IP 地址,假设获取到的IP为 `192.168.188.1`
+
+内网远程桌面访问地址: 192.168.188.1 端口:4000
+
+内网 SSH 访问地址:192.168.188.1 端口:22
+
+用户名:autolabor
+
+密码:autolabor
+
+推荐用户使用 `远程桌面`,有图形化界面操作更方便,还可直接与用户端主机传输文件。
+
+### 三、连接设备
+
+#### 远程桌面
+
+远程桌面使用的是 NoMachine,这是一个多平台的远程桌面访问工具,图形化操作界面,支持 Windows/Mac/Linux,同一时间仅限 1 人连接(可理解为teamviewer)。
+
+#### 下载NoMachine
+
+[Windows](http://download.autolabor.com.cn/software/nomachine_6.11.2_1.exe)/[OS X](http://download.autolabor.com.cn/software/nomachine_6.11.2_13.dmg)/[Ubuntu](http://download.autolabor.com.cn/software/nomachine_6.11.2_1_amd64.deb)
+
+
+#### 安装
+
+
+
+
+
+#### 启动
+
+1. 打开 NoMachine 软件,会弹出引导页面,点击 `continue`
+
+
+
+2. NoMachine 会将同一局域网中所有设备列出,与机器人在同一网络时,可直接看到机器人设备,右键点击设置图标,选择 `Edit Connection` 按钮,确认IP地址是否正确。
+
+
+
+
+
+3. 点击 `OK` `continue`,开始连接
+
+
+
+4. 输入 用户名: autolabor 密码: autolabor
+
+
+
+5. 点击 `OK`,成功连接到机器人上。
+
+ 此时桌面上弹出了一个对话框,是远程桌面软件的设置窗口,左下角勾选之后会不再显示,点击 `OK` 关闭。
+
+ 注:如果连接的时候显示白屏,此时系统图形化界面加载中,请等待片刻。
+
+ 
+
+***
+
+
+#### SSH
+
+此处用 windows 下的 putty 介绍,SSH 的连接方式。
+
+1. 打开 putty 软件,Host: `获取到的IP地址` Port: `22`,`open` 打开。
+
+
+
+2. 选择 `是`
+
+
+
+3. 输入 用户名:autolabor 密码:autolabor,回车连接
+
+
+
+4. 登录成功
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/version_two/network/keyboard-plugin.md b/source/version_two/network/keyboard-plugin.md
new file mode 100644
index 0000000..a602c71
--- /dev/null
+++ b/source/version_two/network/keyboard-plugin.md
@@ -0,0 +1,115 @@
+# 远程控制-键盘插件
+
+使用远程连接到 AP1 上后,我们想要控制 AP1运动,发现键盘控制车不动。
+
+在 OS 系统中程序默认识别的是插在车载电脑上的键盘外设,远程主机的键盘命令程序无法接收,键盘控制指令则无法执行。
+
+为了解决远程连接控制的问题,我们需要安装一个键盘驱动包,获取远程主机键盘的指令,发送到车载主机上。
+
+
+## rviz_keyboard_plugin
+
+
+### 描述:
+
+该功能包为Autolabor 机器人远程连接时,提供用户端主机键盘控制功能。
+
+### 要求:
+
+必须基于 Autolabor OS 使用
+
+
+### 一、下载与编译
+
+
+#### 1. 下载程序包
+
+进入 /home/autolabor/catkin_ws/src 目录,执行
+
+```
+git clone https://github.com/autolaborcenter/rviz_keyboard_plugin.git
+```
+
+或访问 https://github.com/autolaborcenter/rviz_keyboard_plugin.git 下载源代码,放入 /home/autolabor/catkin_ws/src 目录中
+
+给新加入的文件添加操作权限,在/home/autolabor/catkin_ws 目录下,右键打开终端,执行
+
+`sudo chmod -R 777 /home/autolabor/catkin_ws/src/`
+
+输入密码 `autolabor`,回车
+
+#### 2. 编译
+
+还是在 /home/autolabor/catkin_ws 目录下,终端执行
+
+`sudo rm -rf build/ devel/ logs/ .catkin_tools/`
+
+输入密码 `autolabor`,回车,然后执行
+
+`catkin build`
+
+
+### 二、安装
+
+以**建图**为例,演示该插件的安装方法。
+
+#### 1. 远程连接
+
+使用远程桌面工具,连接到车载电脑上。
+
+#### 2. 点击【开始建图】
+
+
+
+程序启动,RVIZ打开。
+
+
+
+#### 3. 加载插件
+
+RViz 的左上角依次点击 Panels -> Add New Panel -> rviz_keyboard_twist -> KeyboardTwist
+
+
+
+