Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B-ASIC - Better ASIC Toolbox
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d274e43b

Commit d274e43b authored 5 years ago by angloth

Downloads
- Plain Diff

Solve merge conflict in basic operation where old identifier was still used on develop

parents c063e9cb 541b1394

No related branches found

No related tags found

1 merge request!2Integrated ID system, traversing and som signal tests

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.clang-format 151 additions, 0 deletions

.clang-format
.gitignore 3 additions, 1 deletion

.gitignore
CMakeLists.txt 1 addition, 6 deletions

CMakeLists.txt
README.md 34 additions, 19 deletions

README.md
b_asic/basic_operation.py 1 addition, 1 deletion

b_asic/basic_operation.py
setup.py 2 additions, 1 deletion

setup.py
test/__init__.py 0 additions, 0 deletions

test/__init__.py
test/conftest.py 2 additions, 0 deletions

test/conftest.py
test/fixtures/__init__.py 0 additions, 0 deletions

test/fixtures/__init__.py
test/fixtures/signal.py 20 additions, 0 deletions

test/fixtures/signal.py
test/port/__init__.py 0 additions, 0 deletions

test/port/__init__.py
test/port/test_inputport.py 23 additions, 0 deletions

test/port/test_inputport.py
test/port/test_outputport.py 18 additions, 0 deletions

test/port/test_outputport.py
test/port/test_port.py 25 additions, 0 deletions

test/port/test_port.py

with 280 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment