Merge pull request #11 from Ken-Vamrs/main

update cm5 info and add accessories
radxa-docs · Mar 29, 2024 · f953d4a · f953d4a
2 parents f17a38e + 749d591
commit f953d4a
Show file tree

Hide file tree

Showing 21 changed files with 284 additions and 7 deletions.
diff --git a/docs/Home.md b/docs/Home.md
@@ -391,6 +391,13 @@ sidebar_custom_props: { product_docs: [
                 info_en: "Compile the Source Code",
                 url: "/compute-module/cm5/radxa-os/low-level-dev",
               },
+              {
+                title_zh: "系统配置",
+                info_zh: "系统配置指南",
+                title_en: "System Configurations",
+                info_en: "System Configuration Guide",
+                url: "/compute-module/cm5/radxa-os",
+              },
               {
                 title_zh: "相关认证信息",
                 info_zh: "CM5 认证文件",
@@ -403,7 +410,7 @@ sidebar_custom_props: { product_docs: [
                 info_zh: "支持多种镜像下载",
                 title_en: "Image Download",
                 info_en: "Support Multiple Images Download",
-                url: "/compute-module/images",
+                url: "/compute-module/images?model=Radxa+CM5",
               },
             ],
         },

diff --git a/docs/compliance/compute-module/radxa-cm5.md b/docs/compliance/compute-module/radxa-cm5.md
@@ -0,0 +1,5 @@
+---
+sidebar_position: 1
+---
+
+# Radxa CM5 认证信息
diff --git a/docs/compute-module/cm5/README.md b/docs/compute-module/cm5/README.md
@@ -20,7 +20,7 @@ Radxa CM5 是基于 Rockchip RK3588S 片上系统 (SoC) 的系统模块 (SoM)。
 
 | Features | Description                                                                                                                                                                   |
 | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| SoC      | Rockchip RK3588S                                                                                                                                                              |
+| SoC      | Rockchip RK3588S2                                                                                                                                                             |
 | CPU      | Quad Cortex®‑A76 @ 2.2~2.4GHz and a quad Cortex®‑A55 @ 1.8GHz<br/>based on Arm® DynamIQ™ configuration                                                                    |
 | GPU      | Arm Mali™ G610MP4 GPU ‑ OpenGL® ES1.1, ES2.0, and ES3.2 ‑ OpenCL®<br/>1.1, 1.2 and 2.2 ‑ Vulkan® 1.1 and 1.2 ‑ Embedded high performance 2D<br/>image acceleration module |
 | NPU      | NPU supporting INT4 / INT8 / INT16 / FP16 / BF16 and TF32 acceleration<br/>and computing power is up to 6TOPs                                                                 |

diff --git a/docs/compute-module/cm5/accessories/8hd-display_use.md b/docs/compute-module/cm5/accessories/8hd-display_use.md
@@ -0,0 +1,26 @@
+---
+sidebar_position: 3
+---
+
+# Radxa Display 8 HD
+准备好 Radxa Display 8HD、Radxa Display 10HD  或者 Radxa Display 10FHD，通过 FPC 线接上 Radxa CM5 IO板 LCD1接口。
+
+## 以连接radxd 8寸屏为例
+
+![显示屏安装-01](/img/rock5b/rock5b-display-8hd-FPC.webp)  
+![显示屏安装-02](/img/cm5/cm5io-display-8hd-connected.webp)
+
+- 通过左下角 Application Launcher 打开 Kconsole 终端, 运行 `rsetup` 命令：
+
+```bash
+radxa@radxa-cm5-io:~$ rsetup
+```
+
+- 通过[设备树配置](../os-config/rsetup#overlays)来启用瑞莎 8 寸触摸屏的 Overlay。
+
+:::caution [注意]
+
+1. 请启用 `[] Enable Radxa Display 8HD on DSI1` 项 Overlay。
+2. 在启用成功显示 `[*] Enable Radxa Display 8HD on DSI1` 后退出重启才能使配置生效。
+
+:::
diff --git a/docs/compute-module/cm5/accessories/README.md b/docs/compute-module/cm5/accessories/README.md
@@ -1,5 +1,9 @@
 ---
-sidebar_position: 5
+sidebar_position: 9
 ---
 
-# 配件
+# 配件列表
+
+介绍支持的配件信息
+
+<DocCardList />
diff --git a/docs/compute-module/cm5/accessories/camera_4k.md b/docs/compute-module/cm5/accessories/camera_4k.md
@@ -0,0 +1,44 @@
+---
+sidebar_position: 4
+---
+
+# Radxa Camera 4K
+
+![Camera-4K 安装](/img/cm5/cm5io-4k-camera-connected.webp)  
+
+- 准备好 Radxa Camera 4K，通过 FPC 线接上 Radxa CM5 IO板Camera 1接口。
+
+- 通过左下角 Application Launcher 打开 Kconsole 终端, 运行 `rsetup` 命令：
+
+```bash
+radxa@radxa-cm5-io:~$ rsetup
+```
+
+- 通过[设备树配置](../os-config/rsetup#overlays)来启用瑞莎 4K 摄像头的 Overlay。
+
+:::caution [注意]
+
+1. 请启用 `[] Enable Radxa Camera 4K` 项 Overlay。
+2. 在启用成功显示 `[*] Enable Radxa Camera 4K` 后退出reboot重启才能使配置生效。
+
+:::
+
+## 测试 Radxa Camera 4K
+
+你也可以使用终端命令打开相机预览:
+
+```bash
+gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw,format=NV12,width=1920,height=1080 ! xvimagesink;
+```
+
+使用以下命令拍照:
+
+```bash
+gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw,format=NV12,width=1920,height=1080 ! jpegenc ! multifilesink location=file.name.jpg;
+```
+
+使用以下命令拍摄视频:
+
+```bash
+gst-launch-1.0 v4l2src num-buffers=512 device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw, format=NV12, width=1920, height=1080, framerate=30/1 ! tee name=t ! queue ! mpph264enc ! queue ! h264parse ! mpegtsmux ! filesink location=/home/radxa/file.name.mp4
+```
diff --git a/docs/compute-module/cm5/accessories/camera_8m.md b/docs/compute-module/cm5/accessories/camera_8m.md
@@ -0,0 +1,47 @@
+---
+sidebar_position: 5
+---
+
+# Radxa Camera 8M
+Radxa CM5 IO Camera0 接口，使用反向15pin排线，兼容的摄像头有：   
+Radxa Camera 8M、OKDO 5MP、RPI Camera V13、RPI Camera V2。
+
+## 以连接Radxa Camera 8M为例：
+![Camera-8M 安装](/img/cm5/cm5io-8m-camera-connected.webp)  
+
+- 准备好 Radxa Camera 8M，通过 FPC 线接上 Radxa CM5 IO板的Camera 0接口。
+
+- 通过左下角 Application Launcher 打开 Kconsole 终端, 运行 `rsetup` 命令：
+
+```bash
+radxa@radxa-cm5-io:~$ rsetup
+```
+
+- 通过[设备树配置](../os-config/rsetup#overlays)来启用瑞莎 8M 摄像头的 Overlay。
+
+:::caution [注意]
+
+1. 请启用 `[] Enable Radxa Camera 8M 219 on CSI0` 项 Overlay。
+2. 在启用成功显示 `[*] Enable Radxa Camera 8M 219 on CSI0` 后退出reboot重启才能使配置生效。
+
+:::
+
+## 测试 Radxa Camera 8M
+
+你也可以使用终端命令打开相机预览:
+
+```bash
+gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw,format=NV12,width=1920,height=1080 ! xvimagesink;
+```
+
+使用以下命令拍照:
+
+```bash
+gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw,format=NV12,width=1920,height=1080 ! jpegenc ! multifilesink location=file.name.jpg;
+```
+
+使用以下命令拍摄视频:
+
+```bash
+gst-launch-1.0 v4l2src num-buffers=512 device=/dev/video11 io-mode=4 ! videoconvert ! video/x-raw, format=NV12, width=1920, height=1080, framerate=30/1 ! tee name=t ! queue ! mpph264enc ! queue ! h264parse ! mpegtsmux ! filesink location=/home/radxa/file.name.mp4
+```
diff --git a/docs/compute-module/cm5/accessories/rpi-7inch-display.md b/docs/compute-module/cm5/accessories/rpi-7inch-display.md
@@ -0,0 +1,26 @@
+---
+sidebar_position: 3
+---
+
+# RPI 7 inch Display
+Radxa CM5 IO LCD0 接口，使用反向15pin排线，兼容的5寸和7寸屏。  
+## 以连接树莓派7寸屏为例：
+- 准备好 RPI 7 inch Display，通过 15pin 反向FPC 线接上 Radxa CM5 IO。
+
+![显示屏安装-01](/img/cm5/cm5io-rpi-display-7inch-FPC.webp)  
+![显示屏安装-02](/img/cm5/cm5io-rpi-display-7inch-connected.webp)
+
+- 通过左下角 Application Launcher 打开 Kconsole 终端, 运行 `rsetup` 命令：
+
+```bash
+radxa@radxa-cm5-io:~$ rsetup
+```
+
+- 通过[设备树配置](../os-config/rsetup#overlays)来启用树莓派7寸屏的 Overlay。
+
+:::caution [注意]
+
+1. 请启用 `[] Enable Raspberry Pi 7-inch Touchscreen on DSI0` 项 Overlay。
+2. 在启用成功显示 `[*] Enable Raspberry Pi 7-inch Touchscreen on DSI0` 后退出reboot重启才能使配置生效。
+
+:::
diff --git a/docs/compute-module/cm5/accessories/wifi_bt_access.md b/docs/compute-module/cm5/accessories/wifi_bt_access.md
@@ -0,0 +1,113 @@
+---
+sidebar_position: 2
+---
+
+# WIFI & BT
+
+## WIFI & BT 支持模块列表
+
+| NO. | Model                                               | Chip        | WiFi          | BT  | WIFI Throughput                       | Remark                                              |
+| --- | --------------------------------------------------- | ----------- | ------------- | --- | ------------------------------------- | --------------------------------------------------- |
+| 1   | Radxa wireless A8                                   | RTL8852BE   | 2.4G&5G&WIFI6 | 5.0 | up:600 Mbits/sec down: 900 Mbits/sec  |                                                     |
+| 2   | Intel 0MHK36 (PCIE+USB)                             | Intel 3165  | 2.4G&5G       | 4.2 | up:283 Mbits/sec down: 334 Mbits/sec  |                                                     |
+| 3   | Intel 7265NGW (PCIE+USB)                            | Intel 7265  | 2.4G&5G       | 4.2 | up:363 Mbits/sec down: 619 Mbits/sec  |                                                     |
+| 4   | Intel AX210 (PCIE+USB)                              | Intel AX210 | WiFi 6        | 5.2 | up:859 Mbits/sec down: 813 Mbits/sec  |                                                     |
+
+- Radxa CM5 搭配 Radxa CM5 IO 板，没有板载WiFi/BT模块，需要外接模块。以上是支持并测试过的 WITI/BT 卡。
+- 这里演示的 M.2 无线模块是： Radxa 无线模块 A8。
+
+[Radxa 无线模块A8](/zh/img/accessories/a8-module-01.webp)
+
+- 安装如图所示：
+
+[Radxa 无线模块A8](/zh/img/accessories/a8-module-02.webp)
+
+## WIFI 使用
+
+1. 首先进入ROOT用户模式。
+
+```
+sudo su
+```
+
+2. 打开WIFI
+
+```
+nmcli r wifi on
+```
+
+3. 扫描WIFI
+
+```
+nmcli dev wifi
+```
+
+1. 连接wifi网络
+
+```
+nmcli dev wifi connect "wifi_name" password "wifi_password"
+```
+
+## 蓝牙使用
+
+- 使用Radxa无线A8模块时，必须添加以下黑名单才能使BT正常工作。
+
+```
+root@radxa-cm5-io:~# cat /etc/modprobe.d/blacklist.conf
+blacklist pgdrv
+blacklist btusb
+blacklist btrtl
+blacklist btbcm
+blacklist btintel
+
+root@radxa-cm5-io:~# reboot
+```
+
+1. 测试蓝牙模块的状态并检查蓝牙设备。
+
+```
+root@radxa-cm5-io:~# systemctl status bluetooth
+```
+
+2. 运行蓝牙设备。
+
+```
+root@radxa-cm5-io:~# systemctl start bluetooth
+```
+
+3. 检测蓝牙设备
+
+```
+root@radxa-cm5-io:~# hciconfig
+hci0:   Type: Primary Bus: UART
+       BD Address: 10:2C:6B:49:D5:53 ACL MTU: 1021:8 SCO MTU: 64:1
+       UP RUNNING
+       RX bytes:850 acl:0 sco:0 events:58 errors:0
+       TX bytes:2814 acl:0 sco:0 commands:58 errors:0
+```
+
+4. 测试：连接蓝牙音箱，首先安装pulseaudio
+
+```
+root@radxa-cm5-io:~# apt-get install -y pulseaudio-module-bluetooth pulseaudio
+```
+
+5. 运行 pulseaudio
+
+```
+root@radxa-cm5-io:~# pulseaudio --start
+```
+
+6. 使用 pulseaudio 连接
+
+```
+root@radxa-cm5-io:~# bluetoothctl
+[bluetooth]# default-agent
+[bluetooth]# power on
+[bluetooth]# scan on
+[bluetooth]# trust 41:42:1A:8D:A9:65       #BT-280
+[bluetooth]# pair 41:42:1A:8D:A9:65
+[bluetooth]# connect 41:42:1A:8D:A9:65
+```
+
+7. 现在您可以听音乐了。
diff --git a/docs/compute-module/cm5/getting-started/overview.md b/docs/compute-module/cm5/getting-started/overview.md
@@ -12,7 +12,7 @@ sidebar_position: 1
 
 | 特征     | 描述                                                                                                                                                                                                                                                                                                                                                                        |
 | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| SoC      | Rockchip RK3588S                                                                                                                                                                                                                                                                                                                                                            |
+| SoC      | Rockchip RK3588S2                                                                                                                                                                                                                                                                                                                                                            |
 | CPU      | 四核 Cortex®‑A76 @ 2.2~2.4GHz and 四核 Cortex®‑A55 @ 1.8GHz<br/>based on Arm® DynamIQ™ configuration                                                                                                                                                                                                                                                                    |
 | GPU      | ARM Mali G610MP4 GPU ‑ OpenGL® ES1.1, ES2.0, and ES3.2 ‑ OpenCL®<br/>1.1, 1.2 and 2.2 ‑ Vulkan® 1.1 and 1.2 ‑ Embedded high performance 2D<br/>image acceleration module                                                                                                                                                                                                 |
 | NPU      | NPU 支持格式 INT4 / INT8 / INT16 / FP16 / BF16 and TF32 <br/> 算力最高可达 6TOPs@INT8                                                                                                                                                                                                                                                                                       |

diff --git a/docs/rock5/rock5b/accessories/wifi_bt_access.md b/docs/rock5/rock5b/accessories/wifi_bt_access.md
@@ -15,7 +15,7 @@ sidebar_position: 2
 | 5   | Radxa wireless A8                                   | RTL8852BE   | 2.4G&5G&WIFI6 | 5.0 | up:600Mbits/sec down:900 Mbits/sec    |                                                     |
 | 6   | Intel 0MHK36 (PCIE+USB)                             | Intel 3165  | 2.4G&5G       | 4.2 | up:283 Mbits/sec down: 334 Mbits/sec  |                                                     |
 | 7   | Intel 7265NGW (PCIE+USB)                            | Intel 7265  | 2.4G&5G       | 4.2 | up:363 Mbits/sec down: 619 Mbits/sec  |                                                     |
-| 8   | Intel AX210 (PCIE+USB)                              | Intel AX210 | WiFi 6        | 5.2 | up: 859 Mbits/sec down: 813 Mbits/sec | Only WIFI is supported currently, BT is not working |
+| 8   | Intel AX210 (PCIE+USB)                              | Intel AX210 | WiFi 6        | 5.2 | up: 859 Mbits/sec down: 813 Mbits/sec |                                                     |
 
 - ROCK 5B 没有板载WiFi/BT模块，需要外接模块。以上是支持并测试过的 WITI/BT 卡。
 - 这里演示的 M.2 无线模块是： Radxa 无线模块 A8。

diff --git a/...n/docusaurus-plugin-content-docs/current/compliance/compute-module/radxa-cm5.md b/...n/docusaurus-plugin-content-docs/current/compliance/compute-module/radxa-cm5.md
@@ -0,0 +1,5 @@
+---
+sidebar_position: 1
+---
+
+# Radxa CM5 Compliance Certification
diff --git a/...urus-plugin-content-docs/current/compute-module/cm5/getting-started/overview.md b/...urus-plugin-content-docs/current/compute-module/cm5/getting-started/overview.md
@@ -12,7 +12,7 @@ sidebar_position: 1
 
 | Features     | Description                                                                                                                                                                                                                                                                                                                                                  |
 | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| SoC          | Rockchip RK3588S                                                                                                                                                                                                                                                                                                                                             |
+| SoC          | Rockchip RK3588S2                                                                                                                                                                                                                                                                                                                                             |
 | CPU          | Quad Cortex®‑A76 @ 2.2~2.4GHz and Quad Cortex®‑A55 @ 1.8GHz<br/>based on Arm® DynamIQ™ configuration                                                                                                                                                                                                                                                     |
 | GPU          | ARM Mali G610MP4 GPU ‑ OpenGL® ES1.1, ES2.0, and ES3.2 ‑ OpenCL®<br/>1.1, 1.2 and 2.2 ‑ Vulkan® 1.1 and 1.2 ‑ Embedded high performance 2D<br/>image acceleration module                                                                                                                                                                                  |
 | NPU          | NPU supporting INT4 / INT8 / INT16 / FP16 / BF16 and TF32 acceleration<br/>and computing power is up to 6TOPs                                                                                                                                                                                                                                                |

diff --git a/static/img/cm5/cm5-block-diagram.webp b/static/img/cm5/cm5-block-diagram.webp
diff --git a/static/img/cm5/cm5-overview.webp b/static/img/cm5/cm5-overview.webp
diff --git a/static/img/cm5/cm5io-4k-camera-connected.webp b/static/img/cm5/cm5io-4k-camera-connected.webp
diff --git a/static/img/cm5/cm5io-8m-camera-connected.webp b/static/img/cm5/cm5io-8m-camera-connected.webp
diff --git a/static/img/cm5/cm5io-display-8hd-connected.webp b/static/img/cm5/cm5io-display-8hd-connected.webp
diff --git a/static/img/cm5/cm5io-rpi-display-7inch-FPC.webp b/static/img/cm5/cm5io-rpi-display-7inch-FPC.webp
diff --git a/static/img/cm5/cm5io-rpi-display-7inch-connected.webp b/static/img/cm5/cm5io-rpi-display-7inch-connected.webp
diff --git a/static/img/cm5/rk3588s-block-diagram.webp b/static/img/cm5/rk3588s-block-diagram.webp