Skip to content

Commit 547a461

Browse files
jack-majack-ma
authored
Merge branch 'main' into rock5a
2 parents 956e4fe + a29ac7d commit 547a461

File tree

241 files changed

+10757
-1880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+10757
-1880
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,4 @@ docs/orion/o6/cix-sdk/get-source.md @RadxaYuntian
369369
i18n/en/docusaurus-plugin-content-docs/current/orion/o6/cix-sdk/get-source.md @RadxaYuntian
370370
docs/e/e54c/hardware-design/hardware-interface.md @peterwang2050
371371
docs/rock5/rock5a/getting-started/quick-start.md @nascs
372+
docs/common/dev/_pico-gpio-controlled-by-intel.mdx @nascs

‎docs/common/dev/_pico-gpio-controlled-by-intel.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ import { PreView } from "@site/src/utils/docs";
8484
uint8_t ch = uart_getc(UART_ID);
8585
uart_puts(UART_ID, "Received data!\\r\\n");
8686
uart_putc(UART_ID, ch);
87+
gpio_put(BLINK_PIN, 1);
8788
} else {
8889
gpio_put(BLINK_PIN, 0);
8990
uart_puts(UART_ID, "Uart is not readable!\\r\\n");

‎docs/common/radxa-os/_wayland.mdx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Wayland 是 X11 窗口系统协议和架构的替代品，往往有着更良好的图形性能表现。但是由于 Rockchip Debian SDK 并没有提供相应的支持，因此 Radxa OS 默认也关闭了 GDM 的 Wayland 模式。如果您想使用 Wayland 运行图形软件/桌面，可以按照以下步骤进行操作：
2+
3+
:::warning
4+
某些 Rockchip 提供的视频/图形软件栈未对 Wayland 进行适配，开启 Wayland 后可能会出现性能下降/图形错乱等意料之外的现象。
5+
:::
6+
7+
1. 编辑 `/etc/gdm3/daemon.conf`，并将 `WaylandEnable` 取消注释后设置为 `true`：
8+
9+
```bash
10+
sudo nano /etc/gdm3/daemon.conf
11+
```
12+
13+
`/etc/gdm3/daemon.conf` 修改后应包含以下内容：
14+
15+
```
16+
[daemon]
17+
# Uncomment the line below to force the login screen to use Xorg
18+
WaylandEnable=true
19+
```
20+
21+
2. 重启系统以应用新配置：
22+
23+
```bash
24+
sudo reboot
25+
```
26+
27+
3. 重启后，即可在登陆时的右下角选择 Wayland 会话：
28+
29+
![wayland_gdm.webp](/img/common/wayland/wayland_gdm.webp)

‎docs/compute-module/cm3/radxa-os/wayland.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Wayland from "../../../common/radxa-os/\_wayland.mdx";
2+
3+
# 开启 Wayland 会话
4+
5+
<Wayland />

‎docs/compute-module/cm3i/radxa-os/wayland.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Wayland from "../../../common/radxa-os/\_wayland.mdx";
2+
3+
# 开启 Wayland 会话
4+
5+
<Wayland />

‎docs/compute-module/cm3j/radxa-os/wayland.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Wayland from "../../../common/radxa-os/\_wayland.mdx";
2+
3+
# 开启 Wayland 会话
4+
5+
<Wayland />

‎docs/compute-module/cm5/android/low-level-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ $ sudo chmod +x /usr/local/bin/repo
9090
#### 代码下载
9191

9292
```bash
93-
$ repo init -u https://github.com/radxa/manifests.git -b Android12_Radxa_rk14 -m rockchip-r-release.xml
93+
$ repo init -u https://github.com/radxa/manifests.git -b Android12_Radxa_rk14 -m rockchip-s-release.xml
9494
$ repo sync -d --no-tags -j4
9595
```
9696

‎docs/compute-module/cm5/radxa-os/wayland.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Wayland from "../../../common/radxa-os/\_wayland.mdx";
2+
3+
# 开启 Wayland 会话
4+
5+
<Wayland />

‎docs/compute-module/nx5/accessories/pd-30w.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import Content from '../../../common/accessories/\_pd-30w.mdx'
2-
31
# Radxa Power PD 30W
42

5-
<Content />
3+
Radxa NX5-IO 仅支持 5V DC 供电(接口规格：DC 5525)，建议电流 3A 及以上。
4+
5+
推荐使用我们的 [Radxa Power PD 30W](https://radxa.com/products/accessories/power-pd-30w) 电源适配器搭配 [Type-C 转 DC 口数据线](https://arace.tech/products/radxa-type-c-to-dc-5v-cable) 使用。
6+
7+
<div style={{textAlign: 'center'}}>
8+
<img src="/img/nx5/nx5-io/pd-30w-typec-dc.webp" style={{width: '100%', maxWidth: '800px'}} />
9+
</div>

‎docs/compute-module/nx5/getting-started/install-os.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_position: 2
55
import Installdebian from "../radxa-os/install-os.mdx";
66
import Installandroid from "../android/install-os.mdx";
77

8-
# 系统安装
8+
# 安装系统
99

1010
<Tabs queryString="target">
1111
<TabItem value="Radxa-OS" label="Radxa-os">

‎docs/compute-module/nx5/radxa-os/install-os.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ NX5 可以从 microSD 卡启动，也可以从板载 EMMC 启动，基于不同
7676

7777
#### Linux/Mac 系统使用 rkdeveloptool 写入
7878

79-
&emsp;[rkdeveloptool](./low-level-dev/rkdeveloptool)
79+
[rkdeveloptool](/compute-module/nx5/radxa-os/low-level-dev/rkdeveloptool)
8080

81-
&emsp;[upgrade_tool](./low-level-dev/upgrade-tool)（可同时烧录多台设备）
81+
[upgrade_tool](/compute-module/nx5/radxa-os/low-level-dev/upgrade-tool)（可同时烧录多台设备）
8282

8383
</TabItem>
8484

8585
<TabItem value="Windows" label="Windows">
8686

8787
#### Windows 系统使用 rkdeveloptool 写入
8888

89-
&emsp;[rkdevtool](./low-level-dev/rkdevtool)
89+
[rkdevtool](/compute-module/nx5/radxa-os/low-level-dev/rkdevtool)
9090

9191
</TabItem>
9292

‎docs/compute-module/nx5/radxa-os/wayland.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Wayland from "../../../common/radxa-os/\_wayland.mdx";
2+
3+
# 开启 Wayland 会话
4+
5+
<Wayland />

‎docs/e/e54c/download.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,24 @@ Debian 镜像文件，解压后可直接写入 SD 卡 / eMMC / SSD
2020

2121
[radxa-e54c_bookworm_cli_b2.output.img.xz](https://github.com/radxa-build/radxa-e54c/releases/download/rsdk-b2/radxa-e54c_bookworm_cli_b2.output.img.xz)
2222

23+
### Flippy OpenWrt:
24+
25+
Flippy OpenWrt 镜像文件，解压后可直接写入 SD 卡 / eMMC / SSD
26+
27+
[openwrt_e54c_flippy.7z](https://dl.radxa.com/e/e54c/images/openwrt_rk3588s_e54c_R25.05.07_k6.12.27-flippy-93+.7z)
28+
2329
### Loader 文件
2430

2531
USB 刷机使用，Loader 文件用于 USB 下载初始化，写入 SD 卡无需下载
2632

2733
[rk3588_spl_loader_v1.15.113.bin](https://dl.radxa.com/e/e52c/images/rk3588_spl_loader_v1.15.113.bin)
2834

35+
## SPI 启动固件文件
36+
37+
SPI 启动固件文件，用于刷入 SPI Flash
38+
39+
[spi.img](https://dl.radxa.com/e/e54c/images/radxa-e54c-spi-flash-image.img)
40+
2941
## 硬件设计
3042

3143
Radxa E54C V1.2 版本

0 commit comments

Comments
 (0)