Skip to content

Commit

Permalink
Merge branch 'sipeed:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
SinKy-Yan authored Jun 29, 2024
2 parents afa2d99 + 12b5d41 commit 9e318f7
Show file tree
Hide file tree
Showing 26 changed files with 386 additions and 19 deletions.
12 changes: 12 additions & 0 deletions docs/hardware/en/sidebar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,18 @@ items:
file: logic_analyzer/combo8/update_firmware.md
- label: FAQ
file: logic_analyzer/combo8/faq.md
- label: KVM
items:
- label: Lichee Nano KVM
items:
- label: Introduction
file: kvm/NanoKVM/1_intro.md
- label: Unboxing Experience
file: kvm/NanoKVM/2_unbox.md
- label: Update Firmware
file: kvm/NanoKVM/3_firmware.md
- label: FAQ
file: kvm/NanoKVM/4_faq.md
# - label: Maix Audio
# items:
# - label: MA USB 16
Expand Down
2 changes: 1 addition & 1 deletion docs/hardware/en/tang/tang-mega-138k/mega-138k.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Tang Mega 138K ~Dock~
title: Tang Mega 138K Dock
keywords: FPGA, Tang, Mega, 138K
update:
- date: 06-26-2024
Expand Down
59 changes: 59 additions & 0 deletions docs/hardware/zh/kvm/NanoKVM/1_intro.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
---
title: LicheeRV Nano
keywords: NanoKVM, Remote desktop, Lichee, PiKVM, RISCV, tool
update:
- date: 2024-6-21
version: v0.1
author: BuGu
content:
- Release docs
---

## 简介
Lichee NanoKVM 是基于 LicheeRV Nano 的 IP-KVM 产品,继承了 LicheeRV Nano的极致体积 和 强大功能。
Lichee NanoKVM分为两个版本:
NanoKVM Lite 为基础版配置,适合 具有一定DIY能力的个人用户 和 有批量需求的企业用户。
NanoKVM Full 为完整版配置,带精致外壳和完整配件,内置开机即用的系统镜像卡,推荐个人用户购买。

![](./../assets/RV_Nano/intro/RV_Nano_1.jpg)

## 参数

| 产品 | NanoKVM (Lite) | NanoKVM (FULL) | PiKVM V4 |
| --- | --- | --- | --- |
| 计算单元 | LicheeRV Nano(RISCV) | LicheeRV Nano(RISCV) | CM4 (ARM) |
| 分辨率 | 1080P @ 60fps | 1080P @ 60fps | 1080P @ 60fps |
| 视频编码 | MJPEG, H264(developing) | MJPEG, H264(developing) | MJPEG, H264 |
| 视频延迟 | | | 100~140ms |
| UEFI/BIOS ||||
| 模拟USB键鼠 <br>Virtual HID ||||
| 模拟USB存储 <br> Virtual CD-ROM ||||
| IPMI ||||
| Wake-on-LAN ||||
| ATX电源控制 | 无,用户可自行连接 | USB接口IO控制板 | RJ45接口IO控制板 |
| OLED显示 | 无,用户可自行扩展 | 128x64 0.96" white | 128x32 0.91" white |
| 外接串口 | 2路 | 2路 | 1路 |
| TF卡 | 无,用户自备 | 有,开机即用 ||
| 扩展配件 || WiFi 或 PoE | WiFi/LTE |
| 功耗 | 0.2A@5V | 0.2A@5V | Peak 2.6A@5V |
| 电源输入 | PC USB即可供电 | PC USB即可供电 <br> 也支持额外辅助供电 | 需要DC 5V 3A供电 |
| 散热 | 静音无风扇 | 静音无风扇 | 需要风扇主动散热 |
| 尺寸 | 23x37x15mm <br> ~1/30 PiKVM V4 体积 | 40x36x36mm <br/> ~1/7 PiKVM V4 体积 | 120x68x44mm |

![](./../assets/RV_Nano/intro/RV_Nano_3.jpg)

![](./../assets/RV_Nano/intro/RV_Nano_4.jpg)


## 硬件资料

NanoKVM 基于 Sipeed 的 [LicheeRV Nano](https://wiki.sipeed.com/hardware/zh/lichee/RV_Nano/1_intro.html) 核心板搭建,这部分硬件的规格书、原理图、尺寸图等均可在这里找到:[点击这里](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano)

NanoKVM Lite 由 LicheeRV Nano E 和 HDMItoCSI 小板构成,NanoKVM FULL 在 NanoKVM Lite 基础上增加 NanoKVM-A/B 板和外壳。HDMItoCSI板用于转换HDMI信号;NanoKVM-A 包含 OLED、ATX控制输出(TypeC接口形式)、辅助供电(TypeC接口)以及ATX开关机、复位按键;NanoKVM-B 一端连接A板,一端连接电脑ATX针脚,用于电脑的远程开关机

+ [板卡规格书](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano/01_Specification)

## 软件资料

+ [LicheeRV Nano SDK](https://github.com/sipeed/LicheeRV-Nano-Build)

27 changes: 27 additions & 0 deletions docs/hardware/zh/kvm/NanoKVM/2_unbox.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
title: LicheeRV Nano
keywords: NanoKVM, Remote desktop, Lichee, PiKVM, RISCV, tool
update:
- date: 2024-6-21
version: v0.1
author: BuGu
content:
- Release docs
---

## 开箱

## 接线

## 浏览器查看远程桌面

## 如何进行远程装机

## 如何在外网访问

Todo

## 串口使用



12 changes: 12 additions & 0 deletions docs/hardware/zh/kvm/NanoKVM/3_firmware.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: LicheeRV Nano
keywords: NanoKVM, Remote desktop, Lichee, PiKVM, RISCV, tool
update:
- date: 2024-6-21
version: v0.1
author: BuGu
content:
- Release docs
---

## 镜像烧录与升级
12 changes: 12 additions & 0 deletions docs/hardware/zh/kvm/NanoKVM/4_faq.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: LicheeRV Nano
keywords: NanoKVM, Remote desktop, Lichee, PiKVM, RISCV, tool
update:
- date: 2024-6-21
version: v0.1
author: BuGu
content:
- Release docs
---

## Todo
12 changes: 12 additions & 0 deletions docs/hardware/zh/kvm/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: KVM series
keywords: NanoKVM, Remote desktop, Lichee, PiKVM, RISCV, tool
update:
- date: 2024-06-21
version: v0.1
author: BuGu
content:
- Create file
---

Lichee NanoKVM is Sipeed KVM tool.
16 changes: 11 additions & 5 deletions docs/hardware/zh/lichee/RV_Nano/5_peripheral.md
Original file line number Diff line number Diff line change
Expand Up @@ -517,15 +517,21 @@ vi uEnv.txt
# 使用 'Esc',':wq'保存并退出
```

7寸屏:
7寸屏(型号以屏幕丝印为准):

```
panel=zct2133v1
# 新屏
panel=mtd700920b
```

5寸屏:
5寸屏(型号以屏幕丝印为准):
```
panel=st7701_dxq5d0019b480854
panel=st7701_dxq5d0019_V0
# 早期测试5寸屏使用:
# panel=st7701_dxq5d0019b480854
```

3寸屏:
Expand Down Expand Up @@ -593,7 +599,7 @@ touch /boot/gt9xx
然后执行:

```
echo 2 | evtest
echo 1 | evtest
```

点击触摸屏会在终端看到具体坐标
Expand Down Expand Up @@ -700,7 +706,7 @@ cp sensor_cfg.ini.alpha sensor_cfg.ini # 内测版
使用命令查看按键事件:

```
echo 1 | evtest
echo 0 | evtest
```

然后按下USER按键,可以在终端看到对应的事件报告
Expand Down
Empty file added git
Empty file.
2 changes: 1 addition & 1 deletion layout/locales/en/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ msgstr ""
#: tang.html:215 tang.html:231 tang.html:247 tang.html:263 tang.html:279
#: tang.html:295
msgid "文档"
msgstr "Documentation"
msgstr "Docs"

#: home.html:97
msgid "/maixcam"
Expand Down
16 changes: 16 additions & 0 deletions pages/index/en/mega138k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/en/tang/tang-mega-138k/mega-138k.html"
}
else
{ if( navigator.language.indexOf("en") == 0 )
{
location.href = window.location.origin + "/hardware/en/tang/tang-mega-138k/mega-138k.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/tang-mega-138k/mega-138k.html"
}
}
</script>
File renamed without changes.
16 changes: 16 additions & 0 deletions pages/index/en/mega60k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
}
else
{ if( navigator.language.indexOf("en") == 0 )
{
location.href = window.location.origin + "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/tang-mega-60k/mega-60k.html"
}
}
</script>
16 changes: 16 additions & 0 deletions pages/index/en/nano1k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/en/lichee/th1520/1_intro.html"
}
else
{ if( navigator.language.indexOf("zh") == 0 )
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-1K/Nano-1k.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-1K/Nano-1k.html"
}
}
</script>
19 changes: 19 additions & 0 deletions pages/index/en/nano20k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<script>
var hash = window.location.hash
var url_language = "en"

if( navigator.language.indexOf("zh") == -1 )
{
url_language = "zh"
}


if (hash.indexOf("start")!= -1)
{
location.href = window.location.origin + "/hardware/" + url_language + "/tang/tang-nano-20k/example/unbox.html"
}
else
{
location.href = window.location.origin + "/hardware/" + url_language + "/tang/tang-nano-20k/nano-20k.html"
}
</script>
16 changes: 16 additions & 0 deletions pages/index/en/nano4k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/en/lichee/th1520/1_intro.html"
}
else
{ if( navigator.language.indexOf("zh") == 0 )
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-4K/Nano-4K.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-4K/Nano-4K.html"
}
}
</script>
16 changes: 16 additions & 0 deletions pages/index/en/nano9k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/en/lichee/th1520/1_intro.html"
}
else
{ if( navigator.language.indexOf("zh") == 0 )
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-9K/Nano-9K.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/Tang-Nano-9K/Nano-9K.html"
}
}
</script>
16 changes: 16 additions & 0 deletions pages/index/en/primer15k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/zh/tang/tang-primer-15k/mega-60k.html"
}
else
{ if( navigator.language.indexOf("en") == 0 )
{
location.href = window.location.origin + "/hardware/zh/tang/tang-primer-15k/mega-60k.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/tang-primer-15k/mega-60k.html"
}
}
</script>
25 changes: 25 additions & 0 deletions pages/index/en/primer25k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1)
{
if( navigator.language.indexOf("zh") == 0 )
{
location.href = "https://wiki.sipeed.com/hardware/zh/tang/tang-primer-25k/start.html"
}
else
{
location.href = "https://wiki.sipeed.com/hardware/en/tang/tang-primer-25k/start.html"
}
}
else
{
if( navigator.language.indexOf("zh") == 0 )
{
location.href = "https://wiki.sipeed.com/hardware/zh/tang/tang-primer-25k/primer-25k.html"
}
else
{
location.href = "https://wiki.sipeed.com/hardware/en/tang/tang-primer-25k/primer-25k.html"
}
}
</script>
16 changes: 16 additions & 0 deletions pages/index/en/tang.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/en/lichee/th1520/1_intro.html"
}
else
{ if( navigator.language.indexOf("zh") == 0 )
{
location.href = window.location.origin + "/hardware/en/tang/index.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/index.html"
}
}
</script>
16 changes: 16 additions & 0 deletions pages/index/zh/mega138k.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
var hash = window.location.hash
if (hash.indexOf("start")!= -1){
location.href = window.location.origin + "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
}
else
{ if( navigator.language.indexOf("zh") == 0 )
{
location.href = window.location.origin + "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
}
else
{
location.href = window.location.origin + "/hardware/en/tang/tang-mega-138k/mega-138k.html"
}
}
</script>
Loading

0 comments on commit 9e318f7

Please sign in to comment.