Skip to content
This repository was archived by the owner on Aug 11, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
0553a2c
integrante lucca
LuccaHiratsuca Sep 5, 2022
3ee5b4f
aleeeeeee
alemagno10 Sep 5, 2022
657e094
commit integrantes
juliapaiva1 Sep 5, 2022
4d5ec37
branch demux config inicial
juliapaiva1 Sep 11, 2022
ef83b5d
demux2way funcionando
juliapaiva1 Sep 11, 2022
9a14f90
dois demux funcionando
juliapaiva1 Sep 11, 2022
8f368fa
Update Integrantes
FeMCDias Sep 11, 2022
9d131c0
commit combinacional
juliapaiva1 Sep 11, 2022
dea1955
commit erro build
juliapaiva1 Sep 11, 2022
14d14c3
erro corrigido
juliapaiva1 Sep 11, 2022
5b59bfc
Merge pull request #16 from alemagno10/branch_mux
alemagno10 Sep 11, 2022
5a49b87
nome gp
alemagno10 Sep 11, 2022
af595f5
Merge branch 'main' of https://github.com/alemagno10/bits-e-proc-Grup…
alemagno10 Sep 11, 2022
5abece3
Adicionado mux2way, mux4way, e mux8way funcionando e testados
FeMCDias Sep 12, 2022
b63e924
Merge pull request #17 from alemagno10/muxways
alemagno10 Sep 12, 2022
b642f4f
Subindo a função and16
LuccaHiratsuca Sep 12, 2022
d103264
Merge pull request #18 from alemagno10/and16
alemagno10 Sep 12, 2022
026293d
zerado
alemagno10 Sep 12, 2022
2b691e1
Subindo a função and16
LuccaHiratsuca Sep 12, 2022
2931346
Merge branch 'main' into and16
alemagno10 Sep 12, 2022
080a3ef
Merge pull request #19 from alemagno10/and16
alemagno10 Sep 12, 2022
ce950e7
Adicionando funcao mux2way + teste
FeMCDias Sep 12, 2022
f87f4bd
Concertei teste mux2way
FeMCDias Sep 12, 2022
212769e
Merge pull request #20 from alemagno10/mux2way
alemagno10 Sep 12, 2022
3659934
Subindo a função + teste and16
LuccaHiratsuca Sep 12, 2022
a0109d3
Merge branch 'main' into or8way
alemagno10 Sep 12, 2022
eb6680d
Merge pull request #21 from alemagno10/or8way
alemagno10 Sep 12, 2022
2b0c339
mux4way teste+funcao
FeMCDias Sep 12, 2022
fdd89b6
Merge pull request #22 from alemagno10/mux4way
alemagno10 Sep 12, 2022
d79045a
Subindo a função + testes deMux8way
LuccaHiratsuca Sep 12, 2022
3651951
Merge pull request #23 from alemagno10/deMux8way
alemagno10 Sep 12, 2022
da097ba
Funcao Mux8way + Teste
FeMCDias Sep 12, 2022
79d259f
Merge pull request #24 from alemagno10/mux8way
alemagno10 Sep 12, 2022
e0d38e6
Subindo a função + testes orNway
LuccaHiratsuca Sep 12, 2022
04059a6
Merge pull request #25 from alemagno10/orNway
alemagno10 Sep 12, 2022
5004460
barrelShifter + teste Implementado
FeMCDias Sep 12, 2022
7af52ab
Merge pull request #26 from alemagno10/barrelShifter
alemagno10 Sep 12, 2022
c5ac89a
Subindo a função + testes deMux2way
LuccaHiratsuca Sep 12, 2022
2406591
Merge pull request #27 from alemagno10/deMux2way
alemagno10 Sep 12, 2022
a5e720a
deMux4Way + teste implementado
FeMCDias Sep 12, 2022
8365c46
Merge pull request #28 from alemagno10/deMux4way
alemagno10 Sep 12, 2022
4201386
Subindo a função + testes + correção teste bin2bcd
LuccaHiratsuca Sep 12, 2022
3e71d64
Merge pull request #29 from alemagno10/bin2bcd
alemagno10 Sep 12, 2022
7ccc6ec
Subindo o arquivo toplevel.py correto
LuccaHiratsuca Sep 12, 2022
7ab87aa
Merge pull request #30 from alemagno10/toplevel
alemagno10 Sep 12, 2022
b05ae67
bin2bcd teste + funcao
FeMCDias Sep 15, 2022
c410766
bin2hex
FeMCDias Sep 15, 2022
19a12a7
Merge pull request #31 from alemagno10/bin2bcd
LuccaHiratsuca Sep 15, 2022
b60cfba
Merge pull request #32 from alemagno10/bin2hex
LuccaHiratsuca Sep 15, 2022
12ba40d
env
LuccaHiratsuca Sep 15, 2022
c916b5f
Merge branch 'main' of https://github.com/alemagno10/bits-e-proc-Grup…
LuccaHiratsuca Sep 15, 2022
39b31a3
commit
LuccaHiratsuca Sep 15, 2022
c293a49
vetores
LuccaHiratsuca Sep 15, 2022
e58169d
vetores novo
LuccaHiratsuca Sep 15, 2022
46511b3
Merge pull request #33 from alemagno10/bin2bcd
LuccaHiratsuca Sep 15, 2022
5f3db0d
Delete vetores
FeMCDias Sep 15, 2022
a5ed4ea
Merge pull request #34 from alemagno10/bin2bcd
FeMCDias Sep 15, 2022
41c898f
configurando repo para novo projeto
FeMCDias Sep 19, 2022
45d0a81
configurando repo + modificando grupo.yml
FeMCDias Sep 19, 2022
2ba7741
Subindo função inc + teste
LuccaHiratsuca Sep 19, 2022
9d64edf
add ula
alemagno10 Sep 19, 2022
175f658
Arrumando nome teste
LuccaHiratsuca Sep 19, 2022
a9d1dc7
corrigindo add ula
alemagno10 Sep 19, 2022
b65d8a1
colocando actions
alemagno10 Sep 19, 2022
75d0304
add final
alemagno10 Sep 19, 2022
9aa04e1
Concertar o teste AGAIN
LuccaHiratsuca Sep 19, 2022
8bf368f
arrumando identacao
FeMCDias Sep 19, 2022
d5af019
zerador 1
alemagno10 Sep 19, 2022
87e5311
compoents final
alemagno10 Sep 19, 2022
e6ce30b
Arrumando NOVAMENTE
LuccaHiratsuca Sep 19, 2022
51a6552
Create exit
LuccaHiratsuca Sep 19, 2022
679ba24
Merge branch 'main' into inc
FeMCDias Sep 19, 2022
9c19ac3
Merge pull request #43 from FeMCDias/inc
FeMCDias Sep 19, 2022
5051d95
merge final
alemagno10 Sep 19, 2022
96b94b5
Merge pull request #44 from FeMCDias/add
FeMCDias Sep 19, 2022
1882a7d
comparador implementado e testado
FeMCDias Sep 19, 2022
b9f1500
Merge pull request #45 from FeMCDias/comparador
FeMCDias Sep 19, 2022
b79b0f5
zerador 2
alemagno10 Sep 19, 2022
bcdc01b
merge final zerador
alemagno10 Sep 19, 2022
ab050a1
corrigindo components
alemagno10 Sep 19, 2022
dbaedc8
Merge pull request #46 from FeMCDias/zerador
FeMCDias Sep 19, 2022
9c18e01
inversor implementado e testado
FeMCDias Sep 19, 2022
f75e914
Merge pull request #47 from FeMCDias/inversor
FeMCDias Sep 19, 2022
ba72148
inversor
juliapaiva1 Sep 19, 2022
e30c785
Merge pull request #52 from FeMCDias/inversor
FeMCDias Sep 19, 2022
c3b67ad
Implementar ULA, Testado
FeMCDias Sep 19, 2022
a4860e1
Merge branch 'main' of https://github.com/FeMCDias/bits-e-proc-GrupoG…
FeMCDias Sep 19, 2022
6578d4f
Deixar ula mais bonitinho
FeMCDias Sep 19, 2022
ece0a01
Merge pull request #53 from FeMCDias/ula
FeMCDias Sep 19, 2022
174d978
addcla4
alemagno10 Sep 21, 2022
fadbf9a
corrigido compoenents
alemagno10 Sep 21, 2022
3d1e7bf
yeeeey
alemagno10 Sep 21, 2022
f437d0d
Merge pull request #54 from FeMCDias/addcla4
FeMCDias Sep 21, 2022
6e7be91
Subindo toplevel com alterações para ula
LuccaHiratsuca Sep 21, 2022
0e12e29
Merge pull request #56 from FeMCDias/toplevel_ula
FeMCDias Sep 21, 2022
ca77237
Arrumando função addcla16 + teste da função
LuccaHiratsuca Sep 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 64 additions & 1 deletion .github/workflows/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,71 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

# ------------- Tests ----------------
- name: test and16
run: |
pytest hw/test_components.py -k and16

- name: test or8way
run: |
pytest hw/test_components.py -k or8way

- name: test mux2way
run: |
pytest hw/test_components.py -k test_mux2way

- name: test mux4way
run: |
pytest hw/test_components.py -k test_mux4way

- name: test mux8way
run: |
pytest hw/test_components.py -k test_mux8way

- name: test deMux8way
run: |
pytest hw/test_components.py -k test_deMux8way

- name: test orNway
run: |
pytest hw/test_components.py -k orNway

- name: test barrelShifter
run: |
pytest hw/test_components.py -k barrelShifter

- name: test deMux2way
run: |
pytest hw/test_components.py -k test_deMux2way

- name: test deMux4way
run: |
pytest hw/test_components.py -k test_deMux4way

- name: test bin2bcd
run: |
pytest hw/test_components.py -k bin2bcd

- name: Combinacional
run: |
pytest hw/test_components.py

- name: test add
run: |
pytest hw/test_ula.py -k test_add

- name: test zerador
run: |
pytest hw/test_ula.py -k test_zerador

- name: test inversor
run: |
pytest hw/test_ula.py -k test_inversor

- name: test addcla4
run: |
pytest hw/test_ula.py -k test_addcla4




2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ htmlcov
*.v
.direnv/
*.ini
/env
/env]
3 changes: 2 additions & 1 deletion GRUPO.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Nome-Grupo: "Macarrao"
Nome-Grupo: "Grupo Grã"
Scrum-Master: "Felipe Maluli de Carvalho Dias"
42 changes: 42 additions & 0 deletions INTEGRANTES.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"user": "1",
"name": "Alexandre Magno Maciel dos Santos",
"git-username": "alemagno10",
"blackboard-username": "alexandremms"
},

{
"user": "2",
"name": "Lucca Hiratsuca Costa",
"git-username": "LuccaHiratsuca",
"blackboard-username": "luccahc"
},

{
"user": "3",
"name": "Júlia Ferreira de Paiva",
"git-username": "juliapaiva1",
"blackboard-username": "juliafp2"
},

{
"user": "4",
"name": "Felipe Maluli de Carvalho Dias",
"git-username": "FeMCDias",
"blackboard-username": "felipemcd1"
},

{
"user": "5",
"name": "Felipe Figueiró",
"git-username": "",
"blackboard-username": ""
},
{
"user": "6",
"name": "Gustavo Lagoa",
"git-username": "",
"blackboard-username": ""
}
]
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
link do video - conceito A
https://youtube.com/shorts/-07dCv11VKs?feature=share
10 changes: 10 additions & 0 deletions exit
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
and16
bin2bcd
deMux2way
deMux8way
* inc
main
or8way
orNway
test_inc
toplevel
Loading