ruige/eb001
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除不合理的冲突合并代码

Browse Source
This commit is contained in:
bacon
2025-07-30 16:34:51 +08:00
parent d7d5544f08
commit 2968b6d546
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/backBoard/shin/ShinTop.scala
View File

@@ -51,8 +51,6 @@ abstract class ShinTopBase extends Module{
interface.io.latchPin := io.latchPin interface.io.latchPin := io.latchPin
interface.io.latchPin := io.latchPin
io.ledTest := RegNext( Cat(slaveParser.io.intHWTrig(0), slaveParser.io.intHWTrig(1)) ) io.ledTest := RegNext( Cat(slaveParser.io.intHWTrig(0), slaveParser.io.intHWTrig(1)) )
io.isSoftReset := interface.io.isSoftReset io.isSoftReset := interface.io.isSoftReset