Merge branch 'master' of https://github.com/m5stack/m5-docs

docs/en/app/lidarbot.md

@@ -114,6 +114,17 @@ If you are interest in AGV development, We especially encourage you to modify th
 
 !>3.The CP210X (USB driver) needs to be installed before the EasyLoader is burned. [Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-driver)
 
+
+## Connect And Pair
+
+Example note: 
+
+If you have no map on the screen of your remote, reconnect it.
+
+Press Button B of the lidarBot until the sound raised and the car will get into Broadcast mode with it's mac address on the screen which will send the lidarBot Mac address to the remote.
+And Press Button B for a few second,you will hear the same sound and the Mac address of lidarBot will show on the screen,use down button to select and press select when you choose the right Mac address on the screen.
+Check out the lidarBot screen whether it receive the message from the remote,press confirm and you finish the match.
+
 ## Example
 
 *To get complete code, please click [here](https://github.com/m5stack/Applications-LidarBot/tree/master/LidarBot/Example)。*

docs/en/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md

@@ -38,34 +38,36 @@
 
 ## Firmware burning
 
-> 1. Double-click the Burner burning tool and click the download button in the left menu according to the firmware version you need. Then,  connect the M5 device to the computer via a Type-C data cable, select the corresponding COM, baud rate , as well as the type of your programming device.
+>1.Double-click to open the Burner burning tool, select the corresponding device type in the left menu, select the firmware version you need, and click the download button to download.
 
-?> Note: M5Burner includes different UIFlow firmware versions from different M5Stack products. Therefore, you need to select the correct device type before proceeding with the burning process to obtain the firmware that matches the device, as shown in the figure below. (The default burning rate of the configuration can be chosen. In special cases like malfunction of the burning process, you can try to reduce the burning rate to 115200).
+<img src="assets\img\quick_start\m5stickc\burner_m5stickc01.webp" width="70%"> 
 
-<img src="assets\img\getting_started_pics\m5stickc\m5burner_stickc01.webp" width="70%"> 
+>2.Then connect the M5 device to the computer through the Type-C cable, select the corresponding COM port, the baud rate can use the default configuration in M5Burner, in addition, you can also fill in the WIFI that the device will be connected to during the firmware burning stage information. After configuration, click "Burn" to start burning.
 
-> 2. Select the firmware version you want to burn, connect the device to the computer via Type-C data cable, select the corresponding COM port and device type. Click "Burn" to start burning.
+<img src="assets\img\quick_start\m5stickc\burner_m5stickc02.webp" width="70%"> 
+
+>3.When the burning log prompts `Burn Successfully`, it means that the firmware has been burned.
+
+<img src="assets\img\quick_start\core\burner_done.webp" width="70%">
 
 ?> When first burning or the firmware program runs abnormally, you can click "Erase" to erase the flash memory. In the subsequent firmware update, there is no need to erase again, otherwise the saved Wi-Fi information will be deleted and the API Key will be refreshed.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5burner_stickc02.webp" width="70%"> 
-
 
 ## Configure WIFI
 
 > UIFlow provides both offline and web version of the programmer. When using the web version, we need to configure a WiFi connection for the device. The following describes two ways to configure WiFi connection for the device (Burn configuration and AP hotspot configuration).
 
-### Burn configuration WiFi
+### Burn configuration WiFi(recommend)
 
 ?> UIFlow-1.4.5 and versions above can write WiFi information directly through M5Burner.
 
-<img src="assets\img\getting_started_pics\m5stack_core\get_started_with_uiflow\m5burner_wifi.webp " width="70%">
+<img src="assets\img\quick_start\core\burner_wifi.webp" width="70%">
 
 ### AP hotspot configuration WiFi
 
 > 1. Press and hold the power button on the left to turn on the machine. If WiFi is not configured, the system will automatically enter the network configuration mode when it is turned on for the first time. Suppose you want to re-enter the network configuration mode after running other programs, you can refer to the operation below. After the UIFlow Logo appears at startup, quickly click the Home button (center M5 button) to enter the configuration page. Press the button on the right side of the fuselage to switch the option to Setting, and press the Home button to confirm. Press the right button to switch the option to WiFi Setting, press the Home button to confirm, and start the configuration.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_wifi_setup01.webp ">
+<img src="assets\img\quick_start\m5stickc\m5stickc_ap_setup.webp">
 
 > 2. After successfully connecting to the hotspot with your mobile phone, open the mobile phone browser to scan the QR code on the screen or directly access __192.168.4.1__, enter the page to fill in your personal WIFI information, and click Configure to record your WiFi information. The device will restart automatically after successfully configuring and enter programming mode.
 
@@ -138,13 +140,13 @@
 
 > After the driver installation is complete, it will automatically enter the UIFlow Desktop IDE and automatically pop up the configuration box. At this time, connect the M5 device to the computer through the Tpye-C data cable.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_usb_connect.webp ">
+<img src="assets\img\quick_start\m5stickc\m5stickc_usb_connect.webp">
 
 !> Using UIFlow Desktop IDE requires M5 device with UIFlow firmware and enter ** USB programming mode **.
 
-> Click the power button on the left side of the device to restart. Quickly select Setup after entering the menu, enter the configuration page, and select **USB mode**.
+> Click the power button on the left side of the device to restart, after entering the menu, quickly click the right button to select **USB mode**.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_usb_mode01.webp">
+<img src="assets\img\quick_start\m5stickc\m5stickc_usb_mode.webp">
 
 > Select the corresponding port, and the programming device, click OK to connect.
 

docs/index_source.html

@@ -8,6 +8,7 @@
     <meta name="description" content="The reference docs for M5Stack products. Quick start, get the detailed information or instructions such as IDE,UIFLOW,Arduino. The tutorials for M5Burner, Firmware, Burning, programming. ESP32,M5StickC,StickV, StickT,M5ATOM.">
     <meta name="google-site-verification" content="sYDlVf68aDW21U32H46j1P4YDSimljEGHBEMi4JRxQ8" />
     <title>M5Stack Docs - The reference docs for M5Stack products.</title>
+    <base target="_blank">
     <link rel="icon" href="assets/img/favicon.ico">
     <!-- Stylesheets -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsify-themeable@0.7.2/dist/css/theme-simple.css" title="Simple">

docs/zh_CN/app/lidarbot.md

@@ -114,6 +114,15 @@
 !>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动)
 
 
+## 连接与配对
+
+案例程序提示：
+
+当手柄不能控制或者显示地图的时候，需要将雷达车和手柄重新配对一下。雷达车启动之后按住Button B键（中间的按键）不放，直到雷达车声音响起，雷达车进入广播模式，主机的地址回显示到屏幕上。
+手柄启动之后按住Button B(中间的按键)不放，直到手柄声音响起，此时应该接到来自雷达车的广播消息，并且会显示雷达车的Mac地址。如果有多个Mac地址可以通过down键向下选择，如果错过了可以按update键刷新当前操作。选择与雷达车对应的Mac地址后按下select即可确认需要配对的雷达车地址。
+这时候雷达车，会收到手柄的确认信息，手柄的Mac地址并且会显示到雷达车的屏幕上，按下屏幕的confirm即可完成配对。
+
+
 ## 案例程序
 
 *以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/Applications-LidarBot/tree/master/LidarBot/Example)。*

docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md

@@ -42,7 +42,7 @@
 
 <img src="assets\img\quick_start\m5stickc\burner_m5stickc01.webp" width="70%"> 
 
->2.然后将M5设备通过Type-C数据线连接到电脑，选择对应的COM口，波特率可使用M5Burner中的默认配置，i另外，你还可以在固件烧录阶段就填入设备后续将要连接的WIFI信息。配置完成后，点击"Burn"开始烧录.
+>2.然后将M5设备通过Type-C数据线连接到电脑，选择对应的COM口，波特率可使用M5Burner中的默认配置，另外，你还可以在固件烧录阶段就填入设备后续将要连接的WIFI信息。配置完成后，点击"Burn"开始烧录.
 
 <img src="assets\img\quick_start\m5stickc\burner_m5stickc02.webp" width="70%"> 
 
@@ -66,7 +66,7 @@
 
 >1.长按左侧电源键开机，在未配置WiFi的情况下，首次开机将自动进入网络配置模式。假设在运行其他程序后，你想要重新进入网络配置模式，你可以参照下方操作。开机出现UIFlow Logo后，快速单击Home键（中心M5按键），进入配罝页面。按机身右侧按键将选项切换至Setting，按下Home键确认。按右侧按键切换选项至`Wi-Fi via AP`,按下Home键确认，开始配置。
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_wifi_setup01.webp ">
+<img src="assets\img\quick_start\m5stickc\m5stickc_ap_setup.webp">
 
 >2.用手机连接热点成功后，打开手机浏览器扫描屏幕上的二维码，或是直接访问 __192.168.4.1__，进入页面填写个人的WIFI信息，点击配置，使设备记录下你的WiFi信息。配置成功后设备将自动重启。并进入编程模式。
 
@@ -83,7 +83,7 @@
 
 >开机后，在主菜单界面按下按键A选择编程模式，在编程模式页面等待网络指示标志右红变成绿色，通过电脑浏览器访问[flow.m5stack.com](http://flow.m5stack.com/)进入UIFlow编程页面.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_wifi_mode.webp ">
+<img src="assets\img\quick_start\m5stickc\m5stickc_wifi_mode.webp">
 
 #### API KEY配对
 
@@ -139,13 +139,13 @@
 
 >驱动安装完成后，将自动进入UIFlow Desktop IDE并自动弹出配置框，此时将M5设备通过Tpye-C数据线连接至电脑.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_usb_connect.webp ">
+<img src="assets\img\quick_start\m5stickc\m5stickc_usb_connect.webp">
 
 !>使用UIFlow Desktop IDE需要M5设备搭载UIFlow固件且进入**USB编程模式**.
 
->单击设备左侧电源键重启，进入菜单后快速选择Setup，进入配置页面，选择**USB mode**.
+>单击设备左侧电源键重启，进入菜单后快速单击右侧按钮切换模式，选择**USB mode**.
 
-<img src="assets\img\getting_started_pics\m5stickc\m5stickc_usb_mode01.webp">
+<img src="assets\img\quick_start\m5stickc\m5stickc_usb_mode.webp">
 
 >选择好对应的端口，与编程设备，点击OK进行连接.