projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned andor414
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
andor414.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
index
6a1554e
..
23ac113
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
@@
-2,6
+2,15
@@
"width": 35.0,
"height": 90.0,
"interfacePins": [
"width": 35.0,
"height": 90.0,
"interfacePins": [
+ {
+ "location": {
+ "x": 0.0,
+ "y": 65.0
+ },
+ "name": "A",
+ "logicWidth": 4,
+ "usage": "INPUT"
+ },
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
@@
-22,7
+31,7
@@
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
+ "x":
-6
.0,
"y": 65.0
},
"name": "A3",
"y": 65.0
},
"name": "A3",
@@
-47,96
+56,78
@@
"logicWidth": 1,
"usage": "INPUT"
},
"logicWidth": 1,
"usage": "INPUT"
},
- {
- "location": {
- "x": 0.0,
- "y": 5.0
- },
- "name": "C1",
- "logicWidth": 1,
- "usage": "INPUT"
- },
- {
- "location": {
- "x": 0.0,
- "y": 15.0
- },
- "name": "C2",
- "logicWidth": 1,
- "usage": "INPUT"
- },
{
"location": {
"x": 0.0,
"y": 25.0
},
{
"location": {
"x": 0.0,
"y": 25.0
},
- "name": "C
3
",
- "logicWidth":
1
,
+ "name": "C",
+ "logicWidth":
4
,
"usage": "INPUT"
},
"usage": "INPUT"
},
- {
- "location": {
- "x": 0.0,
- "y": 35.0
- },
- "name": "C4",
- "logicWidth": 1,
- "usage": "INPUT"
- },
- {
- "location": {
- "x": 35.0,
- "y": 5.0
- },
- "name": "Y1",
- "logicWidth": 1,
- "usage": "OUTPUT"
- },
- {
- "location": {
- "x": 35.0,
- "y": 15.0
- },
- "name": "Y2",
- "logicWidth": 1,
- "usage": "OUTPUT"
- },
{
"location": {
"x": 35.0,
"y": 25.0
},
{
"location": {
"x": 35.0,
"y": 25.0
},
- "name": "Y3",
- "logicWidth": 1,
- "usage": "OUTPUT"
- },
- {
- "location": {
- "x": 35.0,
- "y": 35.0
- },
- "name": "Y4",
- "logicWidth": 1,
+ "name": "Y",
+ "logicWidth": 4,
"usage": "OUTPUT"
}
],
"innerScale": 0.4,
"submodel": {
"components": [
"usage": "OUTPUT"
}
],
"innerScale": 0.4,
"submodel": {
"components": [
+ {
+ "id": "Splitter",
+ "name": "Splitter#0",
+ "pos": {
+ "x": 17.5,
+ "y": 87.5
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#1",
+ "pos": {
+ "x": 72.5,
+ "y": 47.5
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#2",
+ "pos": {
+ "x": 17.5,
+ "y": 47.5
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
+ },
{
"id": "and41",
"name": "and41#0",
"pos": {
{
"id": "and41",
"name": "and41#0",
"pos": {
- "x":
1
5.0,
- "y": 14
2
.5
+ "x":
3
5.0,
+ "y": 14
7
.5
}
},
{
"id": "or_4",
"name": "or_4#0",
"pos": {
}
},
{
"id": "or_4",
"name": "or_4#0",
"pos": {
- "x": 3
5.0
,
- "y":
37
.5
+ "x": 3
2.5
,
+ "y":
42
.5
}
}
],
}
}
],
@@
-144,86
+135,50
@@
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
1
"
+ "pinName": "A"
},
"pin2": {
"compName": "and41#0",
},
"pin2": {
"compName": "and41#0",
- "pinName": "A
1
"
+ "pinName": "A"
},
"name": "unnamedWire#0",
},
"name": "unnamedWire#0",
- "path": [
- {
- "x": 10.0,
- "y": 112.5
- },
- {
- "x": 10.0,
- "y": 147.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A2
"
+ "compName": "
Splitter#1
",
+ "pinName": "
I
"
},
"pin2": {
},
"pin2": {
- "compName": "
and41#0
",
- "pinName": "
A2
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
"
},
"name": "unnamedWire#1",
},
"name": "unnamedWire#1",
- "path": [
- {
- "x": 5.0,
- "y": 137.5
- },
- {
- "x": 5.0,
- "y": 157.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A3
"
+ "compName": "
or_4#0
",
+ "pinName": "
Y1
"
},
"pin2": {
},
"pin2": {
- "compName": "
and41#0
",
- "pinName": "
A3
"
+ "compName": "
Splitter#1
",
+ "pinName": "
O0
"
},
"name": "unnamedWire#2",
},
"name": "unnamedWire#2",
- "path": [
- {
- "x": 10.0,
- "y": 162.5
- },
- {
- "x": 10.0,
- "y": 167.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A4
"
+ "compName": "
or_4#0
",
+ "pinName": "
Y2
"
},
"pin2": {
},
"pin2": {
- "compName": "
and41#0
",
- "pinName": "
A4
"
+ "compName": "
Splitter#1
",
+ "pinName": "
O1
"
},
"name": "unnamedWire#3",
},
"name": "unnamedWire#3",
- "path": [
- {
- "x": 5.0,
- "y": 187.5
- },
- {
- "x": 5.0,
- "y": 177.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-237,61
+192,43
@@
"name": "unnamedWire#4",
"path": [
{
"name": "unnamedWire#4",
"path": [
{
- "x":
1
0.0,
+ "x":
3
0.0,
"y": 212.5
},
{
"y": 212.5
},
{
- "x":
1
0.0,
- "y": 1
8
7.5
+ "x":
3
0.0,
+ "y": 1
7
7.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "C
1
"
+ "pinName": "C"
},
"pin2": {
},
"pin2": {
- "compName": "
or_4#0
",
- "pinName": "
A1
"
+ "compName": "
Splitter#2
",
+ "pinName": "
I
"
},
"name": "unnamedWire#5",
},
"name": "unnamedWire#5",
- "path": [
- {
- "x": 10.0,
- "y": 12.5
- },
- {
- "x": 10.0,
- "y": 42.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C2
"
+ "compName": "
Splitter#2
",
+ "pinName": "
O3
"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
- "pinName": "A
2
"
+ "pinName": "A
4
"
},
"name": "unnamedWire#6",
},
"name": "unnamedWire#6",
- "path": [
- {
- "x": 5.0,
- "y": 37.5
- },
- {
- "x": 5.0,
- "y": 52.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C3
"
+ "compName": "
Splitter#2
",
+ "pinName": "
O2
"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
@@
-302,215
+239,128
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C4
"
+ "compName": "
Splitter#2
",
+ "pinName": "
O1
"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
- "pinName": "A
4
"
+ "pinName": "A
2
"
},
"name": "unnamedWire#8",
},
"name": "unnamedWire#8",
- "path": [
- {
- "x": 5.0,
- "y": 87.5
- },
- {
- "x": 5.0,
- "y": 72.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
and41
#0",
- "pinName": "
Y1
"
+ "compName": "
Splitter
#0",
+ "pinName": "
O3
"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
- "pinName": "B
1
"
+ "pinName": "B
4
"
},
"name": "unnamedWire#9",
},
"name": "unnamedWire#9",
- "path": [
- {
- "x": 50.0,
- "y": 147.5
- },
- {
- "x": 50.0,
- "y": 122.5
- },
- {
- "x": 30.0,
- "y": 122.5
- },
- {
- "x": 30.0,
- "y": 82.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
and41
#0",
- "pinName": "
Y
2"
+ "compName": "
Splitter
#0",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
- "pinName": "B
2
"
+ "pinName": "B
3
"
},
"name": "unnamedWire#10",
},
"name": "unnamedWire#10",
- "path": [
- {
- "x": 45.0,
- "y": 157.5
- },
- {
- "x": 45.0,
- "y": 127.5
- },
- {
- "x": 25.0,
- "y": 127.5
- },
- {
- "x": 25.0,
- "y": 92.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
and41
#0",
- "pinName": "
Y3
"
+ "compName": "
or_4
#0",
+ "pinName": "
B2
"
},
"pin2": {
},
"pin2": {
- "compName": "
or_4
#0",
- "pinName": "
B3
"
+ "compName": "
Splitter
#0",
+ "pinName": "
O1
"
},
"name": "unnamedWire#11",
},
"name": "unnamedWire#11",
- "path": [
- {
- "x": 40.0,
- "y": 167.5
- },
- {
- "x": 40.0,
- "y": 132.5
- },
- {
- "x": 20.0,
- "y": 132.5
- },
- {
- "x": 20.0,
- "y": 102.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
and41
#0",
- "pinName": "
Y4
"
+ "compName": "
Splitter
#0",
+ "pinName": "
O0
"
},
"pin2": {
"compName": "or_4#0",
},
"pin2": {
"compName": "or_4#0",
- "pinName": "B
4
"
+ "pinName": "B
1
"
},
"name": "unnamedWire#12",
},
"name": "unnamedWire#12",
- "path": [
- {
- "x": 35.0,
- "y": 177.5
- },
- {
- "x": 35.0,
- "y": 137.5
- },
- {
- "x": 15.0,
- "y": 137.5
- },
- {
- "x": 15.0,
- "y": 112.5
- }
- ]
+ "path": []
},
{
"pin1": {
"compName": "or_4#0",
},
{
"pin1": {
"compName": "or_4#0",
- "pinName": "Y
1
"
+ "pinName": "Y
3
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y1
"
+ "compName": "
Splitter#1
",
+ "pinName": "
O2
"
},
"name": "unnamedWire#13",
},
"name": "unnamedWire#13",
- "path": [
- {
- "x": 75.0,
- "y": 42.5
- },
- {
- "x": 75.0,
- "y": 12.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
or_4#0
",
- "pinName": "
Y2
"
+ "compName": "
Splitter#1
",
+ "pinName": "
O3
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "Y
2
"
+ "compName": "
or_4#0
",
+ "pinName": "Y
4
"
},
"name": "unnamedWire#14",
},
"name": "unnamedWire#14",
- "path": [
- {
- "x": 80.0,
- "y": 52.5
- },
- {
- "x": 80.0,
- "y": 37.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
or_4
#0",
- "pinName": "
Y3
"
+ "compName": "
Splitter
#0",
+ "pinName": "
I
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "Y
3
"
+ "compName": "
and41#0
",
+ "pinName": "Y"
},
"name": "unnamedWire#15",
},
"name": "unnamedWire#15",
- "path": []
+ "path": [
+ {
+ "x": 12.5,
+ "y": 102.5
+ },
+ {
+ "x": 12.5,
+ "y": 127.5
+ },
+ {
+ "x": 75.0,
+ "y": 127.5
+ },
+ {
+ "x": 75.0,
+ "y": 162.5
+ }
+ ]
},
{
"pin1": {
"compName": "or_4#0",
},
{
"pin1": {
"compName": "or_4#0",
- "pinName": "
Y4
"
+ "pinName": "
A1
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y4
"
+ "compName": "
Splitter#2
",
+ "pinName": "
O0
"
},
"name": "unnamedWire#16",
},
"name": "unnamedWire#16",
- "path": [
- {
- "x": 80.0,
- "y": 72.5
- },
- {
- "x": 80.0,
- "y": 87.5
- }
- ]
+ "path": []
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"