From 67a75d6bdf351341a3d0487fb577276558f3e8c5 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Thu, 14 Dec 2023 10:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=B3=A2=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20(#7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 后面加一下每一个的信息 开一堆issue @cree 我谢谢你啊 Co-authored-by: creepebucket <3327018890@qq.com> Reviewed-on: http://shenjack.top:5100/ARS/ARS-docs/pulls/7 --- .gitea/workflows/label.yml | 46 ++++++++++++ modules/10/10.litematic | 3 + modules/10/10.schem | 3 + modules/10/10_bottom.nbt | 3 + modules/10/10_top.nbt | 3 + modules/11/11.litematic | 3 + modules/11/11.schem | 3 + modules/11/11_bottom.nbt | 3 + modules/11/11_top.nbt | 3 + modules/12/12.litematic | 3 + modules/12/12.nbt | 3 + modules/12/12.schem | 3 + modules/13/13.litematic | 3 + modules/13/13.schem | 3 + modules/13/13_bottom.nbt | 3 + modules/13/13_top.nbt | 3 + modules/15/15.litematic | 3 + modules/15/15.nbt | 3 + modules/15/15.schem | 3 + modules/8/8.litematic | 3 + modules/8/8.schem | 3 + modules/8/8_bottom.nbt | 3 + modules/8/8_top.nbt | 3 + .../BCS-vertical-10gt-2t.litematic | 0 .../BCS-vertical-10gt-2t.nbt | 0 .../BCS-vertical-10gt-2t.schem | 0 .../{ => BCS}/BCS-vertical-10gt-2t/readme.md | 18 ++--- modules/CCA-vertial-20gt-32bit/readme.md | 51 ------------- .../CCA-vertial-20gt-32bit(bottom).nbt | 0 .../CCA-vertial-20gt-32bit(top).nbt | 0 .../CCA-vertial-20gt-32bit.litematic | 0 .../CCA-vertial-20gt-32bit.schem | 0 modules/CCA/CCA-vertial-20gt-32bit/readme.md | 74 +++++++++++++++++++ modules/CCA/CCA-vertical-8bit/4.litematic | 3 + modules/CCA/CCA-vertical-8bit/4.nbt | 3 + modules/CCA/CCA-vertical-8bit/4.schem | 3 + modules/CCA/CCA-vertical-8bit/readme.md | 0 .../CCA-vertical-8gt.litematic | 0 .../CCA-vertical-8gt/CCA-vertical-8gt.nbt | 0 .../CCA-vertical-8gt/CCA-vertical-8gt.schem | 0 modules/{ => CCA}/CCA-vertical-8gt/readme.md | 15 ++-- .../CSA-vertical-4gt-32bit-bottom.nbt | 3 + .../CSA-vertical-4gt-32bit-top.nbt | 3 + .../CSA-vertical-4gt-32bit.litematic | 3 + .../CSA-vertical-4gt-32bit.schem | 3 + modules/CSA/CSA-vertical-4gt-32bit/readme.md | 7 ++ modules/DIV/DIV-8gt-flow/9.litematic | 3 + modules/DIV/DIV-8gt-flow/9.nbt | 3 + modules/DIV/DIV-8gt-flow/9.schem | 3 + modules/alu.schem | 3 + scripts/parse-label.py | 28 +++++++ tags/readme.md | 6 +- tags/tags/adder_or_subtractor.md | 6 +- tags/tags/au.md | 6 +- tags/tags/je.md | 6 +- tags/tags/no_container.md | 2 + 56 files changed, 285 insertions(+), 79 deletions(-) create mode 100644 .gitea/workflows/label.yml create mode 100644 modules/10/10.litematic create mode 100644 modules/10/10.schem create mode 100644 modules/10/10_bottom.nbt create mode 100644 modules/10/10_top.nbt create mode 100644 modules/11/11.litematic create mode 100644 modules/11/11.schem create mode 100644 modules/11/11_bottom.nbt create mode 100644 modules/11/11_top.nbt create mode 100644 modules/12/12.litematic create mode 100644 modules/12/12.nbt create mode 100644 modules/12/12.schem create mode 100644 modules/13/13.litematic create mode 100644 modules/13/13.schem create mode 100644 modules/13/13_bottom.nbt create mode 100644 modules/13/13_top.nbt create mode 100644 modules/15/15.litematic create mode 100644 modules/15/15.nbt create mode 100644 modules/15/15.schem create mode 100644 modules/8/8.litematic create mode 100644 modules/8/8.schem create mode 100644 modules/8/8_bottom.nbt create mode 100644 modules/8/8_top.nbt rename modules/{ => BCS}/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.litematic (100%) rename modules/{ => BCS}/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.nbt (100%) rename modules/{ => BCS}/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.schem (100%) rename modules/{ => BCS}/BCS-vertical-10gt-2t/readme.md (93%) delete mode 100644 modules/CCA-vertial-20gt-32bit/readme.md rename modules/{ => CCA}/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(bottom).nbt (100%) rename modules/{ => CCA}/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(top).nbt (100%) rename modules/{ => CCA}/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.litematic (100%) rename modules/{ => CCA}/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.schem (100%) create mode 100644 modules/CCA/CCA-vertial-20gt-32bit/readme.md create mode 100644 modules/CCA/CCA-vertical-8bit/4.litematic create mode 100644 modules/CCA/CCA-vertical-8bit/4.nbt create mode 100644 modules/CCA/CCA-vertical-8bit/4.schem create mode 100644 modules/CCA/CCA-vertical-8bit/readme.md rename modules/{ => CCA}/CCA-vertical-8gt/CCA-vertical-8gt.litematic (100%) rename modules/{ => CCA}/CCA-vertical-8gt/CCA-vertical-8gt.nbt (100%) rename modules/{ => CCA}/CCA-vertical-8gt/CCA-vertical-8gt.schem (100%) rename modules/{ => CCA}/CCA-vertical-8gt/readme.md (93%) create mode 100644 modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-bottom.nbt create mode 100644 modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-top.nbt create mode 100644 modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.litematic create mode 100644 modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.schem create mode 100644 modules/CSA/CSA-vertical-4gt-32bit/readme.md create mode 100644 modules/DIV/DIV-8gt-flow/9.litematic create mode 100644 modules/DIV/DIV-8gt-flow/9.nbt create mode 100644 modules/DIV/DIV-8gt-flow/9.schem create mode 100644 modules/alu.schem create mode 100644 scripts/parse-label.py diff --git a/.gitea/workflows/label.yml b/.gitea/workflows/label.yml new file mode 100644 index 0000000..5fad28e --- /dev/null +++ b/.gitea/workflows/label.yml @@ -0,0 +1,46 @@ +name: 自动生成 label + +# main 分支推送 +on: + [push] + # push: + # branches: + # - main + +jobs: + Generate-label: + runs-on: node-21 + steps: + - name: 获取仓库 + uses: http://shenjack.top:5100/gitea-server/checkout@v4 + with: + path: main + + # - name: 安装 Python + # uses: actions/setup-python + + # - name: ensure pip + # uses: http://shenjack.top:5100/gitea-server/python-packs@1cd32b1235ba23d51524b6870c0735f63efcffc2 + + - name: ensurepip + uses: http://shenjack.top:5100/gitea-server/checkout@v4 + with: + repository: gitea-server/python-packs + with: + path: python-packs + + - name: 安装依赖 + run: | + ls -la . + ls -la .. + ls -la ../.. + python3 -m ../python-packs/ensurepip + python3 -m pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install -U pip + python3 -m pip install mistune + + - name: 生成 label + run: | + python3 generate_label.py + +# https://gitea.com/actions/gitea-release-action diff --git a/modules/10/10.litematic b/modules/10/10.litematic new file mode 100644 index 0000000..2a44368 --- /dev/null +++ b/modules/10/10.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f47c635221913891af353c5ffb1282fdab8040d0d19ece72a0271f5dacafc0f5 +size 10125 diff --git a/modules/10/10.schem b/modules/10/10.schem new file mode 100644 index 0000000..3a23535 --- /dev/null +++ b/modules/10/10.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41e7055e133c7b299ffcf2c1c9deea59258ddcf903df81aeee19eaee70652063 +size 10031 diff --git a/modules/10/10_bottom.nbt b/modules/10/10_bottom.nbt new file mode 100644 index 0000000..0142d2b --- /dev/null +++ b/modules/10/10_bottom.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da0f69741e6a6ff7f9804a502ae771fbf6fc93f8025e6400835215599870d36a +size 23841 diff --git a/modules/10/10_top.nbt b/modules/10/10_top.nbt new file mode 100644 index 0000000..1ceba7d --- /dev/null +++ b/modules/10/10_top.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1097d8ac9662ffe9f8bdb8738072b69296ad028a7c89a167858fb076322a8979 +size 86 diff --git a/modules/11/11.litematic b/modules/11/11.litematic new file mode 100644 index 0000000..21b2e0c --- /dev/null +++ b/modules/11/11.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:601cfbbf97ae6bb2d6d175f9fc0336b1eefdbd09952313fce4356a56d293fb50 +size 13276 diff --git a/modules/11/11.schem b/modules/11/11.schem new file mode 100644 index 0000000..64a3f2a --- /dev/null +++ b/modules/11/11.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f360fe68055a475b72b955d3837cb0a4346dfff918f50250d0a014f4cfed103 +size 11832 diff --git a/modules/11/11_bottom.nbt b/modules/11/11_bottom.nbt new file mode 100644 index 0000000..c4d970c --- /dev/null +++ b/modules/11/11_bottom.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb602b483a4aeef696a01da8575f4d57ab849e5844519e5cda6ab2df38882546 +size 38638 diff --git a/modules/11/11_top.nbt b/modules/11/11_top.nbt new file mode 100644 index 0000000..f00b68e --- /dev/null +++ b/modules/11/11_top.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:649557ccb7d795b9a7866e47c693d1f1437ed138a05916651cab818e7377251a +size 83640 diff --git a/modules/12/12.litematic b/modules/12/12.litematic new file mode 100644 index 0000000..207e7dd --- /dev/null +++ b/modules/12/12.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c7b521439dbae44dcc27829af089c26aa13ab88c76c7a7a0e525384d0657060 +size 6078 diff --git a/modules/12/12.nbt b/modules/12/12.nbt new file mode 100644 index 0000000..45462c3 --- /dev/null +++ b/modules/12/12.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2435ed3f325fe210b713eca63a65411a21325c0a18aebd02868f09b6049f758b +size 26266 diff --git a/modules/12/12.schem b/modules/12/12.schem new file mode 100644 index 0000000..64ce5a2 --- /dev/null +++ b/modules/12/12.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5855cdf6f1c38060495a57ca54fbd8b188d483c85b3abf764d39d2c93dc7890b +size 5859 diff --git a/modules/13/13.litematic b/modules/13/13.litematic new file mode 100644 index 0000000..3d74c38 --- /dev/null +++ b/modules/13/13.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d72759bf482de5e96cdeff5e4d7f80a9b475757c5779c4834879c929291e8e66 +size 7784 diff --git a/modules/13/13.schem b/modules/13/13.schem new file mode 100644 index 0000000..1c83b32 --- /dev/null +++ b/modules/13/13.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a9c829b744420d1b6304ae4df0e18b7731be68a954a687ca5bed27c587271d +size 691 diff --git a/modules/13/13_bottom.nbt b/modules/13/13_bottom.nbt new file mode 100644 index 0000000..2e24185 --- /dev/null +++ b/modules/13/13_bottom.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6af674c5531515ab68bff3b81ebae900642441578a7b4d2a13215b4c0f7c7786 +size 16281 diff --git a/modules/13/13_top.nbt b/modules/13/13_top.nbt new file mode 100644 index 0000000..1ceba7d --- /dev/null +++ b/modules/13/13_top.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1097d8ac9662ffe9f8bdb8738072b69296ad028a7c89a167858fb076322a8979 +size 86 diff --git a/modules/15/15.litematic b/modules/15/15.litematic new file mode 100644 index 0000000..0ab21dd --- /dev/null +++ b/modules/15/15.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a8b49117bae9d2f4294f9fec6e1c3ffe099631bd9ffc751920e7b2855fcc49a +size 1267 diff --git a/modules/15/15.nbt b/modules/15/15.nbt new file mode 100644 index 0000000..f59f35c --- /dev/null +++ b/modules/15/15.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbb378bbd2fb5a069977a3e20cc844fc4e0cecb3df4c67bd5a5ae4b7c5d032d5 +size 8963 diff --git a/modules/15/15.schem b/modules/15/15.schem new file mode 100644 index 0000000..ea72961 --- /dev/null +++ b/modules/15/15.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a343283cc6abff4725503930028d424afd57891052a51200f75d4377c4a0cf9e +size 1247 diff --git a/modules/8/8.litematic b/modules/8/8.litematic new file mode 100644 index 0000000..88aeae3 --- /dev/null +++ b/modules/8/8.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d17057a1884e34516613bc557ecb51ce054b1b295018346ea70bb7ed326a0b01 +size 10427 diff --git a/modules/8/8.schem b/modules/8/8.schem new file mode 100644 index 0000000..cc8165c --- /dev/null +++ b/modules/8/8.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64d0db9358b47d4a1d93bbd81c4249a280a880f3bd379e0a6decbecd8076606b +size 8272 diff --git a/modules/8/8_bottom.nbt b/modules/8/8_bottom.nbt new file mode 100644 index 0000000..976ee38 --- /dev/null +++ b/modules/8/8_bottom.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db3d921f5bd1905a963662b299e74eba315ded36330ba3479d717a9a53361905 +size 23586 diff --git a/modules/8/8_top.nbt b/modules/8/8_top.nbt new file mode 100644 index 0000000..e33576c --- /dev/null +++ b/modules/8/8_top.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebd7467b076ebef1aaea8f7d116a5c2953f19de29d3751c90ce35434cdf42828 +size 50817 diff --git a/modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.litematic b/modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.litematic similarity index 100% rename from modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.litematic rename to modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.litematic diff --git a/modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.nbt b/modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.nbt similarity index 100% rename from modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.nbt rename to modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.nbt diff --git a/modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.schem b/modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.schem similarity index 100% rename from modules/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.schem rename to modules/BCS/BCS-vertical-10gt-2t/BCS-vertical-10gt-2t.schem diff --git a/modules/BCS-vertical-10gt-2t/readme.md b/modules/BCS/BCS-vertical-10gt-2t/readme.md similarity index 93% rename from modules/BCS-vertical-10gt-2t/readme.md rename to modules/BCS/BCS-vertical-10gt-2t/readme.md index 6e34be6..9012f20 100644 --- a/modules/BCS-vertical-10gt-2t/readme.md +++ b/modules/BCS/BCS-vertical-10gt-2t/readme.md @@ -23,15 +23,15 @@ ## 标签 -- 小型模块 -- 运算单元 -- 加/减法器 -- 二级模块 -- java版 -- 2t流水 -- 无容器 -- 静音 -- 传统红石 +- `小型模块` +- `运算单元` +- `加/减法器` +- `二级模块` +- `java版` +- `2t流水` +- `无容器` +- `静音` +- `传统红石` ## 特性表 diff --git a/modules/CCA-vertial-20gt-32bit/readme.md b/modules/CCA-vertial-20gt-32bit/readme.md deleted file mode 100644 index fa320f0..0000000 --- a/modules/CCA-vertial-20gt-32bit/readme.md +++ /dev/null @@ -1,51 +0,0 @@ -# 32位 封闭进位加法器 - -## 基本描述 - -计算两组32位整数的和。输入输出并不完全同步,每8位为一组(组间具有2rt进位延迟)。同步输入不影响最终结果(但会带来计算毛刺)。总延迟为10rt。含火把。体积小,速度快。建议用于无2rt流水线电路 - -## 原视频链接：[点击传送](https://www.bilibili.com/video/BV1Ni4y1M7Qj) - -## 元件信息 - -- 适用版本 - - Java版 1.6+ -- 作者 - - Fredbill -- 存档位置 - - `32 4 32` -- 电路类型 - - 算术电路 -- 电路大小 - - `6 × 67 × 9` -- 总延迟 - - `4 + 6 = 10` - -### 标签 - -- `算术运算模块` -- `加/减法器` -- `二级模块` -- `静音` -- `传统红石` - -## 模块参数列表 - -| 端口列表 | 位宽 | 位置 | 延迟 | 注释 | -| -------- | --- | ----- | -------- | ---- | -| 输入数据A | 32 | 1 3 1 | 0+2[N mod 8] | 加数A | -| 输入数据B | 32 | 4 3 1 | 0+2[N mod 8] | 加数B | -| 输出数据 | 32 | 5 2 9 | 4+2[N mod 8] | 和 | -| 进位输入 | 1 | 3 2 6 | 0 | 低位进位 | -| 标志位 | 1 | 5 65 9 | 11 | 溢出 | - -## 模块指标列表 - -| 指标项目 | 参数 | 指标项目 | 参数 | -| ------------------ | --- | ---------------- | --- | -| 火把 | 有 | 2rt流水线 | 不支持 | -| 活塞 | 无 | 红石粉 | 有 | -| 侦测器 | 无 | 容器 | 无 | -| 应用漏斗、投掷器 | 无 | 墙电、水电、光电 | 无 | | | - -模块分支：封闭进位加法器 diff --git a/modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(bottom).nbt b/modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(bottom).nbt similarity index 100% rename from modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(bottom).nbt rename to modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(bottom).nbt diff --git a/modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(top).nbt b/modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(top).nbt similarity index 100% rename from modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(top).nbt rename to modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit(top).nbt diff --git a/modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.litematic b/modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.litematic similarity index 100% rename from modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.litematic rename to modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.litematic diff --git a/modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.schem b/modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.schem similarity index 100% rename from modules/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.schem rename to modules/CCA/CCA-vertial-20gt-32bit/CCA-vertial-20gt-32bit.schem diff --git a/modules/CCA/CCA-vertial-20gt-32bit/readme.md b/modules/CCA/CCA-vertial-20gt-32bit/readme.md new file mode 100644 index 0000000..a188256 --- /dev/null +++ b/modules/CCA/CCA-vertial-20gt-32bit/readme.md @@ -0,0 +1,74 @@ +--- +```toml +tags = [ + "小型模块", + "算术运算模块", + "加/减法器", + "二级模块", + "静音", + "传统红石", + "无容器", + "Java版" +] +authors = ["Fredbill"] +title = "CCA-vertial-20gt-32bit" +description = "竖式 32位 20gt 加法器" +[version] +java = "1.16+" +``` +--- + +# 32位封闭进位加法器 + +## 基本描述 + +计算两组32位整数的和。输入输出并不完全同步,每8位为一组(组间具有2rt进位延迟)。同步输入不影响最终结果(但会带来计算毛刺)。总延迟为10rt。含火把。体积小,速度快。建议用于无2rt流水线电路 + +## 原视频链接：[点击传送](https://www.bilibili.com/video/BV1Ni4y1M7Qj) + +## 元件信息 + +- 适用版本 + - Java版 1.6+ +- 作者 + - Fredbill +- 存档位置 + - `32 4 32` +- 电路类型 + - 算术电路 +- 电路大小 + - `6 × 67 × 9` +- 总延迟 + - `4 + 6 = 10` + +### 标签 + +- `小型模块` +- `算术运算模块` +- `加/减法器` +- `二级模块` +- `静音` +- `传统红石` +- `无容器` +- `Java版` + +## 模块参数列表 + +| 端口列表 | 位宽 | 位置 | 延迟 | 注释 | +| --------- | ---- | ------ | ------------ | -------- | +| 输入数据A | 32 | 1 3 1 | 0+2[N mod 8] | 加数A | +| 输入数据B | 32 | 4 3 1 | 0+2[N mod 8] | 加数B | +| 输出数据 | 32 | 5 2 9 | 4+2[N mod 8] | 和 | +| 进位输入 | 1 | 3 2 6 | 0 | 低位进位 | +| 标志位 | 1 | 5 65 9 | 11 | 溢出 | + +## 模块指标列表 + +| 指标项目 | 参数 | 指标项目 | 参数 | +| ---------------- | ---- | ---------------- | ------ | +| 火把 | 有 | 2rt流水线 | 不支持 | +| 活塞 | 无 | 红石粉 | 有 | +| 侦测器 | 无 | 容器 | 无 | +| 应用漏斗、投掷器 | 无 | 墙电、水电、光电 | 无 | + +模块分支：封闭进位加法器 diff --git a/modules/CCA/CCA-vertical-8bit/4.litematic b/modules/CCA/CCA-vertical-8bit/4.litematic new file mode 100644 index 0000000..1b2ab4d --- /dev/null +++ b/modules/CCA/CCA-vertical-8bit/4.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34c4cc1898346a349ec51e984dc08713056f7816ce4ec162f899cc4b30874e38 +size 2015 diff --git a/modules/CCA/CCA-vertical-8bit/4.nbt b/modules/CCA/CCA-vertical-8bit/4.nbt new file mode 100644 index 0000000..1ceba7d --- /dev/null +++ b/modules/CCA/CCA-vertical-8bit/4.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1097d8ac9662ffe9f8bdb8738072b69296ad028a7c89a167858fb076322a8979 +size 86 diff --git a/modules/CCA/CCA-vertical-8bit/4.schem b/modules/CCA/CCA-vertical-8bit/4.schem new file mode 100644 index 0000000..d5b64a2 --- /dev/null +++ b/modules/CCA/CCA-vertical-8bit/4.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a6af0175b5cb5f08e5a412f19f66f5a7bfb783ee03037bc048a6deefdc161ec +size 1587 diff --git a/modules/CCA/CCA-vertical-8bit/readme.md b/modules/CCA/CCA-vertical-8bit/readme.md new file mode 100644 index 0000000..e69de29 diff --git a/modules/CCA-vertical-8gt/CCA-vertical-8gt.litematic b/modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.litematic similarity index 100% rename from modules/CCA-vertical-8gt/CCA-vertical-8gt.litematic rename to modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.litematic diff --git a/modules/CCA-vertical-8gt/CCA-vertical-8gt.nbt b/modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.nbt similarity index 100% rename from modules/CCA-vertical-8gt/CCA-vertical-8gt.nbt rename to modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.nbt diff --git a/modules/CCA-vertical-8gt/CCA-vertical-8gt.schem b/modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.schem similarity index 100% rename from modules/CCA-vertical-8gt/CCA-vertical-8gt.schem rename to modules/CCA/CCA-vertical-8gt/CCA-vertical-8gt.schem diff --git a/modules/CCA-vertical-8gt/readme.md b/modules/CCA/CCA-vertical-8gt/readme.md similarity index 93% rename from modules/CCA-vertical-8gt/readme.md rename to modules/CCA/CCA-vertical-8gt/readme.md index ea2ac75..5708b15 100644 --- a/modules/CCA-vertical-8gt/readme.md +++ b/modules/CCA/CCA-vertical-8gt/readme.md @@ -6,13 +6,14 @@ 电路接受最少强度5的输入，且两侧输入强度差距不超过1。之后所有含此类异或门结构的电路均是如此。 ## 标签 -- 小型模块 -- 运算单元 -- 加/减法器 -- 二级模块 -- Java版 -- 静音 -- 传统红石 +- `小型模块` +- `运算单元` +- `加/减法器` +- `二级模块` +- `Java版` +- `静音` +- `传统红石` +- `无容器` ## 元件信息 diff --git a/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-bottom.nbt b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-bottom.nbt new file mode 100644 index 0000000..cacb3c3 --- /dev/null +++ b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-bottom.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8f09d662ad4148afd5ff4a32e03d76ede9221c3264c69353eb35355320f1bb9 +size 14911 diff --git a/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-top.nbt b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-top.nbt new file mode 100644 index 0000000..5c519a7 --- /dev/null +++ b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit-top.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f20cabf79d6096fbcb8d651222128b08e54643f72e101c2ab7e0b9e4bc34c66 +size 31483 diff --git a/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.litematic b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.litematic new file mode 100644 index 0000000..275ee88 --- /dev/null +++ b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43ad577ec7efaa9cf8a41ad0d6ab8210cd290b3b556b6d85228d6966b484a4d3 +size 9572 diff --git a/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.schem b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.schem new file mode 100644 index 0000000..a41b800 --- /dev/null +++ b/modules/CSA/CSA-vertical-4gt-32bit/CSA-vertical-4gt-32bit.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:177f4329929aeeb6598aaaa276e9486115a666a0dd182c63f103d9fd5a639e6a +size 5679 diff --git a/modules/CSA/CSA-vertical-4gt-32bit/readme.md b/modules/CSA/CSA-vertical-4gt-32bit/readme.md new file mode 100644 index 0000000..ddd44a7 --- /dev/null +++ b/modules/CSA/CSA-vertical-4gt-32bit/readme.md @@ -0,0 +1,7 @@ +# CSA + +```text +这大概是借助墙电作外围控制的2rtCSA乘,归类:乘法器,串行CSA乘。 +``` + +http://shenjack.top:5100/ARS/ARS-docs/issues/11 diff --git a/modules/DIV/DIV-8gt-flow/9.litematic b/modules/DIV/DIV-8gt-flow/9.litematic new file mode 100644 index 0000000..c3a6080 --- /dev/null +++ b/modules/DIV/DIV-8gt-flow/9.litematic @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5db12870faef5a1094037c3b5981e7c973962fdd90be8c15636820be1eca7383 +size 3985 diff --git a/modules/DIV/DIV-8gt-flow/9.nbt b/modules/DIV/DIV-8gt-flow/9.nbt new file mode 100644 index 0000000..ec92852 --- /dev/null +++ b/modules/DIV/DIV-8gt-flow/9.nbt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05d76c3627e92c3e6815b3bd4b47b1d680143e045dcccf0a134d8298d4cc9a8e +size 17351 diff --git a/modules/DIV/DIV-8gt-flow/9.schem b/modules/DIV/DIV-8gt-flow/9.schem new file mode 100644 index 0000000..86725dc --- /dev/null +++ b/modules/DIV/DIV-8gt-flow/9.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba70ae9a2161cb478e43ffaef4b45e94202e63bc02924266a6e36dc1f2284393 +size 3782 diff --git a/modules/alu.schem b/modules/alu.schem new file mode 100644 index 0000000..2988526 --- /dev/null +++ b/modules/alu.schem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f69b2549791d98dbef2974921def3ebcdfc8d2315ea93e301656be2287cdbac +size 4223 diff --git a/scripts/parse-label.py b/scripts/parse-label.py new file mode 100644 index 0000000..7c775d5 --- /dev/null +++ b/scripts/parse-label.py @@ -0,0 +1,28 @@ + +from pathlib import Path +from pprint import pprint + +import mistune + +ast_markdown = mistune.create_markdown(renderer='ast') + +def read_files(module_path: Path): + with open(module_path, 'r', encoding='utf-8') as f: + file = f.read() + + parsed = ast_markdown(file) + return parsed + + +if __name__ == '__main__': + module_path = Path('modules') + + # walk through the modules + # for every markdown file + # parse the label + + for md_file in module_path.rglob('*.md'): + print(md_file) + parsed = read_files(md_file) + pprint(parsed) + diff --git a/tags/readme.md b/tags/readme.md index b5f94a5..e30f818 100644 --- a/tags/readme.md +++ b/tags/readme.md @@ -1,10 +1,10 @@ # 标签索引 ![标签索引logo](../assets/image/tag_index.png) -### 所有可用标签: +##s 所有可用标签: - [小型模块](./tags/small_module.md) : 方块数量小于10000的模块 - [中型模块](./tags/middle_size_module.md) : 方块数量在10001-100000之间的模块。 - [大型模块](./tags/large_module.md) : 方块数量>100000的模块。 - - [算数单元](./tags/au.md) : 具有运算功能的模块。 + - [算术单元](./tags/au.md) : 具有运算功能的模块。 - [加/减法器](./tags/adder_or_subtractor.md) : 具有加/减法功能的模块。 - [ALU (算逻单元) ](./tags/alu.md) : 算术逻辑单元 - [显示模块](./tags/display_module.md) : 具备显示功能的模块。 @@ -21,6 +21,6 @@ - [时序严格](./tags/strict_timing.md) : 对于电路时序要求严格的模块。 - [无容器](./tags/no_container.md) : 没有容器的模块。 - [静音](./tags/silent.md) : 不会发出响声的模块。 - - [单片](./tags/single-chip.md) : 1高或1宽的模块。 + - [单片](./tags/single_chip.md) : 1高或1宽的模块。 - [传统红石](./tags/traditional_redstone.md) : 仅使用红石方块特性，不使用墙电，水电，树电，脚电等其他特性的模块。   diff --git a/tags/tags/adder_or_subtractor.md b/tags/tags/adder_or_subtractor.md index 28f017c..8747d9b 100644 --- a/tags/tags/adder_or_subtractor.md +++ b/tags/tags/adder_or_subtractor.md @@ -2,6 +2,6 @@ ### 在此标签下的模块有: -- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/CCA-vertical-8gt/) -- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/BCS-vertical-10gt-2t/) -- [32位封闭进位加法器](../../modules/CCA-vertial-20gt-32bit/) \ No newline at end of file +- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/1_CCA-vertical-8gt/) +- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../2_modules/BCS-vertical-10gt-2t/) +- [32位封闭进位加法器](../../modules/3_CCA-vertial-20gt-32bit/) \ No newline at end of file diff --git a/tags/tags/au.md b/tags/tags/au.md index ce026b6..99b8861 100644 --- a/tags/tags/au.md +++ b/tags/tags/au.md @@ -2,6 +2,6 @@ ### 在此标签下的模块有: -- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/1-CCA-vertical-8gt/) -- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/2-BCS-vertical-10gt-2t/) -- [32位封闭进位加法器](../../modules/3-CCA-vertial-20gt-32bit/) \ No newline at end of file +- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/1_CCA-vertical-8gt/) +- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/2_BCS-vertical-10gt-2t/) +- [32位封闭进位加法器](../../modules/3_CCA-vertial-20gt-32bit/) \ No newline at end of file diff --git a/tags/tags/je.md b/tags/tags/je.md index 31f95cd..f0dcf8c 100644 --- a/tags/tags/je.md +++ b/tags/tags/je.md @@ -2,6 +2,6 @@ ### 在此标签下的模块有: -- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/CCA-vertical-8gt/) -- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/BCS-vertical-10gt-2t/) -- [32位封闭进位加法器](../../modules/CCA-vertial-20gt-32bit/) +- [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/1_CCA-vertical-8gt/) +- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/2_BCS-vertical-10gt-2t/) +- [32位封闭进位加法器](../../modules/3_CCA-vertial-20gt-32bit/) diff --git a/tags/tags/no_container.md b/tags/tags/no_container.md index d4eda6e..0cfe5ec 100644 --- a/tags/tags/no_container.md +++ b/tags/tags/no_container.md @@ -3,3 +3,5 @@ ### 在此标签下的模块有: - [封闭进位加法器 (CCA, Carry Cancel Adder) ](../../modules/CCA-vertical-8gt) +- [借位封闭减法器 (BCS, Borrow Carry Subtractor) ](../../modules/2_BCS-vertical-10gt-2t/) +[32位 封闭进位加法器](../../modules/3_CCA-vertial-20gt-32bit) \ No newline at end of file