diff --git a/app/index.html b/app/index.html
index 3e2ff3b32..3c8ecbce2 100644
--- a/app/index.html
+++ b/app/index.html
@@ -16,7 +16,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
@@ -49,24 +49,25 @@
+
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice
index 12afc6a86..3c7f9feba 100644
--- a/app/resources/blocks/bit/0.ice
+++ b/app/resources/blocks/bit/0.ice
@@ -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
+ }
]
}
},
@@ -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,
diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice
index ed3410f62..87964be30 100644
--- a/app/resources/blocks/bit/1.ice
+++ b/app/resources/blocks/bit/1.ice
@@ -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
+ }
]
}
},
@@ -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,
@@ -62,4 +74,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice
index d36960ce3..d0a3a3e8c 100644
--- a/app/resources/blocks/config/pull_up.ice
+++ b/app/resources/blocks/config/pull_up.ice
@@ -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
+ }
]
}
},
@@ -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,
@@ -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,
@@ -79,8 +102,8 @@
"deps": {},
"state": {
"pan": {
- "x": -23,
- "y": 8
+ "x": 0,
+ "y": 0
},
"zoom": 1
}
diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice
index 6d8b8a698..129e0c67c 100644
--- a/app/resources/blocks/config/pull_up_inv.ice
+++ b/app/resources/blocks/config/pull_up_inv.ice
@@ -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
+ }
]
}
},
@@ -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,
@@ -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,
@@ -79,8 +102,8 @@
"deps": {},
"state": {
"pan": {
- "x": -23,
- "y": 8
+ "x": 0,
+ "y": 0
},
"zoom": 1
}
diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice
index 6a673429d..7168cffa6 100644
--- a/app/resources/blocks/config/tri_state.ice
+++ b/app/resources/blocks/config/tri_state.ice
@@ -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
+ }
]
}
},
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -129,4 +174,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/combinational/demux_1_2.ice b/app/resources/blocks/logic/combinational/demux_1_2.ice
index 3e844f7e2..6e35eb0a4 100644
--- a/app/resources/blocks/logic/combinational/demux_1_2.ice
+++ b/app/resources/blocks/logic/combinational/demux_1_2.ice
@@ -16,64 +16,109 @@
"type": "basic.code",
"data": {
"code": "assign {out1,out0} = in0 << sel0;",
+ "params": [],
"ports": {
"in": [
- "in0",
- "sel0"
+ {
+ "name": "in0",
+ "size": 1
+ },
+ {
+ "name": "sel0",
+ "size": 1
+ }
],
"out": [
- "out0",
- "out1"
+ {
+ "name": "out0",
+ "size": 1
+ },
+ {
+ "name": "out1",
+ "size": 1
+ }
]
}
},
"position": {
- "x": 208,
- "y": 64
+ "x": 248,
+ "y": 88
}
},
{
"id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406",
"type": "basic.input",
"data": {
- "label": "i"
+ "name": "i",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 0,
- "y": 96
+ "x": 40,
+ "y": 120
}
},
{
"id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa",
"type": "basic.output",
"data": {
- "label": "o0"
+ "name": "o0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 720,
- "y": 96
+ "x": 760,
+ "y": 120
}
},
{
"id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f",
"type": "basic.input",
"data": {
- "label": "sel"
+ "name": "sel",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 0,
- "y": 224
+ "x": 40,
+ "y": 248
}
},
{
"id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2",
"type": "basic.output",
"data": {
- "label": "o1"
+ "name": "o1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 720,
- "y": 224
+ "x": 760,
+ "y": 248
}
}
],
@@ -123,10 +168,10 @@
"deps": {},
"state": {
"pan": {
- "x": 104.8444188797269,
- "y": 152.1580250587398
+ "x": 0,
+ "y": 0
},
- "zoom": 0.8586960682653878
+ "zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/combinational/demux_1_4.ice b/app/resources/blocks/logic/combinational/demux_1_4.ice
index 8a4a6fa81..216ad1229 100644
--- a/app/resources/blocks/logic/combinational/demux_1_4.ice
+++ b/app/resources/blocks/logic/combinational/demux_1_4.ice
@@ -15,11 +15,19 @@
"id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa",
"type": "basic.output",
"data": {
- "label": "o0"
+ "name": "o0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 760,
- "y": 40
+ "x": 800,
+ "y": 64
}
},
{
@@ -27,89 +35,159 @@
"type": "basic.code",
"data": {
"code": "assign {out3,out2,out1,out0} = in0 << {sel1,sel0};",
+ "params": [],
"ports": {
"in": [
- "in0",
- "sel0",
- "sel1"
+ {
+ "name": "in0",
+ "size": 1
+ },
+ {
+ "name": "sel0",
+ "size": 1
+ },
+ {
+ "name": "sel1",
+ "size": 1
+ }
],
"out": [
- "out0",
- "out1",
- "out2",
- "out3"
+ {
+ "name": "out0",
+ "size": 1
+ },
+ {
+ "name": "out1",
+ "size": 1
+ },
+ {
+ "name": "out2",
+ "size": 1
+ },
+ {
+ "name": "out3",
+ "size": 1
+ }
]
}
},
"position": {
- "x": 208,
- "y": 64
+ "x": 248,
+ "y": 88
}
},
{
"id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406",
"type": "basic.input",
"data": {
- "label": "i"
+ "name": "i",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 72
+ "x": 56,
+ "y": 96
}
},
{
"id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2",
"type": "basic.output",
"data": {
- "label": "o1"
+ "name": "o1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 760,
- "y": 120
+ "x": 800,
+ "y": 144
}
},
{
"id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f",
"type": "basic.input",
"data": {
- "label": "sel0"
+ "name": "sel0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 160
+ "x": 56,
+ "y": 184
}
},
{
"id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3",
"type": "basic.output",
"data": {
- "label": "o2"
+ "name": "o2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 760,
- "y": 200
+ "x": 800,
+ "y": 224
}
},
{
"id": "657dab9e-6580-4f02-b54f-66477863f26a",
"type": "basic.input",
"data": {
- "label": "sel1"
+ "name": "sel1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 248
+ "x": 56,
+ "y": 272
}
},
{
"id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2",
"type": "basic.output",
"data": {
- "label": "o3"
+ "name": "o3",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 760,
- "y": 280
+ "x": 800,
+ "y": 304
}
}
],
@@ -189,10 +267,10 @@
"deps": {},
"state": {
"pan": {
- "x": 75.84442855228853,
- "y": 63.15803102316195
+ "x": 11.176135344899718,
+ "y": 3.2150526334643024
},
- "zoom": 0.8586960434913635
+ "zoom": 0.9234510996506167
}
}
}
diff --git a/app/resources/blocks/logic/combinational/demux_1_8.ice b/app/resources/blocks/logic/combinational/demux_1_8.ice
index 0784a2757..823421011 100644
--- a/app/resources/blocks/logic/combinational/demux_1_8.ice
+++ b/app/resources/blocks/logic/combinational/demux_1_8.ice
@@ -15,44 +15,76 @@
"id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa",
"type": "basic.output",
"data": {
- "label": "o0"
+ "name": "o0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": -128
+ "x": 760,
+ "y": -120
}
},
{
"id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2",
"type": "basic.output",
"data": {
- "label": "o1"
+ "name": "o1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": -48
+ "x": 760,
+ "y": -40
}
},
{
"id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3",
"type": "basic.output",
"data": {
- "label": "o2"
+ "name": "o2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 32
+ "x": 760,
+ "y": 40
}
},
{
"id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406",
"type": "basic.input",
"data": {
- "label": "i"
+ "name": "i",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 40
+ "x": -8,
+ "y": 48
}
},
{
@@ -60,116 +92,217 @@
"type": "basic.code",
"data": {
"code": "assign {out7,out6,out5,out4,out3,out2,out1,out0} = in0 << {sel2,sel1,sel0};",
+ "params": [],
"ports": {
"in": [
- "in0",
- "sel0",
- "sel1",
- "sel2"
+ {
+ "name": "in0",
+ "size": 1
+ },
+ {
+ "name": "sel0",
+ "size": 1
+ },
+ {
+ "name": "sel1",
+ "size": 1
+ },
+ {
+ "name": "sel2",
+ "size": 1
+ }
],
"out": [
- "out0",
- "out1",
- "out2",
- "out3",
- "out4",
- "out5",
- "out6",
- "out7"
+ {
+ "name": "out0",
+ "size": 1
+ },
+ {
+ "name": "out1",
+ "size": 1
+ },
+ {
+ "name": "out2",
+ "size": 1
+ },
+ {
+ "name": "out3",
+ "size": 1
+ },
+ {
+ "name": "out4",
+ "size": 1
+ },
+ {
+ "name": "out5",
+ "size": 1
+ },
+ {
+ "name": "out6",
+ "size": 1
+ },
+ {
+ "name": "out7",
+ "size": 1
+ }
]
}
},
"position": {
- "x": 208,
- "y": 64
+ "x": 184,
+ "y": 72
}
},
{
"id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2",
"type": "basic.output",
"data": {
- "label": "o3"
+ "name": "o3",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 112
+ "x": 760,
+ "y": 120
}
},
{
"id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f",
"type": "basic.input",
"data": {
- "label": "sel0"
+ "name": "sel0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 120
+ "x": -8,
+ "y": 128
}
},
{
"id": "657dab9e-6580-4f02-b54f-66477863f26a",
"type": "basic.input",
"data": {
- "label": "sel1"
+ "name": "sel1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 200
+ "x": -8,
+ "y": 208
}
},
{
"id": "1b8510ac-d723-4226-bf28-c7329d0f73fb",
"type": "basic.output",
"data": {
- "label": "o4"
+ "name": "o4",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 208
+ "x": 760,
+ "y": 216
}
},
{
"id": "e1a156c8-5813-46f6-a4d4-c672857f3396",
"type": "basic.input",
"data": {
- "label": "sel2"
+ "name": "sel2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 16,
- "y": 280
+ "x": -8,
+ "y": 288
}
},
{
"id": "65f31fca-d607-4d5c-82cc-878a93b8e580",
"type": "basic.output",
"data": {
- "label": "o5"
+ "name": "o5",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 304
+ "x": 760,
+ "y": 312
}
},
{
"id": "c8fadd68-77e1-47be-a262-b076e878e6fd",
"type": "basic.output",
"data": {
- "label": "o6"
+ "name": "o6",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 384
+ "x": 760,
+ "y": 392
}
},
{
"id": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633",
"type": "basic.output",
"data": {
- "label": "o7"
+ "name": "o7",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 784,
- "y": 464
+ "x": 760,
+ "y": 472
}
}
],
@@ -225,8 +358,8 @@
},
"vertices": [
{
- "x": 664,
- "y": -24
+ "x": 640,
+ "y": -16
}
]
},
@@ -241,8 +374,8 @@
},
"vertices": [
{
- "x": 664,
- "y": 416
+ "x": 640,
+ "y": 424
}
]
},
@@ -257,8 +390,8 @@
},
"vertices": [
{
- "x": 680,
- "y": 32
+ "x": 656,
+ "y": 40
}
]
},
@@ -273,8 +406,8 @@
},
"vertices": [
{
- "x": 696,
- "y": 112
+ "x": 672,
+ "y": 120
}
]
},
@@ -289,8 +422,8 @@
},
"vertices": [
{
- "x": 712,
- "y": 176
+ "x": 688,
+ "y": 184
}
]
},
@@ -315,8 +448,8 @@
},
"vertices": [
{
- "x": 696,
- "y": 288
+ "x": 672,
+ "y": 296
}
]
},
@@ -331,20 +464,20 @@
},
"vertices": [
{
- "x": 680,
- "y": 320
+ "x": 656,
+ "y": 328
},
{
- "x": 680,
- "y": 360
+ "x": 656,
+ "y": 368
},
{
- "x": 680,
- "y": 376
+ "x": 656,
+ "y": 384
},
{
- "x": 688,
- "y": 416
+ "x": 664,
+ "y": 424
}
]
}
@@ -353,10 +486,10 @@
"deps": {},
"state": {
"pan": {
- "x": 75.69774669071234,
- "y": 148.91048230054443
+ "x": 143.76402059142058,
+ "y": 110.755583226028
},
- "zoom": 0.6331667332315369
+ "zoom": 0.7272029968400818
}
}
}
diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice
index 6dc70db99..4435b169b 100644
--- a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice
+++ b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice
@@ -15,7 +15,15 @@
"id": "8b73e273-3603-443a-b952-0ab9ad826a96",
"type": "basic.output",
"data": {
- "label": "a"
+ "name": "a",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -26,7 +34,15 @@
"id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"type": "basic.output",
"data": {
- "label": "b"
+ "name": "b",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -37,7 +53,15 @@
"id": "16e44a6a-853a-4264-9e9d-2269827ed136",
"type": "basic.input",
"data": {
- "label": "h0"
+ "name": "h0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -49,21 +73,55 @@
"type": "basic.code",
"data": {
"code": "// Ánodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = ~_o;",
+ "params": [],
"ports": {
"in": [
- "h0",
- "h1",
- "h2",
- "h3"
+ {
+ "name": "h0",
+ "size": 1
+ },
+ {
+ "name": "h1",
+ "size": 1
+ },
+ {
+ "name": "h2",
+ "size": 1
+ },
+ {
+ "name": "h3",
+ "size": 1
+ }
],
"out": [
- "a",
- "b",
- "c",
- "d",
- "e",
- "f",
- "g"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ },
+ {
+ "name": "c",
+ "size": 1
+ },
+ {
+ "name": "d",
+ "size": 1
+ },
+ {
+ "name": "e",
+ "size": 1
+ },
+ {
+ "name": "f",
+ "size": 1
+ },
+ {
+ "name": "g",
+ "size": 1
+ }
]
}
},
@@ -76,7 +134,15 @@
"id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8",
"type": "basic.output",
"data": {
- "label": "c"
+ "name": "c",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -87,7 +153,15 @@
"id": "9cdbdf9f-f086-4427-9719-e13470658d97",
"type": "basic.input",
"data": {
- "label": "h1"
+ "name": "h1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -98,7 +172,15 @@
"id": "4687e984-3f19-44d7-baee-ca89513f8f1a",
"type": "basic.output",
"data": {
- "label": "d"
+ "name": "d",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -109,7 +191,15 @@
"id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40",
"type": "basic.input",
"data": {
- "label": "h2"
+ "name": "h2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -120,7 +210,15 @@
"id": "1691b072-9102-4986-a900-fefd1a5a7b9e",
"type": "basic.output",
"data": {
- "label": "e"
+ "name": "e",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -131,7 +229,15 @@
"id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff",
"type": "basic.input",
"data": {
- "label": "h3"
+ "name": "h3",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -142,7 +248,15 @@
"id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"type": "basic.output",
"data": {
- "label": "f"
+ "name": "f",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -153,7 +267,15 @@
"id": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"type": "basic.output",
"data": {
- "label": "g"
+ "name": "g",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -230,7 +352,13 @@
"target": {
"block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 952,
+ "y": 504
+ }
+ ]
},
{
"source": {
@@ -240,7 +368,13 @@
"target": {
"block": "8b73e273-3603-443a-b952-0ab9ad826a96",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 928,
+ "y": 440
+ }
+ ]
},
{
"source": {
@@ -250,7 +384,13 @@
"target": {
"block": "1691b072-9102-4986-a900-fefd1a5a7b9e",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 976,
+ "y": 704
+ }
+ ]
},
{
"source": {
@@ -260,7 +400,13 @@
"target": {
"block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 952,
+ "y": 752
+ }
+ ]
},
{
"source": {
@@ -270,17 +416,23 @@
"target": {
"block": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 928,
+ "y": 824
+ }
+ ]
}
]
},
"deps": {},
"state": {
"pan": {
- "x": -155.98941303266986,
- "y": -230.62665026580393
+ "x": -152.07320110504,
+ "y": -209.21075900090992
},
- "zoom": 0.7823535799980164
+ "zoom": 0.7373584811199316
}
}
}
diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice
index 2aa29a892..9d64d44c5 100644
--- a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice
+++ b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice
@@ -15,7 +15,15 @@
"id": "8b73e273-3603-443a-b952-0ab9ad826a96",
"type": "basic.output",
"data": {
- "label": "a"
+ "name": "a",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -26,7 +34,15 @@
"id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"type": "basic.output",
"data": {
- "label": "b"
+ "name": "b",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -37,7 +53,15 @@
"id": "16e44a6a-853a-4264-9e9d-2269827ed136",
"type": "basic.input",
"data": {
- "label": "h0"
+ "name": "h0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -49,21 +73,55 @@
"type": "basic.code",
"data": {
"code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = _o;",
+ "params": [],
"ports": {
"in": [
- "h0",
- "h1",
- "h2",
- "h3"
+ {
+ "name": "h0",
+ "size": 1
+ },
+ {
+ "name": "h1",
+ "size": 1
+ },
+ {
+ "name": "h2",
+ "size": 1
+ },
+ {
+ "name": "h3",
+ "size": 1
+ }
],
"out": [
- "a",
- "b",
- "c",
- "d",
- "e",
- "f",
- "g"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ },
+ {
+ "name": "c",
+ "size": 1
+ },
+ {
+ "name": "d",
+ "size": 1
+ },
+ {
+ "name": "e",
+ "size": 1
+ },
+ {
+ "name": "f",
+ "size": 1
+ },
+ {
+ "name": "g",
+ "size": 1
+ }
]
}
},
@@ -76,7 +134,15 @@
"id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8",
"type": "basic.output",
"data": {
- "label": "c"
+ "name": "c",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -87,7 +153,15 @@
"id": "9cdbdf9f-f086-4427-9719-e13470658d97",
"type": "basic.input",
"data": {
- "label": "h1"
+ "name": "h1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -98,7 +172,15 @@
"id": "4687e984-3f19-44d7-baee-ca89513f8f1a",
"type": "basic.output",
"data": {
- "label": "d"
+ "name": "d",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -109,7 +191,15 @@
"id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40",
"type": "basic.input",
"data": {
- "label": "h2"
+ "name": "h2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -120,7 +210,15 @@
"id": "1691b072-9102-4986-a900-fefd1a5a7b9e",
"type": "basic.output",
"data": {
- "label": "e"
+ "name": "e",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -131,7 +229,15 @@
"id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff",
"type": "basic.input",
"data": {
- "label": "h3"
+ "name": "h3",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 312,
@@ -142,7 +248,15 @@
"id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"type": "basic.output",
"data": {
- "label": "f"
+ "name": "f",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -153,7 +267,15 @@
"id": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"type": "basic.output",
"data": {
- "label": "g"
+ "name": "g",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 1016,
@@ -230,7 +352,13 @@
"target": {
"block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 952,
+ "y": 528
+ }
+ ]
},
{
"source": {
@@ -240,7 +368,13 @@
"target": {
"block": "8b73e273-3603-443a-b952-0ab9ad826a96",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 928,
+ "y": 448
+ }
+ ]
},
{
"source": {
@@ -260,7 +394,13 @@
"target": {
"block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 952,
+ "y": 776
+ }
+ ]
},
{
"source": {
@@ -270,7 +410,13 @@
"target": {
"block": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"port": "in"
- }
+ },
+ "vertices": [
+ {
+ "x": 928,
+ "y": 824
+ }
+ ]
}
]
},
@@ -280,7 +426,7 @@
"x": -152.07320110504,
"y": -209.21075900090992
},
- "zoom": 0.7373584508895874
+ "zoom": 0.7373584371699413
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/combinational/mux_2_1.ice b/app/resources/blocks/logic/combinational/mux_2_1.ice
index f10bd5288..1e939fdf3 100644
--- a/app/resources/blocks/logic/combinational/mux_2_1.ice
+++ b/app/resources/blocks/logic/combinational/mux_2_1.ice
@@ -16,14 +16,27 @@
"type": "basic.code",
"data": {
"code": "reg _o;\n\nalways @(*) begin\n case(sel0)\n 0: _o = in0;\n 1: _o = in1;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;",
+ "params": [],
"ports": {
"in": [
- "in0",
- "in1",
- "sel0"
+ {
+ "name": "in0",
+ "size": 1
+ },
+ {
+ "name": "in1",
+ "size": 1
+ },
+ {
+ "name": "sel0",
+ "size": 1
+ }
],
"out": [
- "o"
+ {
+ "name": "o",
+ "size": 1
+ }
]
}
},
@@ -36,7 +49,15 @@
"id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7",
"type": "basic.input",
"data": {
- "label": "i0"
+ "name": "i0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 80,
@@ -47,7 +68,15 @@
"id": "5fb29465-2ee7-45bb-afa4-9a3de895c774",
"type": "basic.input",
"data": {
- "label": "i1"
+ "name": "i1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 80,
@@ -58,7 +87,15 @@
"id": "061aa997-2f30-4591-8841-fb6abf5c3b2e",
"type": "basic.output",
"data": {
- "label": "o"
+ "name": "o",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 792,
@@ -69,7 +106,15 @@
"id": "67ed5e09-486d-4f97-929f-aefea9c43951",
"type": "basic.input",
"data": {
- "label": "sel"
+ "name": "sel",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 80,
@@ -126,7 +171,7 @@
"x": -21.03752160981206,
"y": 29.479234822175684
},
- "zoom": 1.000000703366588
+ "zoom": 1
}
}
}
diff --git a/app/resources/blocks/logic/combinational/mux_4_1.ice b/app/resources/blocks/logic/combinational/mux_4_1.ice
index 7480c7521..66b25ea73 100644
--- a/app/resources/blocks/logic/combinational/mux_4_1.ice
+++ b/app/resources/blocks/logic/combinational/mux_4_1.ice
@@ -15,7 +15,15 @@
"id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7",
"type": "basic.input",
"data": {
- "label": "i0"
+ "name": "i0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -26,7 +34,15 @@
"id": "5fb29465-2ee7-45bb-afa4-9a3de895c774",
"type": "basic.input",
"data": {
- "label": "i1"
+ "name": "i1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -38,17 +54,39 @@
"type": "basic.code",
"data": {
"code": "reg _o;\nwire [1:0] _sel;\n\nassign _sel = {sel1, sel0};\n\nalways @(*) begin\n case(_sel)\n 0: _o = in0;\n 1: _o = in1;\n 2: _o = in2;\n 3: _o = in3;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;",
+ "params": [],
"ports": {
"in": [
- "in0",
- "in1",
- "in2",
- "in3",
- "sel0",
- "sel1"
+ {
+ "name": "in0",
+ "size": 1
+ },
+ {
+ "name": "in1",
+ "size": 1
+ },
+ {
+ "name": "in2",
+ "size": 1
+ },
+ {
+ "name": "in3",
+ "size": 1
+ },
+ {
+ "name": "sel0",
+ "size": 1
+ },
+ {
+ "name": "sel1",
+ "size": 1
+ }
],
"out": [
- "o"
+ {
+ "name": "o",
+ "size": 1
+ }
]
}
},
@@ -61,7 +99,15 @@
"id": "67ed5e09-486d-4f97-929f-aefea9c43951",
"type": "basic.input",
"data": {
- "label": "i2"
+ "name": "i2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -72,7 +118,15 @@
"id": "061aa997-2f30-4591-8841-fb6abf5c3b2e",
"type": "basic.output",
"data": {
- "label": "o"
+ "name": "o",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 776,
@@ -83,7 +137,15 @@
"id": "8be9cded-6d06-4b23-b73c-94c7ff311dbc",
"type": "basic.input",
"data": {
- "label": "i3"
+ "name": "i3",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -94,7 +156,15 @@
"id": "1b7db016-c89a-4f65-b6f0-0f87c851c077",
"type": "basic.input",
"data": {
- "label": "sel0"
+ "name": "sel0",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -105,7 +175,15 @@
"id": "a014971e-5470-490b-9058-b4b00f2dd125",
"type": "basic.input",
"data": {
- "label": "sel1"
+ "name": "sel1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 40,
@@ -204,7 +282,7 @@
"x": 0,
"y": 0
},
- "zoom": 0.9999999999994884
+ "zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/gate/and.ice b/app/resources/blocks/logic/gate/and.ice
index 64b081da8..41d70ac1c 100644
--- a/app/resources/blocks/logic/gate/and.ice
+++ b/app/resources/blocks/logic/gate/and.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// AND logic gate\n\nassign c = a & b;",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -104,7 +138,7 @@
"x": 0,
"y": 0
},
- "zoom": 0.9999999784900666
+ "zoom": 1
}
}
}
diff --git a/app/resources/blocks/logic/gate/nand.ice b/app/resources/blocks/logic/gate/nand.ice
index 0d5fe5a31..cb8a28934 100644
--- a/app/resources/blocks/logic/gate/nand.ice
+++ b/app/resources/blocks/logic/gate/nand.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// NAND logic gate\n\nassign c = ~(a & b);",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -107,4 +141,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/gate/nor.ice b/app/resources/blocks/logic/gate/nor.ice
index 1d9f38242..b1157273c 100644
--- a/app/resources/blocks/logic/gate/nor.ice
+++ b/app/resources/blocks/logic/gate/nor.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// NOR logic gate\n\nassign c = ~(a | b);",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
diff --git a/app/resources/blocks/logic/gate/not.ice b/app/resources/blocks/logic/gate/not.ice
index 0586db3bc..12ff9752b 100644
--- a/app/resources/blocks/logic/gate/not.ice
+++ b/app/resources/blocks/logic/gate/not.ice
@@ -16,12 +16,19 @@
"type": "basic.code",
"data": {
"code": "// NOT logic gate\n\nassign c = ~ a;",
+ "params": [],
"ports": {
"in": [
- "a"
+ {
+ "name": "a",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -34,7 +41,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -45,7 +60,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -85,4 +108,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/gate/or.ice b/app/resources/blocks/logic/gate/or.ice
index 35c0f1515..440294bb7 100644
--- a/app/resources/blocks/logic/gate/or.ice
+++ b/app/resources/blocks/logic/gate/or.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// OR logic gate\n\nassign c = a | b;",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -107,4 +141,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/gate/xnor.ice b/app/resources/blocks/logic/gate/xnor.ice
index f55df49ff..b90ac28a1 100644
--- a/app/resources/blocks/logic/gate/xnor.ice
+++ b/app/resources/blocks/logic/gate/xnor.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// XNOR logic gate\n\nassign c = ~(a ^ b);",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
diff --git a/app/resources/blocks/logic/gate/xor.ice b/app/resources/blocks/logic/gate/xor.ice
index 37e840d56..b0a081f16 100644
--- a/app/resources/blocks/logic/gate/xor.ice
+++ b/app/resources/blocks/logic/gate/xor.ice
@@ -16,13 +16,23 @@
"type": "basic.code",
"data": {
"code": "// XOR logic gate\n\nassign c = a ^ b;",
+ "params": [],
"ports": {
"in": [
- "a",
- "b"
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
],
"out": [
- "c"
+ {
+ "name": "c",
+ "size": 1
+ }
]
}
},
@@ -35,7 +45,15 @@
"id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -46,7 +64,15 @@
"id": "664caf9e-5f40-4df4-800a-b626af702e62",
"type": "basic.output",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 752,
@@ -57,7 +83,15 @@
"id": "97b51945-d716-4b6c-9db9-970d08541249",
"type": "basic.input",
"data": {
- "label": ""
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 64,
@@ -107,4 +141,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/sequential/debouncer.ice b/app/resources/blocks/logic/sequential/debouncer.ice
index d28c6ea5c..3b6019dd2 100644
--- a/app/resources/blocks/logic/sequential/debouncer.ice
+++ b/app/resources/blocks/logic/sequential/debouncer.ice
@@ -16,52 +16,86 @@
"type": "basic.code",
"data": {
"code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign out = btn_out_r;\n",
+ "params": [],
"ports": {
"in": [
- "clk",
- "in"
+ {
+ "name": "clk",
+ "size": 1
+ },
+ {
+ "name": "in",
+ "size": 1
+ }
],
"out": [
- "out"
+ {
+ "name": "out",
+ "size": 1
+ }
]
}
},
"position": {
- "x": 368,
- "y": 120
+ "x": 264,
+ "y": 112
}
},
{
"id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a",
"type": "basic.input",
"data": {
- "label": "clk"
+ "name": "clk",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 152,
- "y": 152
+ "x": 48,
+ "y": 144
}
},
{
"id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077",
"type": "basic.output",
"data": {
- "label": "out"
+ "name": "out",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 872,
- "y": 216
+ "x": 768,
+ "y": 208
}
},
{
"id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530",
"type": "basic.input",
"data": {
- "label": "in"
+ "name": "in",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
- "x": 152,
- "y": 280
+ "x": 48,
+ "y": 272
}
}
],
@@ -104,7 +138,7 @@
"x": 0,
"y": 0
},
- "zoom": 0.9999999623653131
+ "zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/sequential/dff_ar.ice b/app/resources/blocks/logic/sequential/dff_ar.ice
index fae0d636e..7f04bfbc3 100644
--- a/app/resources/blocks/logic/sequential/dff_ar.ice
+++ b/app/resources/blocks/logic/sequential/dff_ar.ice
@@ -15,7 +15,15 @@
"id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2",
"type": "basic.input",
"data": {
- "label": "D"
+ "name": "D",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -27,16 +35,35 @@
"type": "basic.code",
"data": {
"code": "// D flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n",
+ "params": [],
"ports": {
"in": [
- "d",
- "en",
- "rst_n",
- "clk"
+ {
+ "name": "d",
+ "size": 1
+ },
+ {
+ "name": "en",
+ "size": 1
+ },
+ {
+ "name": "rst_n",
+ "size": 1
+ },
+ {
+ "name": "clk",
+ "size": 1
+ }
],
"out": [
- "q",
- "q_n"
+ {
+ "name": "q",
+ "size": 1
+ },
+ {
+ "name": "q_n",
+ "size": 1
+ }
]
}
},
@@ -49,7 +76,15 @@
"id": "ffdd9aa2-aea3-4aa9-8431-80e799226774",
"type": "basic.output",
"data": {
- "label": "Q"
+ "name": "Q",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -60,7 +95,15 @@
"id": "50d69ac2-949d-476e-a711-420ba9f510cd",
"type": "basic.input",
"data": {
- "label": "en"
+ "name": "en",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -71,7 +114,15 @@
"id": "07105e68-401b-49e9-b85f-2cddbfee9fbe",
"type": "basic.input",
"data": {
- "label": "rst*"
+ "name": "rst*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -82,7 +133,15 @@
"id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a",
"type": "basic.output",
"data": {
- "label": "Q*"
+ "name": "Q*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -93,7 +152,15 @@
"id": "6855f64f-fa1c-4371-b2e1-a98970674a96",
"type": "basic.input",
"data": {
- "label": "clk"
+ "name": "clk",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -170,7 +237,7 @@
"x": -100,
"y": 0
},
- "zoom": 1.0000000596046377
+ "zoom": 1
}
}
}
diff --git a/app/resources/blocks/logic/sequential/dff_sr.ice b/app/resources/blocks/logic/sequential/dff_sr.ice
index 2dfabb8d0..f57c59a0d 100644
--- a/app/resources/blocks/logic/sequential/dff_sr.ice
+++ b/app/resources/blocks/logic/sequential/dff_sr.ice
@@ -15,7 +15,15 @@
"id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2",
"type": "basic.input",
"data": {
- "label": "D"
+ "name": "D",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -27,16 +35,35 @@
"type": "basic.code",
"data": {
"code": "// D flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n",
+ "params": [],
"ports": {
"in": [
- "d",
- "en",
- "rst_n",
- "clk"
+ {
+ "name": "d",
+ "size": 1
+ },
+ {
+ "name": "en",
+ "size": 1
+ },
+ {
+ "name": "rst_n",
+ "size": 1
+ },
+ {
+ "name": "clk",
+ "size": 1
+ }
],
"out": [
- "q",
- "q_n"
+ {
+ "name": "q",
+ "size": 1
+ },
+ {
+ "name": "q_n",
+ "size": 1
+ }
]
}
},
@@ -49,7 +76,15 @@
"id": "ffdd9aa2-aea3-4aa9-8431-80e799226774",
"type": "basic.output",
"data": {
- "label": "Q"
+ "name": "Q",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -60,7 +95,15 @@
"id": "50d69ac2-949d-476e-a711-420ba9f510cd",
"type": "basic.input",
"data": {
- "label": "en"
+ "name": "en",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -71,7 +114,15 @@
"id": "07105e68-401b-49e9-b85f-2cddbfee9fbe",
"type": "basic.input",
"data": {
- "label": "rst*"
+ "name": "rst*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -82,7 +133,15 @@
"id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a",
"type": "basic.output",
"data": {
- "label": "Q*"
+ "name": "Q*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -93,7 +152,15 @@
"id": "6855f64f-fa1c-4371-b2e1-a98970674a96",
"type": "basic.input",
"data": {
- "label": "clk"
+ "name": "clk",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
diff --git a/app/resources/blocks/logic/sequential/tff_ar.ice b/app/resources/blocks/logic/sequential/tff_ar.ice
index 33e16dfc7..0c1d6ba47 100644
--- a/app/resources/blocks/logic/sequential/tff_ar.ice
+++ b/app/resources/blocks/logic/sequential/tff_ar.ice
@@ -15,7 +15,15 @@
"id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2",
"type": "basic.input",
"data": {
- "label": "T"
+ "name": "T",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -27,16 +35,35 @@
"type": "basic.code",
"data": {
"code": "// T flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};",
+ "params": [],
"ports": {
"in": [
- "t",
- "en",
- "rst_n",
- "clk"
+ {
+ "name": "t",
+ "size": 1
+ },
+ {
+ "name": "en",
+ "size": 1
+ },
+ {
+ "name": "rst_n",
+ "size": 1
+ },
+ {
+ "name": "clk",
+ "size": 1
+ }
],
"out": [
- "q",
- "q_n"
+ {
+ "name": "q",
+ "size": 1
+ },
+ {
+ "name": "q_n",
+ "size": 1
+ }
]
}
},
@@ -49,7 +76,15 @@
"id": "ffdd9aa2-aea3-4aa9-8431-80e799226774",
"type": "basic.output",
"data": {
- "label": "Q"
+ "name": "Q",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -60,7 +95,15 @@
"id": "50d69ac2-949d-476e-a711-420ba9f510cd",
"type": "basic.input",
"data": {
- "label": "en"
+ "name": "en",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -71,7 +114,15 @@
"id": "8fa94192-fba9-4c2a-be61-b8ca88389423",
"type": "basic.input",
"data": {
- "label": "rst*"
+ "name": "rst*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -82,7 +133,15 @@
"id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a",
"type": "basic.output",
"data": {
- "label": "Q*"
+ "name": "Q*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -93,7 +152,15 @@
"id": "6855f64f-fa1c-4371-b2e1-a98970674a96",
"type": "basic.input",
"data": {
- "label": "clk"
+ "name": "clk",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -173,4 +240,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/blocks/logic/sequential/tff_sr.ice b/app/resources/blocks/logic/sequential/tff_sr.ice
index 95267f2e8..825b32d4f 100644
--- a/app/resources/blocks/logic/sequential/tff_sr.ice
+++ b/app/resources/blocks/logic/sequential/tff_sr.ice
@@ -15,7 +15,15 @@
"id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2",
"type": "basic.input",
"data": {
- "label": "T"
+ "name": "T",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -27,16 +35,35 @@
"type": "basic.code",
"data": {
"code": "// T flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};",
+ "params": [],
"ports": {
"in": [
- "t",
- "en",
- "rst_n",
- "clk"
+ {
+ "name": "t",
+ "size": 1
+ },
+ {
+ "name": "en",
+ "size": 1
+ },
+ {
+ "name": "rst_n",
+ "size": 1
+ },
+ {
+ "name": "clk",
+ "size": 1
+ }
],
"out": [
- "q",
- "q_n"
+ {
+ "name": "q",
+ "size": 1
+ },
+ {
+ "name": "q_n",
+ "size": 1
+ }
]
}
},
@@ -49,7 +76,15 @@
"id": "ffdd9aa2-aea3-4aa9-8431-80e799226774",
"type": "basic.output",
"data": {
- "label": "Q"
+ "name": "Q",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -60,7 +95,15 @@
"id": "50d69ac2-949d-476e-a711-420ba9f510cd",
"type": "basic.input",
"data": {
- "label": "en"
+ "name": "en",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -71,7 +114,15 @@
"id": "8fa94192-fba9-4c2a-be61-b8ca88389423",
"type": "basic.input",
"data": {
- "label": "rst*"
+ "name": "rst*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -82,7 +133,15 @@
"id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a",
"type": "basic.output",
"data": {
- "label": "Q*"
+ "name": "Q*",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 824,
@@ -93,7 +152,15 @@
"id": "6855f64f-fa1c-4371-b2e1-a98970674a96",
"type": "basic.input",
"data": {
- "label": "clk"
+ "name": "clk",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
},
"position": {
"x": 168,
@@ -173,4 +240,4 @@
"zoom": 1
}
}
-}
\ No newline at end of file
+}
diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice
index a4aad45ce..c34f87a6a 100644
--- a/app/resources/examples/icestick/1_basic/1_led_on.ice
+++ b/app/resources/examples/icestick/1_basic/1_led_on.ice
@@ -1,130 +1,164 @@
{
- "image": "",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 1
+ "version": "1.0",
+ "package": {
+ "name": "Led on",
+ "version": "1.0.0",
+ "description": "",
+ "author": "",
+ "image": ""
},
- "board": "icestick",
- "graph": {
- "blocks": [
- {
- "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c",
- "type": "basic.info",
- "data": {
- "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again"
+ "design": {
+ "board": "icestick",
+ "graph": {
+ "blocks": [
+ {
+ "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b",
+ "type": "bit.1",
+ "position": {
+ "x": 80,
+ "y": 64
+ }
},
- "position": {
- "x": 40,
- "y": 208
- }
- },
- {
- "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3",
- "type": "basic.info",
- "data": {
- "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo"
+ {
+ "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
+ "type": "basic.output",
+ "data": {
+ "name": "led",
+ "pins": [
+ {
+ "index": "0",
+ "name": "D1",
+ "value": "99"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 352,
+ "y": 64
+ }
},
- "position": {
- "x": 464,
- "y": 208
- }
- },
- {
- "id": "e657ee6f-9430-4fce-a539-72d12d32f5bb",
- "type": "bit.1",
- "data": {},
- "position": {
- "x": 80,
- "y": 64
- }
- },
- {
- "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
- "type": "basic.output",
- "data": {
- "label": "led",
- "pin": {
- "name": "D1",
- "value": "99"
+ {
+ "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c",
+ "type": "basic.info",
+ "data": {
+ "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again"
+ },
+ "position": {
+ "x": 40,
+ "y": 208
}
},
- "position": {
- "x": 352,
- "y": 64
+ {
+ "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3",
+ "type": "basic.info",
+ "data": {
+ "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo"
+ },
+ "position": {
+ "x": 464,
+ "y": 208
+ }
}
- }
- ],
- "wires": [
- {
- "source": {
- "block": "e657ee6f-9430-4fce-a539-72d12d32f5bb",
- "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead"
- },
- "target": {
- "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
- "port": "in"
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b",
+ "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead"
+ },
+ "target": {
+ "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
+ "port": "in"
+ }
}
- }
- ]
- },
- "deps": {
- "bit.1": {
- "graph": {
- "blocks": [
- {
- "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
- "type": "basic.code",
- "data": {
- "code": "// Bit 1\n\nassign v = 1'b1;",
- "ports": {
- "in": [],
- "out": [
- "v"
- ]
+ ]
+ },
+ "deps": {
+ "bit.1": {
+ "version": "1.0",
+ "package": {
+ "name": "Bit 1",
+ "version": "1.0.0",
+ "description": "Assign 1 to the output wire",
+ "author": "Jesús Arroyo",
+ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E"
+ },
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
+ "type": "basic.code",
+ "data": {
+ "code": "// Bit 1\n\nassign v = 1'b1;",
+ "params": [],
+ "ports": {
+ "in": [],
+ "out": [
+ {
+ "name": "v",
+ "size": 1
+ }
+ ]
+ }
+ },
+ "position": {
+ "x": 96,
+ "y": 96
+ }
+ },
+ {
+ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
+ "type": "basic.output",
+ "data": {
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
+ },
+ "position": {
+ "x": 608,
+ "y": 192
+ }
}
- },
- "position": {
- "x": 96,
- "y": 96
- }
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
+ "port": "v"
+ },
+ "target": {
+ "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
+ "port": "in"
+ }
+ }
+ ]
},
- {
- "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
- "type": "basic.output",
- "data": {
- "label": ""
+ "deps": {},
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
},
- "position": {
- "x": 608,
- "y": 192
- }
+ "zoom": 1
}
- ],
- "wires": [
- {
- "source": {
- "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
- "port": "v"
- },
- "target": {
- "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
- "port": "in"
- }
- }
- ]
- },
- "deps": {},
- "image": "resources/images/1.svg",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 1
+ }
}
+ },
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
+ },
+ "zoom": 1
}
}
}
\ No newline at end of file
diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice
index 672560ecc..c66fb5642 100644
--- a/app/resources/examples/icezum/1_basic/1_led_on.ice
+++ b/app/resources/examples/icezum/1_basic/1_led_on.ice
@@ -1,130 +1,164 @@
{
- "image": "",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 0.9999999813303895
+ "version": "1.0",
+ "package": {
+ "name": "Led on",
+ "version": "1.0.0",
+ "description": "",
+ "author": "",
+ "image": ""
},
- "board": "icezum",
- "graph": {
- "blocks": [
- {
- "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c",
- "type": "basic.info",
- "data": {
- "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again"
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b",
+ "type": "bit.1",
+ "position": {
+ "x": 80,
+ "y": 64
+ }
},
- "position": {
- "x": 40,
- "y": 208
- }
- },
- {
- "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3",
- "type": "basic.info",
- "data": {
- "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo"
+ {
+ "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
+ "type": "basic.output",
+ "data": {
+ "name": "led",
+ "pins": [
+ {
+ "index": "0",
+ "name": "LED0",
+ "value": "95"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 352,
+ "y": 64
+ }
},
- "position": {
- "x": 464,
- "y": 208
- }
- },
- {
- "id": "e657ee6f-9430-4fce-a539-72d12d32f5bb",
- "type": "bit.1",
- "data": {},
- "position": {
- "x": 80,
- "y": 64
- }
- },
- {
- "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
- "type": "basic.output",
- "data": {
- "label": "led",
- "pin": {
- "name": "LED0",
- "value": "95"
+ {
+ "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c",
+ "type": "basic.info",
+ "data": {
+ "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again"
+ },
+ "position": {
+ "x": 40,
+ "y": 208
}
},
- "position": {
- "x": 352,
- "y": 64
+ {
+ "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3",
+ "type": "basic.info",
+ "data": {
+ "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo"
+ },
+ "position": {
+ "x": 464,
+ "y": 208
+ }
}
- }
- ],
- "wires": [
- {
- "source": {
- "block": "e657ee6f-9430-4fce-a539-72d12d32f5bb",
- "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead"
- },
- "target": {
- "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
- "port": "in"
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b",
+ "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead"
+ },
+ "target": {
+ "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc",
+ "port": "in"
+ }
}
- }
- ]
- },
- "deps": {
- "bit.1": {
- "graph": {
- "blocks": [
- {
- "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
- "type": "basic.code",
- "data": {
- "code": "// Bit 1\n\nassign v = 1'b1;",
- "ports": {
- "in": [],
- "out": [
- "v"
- ]
+ ]
+ },
+ "deps": {
+ "bit.1": {
+ "version": "1.0",
+ "package": {
+ "name": "Bit 1",
+ "version": "1.0.0",
+ "description": "Assign 1 to the output wire",
+ "author": "Jesús Arroyo",
+ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E"
+ },
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
+ "type": "basic.code",
+ "data": {
+ "code": "// Bit 1\n\nassign v = 1'b1;",
+ "params": [],
+ "ports": {
+ "in": [],
+ "out": [
+ {
+ "name": "v",
+ "size": 1
+ }
+ ]
+ }
+ },
+ "position": {
+ "x": 96,
+ "y": 96
+ }
+ },
+ {
+ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
+ "type": "basic.output",
+ "data": {
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
+ },
+ "position": {
+ "x": 608,
+ "y": 192
+ }
}
- },
- "position": {
- "x": 96,
- "y": 96
- }
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
+ "port": "v"
+ },
+ "target": {
+ "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
+ "port": "in"
+ }
+ }
+ ]
},
- {
- "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
- "type": "basic.output",
- "data": {
- "label": ""
+ "deps": {},
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
},
- "position": {
- "x": 608,
- "y": 192
- }
+ "zoom": 1
}
- ],
- "wires": [
- {
- "source": {
- "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5",
- "port": "v"
- },
- "target": {
- "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead",
- "port": "in"
- }
- }
- ]
- },
- "deps": {},
- "image": "resources/images/1.svg",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 1
+ }
}
+ },
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
+ },
+ "zoom": 1
}
}
}
\ No newline at end of file
diff --git a/app/resources/examples/icezum/1_basic/2_switch_led.ice b/app/resources/examples/icezum/1_basic/2_switch_led.ice
index 3adf6917a..d428f6e3e 100644
--- a/app/resources/examples/icezum/1_basic/2_switch_led.ice
+++ b/app/resources/examples/icezum/1_basic/2_switch_led.ice
@@ -1,91 +1,108 @@
{
- "image": "",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 0.9999999883960295
+ "version": "1.0",
+ "package": {
+ "name": "Switch led",
+ "version": "1.0.0",
+ "description": "",
+ "author": "",
+ "image": ""
},
- "board": "icezum",
- "graph": {
- "blocks": [
- {
- "id": "aac1b394-533e-4410-9f35-ba80af8abd63",
- "type": "basic.input",
- "data": {
- "label": "button",
- "pin": {
- "name": "SW1",
- "value": "10"
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "aac1b394-533e-4410-9f35-ba80af8abd63",
+ "type": "basic.input",
+ "data": {
+ "name": "button",
+ "pins": [
+ {
+ "index": "0",
+ "name": "SW1",
+ "value": "10"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 48,
+ "y": 80
}
},
- "position": {
- "x": 48,
- "y": 80
- }
- },
- {
- "id": "30a83e46-176d-40a8-ac0e-f19a131ea9d9",
- "type": "basic.output",
- "data": {
- "label": "led",
- "pin": {
- "name": "LED0",
- "value": "95"
+ {
+ "id": "30a83e46-176d-40a8-ac0e-f19a131ea9d9",
+ "type": "basic.output",
+ "data": {
+ "name": "led",
+ "pins": [
+ {
+ "index": "0",
+ "name": "LED0",
+ "value": "95"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 320,
+ "y": 80
}
},
- "position": {
- "x": 320,
- "y": 80
- }
- },
- {
- "id": "9e124703-5a80-4d0d-8c31-945447862085",
- "type": "basic.info",
- "data": {
- "info": "Switch-led basic example\n\nA simple circuit that connects the input pin,\nwhere there is a button switch, with the\noutpun pin, where there is a led\n\nWhen the button is pressed (1), the led is\nturned on. When the button is released (0), the\nled is turned off\n\nNotice the blue box with a gear. It is a\nconfiguration block for activating the \nFPGA internal pull-up resistor in the SW1 pin"
- },
- "position": {
- "x": 32,
- "y": 224
- }
- },
- {
- "id": "f76f55d3-ba32-42d8-8c16-9f4cbbd9d27c",
- "type": "basic.info",
- "data": {
- "info": "Ejemplo básico switch-led\n\nSencillo circuito que conecta directamente\nun pin de entrada de la FPGA, donde hay\nun pulsador, con el pin de salida, donde está\nel led\n\nCuando se aprieta el pulsador (1), se enciende\nel led. Cuando se suelta (0) se apaga\n\nFíjate en la caja azul con el engranaje. Es un\nbloque de configuración que permite activar la\nresistencia de pull-up interna del pin de la \nFPGA"
+ {
+ "id": "9e124703-5a80-4d0d-8c31-945447862085",
+ "type": "basic.info",
+ "data": {
+ "info": "Switch-led basic example\n\nA simple circuit that connects the input pin,\nwhere there is a button switch, with the\noutpun pin, where there is a led\n\nWhen the button is pressed (1), the led is\nturned on. When the button is released (0), the\nled is turned off\n\nNotice the blue box with a gear. It is a\nconfiguration block for activating the \nFPGA internal pull-up resistor in the SW1 pin"
+ },
+ "position": {
+ "x": 32,
+ "y": 224
+ }
},
- "position": {
- "x": 448,
- "y": 224
- }
- },
- {
- "id": "d556c4f6-736a-41a9-9f64-badf2b790010",
- "type": "basic.info",
- "data": {
- "info": "EXERCISE 1: Upload the circuit into your FPGA\nboard and test it!\n\nEXERCISE 2: Change the button to SW2 and test\nit again\n\n---------------------------------------------\nEjercicio 1: Carga el circuito en la FPGA y\n¡pruébalo!\n\nEJERCICIO 2: Cambia el pulsador al SW2 y\npruébalo de nuevo"
+ {
+ "id": "f76f55d3-ba32-42d8-8c16-9f4cbbd9d27c",
+ "type": "basic.info",
+ "data": {
+ "info": "Ejemplo básico switch-led\n\nSencillo circuito que conecta directamente\nun pin de entrada de la FPGA, donde hay\nun pulsador, con el pin de salida, donde está\nel led\n\nCuando se aprieta el pulsador (1), se enciende\nel led. Cuando se suelta (0) se apaga\n\nFíjate en la caja azul con el engranaje. Es un\nbloque de configuración que permite activar la\nresistencia de pull-up interna del pin de la \nFPGA"
+ },
+ "position": {
+ "x": 448,
+ "y": 224
+ }
},
- "position": {
- "x": 864,
- "y": 224
+ {
+ "id": "d556c4f6-736a-41a9-9f64-badf2b790010",
+ "type": "basic.info",
+ "data": {
+ "info": "EXERCISE 1: Upload the circuit into your FPGA\nboard and test it!\n\nEXERCISE 2: Change the button to SW2 and test\nit again\n\n---------------------------------------------\nEjercicio 1: Carga el circuito en la FPGA y\n¡pruébalo!\n\nEJERCICIO 2: Cambia el pulsador al SW2 y\npruébalo de nuevo"
+ },
+ "position": {
+ "x": 864,
+ "y": 224
+ }
}
- }
- ],
- "wires": [
- {
- "source": {
- "block": "aac1b394-533e-4410-9f35-ba80af8abd63",
- "port": "out"
- },
- "target": {
- "block": "30a83e46-176d-40a8-ac0e-f19a131ea9d9",
- "port": "in"
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "aac1b394-533e-4410-9f35-ba80af8abd63",
+ "port": "out"
+ },
+ "target": {
+ "block": "30a83e46-176d-40a8-ac0e-f19a131ea9d9",
+ "port": "in"
+ }
}
- }
- ]
- },
- "deps": {}
+ ]
+ },
+ "deps": {},
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
+ },
+ "zoom": 1
+ }
+ }
}
\ No newline at end of file
diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice
index 50c4778b9..3a7a02bf6 100644
--- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice
+++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice
@@ -1,225 +1,289 @@
{
- "image": "",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 0.9999999999999751
+ "version": "1.0",
+ "package": {
+ "name": "",
+ "version": "",
+ "description": "",
+ "author": "",
+ "image": ""
},
- "board": "icezum",
- "graph": {
- "blocks": [
- {
- "id": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1",
- "type": "basic.input",
- "data": {
- "label": "button1",
- "pin": {
- "name": "SW1",
- "value": "10"
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1",
+ "type": "basic.input",
+ "data": {
+ "name": "button1",
+ "pins": [
+ {
+ "index": "0",
+ "name": "SW1",
+ "value": "10"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 40,
+ "y": 32
}
},
- "position": {
- "x": 40,
- "y": 32
- }
- },
- {
- "id": "5d1b4f33-ae65-4154-b4f4-ff1403437600",
- "type": "basic.input",
- "data": {
- "label": "button2",
- "pin": {
- "name": "SW2",
- "value": "11"
+ {
+ "id": "840e71b2-bf5a-4e20-8413-d386500c87fa",
+ "type": "logic.gate.and",
+ "position": {
+ "x": 256,
+ "y": 80
}
},
- "position": {
- "x": 40,
- "y": 128
- }
- },
- {
- "id": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a",
- "type": "basic.output",
- "data": {
- "label": "led",
- "pin": {
- "name": "LED7",
- "value": "104"
+ {
+ "id": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a",
+ "type": "basic.output",
+ "data": {
+ "name": "led",
+ "pins": [
+ {
+ "index": "0",
+ "name": "LED7",
+ "value": "104"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 440,
+ "y": 80
}
},
- "position": {
- "x": 440,
- "y": 80
- }
- },
- {
- "id": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1",
- "type": "logic.and",
- "data": {},
- "position": {
- "x": 264,
- "y": 80
- }
- },
- {
- "id": "cce8504a-dc1f-4deb-9ee3-5f215ac88408",
- "type": "basic.info",
- "data": {
- "info": "Basic AND gate circuit\n\nA 2-inputs AND logic gate is used to turn on\nthe LED7 only when the 2 input buttons\nare pressed\n\nThis example shows the basic behaviour of\nthe AND gate\n\nEXERCISE: Upload this circuit into the FPGA\nboard and play with it"
+ {
+ "id": "5d1b4f33-ae65-4154-b4f4-ff1403437600",
+ "type": "basic.input",
+ "data": {
+ "name": "button2",
+ "pins": [
+ {
+ "index": "0",
+ "name": "SW2",
+ "value": "11"
+ }
+ ],
+ "virtual": false
+ },
+ "position": {
+ "x": 40,
+ "y": 128
+ }
},
- "position": {
- "x": 40,
- "y": 232
- }
- },
- {
- "id": "edf3b438-4271-45f7-bb14-2a6d040880dd",
- "type": "basic.info",
- "data": {
- "info": "Circuito básico con puerta AND\n\nUna puerta lógica AND de 2 entradas se usa\npara encender un led solo cuando los dos\npulsadores de entrada están apretados\n\nEste ejemplo muestra el comportamiento básico\nde una puerta AND\n\nEJERCICIO: Carga este circuito en la FPGA y \njuega con él"
+ {
+ "id": "cce8504a-dc1f-4deb-9ee3-5f215ac88408",
+ "type": "basic.info",
+ "data": {
+ "info": "Basic AND gate circuit\n\nA 2-inputs AND logic gate is used to turn on\nthe LED7 only when the 2 input buttons\nare pressed\n\nThis example shows the basic behaviour of\nthe AND gate\n\nEXERCISE: Upload this circuit into the FPGA\nboard and play with it"
+ },
+ "position": {
+ "x": 40,
+ "y": 232
+ }
},
- "position": {
- "x": 464,
- "y": 232
+ {
+ "id": "edf3b438-4271-45f7-bb14-2a6d040880dd",
+ "type": "basic.info",
+ "data": {
+ "info": "Circuito básico con puerta AND\n\nUna puerta lógica AND de 2 entradas se usa\npara encender un led solo cuando los dos\npulsadores de entrada están apretados\n\nEste ejemplo muestra el comportamiento básico\nde una puerta AND\n\nEJERCICIO: Carga este circuito en la FPGA y \njuega con él"
+ },
+ "position": {
+ "x": 464,
+ "y": 232
+ }
}
- }
- ],
- "wires": [
- {
- "source": {
- "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1",
- "port": "664caf9e-5f40-4df4-800a-b626af702e62"
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "840e71b2-bf5a-4e20-8413-d386500c87fa",
+ "port": "664caf9e-5f40-4df4-800a-b626af702e62"
+ },
+ "target": {
+ "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a",
+ "port": "in"
+ }
},
- "target": {
- "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a",
- "port": "in"
- }
- },
- {
- "source": {
- "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1",
- "port": "out"
+ {
+ "source": {
+ "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1",
+ "port": "out"
+ },
+ "target": {
+ "block": "840e71b2-bf5a-4e20-8413-d386500c87fa",
+ "port": "18c2ebc7-5152-439c-9b3f-851c59bac834"
+ }
},
- "target": {
- "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1",
- "port": "18c2ebc7-5152-439c-9b3f-851c59bac834"
+ {
+ "source": {
+ "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600",
+ "port": "out"
+ },
+ "target": {
+ "block": "840e71b2-bf5a-4e20-8413-d386500c87fa",
+ "port": "97b51945-d716-4b6c-9db9-970d08541249"
+ }
}
- },
- {
- "source": {
- "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600",
- "port": "out"
+ ]
+ },
+ "deps": {
+ "logic.gate.and": {
+ "version": "1.0",
+ "package": {
+ "name": "AND",
+ "version": "1.0.0",
+ "description": "AND logic gate",
+ "author": "Jesús Arroyo",
+ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E"
},
- "target": {
- "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1",
- "port": "97b51945-d716-4b6c-9db9-970d08541249"
- }
- }
- ]
- },
- "deps": {
- "logic.and": {
- "graph": {
- "blocks": [
- {
- "id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
- "type": "basic.input",
- "data": {
- "label": ""
- },
- "position": {
- "x": 64,
- "y": 80
- }
- },
- {
- "id": "97b51945-d716-4b6c-9db9-970d08541249",
- "type": "basic.input",
- "data": {
- "label": ""
- },
- "position": {
- "x": 64,
- "y": 208
- }
- },
- {
- "id": "664caf9e-5f40-4df4-800a-b626af702e62",
- "type": "basic.output",
- "data": {
- "label": ""
- },
- "position": {
- "x": 752,
- "y": 144
- }
- },
- {
- "id": "00925b04-5004-4307-a737-fa4e97c8b6ab",
- "type": "basic.code",
- "data": {
- "code": "// AND logic gate\n\nassign c = a & b;",
- "ports": {
- "in": [
- "a",
- "b"
- ],
- "out": [
- "c"
- ]
+ "design": {
+ "board": "icezum",
+ "graph": {
+ "blocks": [
+ {
+ "id": "00925b04-5004-4307-a737-fa4e97c8b6ab",
+ "type": "basic.code",
+ "data": {
+ "code": "// AND logic gate\n\nassign c = a & b;",
+ "params": [],
+ "ports": {
+ "in": [
+ {
+ "name": "a",
+ "size": 1
+ },
+ {
+ "name": "b",
+ "size": 1
+ }
+ ],
+ "out": [
+ {
+ "name": "c",
+ "size": 1
+ }
+ ]
+ }
+ },
+ "position": {
+ "x": 256,
+ "y": 48
+ }
+ },
+ {
+ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834",
+ "type": "basic.input",
+ "data": {
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
+ },
+ "position": {
+ "x": 64,
+ "y": 80
+ }
+ },
+ {
+ "id": "664caf9e-5f40-4df4-800a-b626af702e62",
+ "type": "basic.output",
+ "data": {
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
+ },
+ "position": {
+ "x": 752,
+ "y": 144
+ }
+ },
+ {
+ "id": "97b51945-d716-4b6c-9db9-970d08541249",
+ "type": "basic.input",
+ "data": {
+ "name": "",
+ "pins": [
+ {
+ "index": "0",
+ "name": "",
+ "value": "0"
+ }
+ ],
+ "virtual": true
+ },
+ "position": {
+ "x": 64,
+ "y": 208
+ }
}
- },
- "position": {
- "x": 256,
- "y": 48
- }
- }
- ],
- "wires": [
- {
- "source": {
- "block": "18c2ebc7-5152-439c-9b3f-851c59bac834",
- "port": "out"
- },
- "target": {
- "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
- "port": "a"
- }
- },
- {
- "source": {
- "block": "97b51945-d716-4b6c-9db9-970d08541249",
- "port": "out"
- },
- "target": {
- "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
- "port": "b"
- }
+ ],
+ "wires": [
+ {
+ "source": {
+ "block": "18c2ebc7-5152-439c-9b3f-851c59bac834",
+ "port": "out"
+ },
+ "target": {
+ "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
+ "port": "a"
+ }
+ },
+ {
+ "source": {
+ "block": "97b51945-d716-4b6c-9db9-970d08541249",
+ "port": "out"
+ },
+ "target": {
+ "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
+ "port": "b"
+ }
+ },
+ {
+ "source": {
+ "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
+ "port": "c"
+ },
+ "target": {
+ "block": "664caf9e-5f40-4df4-800a-b626af702e62",
+ "port": "in"
+ }
+ }
+ ]
},
- {
- "source": {
- "block": "00925b04-5004-4307-a737-fa4e97c8b6ab",
- "port": "c"
+ "deps": {},
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
},
- "target": {
- "block": "664caf9e-5f40-4df4-800a-b626af702e62",
- "port": "in"
- }
+ "zoom": 1
}
- ]
- },
- "deps": {},
- "image": "resources/images/and.svg",
- "state": {
- "pan": {
- "x": 0,
- "y": 0
- },
- "zoom": 1
+ }
}
+ },
+ "state": {
+ "pan": {
+ "x": 0,
+ "y": 0
+ },
+ "zoom": 1
}
}
}
\ No newline at end of file
diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js
index 23de657d1..5b8e59c6c 100644
--- a/app/scripts/controllers/menu.js
+++ b/app/scripts/controllers/menu.js
@@ -76,6 +76,9 @@ angular.module('icestudio')
if (name) {
project.new(name);
}
+ else {
+ evt.cancel = true;
+ }
});
};
diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js
index f7699e8f9..094479257 100644
--- a/app/scripts/plugins/shapes/joint.shapes.js
+++ b/app/scripts/plugins/shapes/joint.shapes.js
@@ -18,7 +18,7 @@ joint.shapes.ice = {};
joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({
markup: '