diff --git a/docs/hardware/en/tang/assets/FTDI_DEVICE.png b/docs/hardware/en/tang/assets/FTDI_DEVICE.png
new file mode 100644
index 0000000000..ed95cd69cf
Binary files /dev/null and b/docs/hardware/en/tang/assets/FTDI_DEVICE.png differ
diff --git a/docs/hardware/en/tang/assets/flash_mode_GAO.png b/docs/hardware/en/tang/assets/flash_mode_GAO.png
new file mode 100644
index 0000000000..bdb3fc0249
Binary files /dev/null and b/docs/hardware/en/tang/assets/flash_mode_GAO.png differ
diff --git a/docs/hardware/en/tang/tang-mega-138k/mega-138k-pro.md b/docs/hardware/en/tang/tang-mega-138k/mega-138k-pro.md
index db11743000..0cd347c35f 100644
--- a/docs/hardware/en/tang/tang-mega-138k/mega-138k-pro.md
+++ b/docs/hardware/en/tang/tang-mega-138k/mega-138k-pro.md
@@ -7,6 +7,11 @@ update:
author: wonder
content:
- 新建文档
+ - date: 2024-09-26
+ version: v0.2
+ author: Serika
+ content:
+ - Update FAQs
---
- Product Overview
@@ -253,6 +258,10 @@ Example code [github](https://github.com/sipeed/TangMega-138KPro-example)
| Avoid Short Circuit |
Please avoid any liquid or metal touching the solder pads of the components on the PCBA during the power-on process, otherwise it may cause a short circuit and burn the PCBA. |
+
+ | Protecting the die |
+ Please avoid any impact on the exposed chip die during the process of removing and installing the heat sink. Do not press the heat sink hard after installing it. Otherwise, the chip die will be damaged. |
+
@@ -267,5 +276,19 @@ Tang Mega 138K can meet different needs of customers in various scenarios. For t
1. Please check if the power switch of the board is turned on.
2. Check your power supply method.
+### How to burn the bitstream to FLASH {#burn_flash}
+
+1. Setting the **Programmer** as shown in the figure below:
+
+
+
+### No Response or Undesirable Pin Phenomenon After Burning
+
+1. First, ensure that the IDE has selected the correct model **GW5AST-LV138FPG676AC1/10**; every parameter in the figure below **MUST** be consistent.
+
+
+
+2. Then, check your code and the corresponding simulation waveforms to meet the requirements. The GAO tools in GOWIN IDE maybe helpful. For more information, please refer to the GOWIN document [SUG100](https://www.gowinsemi.com/upload/database_doc/1885/document/660bb2366d0b3.pdf)(require login).
+
### For more questions and solutions, go to [Related Questions](./../Tang-Nano-Doc/questions.md) to view
\ No newline at end of file
diff --git a/docs/hardware/en/tang/tang-mega-138k/mega-138k.md b/docs/hardware/en/tang/tang-mega-138k/mega-138k.md
index c78ca22e3b..02b4a9150a 100644
--- a/docs/hardware/en/tang/tang-mega-138k/mega-138k.md
+++ b/docs/hardware/en/tang/tang-mega-138k/mega-138k.md
@@ -2,16 +2,21 @@
title: Tang Mega 138K Dock
keywords: FPGA, Tang, Mega, 138K
update:
- - date: 06-26-2024
+ - date: 2024-06-26
version: v0.1
author: Serika
content:
- Create document
+ - date: 2024-09-26
+ version: v0.2
+ author: Serika
+ content:
+ - Corrected description of PCIe bus widths
---
## Overview
- Tang Mega 138K uses a 22nm process **GW5AST-LV138PG484A** FPGA chip, which has 138,240 lookup table units and nearly 300 DSP units. It contains eight high-speed transceivers with a speed range of 270Mbps ~ 6.6Gbps, suitable for transmitting data through high-speed ports such as PCIe. In addition, the chip contains a hard-core PCIe, which consumes better resources when using PCIe and achieves better performance. It is suitable for high-speed communication, protocol conversion, high-performance computing, and other occasions.
+ Tang Mega 138K uses a 22nm process **GW5AST-LV138PG484A** FPGA chip, which has 138,240 lookup table units and nearly 300 DSP units. It contains eight high-speed transceivers with a speed range of 270Mbps ~ 8.0Gbps, suitable for transmitting data through high-speed ports such as PCIe. In addition, the chip contains a hard-core PCIe, which consumes better resources when using PCIe and achieves better performance. It is suitable for high-speed communication, protocol conversion, high-performance computing, and other occasions.
Compared to the 138K Pro Dock, the 138K Dock has a smaller size and a lower price, and it replaces the SFP transceiver with USB3 SS(5Gbps). This not only effectively reduces the cost of high-speed communication but also brings better versatility.
@@ -22,8 +27,11 @@ update:
- Large capacity LUT4
- Large capacity memory
- PCIe 2.0 x 4
- - USB3.0 x 1
- - RISCV hard core
+ - USB3.0 x 1(5Gbps)
+ - RISC-V hard core (AE350 @800MHz)
+ - HDMI TX/RX x 1
+ - Gigabit Ethernet x 1
+ - Onboard 3.7V li-on battery(1-Series) charge/discharge management
## Product Appearance
@@ -94,11 +102,11 @@ TBD
| Transceivers Rate |
- 270Mbps-6.6Gbps |
+ 270Mbps-8.0Gbps |
| PCIe HardCore |
- x1
Speed optional x1, x2, x4, x8 PCIe 2.0 |
+ x1
Speed optional x1, x2, x4 PCIe 3.0 |
| LVDS (Gbps) |
@@ -106,7 +114,7 @@ TBD
| DDR3 (Mbps) |
- 1333 |
+ 800 |
Hard Core SoC |
RiscV AE350_SOC |
@@ -181,10 +189,12 @@ TBD
- [Dimension Diagram](https://dl.sipeed.com/shareURL/TANG/Mega_138K/04_Mechanical_drawing)
- [3D Model](https://dl.sipeed.com/shareURL/TANG/Mega_138K/05_3D_file)
- [Some Chip Manuals](https://dl.sipeed.com/shareURL/TANG/Mega_138K/07_Datasheet)
+- [All PIN Constraints](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/08_Misc)
## Getting Started
Note that 138K is currently not supported by the education version, and you need to download V1.9.9 or a newer version of the commercial IDE for use.
+There are serious problems with the Programmer version V1.9.10.02, and this product cannot be programmed.
Lic can be applied on the Gowin official website, or you can use the online Lic service provided by Sipeed. In the IDE, select Float Lic and fill in the following information:
~~~
@@ -287,7 +297,7 @@ Tang Mega 138K can meet different needs of customers in various scenarios. For t
1. Setting the **Programmer** as shown in the figure below:
-
+
2. Check the position of the DIP switch; the correct position is shown in the figure below:
diff --git a/docs/hardware/en/tang/tang-mega-60k/assets/dip-key_defualt.png b/docs/hardware/en/tang/tang-mega-60k/assets/dip-key_defualt.png
new file mode 100644
index 0000000000..62e1c8ddec
Binary files /dev/null and b/docs/hardware/en/tang/tang-mega-60k/assets/dip-key_defualt.png differ
diff --git a/docs/hardware/en/tang/tang-mega-60k/assets/mega_138k_top.png b/docs/hardware/en/tang/tang-mega-60k/assets/mega_138k_top.png
deleted file mode 100644
index c127d71e0e..0000000000
Binary files a/docs/hardware/en/tang/tang-mega-60k/assets/mega_138k_top.png and /dev/null differ
diff --git a/docs/hardware/en/tang/tang-mega-60k/assets/mega_60k_top.png b/docs/hardware/en/tang/tang-mega-60k/assets/mega_60k_top.png
new file mode 100644
index 0000000000..01df420bbf
Binary files /dev/null and b/docs/hardware/en/tang/tang-mega-60k/assets/mega_60k_top.png differ
diff --git a/docs/hardware/en/tang/tang-mega-60k/assets/partno_60K.png b/docs/hardware/en/tang/tang-mega-60k/assets/partno_60K.png
new file mode 100644
index 0000000000..843c6ca831
Binary files /dev/null and b/docs/hardware/en/tang/tang-mega-60k/assets/partno_60K.png differ
diff --git a/docs/hardware/en/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png b/docs/hardware/en/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png
deleted file mode 100644
index 89d6b2286b..0000000000
Binary files a/docs/hardware/en/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png and /dev/null differ
diff --git a/docs/hardware/en/tang/tang-mega-60k/mega-60k.md b/docs/hardware/en/tang/tang-mega-60k/mega-60k.md
index ba4c21422a..0b25f4aa9c 100644
--- a/docs/hardware/en/tang/tang-mega-60k/mega-60k.md
+++ b/docs/hardware/en/tang/tang-mega-60k/mega-60k.md
@@ -2,32 +2,43 @@
title: Tang Mega 60K Dock
keywords: FPGA, Tang, Mega, 60K
update:
- - date: 06-26-2024
+ - date: 2024-06-26
version: v0.1
author: Serika
content:
- Create document
+ - date: 2024-09-26
+ version: v0.2
+ author: Serika
+ content:
+ - Corrected description of PCIe bus widths
+ - Update content TBD before
---
## Overview
- Date to Release: July xx, 2024
- TBD
+ **Tang Mega 60K** uses the 22nm process **GW5AT-LV60P484A** FPGA chip with 59904 lookup table units and 118 DSP units. It contains four high-speed transceivers with speeds ranging from 270Mbps to 6.6Gbps, which is suitable for transmitting data on high-speed ports such as PCIe. In addition, the chip contains hard-core PCIe and MIPI C/D PHY controllers, which consume better resources and get better performance when using PCIe. It is suitable for high-speed communication, protocol conversion, high-performance computing and other occasions.
+
+ The 60K Dock and 138K Dock share a set of dockboards(TANG MEGA NEO), so the peripherals of the two are exactly the same. Compared with the 138K Dock, the 60K Dock has fewer logic resources and a lower price, and includes a MIPI C/D PHY transceiver. This not only further reduces the cost of high-speed communication, but also brings better compatibility for image processing system integration.
+
+ - Date to Release: October 10th, 2024
- aliexpress purchase link: [Click me](https://sipeed.aliexpress.com/store/1101739727)
+ - aliexpress purchase link: [Click me](https://www.aliexpress.com/item/3256807078990410.html)
## Board Features
- Medium capacity LUT4
- - Medium capacity memory
+ - 512MiB DDR3 memory
- PCIe 2.0 x 4
- - USB3.0 x 1
+ - USB3.0 x 1(5Gbps)
- MIPI C-PHY & D-PHY RX/TX
- - TBD
+ - HDMI TX/RX x 1
+ - Gigabit Ethernet x 1
+ - Onboard 3.7V Li-on battery(1-Series) charge/discharge management
## Product Appearance
-TBD
+
## Block Diagram
@@ -98,7 +109,7 @@ TBD
| PCIe HardCore |
- x1
Speed optional x1, x2, x4, x8 PCIe 2.0 |
+ x1
Speed optional x1, x2, x4 PCIe 2.0 |
| LVDS (Gbps) |
@@ -152,20 +163,47 @@ TBD
### Dock board Parameters
-TBD
+| Item | Quantity | Remarks |
+| :------------------ | ---- | ------------------------------------------------- |
+| LEDs | 4+8 | 4x Battery-Indicator+ 8x PMOD_LED |
+| WS2812 | 1 | The WS2812 & aRGB strip CONN. share the same pin |
+| Buttons | 3+1 | 3x User-KEY + 1x Reconfig-KEY |
+| PCIe | 1 | 4-lane @ 5Gbps，CH569 16bit HSPI |
+| USB3 | 2 | SuperSpeed @ 5Gbps |
+| GbE | 1 | 1000Mbps Ethernet |
+| DVI | 1 | DVI supports both RX and TX |
+| PMOD | 2 | Multiplexed with the the DVP CONN. & 2x20P header at the top of the Dock board |
+| ADC | 2 | 2x differential input channels |
+| WS2812 | 1 | The aRGB strip CONN. & WS2812 share the same pin |
+| DVP Interface | 1 | Multiplexed with the the PMOD & 2x20P header at the top of the Dock board |
+| RGB Interface | 1 | Supports RGB888 screen |
+| MIC ARRAY Interface | 1 | Supports Sipeed 6+1 microphone array |
+| SD Slot | 1 | 1-bit SDIO/MMC or SPI mode |
+| BATT CONN. | 1 | Supports 3.7V li-on battery, with built-in charge management |
+| PWM FAN CONN. | 1 | Supports PWM fan with TACHO |
+| Speaker CONN. | 2 | Support stereo output, 2x 3W Speaker |
+| 3.5mm Headphone CONN.| 1 | Supports stereo output, without Mic |
+| MS5351 | 1 | Provides RefClk for Serdes; control output via onboard UART |
+| USB JTAG & UART | 1 | Supports FPGA programming and provides UART function |
+| 2x20P headers | 2 | 2x20P header at the top of the Dock board multiplexed with the the PMOD & DVP CONN. |
+| Power button | 1 | **Press and hold for 2 seconds to toggle power state** |
+| 12V DC | 1 | DC5521 |
+
## Hardware Resources
-- [Specification](https://dl.sipeed.com/shareURL/TANG/Mega_60K/01_Specification)
-- [Schematics](https://dl.sipeed.com/shareURL/TANG/Mega_60K/02_Schematic)
-- [PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_60K/03_Designator_drawing)
-- [Dimension Diagram](https://dl.sipeed.com/shareURL/TANG/Mega_60K/04_Mechanical_drawing)
-- [3D Model](https://dl.sipeed.com/shareURL/TANG/Mega_60K/05_3D_file)
-- [Some Chip Manuals](https://dl.sipeed.com/shareURL/TANG/Mega_60K/07_Datasheet)
+- [Specification](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/01_Specification)
+- [Schematics](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/02_Schematic)
+- [PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/03_Designator_drawing)
+- [Dimension Diagram](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/04_Mechanical_drawing)
+- [3D Model](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/05_3D_file)
+- [Some Chip Manuals](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/07_Datasheet)
+- [All PIN Constraints](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/08_Misc)
## Getting Started
-Note that 138K is currently not supported by the education version, and you need to download V1.9.9 or a newer version of the commercial IDE for use.
+Note that 60K is currently not supported by the education version, and you need to download V1.9.10.01 or a newer version of the commercial IDE for use.
+There are serious problems with the Programmer version V1.9.10.02, and this product cannot be programmed.
Lic can be applied on the Gowin official website, or you can use the online Lic service provided by Sipeed. In the IDE, select Float Lic and fill in the following information:
~~~
@@ -205,8 +243,8 @@ Example code [github](https://github.com/sipeed/TangMega-60K-example)
Precautions |
- | 芯片型号 |
- The specific model of the FPGA chip used by Tang Mega 138K isGW5AT-LV60PG484A
Please select the package model PBG484A in the IDE. |
+ Chip Model |
+ The specific model of the FPGA chip used by Tang Mega 60K is GW5AT-LV60PG484A
Please select the package model PBG484A in the IDE. |
| Static Electricity |
@@ -242,4 +280,46 @@ Tang Mega 60K can meet different needs of customers in various scenarios. For te
## Frequently Asked Questions (FAQs)
-TBD
+### After powering on the board, only four indicator lights on the dockboard are on, the SOM indicator light is not on
+
+1. Please check if the board’s power has been turned on, press and hold the PWR button (next to the HDMI port) for 2 seconds to turn on the power.
+
+### After powering on the board, the Battery-Indicator light on the dcokboard is flashing
+
+1. This is normal behavior, usually, the last LED (near the 12V DC connector) is flashing;
+2. When the board is connected to a 3.7V lithium battery, these LEDs will serve as battery level indicators.
+
+### After pressing and holding the PWR button for 2 seconds, all the indicator lights on the dockboard turn off and then light up in sequence
+
+1. Check your power supply method, this situation means that the power supply is insufficient;
+2. Solutions (choose one):
+ a. Connect both the board’s **USB-3.0** and **USB-DEBUG** for power supply, i.e., dual 5V USB power supply;
+ b. Connect a 12V DC power supply to the board, if using the USB-C to 12V DC connector from the accessories, a PD power source with 12V output capability is required;
+ c. Connect a 3.7V lithium battery to power the board, note that the battery voltage must be ≥3.6V and the continuous discharge capacity must be ≥600mA.
+
+### IDE cannot find the model GW5AT-LV60PG484A
+
+1. The educational version does not support 60K, please switch to the commercial version. The following image shows the educational version (which does not support 60K);
+
+
+2. IDE version is too low to use, update the IDE version ≥ **1.9.9**.
+
+### How to burn the bitstream to FLASH {#burn_flash}
+
+1. Setting the **Programmer** as shown in the figure below:
+
+
+
+2. Check the position of the DIP switch; the correct position is shown in the figure below:
+
+
+
+### No Response or Undesirable Pin Phenomenon After Burning
+
+1. First, ensure that the IDE has selected the correct model **GW5AT-LV60PG484AC1/10**; every parameter in the figure below **MUST** be consistent.
+
+
+
+2. Then, check your code and the corresponding simulation waveforms to meet the requirements. The GAO tools in GOWIN IDE maybe helpful. For more information, please refer to the GOWIN document [SUG100](https://www.gowinsemi.com/upload/database_doc/1885/document/660bb2366d0b3.pdf)(require login).
+
+### For more questions and solutions, go to [Related Questions](./../Tang-Nano-Doc/questions.md) to view
\ No newline at end of file
diff --git a/docs/hardware/zh/tang/assets/FTDI_DEVICE.png b/docs/hardware/zh/tang/assets/FTDI_DEVICE.png
new file mode 100644
index 0000000000..ed95cd69cf
Binary files /dev/null and b/docs/hardware/zh/tang/assets/FTDI_DEVICE.png differ
diff --git a/docs/hardware/zh/tang/assets/flash_mode_GAO.png b/docs/hardware/zh/tang/assets/flash_mode_GAO.png
new file mode 100644
index 0000000000..bdb3fc0249
Binary files /dev/null and b/docs/hardware/zh/tang/assets/flash_mode_GAO.png differ
diff --git a/docs/hardware/zh/tang/tang-mega-138k/mega-138k-pro.md b/docs/hardware/zh/tang/tang-mega-138k/mega-138k-pro.md
index 12e0d4066f..20f6cf6be0 100644
--- a/docs/hardware/zh/tang/tang-mega-138k/mega-138k-pro.md
+++ b/docs/hardware/zh/tang/tang-mega-138k/mega-138k-pro.md
@@ -7,6 +7,11 @@ update:
author: wonder
content:
- 新建文档
+ - date: 2024-09-26
+ version: v0.91
+ author: Serika
+ content:
+ - 更新FAQs
---
## 产品概述
@@ -184,9 +189,12 @@ update:
[板卡尺寸图](https://dl.sipeed.com/shareURL/TANG/Mega_138K_Pro/04_Mechanical_drawing)
[板卡 3D 模型](https://dl.sipeed.com/shareURL/TANG/Mega_138K_Pro/05_3D_file)
[部分芯片手册](https://dl.sipeed.com/shareURL/TANG/Mega_138K_Pro/07_Datasheet)
+[内部走线长度](https://dl.sipeed.com/shareURL/TANG/Mega_138K_Pro/08_Pinout_Length_table)
+[全引脚约束](https://dl.sipeed.com/shareURL/TANG/Mega_138K_Pro/09_Misc)
## 上手使用
-注意138K目前未被教育版支持，需要下载 V1.9.9 或更新版本的商业版IDE使用。
+注意138K Pro目前未被教育版支持，需要下载 V1.9.9 或更新版本的商业版IDE使用。
+V1.9.10.02版本的Programmer存在严重问题，无法正常下载本产品。
Lic 可以在高云官网申请，或者使用Sipeed提供的在线Lic服务，在IDE中选择Float Lic，填写以下信息即可：
~~~
ip: 106.55.34.119
@@ -249,6 +257,10 @@ port: 10559
避免短路 |
请在上电过程中，避免任何液体和金属触碰到 PCBA 上的元件的焊盘，否则会导致路，烧毁 PCBA |
+
+ | 保护晶圆 |
+ 请在拆装散热片的过程中，避免裸露的晶圆收到任何冲击，在安装好散热片后请勿用力按压散热片。否则将导致晶圆损坏 |
+
## 联系
@@ -257,16 +269,26 @@ Tang Mega 138K 可以在多种场景实现客户不同方面的需要，技术
## 常见问题
-### 板子通电后电源灯没亮
+### 板子通电后电源指示灯没亮
1. 请检查是否开启了板子的电源开关。
2. 检查自己的供电方式。
+### 板子电源指示灯亮了，Programmer提示No USB Cable Connection
+
+1. 请检查USB线是否正确接入标记为**JTAG|UART**的USB-C连接器。
+2. 尽量避免使用机箱前面板的USB连接器和没有独立供电的USB HUB。
+3. 检查自己是否正确安装FT2232的驱动：出现USB Serial Converter A/B。
+
+
+
+4. 通常情况下Windows会在联网后自动安装相应驱动。如果想要手动处理，请前往[相关问题](./../Tang-Nano-Doc/questions.md)查看相关内容。
+
### 如何下载到外部 FLASH {#burn_flash}
进行如下选项设置：
-
+
### 烧录后没反应或者引脚现象不对
diff --git a/docs/hardware/zh/tang/tang-mega-138k/mega-138k.md b/docs/hardware/zh/tang/tang-mega-138k/mega-138k.md
index ed90363ae2..ab520b3082 100644
--- a/docs/hardware/zh/tang/tang-mega-138k/mega-138k.md
+++ b/docs/hardware/zh/tang/tang-mega-138k/mega-138k.md
@@ -7,23 +7,32 @@ update:
author: Serika
content:
- 新建文档
+ - date: 2024-09-25
+ version: v0.2
+ author: Serika
+ content:
+ - 修正PCIe部分总线宽度的描述
+ - 更新GT收发器的最大速率为8.0Gbps
---
## 产品概述
-**Tang Mega 138K** 使用 22nm 制程 **GW5AST-LV138P484A** FPGA 芯片，具有 138240 个查找表单元和近 300 个 DSP 单元。含有八个速度范围在 270Mbps ~ 6.6Gbps 高速收发器，适合用于 PCIE 等高速口传递数据。此外，芯片含有硬核 PCIE，在使用 PCIE 的时候消耗更好的资源，并且得到更佳的性能。适用于高速通信、协议转换、高性能计算等场合。
+**Tang Mega 138K** 使用 22nm 制程 **GW5AST-LV138P484A** FPGA 芯片，具有 138240 个查找表单元和近 300 个 DSP 单元。含有四个速度范围在 270Mbps ~ 8.0Gbps 高速收发器，适合用于 PCIe 等高速口传递数据。此外，芯片含有硬核 PCIe，在使用 PCIe 的时候消耗更好的资源，并且得到更佳的性能。适用于高速通信、协议转换、高性能计算等场合。
相比138K Pro Dock，138K Dock具有更小的体积和更低的价格，并用USB3.0代替了SFP收发器。这不仅有效的降低了高速通讯的成本，还带来了更好的通用性。
淘宝购买链接：[点我](https://item.taobao.com/item.htm?id=740536508140)
## 板卡特点
-- 大容量 LUT
+- 大容量 LUT4
- 大容量 内存
-- PCIE2.0 x 4
-- USB3.0 x1
-- RISCV 硬核
+- PCIe3.0 x 4
+- USB3.0 x 1（5Gbps）
+- RISC-V 硬核（AE350 @800MHz）
+- HDMI TX/RX x 1
+- 千兆以太网 x 1
+- 板载3.7V锂离子电池（1S）充放电管理电路
## 产品外观
@@ -90,11 +99,11 @@ update:
| Transceivers 速率 |
- 270Mbps-6.6Gbps |
+ 270Mbps-8.0Gbps |
| PCIE 硬核 |
- 1个
速度可选 x1, x2, x4, x8 PCIe 2.0 |
+ 1个
速度可选 x1, x2, x4 PCIe 3.0 |
| LVDS (Gbps) |
@@ -102,7 +111,7 @@ update:
| DDR3 (Mbps) |
- 1333 |
+ 800 |
硬核处理器 |
RiscV AE350_SOC |
@@ -120,8 +129,8 @@ update:
| 内存 |
- 1GB DDR3 |
- 512MB x 2 |
+ 1GiB DDR3 |
+ 512MiB x 2 |
| Flash |
@@ -130,7 +139,7 @@ update:
| 调试接口 |
- Jtag + Uart |
+ JTAG + UART |
JST SH1.0 8Pins 连接器 |
@@ -172,15 +181,18 @@ update:
## 硬件资料
-[板卡规格书](https://dl.sipeed.com/shareURL/TANG/Mega_138K/01_Specification)
-[板卡原理图](https://dl.sipeed.com/shareURL/TANG/Mega_138K/02_Schematic)
-[PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_138K/03_Designator_drawing)
-[板卡尺寸图](https://dl.sipeed.com/shareURL/TANG/Mega_138K/04_Mechanical_drawing)
-[板卡 3D 模型](https://dl.sipeed.com/shareURL/TANG/Mega_138K/05_3D_file)
-[部分芯片手册](https://dl.sipeed.com/shareURL/TANG/Mega_138K/07_Datasheet)
+[板卡规格书](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/01_Specification)
+[板卡原理图](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/02_Schematic)
+[PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/03_Designator_drawing)
+[板卡尺寸图](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/04_Mechanical_drawing)
+[板卡 3D 模型](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/05_3D_file)
+[部分芯片手册](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/07_Datasheet)
+[全引脚约束](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/08_Misc)
## 上手使用
注意138K目前未被教育版支持，需要下载 V1.9.9 或更新版本的商业版IDE使用。
+V1.9.10.02版本的Programmer存在严重问题，无法正常下载本产品。
+如需将码流下载到flash中固化，推荐使用 **exFlash Erase,Program thru GAO-Bridge 5A** 模式。
Lic 可以在高云官网申请，或者使用Sipeed提供的在线Lic服务，在IDE中选择Float Lic，填写以下信息即可：
~~~
ip: 106.55.34.119
@@ -268,6 +280,16 @@ Tang Mega 138K 可以在多种场景实现客户不同方面的需要，技术
b. 连接12V DC电源对板子进行供电，如使用配件中的USB-C转12V DC连接器，则需要连接有12V输出能力的PD电源；
c. 连接3.7V锂电池对板子进行供电，注意电池电压必须≥3.6V且连续放电能力≥600mA。
+### 板子电源指示灯亮了，Programmer提示No USB Cable Connection
+
+1. 请检查USB线是否正确接入标记为**USB-DEBUG**的USB-C连接器。
+2. 尽量避免使用机箱前面板的USB连接器和没有独立供电的USB HUB。
+3. 检查自己是否正确安装FT2232的驱动：出现USB Serial Converter A/B。
+
+
+
+4. 通常情况下Windows会在联网后自动安装相应驱动。如果想要手动处理，请前往[相关问题](./../Tang-Nano-Doc/questions.md)查看相关内容。
+
### IDE找不到型号GW5AST-LV138PG484A
1. 教育版不支持138K，请更换商业版。如下图所示即为教育版（不支持138K）；
@@ -275,11 +297,11 @@ Tang Mega 138K 可以在多种场景实现客户不同方面的需要，技术
2. IDE版本过老，必须更新IDE ≥ 1.9.9。
-### 如何下载到外部 FLASH {#burn_flash}
+### 如何下载到外部 FLASH（固化） {#burn_flash}
1. 进行如下选项设置：
-
+
2. 检查拨码开关的位置，正确的位置如下图所示：
diff --git a/docs/hardware/zh/tang/tang-mega-60k/assets/dip-key_defualt.png b/docs/hardware/zh/tang/tang-mega-60k/assets/dip-key_defualt.png
new file mode 100644
index 0000000000..62e1c8ddec
Binary files /dev/null and b/docs/hardware/zh/tang/tang-mega-60k/assets/dip-key_defualt.png differ
diff --git a/docs/hardware/zh/tang/tang-mega-60k/assets/mega_138k_top.png b/docs/hardware/zh/tang/tang-mega-60k/assets/mega_138k_top.png
deleted file mode 100644
index c127d71e0e..0000000000
Binary files a/docs/hardware/zh/tang/tang-mega-60k/assets/mega_138k_top.png and /dev/null differ
diff --git a/docs/hardware/zh/tang/tang-mega-60k/assets/mega_60k_top.png b/docs/hardware/zh/tang/tang-mega-60k/assets/mega_60k_top.png
new file mode 100644
index 0000000000..01df420bbf
Binary files /dev/null and b/docs/hardware/zh/tang/tang-mega-60k/assets/mega_60k_top.png differ
diff --git a/docs/hardware/zh/tang/tang-mega-60k/assets/partno_60K.png b/docs/hardware/zh/tang/tang-mega-60k/assets/partno_60K.png
new file mode 100644
index 0000000000..843c6ca831
Binary files /dev/null and b/docs/hardware/zh/tang/tang-mega-60k/assets/partno_60K.png differ
diff --git a/docs/hardware/zh/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png b/docs/hardware/zh/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png
deleted file mode 100644
index 89d6b2286b..0000000000
Binary files a/docs/hardware/zh/tang/tang-mega-60k/assets/tang_mega_138k_function_map.png and /dev/null differ
diff --git a/docs/hardware/zh/tang/tang-mega-60k/mega-60k.md b/docs/hardware/zh/tang/tang-mega-60k/mega-60k.md
index 53e9862b9b..c947a749dc 100644
--- a/docs/hardware/zh/tang/tang-mega-60k/mega-60k.md
+++ b/docs/hardware/zh/tang/tang-mega-60k/mega-60k.md
@@ -7,21 +7,37 @@ update:
author: Serika
content:
- 新建文档
+ - date: 2024-09-25
+ version: v0.2
+ author: Serika
+ content:
+ - 修正PCIe部分总线宽度的描述
+ - 更新之前TBD的内容
---
## 产品概述
-TBD
+**Tang Mega 60K** 使用 22nm 制程 **GW5AT-LV60P484A** FPGA 芯片，具有 59904 个查找表单元和 118 个 DSP 单元。含有四个速度范围在 270Mbps ~ 6.6Gbps 高速收发器，适合用于 PCIe 等高速口传递数据。此外，芯片含有硬核 PCIe 和 MIPI C/D PHY控制器，在使用 PCIe 的时候消耗更好的资源，并且得到更佳的性能。适用于高速通信、协议转换、高性能计算等场合。
+
+60K Dock 和 138K Dock共用一套底板（TANG MEGA NEO），因此两者的外设完全相同。相比138K Dock，60K Dock具有较少的逻辑资源和更低的价格，并且包含MIPI C/D PHY 收发器。这不仅能进一步降低高速通讯的成本，还带来了更好的影像处理系统集成的兼容性。
+
+淘宝购买链接：[点我](https://item.taobao.com/item.htm?id=740536508140)
-购买链接：[淘宝](https://sipeed.taobao.com)
## 板卡特点
-TBD
+- 中等容量 LUT4
+- 512MiB DDR3 内存
+- PCIe2.0 x 4
+- USB3.0 x 1(5Gbps)
+- MIPI C/D PHY收发器
+- HDMI TX/RX x 1
+- 千兆以太网 x 1
+- 板载3.7V锂离子电池（1S）充放电管理电路
## 产品外观
-TBD
+
## 硬件参数
@@ -88,7 +104,7 @@ TBD
| PCIE 硬核 |
- 1个
速度可选 x1, x2, x4, x8 PCIe 2.0 |
+ 1个
速度可选 x1, x2, x4 PCIe 2.0 |
| LVDS (Gbps) |
@@ -119,8 +135,8 @@ TBD
| 内存 |
- 1GB DDR3 |
- 512MB x 2 |
+ 512MiB DDR3 |
+ 512MiB x 1 |
| Flash |
@@ -129,7 +145,7 @@ TBD
| 调试接口 |
- Jtag + Uart |
+ JTAG + UART |
JST SH1.0 8Pins 连接器 |
@@ -142,19 +158,49 @@ TBD
### 底板参数
-TBD
+| 项目 | 数量 | 备注 |
+| :------------------ | ---- | ------------------------------------------------- |
+| LED | 4+8 | 4个电量指示灯+8个PMOD外接 |
+| WS2812 | 1 | 与 aRGB 灯带连接器同数据引脚 |
+| Buttons | 3+1 | 3个用户按键+1个reconfig按键 |
+| PCIe | 1 | 4-lane @ 5Gbps，CH569 16bit HSPI |
+| USB3 | 2 | SuperSpeed @ 5Gbps |
+| GbE | 1 | 千兆以太网 |
+| DVI RX | 1 | 与 DVI TX 互相占用 |
+| DVI TX | 1 | 与 DVI RX 互相占用 |
+| PMOD | 2 | 与上边的40P排针和DVP复用 |
+| ADC | 2 | 2个差分输入通道 |
+| aRGB CONN. | 1 | 与 WS2812 同数据引脚 |
+| DVP Interface | 1 | 与上侧的40P排针和PMOD复用 |
+| RGB Interface | 1 | 支持 RGB888 屏幕 |
+| MIC ARRAY Interface | 1 | 支持连接 Sipeed 6+1 麦克风阵列 |
+| SD Slot | 1 | 1-bit SDIO/MMC 或SPI模式 |
+| BATT CONN. | 1 | 支持3.7V锂电池，自带充放电管理 |
+| PWM FAN CONN. | 1 | 支持5V PWM风扇，支持测速 |
+| Speaker CONN. | 2 | 支持两个3W扬声器 |
+| 3.5mm Headphone CONN.| 1 | 立体声输出，无Mic |
+| MS5351 | 1 | 为 Serdes 提供 RefClk；通过底板上的串口来控制输出 |
+| USB JTAG & UART | 1 | 支持烧录 FPGA，并且提供串口功能 |
+| 40P 排针 | 2 | 上侧的40P排针与PMOD和DVP复用 |
+| 电源开关 | 1 | 长按2s切换开关机状态 |
+| 12V DC | 1 | 规格DC5521 |
+
## 硬件资料
-[板卡规格书](https://dl.sipeed.com/shareURL/TANG/Mega_60K/01_Specification)
-[板卡原理图](https://dl.sipeed.com/shareURL/TANG/Mega_60K/02_Schematic)
-[PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_60K/03_Designator_drawing)
-[板卡尺寸图](https://dl.sipeed.com/shareURL/TANG/Mega_60K/04_Mechanical_drawing)
-[板卡 3D 模型](https://dl.sipeed.com/shareURL/TANG/Mega_60K/05_3D_file)
-[部分芯片手册](https://dl.sipeed.com/shareURL/TANG/Mega_60K/07_Datasheet)
+[板卡规格书](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/01_Specification)
+[板卡原理图](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/02_Schematic)
+[PCB BOM](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/03_Designator_drawing)
+[板卡尺寸图](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/04_Mechanical_drawing)
+[板卡 3D 模型](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/05_3D_file)
+[部分芯片手册](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/07_Datasheet)
+[全引脚约束](https://dl.sipeed.com/shareURL/TANG/Mega_138K_60K/08_Misc)
+
## 上手使用
-注意60K目前未被教育版支持，需要下载 V1.9.9.04 或更新版本的商业版IDE使用。
+注意60K目前未被教育版支持，需要下载 V1.9.10.01 或更新版本的商业版IDE使用。
+V1.9.10.02版本的Programmer存在严重问题，无法正常下载本产品。
+如需将码流下载到flash中固化，推荐使用 **exFlash Erase,Program thru GAO-Bridge 5A** 模式（需要≥V1.9.10.03）。
Lic 可以在高云官网申请，或者使用Sipeed提供的在线Lic服务，在IDE中选择Float Lic，填写以下信息即可：
~~~
ip: 106.55.34.119
@@ -224,6 +270,56 @@ Tang Mega 60K 可以在多种场景实现客户不同方面的需要，技术支
## 常见问题
-### 板子通电后电源灯没亮
+### 板子通电后底板只亮了四个指示灯，SOM的指示灯没亮
+
+1. 请检查是否开启了板子的电源，**PWR按键**（HDMI接口旁边）长按2S开启电源；
+
+### 板子通电后，底板Battery-Indicator指示灯在闪烁
+
+1. 正常现象，通常是最后一颗LED（靠近12V DC连接器）在闪烁；
+2. 当板子连接3.7V锂电池时，这些LED将作为电池电量指示灯。
+
+### 长按PWR按钮 2s 后，底板指示灯全部熄灭又依次亮起
+
+1. 检查自己的供电方式，出现这种情况意味着供电能力不足；
+2. 解决方案（任选一种）：
+ a. 同时连接板子的**USB-3.0**和**USB-DEBUG**进行供电，即双5V USB电源供电；
+ b. 连接12V DC电源对板子进行供电，如使用配件中的USB-C转12V DC连接器，则需要连接有12V输出能力的PD电源；
+ c. 连接3.7V锂电池对板子进行供电，注意电池电压必须≥3.6V且连续放电能力≥600mA。
+
+### 板子电源指示灯亮了，Programmer提示No USB Cable Connection
+
+1. 请检查USB线是否正确接入标记为**USB-DEBUG**的USB-C连接器。
+2. 尽量避免使用机箱前面板的USB连接器和没有独立供电的USB HUB。
+3. 检查自己是否正确安装FT2232的驱动：出现USB Serial Converter A/B。
+
+
+
+4. 通常情况下Windows会在联网后自动安装相应驱动。如果想要手动处理，请前往[相关问题](./../Tang-Nano-Doc/questions.md)查看相关内容。
+
+### IDE找不到型号GW5AT-LV60PG484A
+
+1. 教育版不支持60K，请更换商业版。如下图所示即为教育版（不支持60K）；
+
+
+2. IDE版本过老，必须更新IDE ≥ 1.9.10.01。
+
+### 如何下载到外部 FLASH（固化） {#burn_flash}
+
+1. 进行如下选项设置：
+
+
+
+2. 检查拨码开关的位置，正确的位置如下图所示：
+
+
+
+### 烧录后没反应或者引脚现象不对
+
+1. 首先确定IDE选择了正确的型号 **GW5AT-LV60PG484AC1/10**，下图中的每一个参数都要求一致；
+
+
+
+2. 然后检查自己的代码和对应的仿真波形是否满足要求，使用云源软件（GOWIN IDE）的GAO工具可以进行片上仿真。更多详情请参考GOWIN文档[SUG100](https://cdn.gowinsemi.com.cn/SUG100-4.0_Gowin%E4%BA%91%E6%BA%90%E8%BD%AF%E4%BB%B6%E7%94%A8%E6%88%B7%E6%8C%87%E5%8D%97.pdf)中关于GAO工具的描述。
-TBD
+### 更多问题及其解决办法前往[相关问题](./../Tang-Nano-Doc/questions.md)查看
diff --git a/layout/locales/en/LC_MESSAGES/messages.po b/layout/locales/en/LC_MESSAGES/messages.po
index ca5f8e6d0f..b93193bc43 100644
--- a/layout/locales/en/LC_MESSAGES/messages.po
+++ b/layout/locales/en/LC_MESSAGES/messages.po
@@ -295,7 +295,7 @@ msgstr ""
"RISC-V 1GHz + 1Tops NPU, 4M HD camera, 2.3-inch 552x368 HD capacitive "
"touch screen, perfect support for all new Maix ecosystem software"
-#: maix.html:168 tang.html:284 tang.html:300
+#: maix.html:168 tang.html:300
msgid "https://sipeed.taobao.com"
msgstr "https://www.aliexpress.com/store/911876460"
@@ -423,34 +423,38 @@ msgstr "CPU"
msgid "其他特点"
msgstr "Ohter Features"
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "内含 6.6G Transceivers"
-msgstr "Inchip 6.6G Transceivers"
-
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "支持 PCIe 2.0 通信"
-msgstr "Support PCIe 2.0 Interface"
-
-#: tang.html:142 tang.html:144
-msgid "支持 USB3 数据传输"
-msgstr "Support USB3 SS Transmission"
-
-#: tang.html:143
+#: tang.html:142
msgid "内含 12.5G Transceivers"
msgstr "Inchip 12.5G Transceivers"
-#: tang.html:143
+#: tang.html:142 tang.html:143
msgid "支持 PCIe 3.0 通信"
msgstr "Support PCIe 3.0 Interface"
-#: tang.html:143
+#: tang.html:142
msgid "支持 SFP+ 数据传输"
msgstr "Support SFP+ (10G) Transmission"
+#: tang.html:143
+msgid "内含 8.0G Transceivers"
+msgstr "Inchip 6.6G Transceivers"
+
+#: tang.html:143 tang.html:144
+msgid "支持 USB3 数据传输"
+msgstr "Support USB3 SS Transmission"
+
+#: tang.html:144 tang.html:147
+msgid "内含 6.6G Transceivers"
+msgstr "Inchip 6.6G Transceivers"
+
#: tang.html:144 tang.html:147
msgid "内含 2.5G MIPI C/DPHY RX/TX"
msgstr "2.5G MIPI C/DPHY RX/TX inside"
+#: tang.html:144 tang.html:147
+msgid "支持 PCIe 2.0 通信"
+msgstr "Support PCIe 2.0 Interface"
+
#: tang.html:145
msgid "内含 2.5G MIPI DPHY RX/TX"
msgstr "2.5G MIPI DPHY RX/TX inside"
@@ -484,98 +488,102 @@ msgid "GOAI~"
msgstr ""
#: tang.html:164
-msgid "小体积的大容量 FPGA 开发板"
-msgstr "Campact High-capacity FPGA Board"
+msgid "小体积的中等量 FPGA 开发板"
+msgstr "Campact Medium-capacity FPGA Board"
#: tang.html:168
-msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
-msgstr "/hardware/en/tang/tang-mega-138k/mega-138k.html"
+msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
+msgstr "/hardware/en/tang/tang-mega-60k/mega-60k.html"
-#: tang.html:172
+#: tang.html:172 tang.html:188
msgid "https://item.taobao.com/item.htm?id=808924746746"
msgstr "https://www.aliexpress.com/item/3256807078990410.html"
#: tang.html:180
+msgid "小体积的大容量 FPGA 开发板"
+msgstr "Campact High-capacity FPGA Board"
+
+#: tang.html:184
+msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
+msgstr "/hardware/en/tang/tang-mega-138k/mega-138k.html"
+
+#: tang.html:196
msgid "可以高速通信的大容量 FPGA 开发板"
msgstr "High Speed Interface FPGA Board"
-#: tang.html:184
+#: tang.html:200
msgid "/hardware/zh/tang/tang-mega-138k/mega-138k-pro.html"
msgstr "/hardware/en/tang/tang-mega-138k/mega-138k-pro.html"
-#: tang.html:188
+#: tang.html:204
msgid "https://item.taobao.com/item.htm?id=740536508140"
msgstr "https://www.aliexpress.com/item/1005006080116482.html"
-#: tang.html:196
+#: tang.html:212
msgid "自由拓展的 FPGA 开发板"
msgstr "Free Expansion FPGA board"
-#: tang.html:200
+#: tang.html:216
msgid "/hardware/zh/tang/tang-primer-25k/primer-25k.html"
msgstr "/hardware/en/tang/tang-primer-25k/primer-25k.html"
-#: tang.html:204
+#: tang.html:220
msgid "https://item.taobao.com/item.htm?id=746293292946"
msgstr "https://www.aliexpress.com/item/1005006224593018.html"
-#: tang.html:212
+#: tang.html:228
msgid "自带多种外设接口的 FPGA 开发板"
msgstr "Mutiple Interfaces FPGA Board"
-#: tang.html:216
+#: tang.html:232
msgid "/hardware/zh/tang/tang-primer-20k/primer-20k.html"
msgstr "/hardware/en/tang/tang-primer-20k/primer-20k.html"
-#: tang.html:220
+#: tang.html:236
msgid "https://item.taobao.com/item.htm?id=680099020807"
msgstr "https://www.aliexpress.com/item/1005004653308809.html"
-#: tang.html:228
+#: tang.html:244
msgid "适用于模拟复古游戏机的 FPGA 开发板"
msgstr "Retro Games Friendly FPGA Board"
-#: tang.html:232
+#: tang.html:248
msgid "/hardware/zh/tang/tang-nano-20k/nano-20k.html"
msgstr "/hardware/en/tang/tang-nano-20k/nano-20k.html"
-#: tang.html:236
+#: tang.html:252
msgid "https://item.taobao.com/item.htm?id=717932028073"
msgstr "https://www.aliexpress.com/item/1005005581148230.html"
-#: tang.html:244
+#: tang.html:260
msgid "适合 RiscV 软核验证的 FPGA 开发板"
msgstr "RiscV Softcore FPGA Board"
-#: tang.html:248
+#: tang.html:264
msgid "/hardware/zh/tang/Tang-Nano-9K/Nano-9K.html"
msgstr "/hardware/en/tang/Tang-Nano-9K/Nano-9K.html"
-#: tang.html:252
+#: tang.html:268
msgid "https://item.taobao.com/item.htm?id=666055424174"
msgstr " https://www.aliexpress.com/item/1005003803994525.html"
-#: tang.html:260
+#: tang.html:276
msgid "芯片内部含有 MCU 的 FPGA 开发板"
msgstr "Hardcore Inside FPGA Board"
-#: tang.html:264
+#: tang.html:280
msgid "/hardware/zh/tang/Tang-Nano-4K/Nano-4K.html"
msgstr "/hardware/en/tang/Tang-Nano-4K/Nano-4K.html"
-#: tang.html:268
+#: tang.html:284
#, fuzzy
msgid "https://item.taobao.com/item.htm?id=661994055100"
msgstr "https://www.aliexpress.com/item/1005003152104886.html"
-#: tang.html:276 tang.html:292
+#: tang.html:292
msgid "开发中，敬请期待。。。"
msgstr "Comming Soon..."
-#: tang.html:280
-msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
-msgstr "/hardware/en/tang/tang-mega-60k/mega-60k.html"
-
#: tang.html:296
msgid "/hardware/zh/tang/tang-primer-15k/primer-15k.html"
msgstr "/hardware/en/tang/tang-primer-15k/primer-15k.html"
diff --git a/layout/locales/messages.pot b/layout/locales/messages.pot
index c3852ed6fd..e2897aae56 100644
--- a/layout/locales/messages.pot
+++ b/layout/locales/messages.pot
@@ -290,7 +290,7 @@ msgstr ""
msgid "RISC-V 1GHz + 1Tops NPU, 4M高清摄像头，2.3寸552x368高清电容触摸屏，完美支持全新 Maix 生态所有软件"
msgstr ""
-#: maix.html:168 tang.html:284 tang.html:300
+#: maix.html:168 tang.html:300
msgid "https://sipeed.taobao.com"
msgstr ""
@@ -405,34 +405,38 @@ msgstr ""
msgid "其他特点"
msgstr ""
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "内含 6.6G Transceivers"
+#: tang.html:142
+msgid "内含 12.5G Transceivers"
msgstr ""
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "支持 PCIe 2.0 通信"
+#: tang.html:142 tang.html:143
+msgid "支持 PCIe 3.0 通信"
msgstr ""
-#: tang.html:142 tang.html:144
-msgid "支持 USB3 数据传输"
+#: tang.html:142
+msgid "支持 SFP+ 数据传输"
msgstr ""
#: tang.html:143
-msgid "内含 12.5G Transceivers"
+msgid "内含 8.0G Transceivers"
msgstr ""
-#: tang.html:143
-msgid "支持 PCIe 3.0 通信"
+#: tang.html:143 tang.html:144
+msgid "支持 USB3 数据传输"
msgstr ""
-#: tang.html:143
-msgid "支持 SFP+ 数据传输"
+#: tang.html:144 tang.html:147
+msgid "内含 6.6G Transceivers"
msgstr ""
#: tang.html:144 tang.html:147
msgid "内含 2.5G MIPI C/DPHY RX/TX"
msgstr ""
+#: tang.html:144 tang.html:147
+msgid "支持 PCIe 2.0 通信"
+msgstr ""
+
#: tang.html:145
msgid "内含 2.5G MIPI DPHY RX/TX"
msgstr ""
@@ -466,97 +470,101 @@ msgid "GOAI~"
msgstr ""
#: tang.html:164
-msgid "小体积的大容量 FPGA 开发板"
+msgid "小体积的中等量 FPGA 开发板"
msgstr ""
#: tang.html:168
-msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
+msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
msgstr ""
-#: tang.html:172
+#: tang.html:172 tang.html:188
msgid "https://item.taobao.com/item.htm?id=808924746746"
msgstr ""
#: tang.html:180
-msgid "可以高速通信的大容量 FPGA 开发板"
+msgid "小体积的大容量 FPGA 开发板"
msgstr ""
#: tang.html:184
+msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
+msgstr ""
+
+#: tang.html:196
+msgid "可以高速通信的大容量 FPGA 开发板"
+msgstr ""
+
+#: tang.html:200
msgid "/hardware/zh/tang/tang-mega-138k/mega-138k-pro.html"
msgstr ""
-#: tang.html:188
+#: tang.html:204
msgid "https://item.taobao.com/item.htm?id=740536508140"
msgstr ""
-#: tang.html:196
+#: tang.html:212
msgid "自由拓展的 FPGA 开发板"
msgstr ""
-#: tang.html:200
+#: tang.html:216
msgid "/hardware/zh/tang/tang-primer-25k/primer-25k.html"
msgstr ""
-#: tang.html:204
+#: tang.html:220
msgid "https://item.taobao.com/item.htm?id=746293292946"
msgstr ""
-#: tang.html:212
+#: tang.html:228
msgid "自带多种外设接口的 FPGA 开发板"
msgstr ""
-#: tang.html:216
+#: tang.html:232
msgid "/hardware/zh/tang/tang-primer-20k/primer-20k.html"
msgstr ""
-#: tang.html:220
+#: tang.html:236
msgid "https://item.taobao.com/item.htm?id=680099020807"
msgstr ""
-#: tang.html:228
+#: tang.html:244
msgid "适用于模拟复古游戏机的 FPGA 开发板"
msgstr ""
-#: tang.html:232
+#: tang.html:248
msgid "/hardware/zh/tang/tang-nano-20k/nano-20k.html"
msgstr ""
-#: tang.html:236
+#: tang.html:252
msgid "https://item.taobao.com/item.htm?id=717932028073"
msgstr ""
-#: tang.html:244
+#: tang.html:260
msgid "适合 RiscV 软核验证的 FPGA 开发板"
msgstr ""
-#: tang.html:248
+#: tang.html:264
msgid "/hardware/zh/tang/Tang-Nano-9K/Nano-9K.html"
msgstr ""
-#: tang.html:252
+#: tang.html:268
msgid "https://item.taobao.com/item.htm?id=666055424174"
msgstr ""
-#: tang.html:260
+#: tang.html:276
msgid "芯片内部含有 MCU 的 FPGA 开发板"
msgstr ""
-#: tang.html:264
+#: tang.html:280
msgid "/hardware/zh/tang/Tang-Nano-4K/Nano-4K.html"
msgstr ""
-#: tang.html:268
+#: tang.html:284
msgid "https://item.taobao.com/item.htm?id=661994055100"
msgstr ""
-#: tang.html:276 tang.html:292
+#: tang.html:292
msgid "开发中，敬请期待。。。"
msgstr ""
-#: tang.html:280
-msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
-msgstr ""
-
#: tang.html:296
msgid "/hardware/zh/tang/tang-primer-15k/primer-15k.html"
msgstr ""
diff --git a/layout/locales/zh/LC_MESSAGES/messages.po b/layout/locales/zh/LC_MESSAGES/messages.po
index 9b000576f5..4c71237672 100644
--- a/layout/locales/zh/LC_MESSAGES/messages.po
+++ b/layout/locales/zh/LC_MESSAGES/messages.po
@@ -290,7 +290,7 @@ msgstr ""
msgid "RISC-V 1GHz + 1Tops NPU, 4M高清摄像头，2.3寸552x368高清电容触摸屏，完美支持全新 Maix 生态所有软件"
msgstr ""
-#: maix.html:168 tang.html:284 tang.html:300
+#: maix.html:168 tang.html:300
msgid "https://sipeed.taobao.com"
msgstr ""
@@ -405,34 +405,38 @@ msgstr ""
msgid "其他特点"
msgstr ""
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "内含 6.6G Transceivers"
+#: tang.html:142
+msgid "内含 12.5G Transceivers"
msgstr ""
-#: tang.html:142 tang.html:144 tang.html:147
-msgid "支持 PCIe 2.0 通信"
+#: tang.html:142 tang.html:143
+msgid "支持 PCIe 3.0 通信"
msgstr ""
-#: tang.html:142 tang.html:144
-msgid "支持 USB3 数据传输"
+#: tang.html:142
+msgid "支持 SFP+ 数据传输"
msgstr ""
#: tang.html:143
-msgid "内含 12.5G Transceivers"
+msgid "内含 8.0G Transceivers"
msgstr ""
-#: tang.html:143
-msgid "支持 PCIe 3.0 通信"
+#: tang.html:143 tang.html:144
+msgid "支持 USB3 数据传输"
msgstr ""
-#: tang.html:143
-msgid "支持 SFP+ 数据传输"
+#: tang.html:144 tang.html:147
+msgid "内含 6.6G Transceivers"
msgstr ""
#: tang.html:144 tang.html:147
msgid "内含 2.5G MIPI C/DPHY RX/TX"
msgstr ""
+#: tang.html:144 tang.html:147
+msgid "支持 PCIe 2.0 通信"
+msgstr ""
+
#: tang.html:145
msgid "内含 2.5G MIPI DPHY RX/TX"
msgstr ""
@@ -466,97 +470,101 @@ msgid "GOAI~"
msgstr ""
#: tang.html:164
-msgid "小体积的大容量 FPGA 开发板"
+msgid "小体积的中等量 FPGA 开发板"
msgstr ""
#: tang.html:168
-msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
+msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
msgstr ""
-#: tang.html:172
+#: tang.html:172 tang.html:188
msgid "https://item.taobao.com/item.htm?id=808924746746"
msgstr ""
#: tang.html:180
-msgid "可以高速通信的大容量 FPGA 开发板"
+msgid "小体积的大容量 FPGA 开发板"
msgstr ""
#: tang.html:184
+msgid "/hardware/zh/tang/tang-mega-138k/mega-138k.html"
+msgstr ""
+
+#: tang.html:196
+msgid "可以高速通信的大容量 FPGA 开发板"
+msgstr ""
+
+#: tang.html:200
msgid "/hardware/zh/tang/tang-mega-138k/mega-138k-pro.html"
msgstr ""
-#: tang.html:188
+#: tang.html:204
msgid "https://item.taobao.com/item.htm?id=740536508140"
msgstr ""
-#: tang.html:196
+#: tang.html:212
msgid "自由拓展的 FPGA 开发板"
msgstr ""
-#: tang.html:200
+#: tang.html:216
msgid "/hardware/zh/tang/tang-primer-25k/primer-25k.html"
msgstr ""
-#: tang.html:204
+#: tang.html:220
msgid "https://item.taobao.com/item.htm?id=746293292946"
msgstr ""
-#: tang.html:212
+#: tang.html:228
msgid "自带多种外设接口的 FPGA 开发板"
msgstr ""
-#: tang.html:216
+#: tang.html:232
msgid "/hardware/zh/tang/tang-primer-20k/primer-20k.html"
msgstr ""
-#: tang.html:220
+#: tang.html:236
msgid "https://item.taobao.com/item.htm?id=680099020807"
msgstr ""
-#: tang.html:228
+#: tang.html:244
msgid "适用于模拟复古游戏机的 FPGA 开发板"
msgstr ""
-#: tang.html:232
+#: tang.html:248
msgid "/hardware/zh/tang/tang-nano-20k/nano-20k.html"
msgstr ""
-#: tang.html:236
+#: tang.html:252
msgid "https://item.taobao.com/item.htm?id=717932028073"
msgstr ""
-#: tang.html:244
+#: tang.html:260
msgid "适合 RiscV 软核验证的 FPGA 开发板"
msgstr ""
-#: tang.html:248
+#: tang.html:264
msgid "/hardware/zh/tang/Tang-Nano-9K/Nano-9K.html"
msgstr ""
-#: tang.html:252
+#: tang.html:268
msgid "https://item.taobao.com/item.htm?id=666055424174"
msgstr ""
-#: tang.html:260
+#: tang.html:276
msgid "芯片内部含有 MCU 的 FPGA 开发板"
msgstr ""
-#: tang.html:264
+#: tang.html:280
msgid "/hardware/zh/tang/Tang-Nano-4K/Nano-4K.html"
msgstr ""
-#: tang.html:268
+#: tang.html:284
msgid "https://item.taobao.com/item.htm?id=661994055100"
msgstr ""
-#: tang.html:276 tang.html:292
+#: tang.html:292
msgid "开发中，敬请期待。。。"
msgstr ""
-#: tang.html:280
-msgid "/hardware/zh/tang/tang-mega-60k/mega-60k.html"
-msgstr ""
-
#: tang.html:296
msgid "/hardware/zh/tang/tang-primer-15k/primer-15k.html"
msgstr ""
diff --git a/layout/tang.html b/layout/tang.html
index 8085bb2db1..fcdc02ac50 100644
--- a/layout/tang.html
+++ b/layout/tang.html
@@ -29,8 +29,8 @@ {{_('Tang 系列板卡参数对比')}}
| {{_('参数')}} |
- Mega 138K |
Mega 138K Pro |
+ Mega 138K |
Mega 60K |
Primer 25K |
Primer 20K |
@@ -127,9 +127,9 @@ {{_('Tang 系列板卡参数对比')}}
| {{_('储存')}} |
- {{_('板载_fpga')}} 128Mb Flash |
{{_('板载_fpga')}} 128Mb Flash * 2 |
{{_('板载_fpga')}} 128Mb Flash |
+ {{_('板载_fpga')}} 128Mb Flash |
{{_('板载_fpga')}} 64Mb Flash |
{{_('板载_fpga')}} 64Mb Flash |
{{_('板载_fpga')}} 64Mb Flash |
@@ -139,8 +139,8 @@ {{_('Tang 系列板卡参数对比')}}
| {{_('其他特点')}} |
- {{_('内含 6.6G Transceivers')}}
{{_('支持 PCIe 2.0 通信')}}
{{_('支持 USB3 数据传输')}} |
{{_('内含 12.5G Transceivers')}}
{{_('支持 PCIe 3.0 通信')}}
{{_('支持 SFP+ 数据传输')}} |
+ {{_('内含 8.0G Transceivers')}}
{{_('支持 PCIe 3.0 通信')}}
{{_('支持 USB3 数据传输')}} |
{{_('内含 6.6G Transceivers')}}
{{_('内含 2.5G MIPI C/DPHY RX/TX')}}
{{_('支持 PCIe 2.0 通信')}}
{{_('支持 USB3 数据传输')}} |
{{_('内含 2.5G MIPI DPHY RX/TX')}}
{{_('支持 PMOD, 64MByte SDRAM模块')}}
{{_('支持 USB手柄')}} |
{{_('丰富外设，HDMI/以太网/USB')}} |
@@ -158,6 +158,22 @@ {{_('Tang 系列板卡参数对比')}}