projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned sel2_4 and sel3_4
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
halfadder.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
index
f3970fc
..
2888e90
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
@@
-1,11
+1,11
@@
{
{
- "width": 3
5
.0,
- "height":
2
0.0,
+ "width": 3
0
.0,
+ "height":
3
0.0,
"interfacePins": [
{
"location": {
"x": 0.0,
"interfacePins": [
{
"location": {
"x": 0.0,
- "y": 5.0
+ "y":
1
5.0
},
"name": "A",
"logicWidth": 1,
},
"name": "A",
"logicWidth": 1,
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
5.0
+ "y":
2
5.0
},
"name": "B",
"logicWidth": 1,
},
"name": "B",
"logicWidth": 1,
@@
-22,7
+22,7
@@
},
{
"location": {
},
{
"location": {
- "x": 3
5
.0,
+ "x": 3
0
.0,
"y": 5.0
},
"name": "Y",
"y": 5.0
},
"name": "Y",
@@
-31,50
+31,23
@@
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
- "y":
1
5.0
+ "x":
0
.0,
+ "y": 5.0
},
},
- "name": "
_
Z",
+ "name": "Z",
"logicWidth": 1,
"usage": "OUTPUT"
}
],
"logicWidth": 1,
"usage": "OUTPUT"
}
],
- "innerScale": 0.
4
,
+ "innerScale": 0.
5
,
"submodel": {
"components": [
{
"id": "NandGate",
"name": "NandGate#0",
"pos": {
"submodel": {
"components": [
{
"id": "NandGate",
"name": "NandGate#0",
"pos": {
- "x": 10.0,
- "y": 15.0
- },
- "params": 1
- },
- {
- "id": "NandGate",
- "name": "NandGate#1",
- "pos": {
- "x": 40.0,
- "y": 2.5
- },
- "params": 1
- },
- {
- "id": "NandGate",
- "name": "NandGate#2",
- "pos": {
- "x": 40.0,
- "y": 27.5
- },
- "params": 1
- },
- {
- "id": "NandGate",
- "name": "NandGate#3",
- "pos": {
- "x": 65.0,
- "y": 2.5
+ "x": 25.0,
+ "y": 7.5
},
"params": 1
},
},
"params": 1
},
@@
-82,42
+55,45
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x": 4.0,
- "y": 11.5
- },
- "params": 1
- },
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
- "pos": {
- "x": 4.0,
- "y": 36.5
+ "x": 19.0,
+ "y": 21.5
},
"params": 1
},
{
},
"params": 1
},
{
- "id": "
WireCrossPoint
",
- "name": "
WireCrossPoint#2
",
+ "id": "
halfadder_invz
",
+ "name": "
halfadder_invz#0
",
"pos": {
"pos": {
- "x": 34.0,
- "y": 24.0
- },
- "params": 1
+ "x": 10.0,
+ "y": 35.0
+ }
}
],
"wires": [
{
"pin1": {
}
],
"wires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A
"
+ "compName": "
halfadder_invz#0
",
+ "pinName": "
_Z
"
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#0",
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#0",
- "path": []
+ "path": [
+ {
+ "x": 50.0,
+ "y": 50.0
+ },
+ {
+ "x": 50.0,
+ "y": 30.0
+ },
+ {
+ "x": 20.0,
+ "y": 30.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-125,14
+101,14
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "NandGate#
1
",
+ "compName": "NandGate#
0
",
"pinName": "A"
},
"name": "unnamedWire#1",
"path": [
{
"pinName": "A"
},
"name": "unnamedWire#1",
"path": [
{
- "x":
5
.0,
- "y":
7
.5
+ "x":
20
.0,
+ "y":
12
.5
}
]
},
}
]
},
@@
-143,182
+119,93
@@
},
"pin2": {
"compName": "NandGate#0",
},
"pin2": {
"compName": "NandGate#0",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#2",
},
"name": "unnamedWire#2",
- "path": [
- {
- "x": 5.0,
- "y": 20.0
- }
- ]
+ "path": []
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
halfadder_invz#0
",
+ "pinName": "
A
"
},
"name": "unnamedWire#3",
},
"name": "unnamedWire#3",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "pin2": {
- "compName": "NandGate#2",
- "pinName": "B"
- },
- "name": "unnamedWire#4",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y": 42.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "pin2": {
- "compName": "NandGate#0",
- "pinName": "B"
- },
- "name": "unnamedWire#5",
- "path": [
+ "y": 30.0
+ },
{
"x": 5.0,
{
"x": 5.0,
- "y":
3
0.0
+ "y":
4
0.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
NandGate#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
B
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
halfadder_invz#0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
6
",
+ "name": "unnamedWire#
4
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
NandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "_Z"
- },
- "name": "unnamedWire#7",
- "path": [
- {
- "x": 80.0,
- "y": 25.0
- },
- {
- "x": 80.0,
- "y": 37.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "NandGate#1",
- "pinName": "B"
+ "pinName": "Z"
},
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
5
",
"path": [
{
"path": [
{
- "x":
35
.0,
+ "x":
50
.0,
"y": 17.5
"y": 17.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "NandGate#2",
- "pinName": "A"
- },
- "name": "unnamedWire#9",
- "path": [
+ },
{
{
- "x": 35.0,
- "y": 32.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "NandGate#1",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "NandGate#3",
- "pinName": "A"
- },
- "name": "unnamedWire#10",
- "path": [
+ "x": 50.0,
+ "y": 5.0
+ },
{
{
- "x":
62.5
,
- "y":
12.5
+ "x":
5.0
,
+ "y":
5.0
},
{
},
{
- "x":
62.5
,
- "y":
7.5
+ "x":
5.0
,
+ "y":
10.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
NandGate#2
",
+ "compName": "
halfadder_invz#0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
NandGate#3
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
"
},
},
- "name": "unnamedWire#
11
",
+ "name": "unnamedWire#
6
",
"path": [
{
"path": [
{
- "x":
62.5
,
- "y":
37.5
+ "x":
55.0
,
+ "y":
40.0
},
{
},
{
- "x":
62.5
,
- "y": 1
7.5
+ "x":
55.0
,
+ "y": 1
0.0
}
]
}
]
- },
- {
- "pin1": {
- "compName": "NandGate#3",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y"
- },
- "name": "unnamedWire#12",
- "path": []
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"
@@
-327,7
+214,7
@@
"symbolRendererParams": {
"centerText": "halfadder",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "halfadder",
"centerTextHeight": 5.0,
- "horizontalComponentCenter": 1
7.5
,
+ "horizontalComponentCenter": 1
5.0
,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},