Skip to content

Commit

Permalink
Merge pull request #120 from Jesus89/bus
Browse files Browse the repository at this point in the history
Bus wires support and more
  • Loading branch information
Jesus89 authored Dec 22, 2016
2 parents b2920f7 + b82c1ec commit 2677c10
Show file tree
Hide file tree
Showing 60 changed files with 5,202 additions and 3,670 deletions.
25 changes: 13 additions & 12 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- build:css styles/main.css -->
<link rel="stylesheet" href="styles/main.css" />
<link rel="stylesheet" href="styles/menu.css" />
<link rel="stylesheet" href="styles/project.css" />
<link rel="stylesheet" href="styles/design.css" />
<!-- endbuild -->
</head>

Expand All @@ -37,7 +37,7 @@
<script src="bower_components/joint/dist/joint.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/select2/dist/js/select2.js"></script>
<script src="bower_components/select2/dist/js/select2.full.js"></script>
<script src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>
<script src="bower_components/ace-builds/src-min-noconflict/theme-chrome.js"></script>
<script src="bower_components/ace-builds/src-min-noconflict/mode-verilog.js"></script>
Expand All @@ -49,24 +49,25 @@
<!-- endbuild -->
<!-- build:js scripts/main.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/design.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/menu.js"></script>
<script src="scripts/controllers/design.js"></script>
<script src="scripts/factories/node.factory.js"></script>
<script src="scripts/factories/joint.factory.js"></script>
<script src="scripts/factories/node.factory.js"></script>
<script src="scripts/factories/window.factory.js"></script>
<script src="scripts/services/project.service.js"></script>
<script src="scripts/services/utils.service.js"></script>
<script src="scripts/services/graph.service.js"></script>
<script src="scripts/services/boards.service.js"></script>
<script src="scripts/services/resources.service.js"></script>
<script src="scripts/services/profile.service.js"></script>
<script src="scripts/services/tools.service.js"></script>
<script src="scripts/services/compiler.service.js"></script>
<script src="scripts/plugins/connectors/joint.connectors.js"></script>
<script src="scripts/plugins/routers/joint.routers.js"></script>
<script src="scripts/plugins/shapes/joint.shapes.js"></script>
<script src="scripts/plugins/ui/joint.ui.js"></script>
<script src="scripts/services/blocks.service.js"></script>
<script src="scripts/services/boards.service.js"></script>
<script src="scripts/services/compiler.service.js"></script>
<script src="scripts/services/graph.service.js"></script>
<script src="scripts/services/profile.service.js"></script>
<script src="scripts/services/project.service.js"></script>
<script src="scripts/services/resources.service.js"></script>
<script src="scripts/services/tools.service.js"></script>
<script src="scripts/services/utils.service.js"></script>
<!-- endbuild -->
</body>

Expand Down
16 changes: 14 additions & 2 deletions app/resources/blocks/bit/0.ice
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
"type": "basic.code",
"data": {
"code": "// Bit 0\n\nassign v = 1'b0;",
"params": [],
"ports": {
"in": [],
"out": [
"v"
{
"name": "v",
"size": 1
}
]
}
},
Expand All @@ -32,7 +36,15 @@
"id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
"type": "basic.output",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 608,
Expand Down
18 changes: 15 additions & 3 deletions app/resources/blocks/bit/1.ice
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
"type": "basic.code",
"data": {
"code": "// Bit 1\n\nassign v = 1'b1;",
"params": [],
"ports": {
"in": [],
"out": [
"v"
{
"name": "v",
"size": 1
}
]
}
},
Expand All @@ -32,7 +36,15 @@
"id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
"type": "basic.output",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 608,
Expand Down Expand Up @@ -62,4 +74,4 @@
"zoom": 1
}
}
}
}
35 changes: 29 additions & 6 deletions app/resources/blocks/config/pull_up.ice
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@
"type": "basic.code",
"data": {
"code": "// Pull up\n\nwire din, dout, outen;\n\nassign o = din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);",
"params": [],
"ports": {
"in": [
"i"
{
"name": "i",
"size": 1
}
],
"out": [
"o"
{
"name": "o",
"size": 1
}
]
}
},
Expand All @@ -34,7 +41,15 @@
"id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150",
"type": "basic.input",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 64,
Expand All @@ -45,7 +60,15 @@
"id": "a139fa0d-9b45-4480-a251-f4a66b49aa23",
"type": "basic.output",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 760,
Expand Down Expand Up @@ -79,8 +102,8 @@
"deps": {},
"state": {
"pan": {
"x": -23,
"y": 8
"x": 0,
"y": 0
},
"zoom": 1
}
Expand Down
35 changes: 29 additions & 6 deletions app/resources/blocks/config/pull_up_inv.ice
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@
"type": "basic.code",
"data": {
"code": "// Pull up inv\n\nwire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);",
"params": [],
"ports": {
"in": [
"i"
{
"name": "i",
"size": 1
}
],
"out": [
"o"
{
"name": "o",
"size": 1
}
]
}
},
Expand All @@ -34,7 +41,15 @@
"id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150",
"type": "basic.input",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 64,
Expand All @@ -45,7 +60,15 @@
"id": "a139fa0d-9b45-4480-a251-f4a66b49aa23",
"type": "basic.output",
"data": {
"label": ""
"name": "",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 760,
Expand Down Expand Up @@ -79,8 +102,8 @@
"deps": {},
"state": {
"pan": {
"x": -23,
"y": 8
"x": 0,
"y": 0
},
"zoom": 1
}
Expand Down
63 changes: 54 additions & 9 deletions app/resources/blocks/config/tri_state.ice
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,27 @@
"type": "basic.code",
"data": {
"code": " SB_IO #(\n .PIN_TYPE(6'b1010_01),\n .PULLUP(1'b0)\n ) triState (\n .PACKAGE_PIN(pin),\n .OUTPUT_ENABLE(oe),\n .D_OUT_0(din),\n .D_IN_0(dout)\n );",
"params": [],
"ports": {
"in": [
"pin",
"oe",
"din"
{
"name": "pin",
"size": 1
},
{
"name": "oe",
"size": 1
},
{
"name": "din",
"size": 1
}
],
"out": [
"dout"
{
"name": "dout",
"size": 1
}
]
}
},
Expand All @@ -36,7 +49,15 @@
"id": "076fd025-aa42-4f23-ae97-b65aec2298ce",
"type": "basic.input",
"data": {
"label": "pin"
"name": "pin",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 32,
Expand All @@ -47,7 +68,15 @@
"id": "f96a1baf-fc8b-4c25-b132-12552605743f",
"type": "basic.input",
"data": {
"label": "oe"
"name": "oe",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 32,
Expand All @@ -58,7 +87,15 @@
"id": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058",
"type": "basic.output",
"data": {
"label": "dout"
"name": "dout",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 760,
Expand All @@ -69,7 +106,15 @@
"id": "04fdb7a7-2740-4ff1-ad26-56407ef5b958",
"type": "basic.input",
"data": {
"label": "din"
"name": "din",
"pins": [
{
"index": "0",
"name": "",
"value": "0"
}
],
"virtual": true
},
"position": {
"x": 32,
Expand Down Expand Up @@ -129,4 +174,4 @@
"zoom": 1
}
}
}
}
Loading

0 comments on commit 2677c10

Please sign in to comment.