projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e63313f
)
Changed incrementer layout to have the MSB on top
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 13 Apr 2020 10:43:41 +0000
(12:43 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 13 Apr 2020 10:43:41 +0000
(12:43 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
patch
|
blob
|
history
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index
ceb1351
..
b1c3127
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@
-3621,7
+3621,7
@@
"path": [
{
"x": 330.0,
"path": [
{
"x": 330.0,
- "y": 1
20
.0
+ "y": 1
45
.0
},
{
"x": 330.0,
},
{
"x": 330.0,
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index
6e08f81
..
59b48ac
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@
-298,7
+298,7
@@
"name": "inc12#0",
"pos": {
"x": 255.0,
"name": "inc12#0",
"pos": {
"x": 255.0,
- "y": 1
65
.0
+ "y": 1
70
.0
}
},
{
}
},
{
@@
-981,15
+981,15
@@
"path": [
{
"x": 250.0,
"path": [
{
"x": 250.0,
- "y": 1
7
0.0
+ "y": 1
9
0.0
},
{
"x": 250.0,
},
{
"x": 250.0,
- "y":
16
0.0
+ "y":
20
0.0
},
{
"x": 290.0,
},
{
"x": 290.0,
- "y":
16
0.0
+ "y":
20
0.0
},
{
"x": 290.0,
},
{
"x": 290.0,
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
63eb1ca
..
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
@@
-5,7
+5,7
@@
{
"location": {
"x": 0.0,
{
"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,
@@
-32,7
+32,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y": 5.0
},
"name": "Z",
"logicWidth": 1,
},
"name": "Z",
"logicWidth": 1,
@@
-47,7
+47,7
@@
"name": "NandGate#0",
"pos": {
"x": 25.0,
"name": "NandGate#0",
"pos": {
"x": 25.0,
- "y":
32
.5
+ "y":
7
.5
},
"params": 1
},
},
"params": 1
},
@@
-56,7
+56,7
@@
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
- "y":
36
.5
+ "y":
21
.5
},
"params": 1
},
},
"params": 1
},
@@
-65,7
+65,7
@@
"name": "halfadder_invz#0",
"pos": {
"x": 10.0,
"name": "halfadder_invz#0",
"pos": {
"x": 10.0,
- "y": 5.0
+ "y":
3
5.0
}
}
],
}
}
],
@@
-83,15
+83,15
@@
"path": [
{
"x": 50.0,
"path": [
{
"x": 50.0,
- "y":
2
0.0
+ "y":
5
0.0
},
{
"x": 50.0,
},
{
"x": 50.0,
- "y":
27.5
+ "y":
30.0
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
27.5
+ "y":
30.0
}
]
},
}
]
},
@@
-105,7
+105,12
@@
"pinName": "A"
},
"name": "unnamedWire#1",
"pinName": "A"
},
"name": "unnamedWire#1",
- "path": []
+ "path": [
+ {
+ "x": 20.0,
+ "y": 12.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-117,12
+122,7
@@
"pinName": "B"
},
"name": "unnamedWire#2",
"pinName": "B"
},
"name": "unnamedWire#2",
- "path": [
- {
- "x": 20.0,
- "y": 47.5
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-134,7
+134,16
@@
"pinName": "A"
},
"name": "unnamedWire#3",
"pinName": "A"
},
"name": "unnamedWire#3",
- "path": []
+ "path": [
+ {
+ "x": 5.0,
+ "y": 30.0
+ },
+ {
+ "x": 5.0,
+ "y": 40.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-146,16
+155,7
@@
"pinName": "B"
},
"name": "unnamedWire#4",
"pinName": "B"
},
"name": "unnamedWire#4",
- "path": [
- {
- "x": 5.0,
- "y": 30.0
- },
- {
- "x": 5.0,
- "y": 20.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-170,19
+170,19
@@
"path": [
{
"x": 50.0,
"path": [
{
"x": 50.0,
- "y":
42
.5
+ "y":
17
.5
},
{
"x": 50.0,
},
{
"x": 50.0,
- "y": 5
5
.0
+ "y": 5.0
},
{
},
{
- "x":
1
5.0,
- "y": 5
5
.0
+ "x": 5.0,
+ "y": 5.0
},
{
},
{
- "x":
1
5.0,
- "y":
5
0.0
+ "x": 5.0,
+ "y":
1
0.0
}
]
},
}
]
},
@@
-196,7
+196,16
@@
"pinName": "Y"
},
"name": "unnamedWire#6",
"pinName": "Y"
},
"name": "unnamedWire#6",
- "path": []
+ "path": [
+ {
+ "x": 55.0,
+ "y": 40.0
+ },
+ {
+ "x": 55.0,
+ "y": 10.0
+ }
+ ]
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
index
bcb0ff4
..
079dff7
100755
(executable)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc12.json
@@
-5,7
+5,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y": 1
5
.0
+ "y": 1
0
.0
},
"name": "A",
"logicWidth": 12,
},
"name": "A",
"logicWidth": 12,
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
5
.0
+ "y":
20
.0
},
"name": "CI",
"logicWidth": 1,
},
"name": "CI",
"logicWidth": 1,
@@
-23,7
+23,7
@@
{
"location": {
"x": 20.0,
{
"location": {
"x": 20.0,
- "y": 1
5
.0
+ "y": 1
0
.0
},
"name": "Y",
"logicWidth": 12,
},
"name": "Y",
"logicWidth": 12,
@@
-38,11
+38,11
@@
"name": "Splitter#0",
"pos": {
"x": 7.5,
"name": "Splitter#0",
"pos": {
"x": 7.5,
- "y":
10
.0
+ "y":
5
.0
},
"params": {
"logicWidth": 12,
},
"params": {
"logicWidth": 12,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-50,11
+50,11
@@
"name": "Splitter#1",
"pos": {
"x": 82.5,
"name": "Splitter#1",
"pos": {
"x": 82.5,
- "y":
10
.0
+ "y":
5
.0
},
"params": {
"logicWidth": 12,
},
"params": {
"logicWidth": 12,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-62,11
+62,11
@@
"name": "Splitter#2",
"pos": {
"x": 22.5,
"name": "Splitter#2",
"pos": {
"x": 22.5,
- "y":
10
.0
+ "y":
85
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-74,11
+74,11
@@
"name": "Splitter#3",
"pos": {
"x": 22.5,
"name": "Splitter#3",
"pos": {
"x": 22.5,
- "y":
50
.0
+ "y":
45
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-86,11
+86,11
@@
"name": "Splitter#4",
"pos": {
"x": 22.5,
"name": "Splitter#4",
"pos": {
"x": 22.5,
- "y":
90
.0
+ "y":
5
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-98,11
+98,11
@@
"name": "Splitter#5",
"pos": {
"x": 67.5,
"name": "Splitter#5",
"pos": {
"x": 67.5,
- "y":
10
.0
+ "y":
85
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-110,11
+110,11
@@
"name": "Splitter#6",
"pos": {
"x": 67.5,
"name": "Splitter#6",
"pos": {
"x": 67.5,
- "y":
50
.0
+ "y":
45
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-122,11
+122,11
@@
"name": "Splitter#7",
"pos": {
"x": 67.5,
"name": "Splitter#7",
"pos": {
"x": 67.5,
- "y":
90
.0
+ "y":
5
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-134,7
+134,7
@@
"name": "inc4#0",
"pos": {
"x": 42.5,
"name": "inc4#0",
"pos": {
"x": 42.5,
- "y":
10
.0
+ "y":
85
.0
}
},
{
}
},
{
@@
-142,7
+142,7
@@
"name": "inc4#1",
"pos": {
"x": 42.5,
"name": "inc4#1",
"pos": {
"x": 42.5,
- "y":
50
.0
+ "y":
45
.0
}
},
{
}
},
{
@@
-150,7
+150,7
@@
"name": "inc4#2",
"pos": {
"x": 42.5,
"name": "inc4#2",
"pos": {
"x": 42.5,
- "y":
90
.0
+ "y":
5
.0
}
}
],
}
}
],
@@
-168,19
+168,19
@@
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
25
.0
+ "y":
100
.0
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y":
5
.0
+ "y":
120
.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
5
.0
+ "y":
120
.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y": 1
5
.0
+ "y": 1
10
.0
}
]
},
}
]
},
@@
-269,11
+269,11
@@
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
75
.0
+ "y":
50
.0
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y": 6
5
.0
+ "y": 6
0
.0
}
]
},
}
]
},
@@
-434,11
+434,11
@@
"path": [
{
"x": 37.5,
"path": [
{
"x": 37.5,
- "y":
35
.0
+ "y":
90
.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
55
.0
+ "y":
70
.0
}
]
},
}
]
},
@@
-455,11
+455,11
@@
"path": [
{
"x": 37.5,
"path": [
{
"x": 37.5,
- "y":
75
.0
+ "y":
50
.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
95
.0
+ "y":
30
.0
}
]
},
}
]
},
@@
-500,11
+500,11
@@
"path": [
{
"x": 95.0,
"path": [
{
"x": 95.0,
- "y": 6
5
.0
+ "y": 6
0
.0
},
{
"x": 95.0,
},
{
"x": 95.0,
- "y":
75
.0
+ "y":
50
.0
}
]
},
}
]
},
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
index
07609bb
..
eee630a
100755
(executable)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc16.json
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
5
.0
+ "y":
30
.0
},
"name": "CI",
"logicWidth": 1,
},
"name": "CI",
"logicWidth": 1,
@@
-42,7
+42,7
@@
},
"params": {
"logicWidth": 16,
},
"params": {
"logicWidth": 16,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-54,7
+54,7
@@
},
"params": {
"logicWidth": 16,
},
"params": {
"logicWidth": 16,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-62,11
+62,11
@@
"name": "Splitter#2",
"pos": {
"x": 22.5,
"name": "Splitter#2",
"pos": {
"x": 22.5,
- "y": 10.0
+ "y": 1
3
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-74,11
+74,11
@@
"name": "Splitter#3",
"pos": {
"x": 22.5,
"name": "Splitter#3",
"pos": {
"x": 22.5,
- "y":
5
0.0
+ "y":
9
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-86,11
+86,11
@@
"name": "Splitter#4",
"pos": {
"x": 22.5,
"name": "Splitter#4",
"pos": {
"x": 22.5,
- "y":
9
0.0
+ "y":
5
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-98,11
+98,11
@@
"name": "Splitter#5",
"pos": {
"x": 22.5,
"name": "Splitter#5",
"pos": {
"x": 22.5,
- "y": 1
3
0.0
+ "y": 10.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-110,11
+110,11
@@
"name": "Splitter#6",
"pos": {
"x": 67.5,
"name": "Splitter#6",
"pos": {
"x": 67.5,
- "y": 10.0
+ "y": 1
3
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-122,11
+122,11
@@
"name": "Splitter#7",
"pos": {
"x": 67.5,
"name": "Splitter#7",
"pos": {
"x": 67.5,
- "y":
5
0.0
+ "y":
9
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-134,11
+134,11
@@
"name": "Splitter#8",
"pos": {
"x": 67.5,
"name": "Splitter#8",
"pos": {
"x": 67.5,
- "y":
9
0.0
+ "y":
5
0.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-146,11
+146,11
@@
"name": "Splitter#9",
"pos": {
"x": 67.5,
"name": "Splitter#9",
"pos": {
"x": 67.5,
- "y": 1
3
0.0
+ "y": 10.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-158,7
+158,7
@@
"name": "inc4#0",
"pos": {
"x": 42.5,
"name": "inc4#0",
"pos": {
"x": 42.5,
- "y": 10.0
+ "y": 1
3
0.0
}
},
{
}
},
{
@@
-166,7
+166,7
@@
"name": "inc4#1",
"pos": {
"x": 42.5,
"name": "inc4#1",
"pos": {
"x": 42.5,
- "y":
5
0.0
+ "y":
9
0.0
}
},
{
}
},
{
@@
-174,7
+174,7
@@
"name": "inc4#2",
"pos": {
"x": 42.5,
"name": "inc4#2",
"pos": {
"x": 42.5,
- "y":
9
0.0
+ "y":
5
0.0
}
},
{
}
},
{
@@
-182,7
+182,7
@@
"name": "inc4#3",
"pos": {
"x": 42.5,
"name": "inc4#3",
"pos": {
"x": 42.5,
- "y": 1
3
0.0
+ "y": 10.0
}
}
],
}
}
],
@@
-200,19
+200,19
@@
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
25
.0
+ "y":
150
.0
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y": 5.0
+ "y":
16
5.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y": 5.0
+ "y":
16
5.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y": 15.0
+ "y": 15
5
.0
}
]
},
}
]
},
@@
-538,11
+538,11
@@
"path": [
{
"x": 37.5,
"path": [
{
"x": 37.5,
- "y": 35.0
+ "y":
1
35.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
5
5.0
+ "y":
11
5.0
}
]
},
}
]
},
@@
-559,11
+559,11
@@
"path": [
{
"x": 37.5,
"path": [
{
"x": 37.5,
- "y":
7
5.0
+ "y":
9
5.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
9
5.0
+ "y":
7
5.0
}
]
},
}
]
},
@@
-580,11
+580,11
@@
"path": [
{
"x": 37.5,
"path": [
{
"x": 37.5,
- "y":
11
5.0
+ "y":
5
5.0
},
{
"x": 37.5,
},
{
"x": 37.5,
- "y":
1
35.0
+ "y": 35.0
}
]
},
}
]
},
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
index
9e1126b
..
a6c8106
100755
(executable)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y": 5.0
+ "y":
2
5.0
},
"name": "CI",
"logicWidth": 1,
},
"name": "CI",
"logicWidth": 1,
@@
-32,7
+32,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y": 5.0
},
"name": "Z",
"logicWidth": 1,
},
"name": "Z",
"logicWidth": 1,
@@
-51,7
+51,7
@@
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-63,7
+63,7
@@
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-71,7
+71,7
@@
"name": "halfadder#0",
"pos": {
"x": 40.0,
"name": "halfadder#0",
"pos": {
"x": 40.0,
- "y":
5
.0
+ "y":
110
.0
}
},
{
}
},
{
@@
-79,7
+79,7
@@
"name": "halfadder#1",
"pos": {
"x": 40.0,
"name": "halfadder#1",
"pos": {
"x": 40.0,
- "y":
40
.0
+ "y":
75
.0
}
},
{
}
},
{
@@
-87,7
+87,7
@@
"name": "halfadder#2",
"pos": {
"x": 40.0,
"name": "halfadder#2",
"pos": {
"x": 40.0,
- "y":
75
.0
+ "y":
40
.0
}
},
{
}
},
{
@@
-95,7
+95,7
@@
"name": "halfadder#3",
"pos": {
"x": 40.0,
"name": "halfadder#3",
"pos": {
"x": 40.0,
- "y":
110
.0
+ "y":
5
.0
}
}
],
}
}
],
@@
-107,17
+107,17
@@
},
"pin2": {
"compName": "halfadder#1",
},
"pin2": {
"compName": "halfadder#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#0",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#0",
"path": [
{
"x": 35.0,
- "y":
30
.0
+ "y":
115
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
45
.0
+ "y":
100
.0
}
]
},
}
]
},
@@
-128,17
+128,17
@@
},
"pin2": {
"compName": "halfadder#2",
},
"pin2": {
"compName": "halfadder#2",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#1",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#1",
"path": [
{
"x": 35.0,
- "y":
65
.0
+ "y":
80
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
80
.0
+ "y":
65
.0
}
]
},
}
]
},
@@
-149,17
+149,17
@@
},
"pin2": {
"compName": "halfadder#3",
},
"pin2": {
"compName": "halfadder#3",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#2",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#2",
"path": [
{
"x": 35.0,
- "y":
100
.0
+ "y":
45
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
115
.0
+ "y":
30
.0
}
]
},
}
]
},
@@
-170,17
+170,17
@@
},
"pin2": {
"compName": "halfadder#0",
},
"pin2": {
"compName": "halfadder#0",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#3",
"path": [
{
"x": 20.0,
},
"name": "unnamedWire#3",
"path": [
{
"x": 20.0,
- "y":
6
0.0
+ "y":
9
0.0
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
20
.0
+ "y":
125
.0
}
]
},
}
]
},
@@
-191,17
+191,17
@@
},
"pin2": {
"compName": "halfadder#1",
},
"pin2": {
"compName": "halfadder#1",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#4",
"path": [
{
"x": 25.0,
},
"name": "unnamedWire#4",
"path": [
{
"x": 25.0,
- "y":
7
0.0
+ "y":
8
0.0
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
55
.0
+ "y":
90
.0
}
]
},
}
]
},
@@
-212,17
+212,17
@@
},
"pin2": {
"compName": "halfadder#2",
},
"pin2": {
"compName": "halfadder#2",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#5",
"path": [
{
"x": 25.0,
},
"name": "unnamedWire#5",
"path": [
{
"x": 25.0,
- "y":
8
0.0
+ "y":
7
0.0
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
90
.0
+ "y":
55
.0
}
]
},
}
]
},
@@
-233,17
+233,17
@@
},
"pin2": {
"compName": "halfadder#3",
},
"pin2": {
"compName": "halfadder#3",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#6",
"path": [
{
"x": 20.0,
},
"name": "unnamedWire#6",
"path": [
{
"x": 20.0,
- "y":
9
0.0
+ "y":
6
0.0
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
125
.0
+ "y":
20
.0
}
]
},
}
]
},
@@
-260,11
+260,11
@@
"path": [
{
"x": 80.0,
"path": [
{
"x": 80.0,
- "y":
6
0.0
+ "y":
9
0.0
},
{
"x": 80.0,
},
{
"x": 80.0,
- "y": 1
0
.0
+ "y": 1
15
.0
}
]
},
}
]
},
@@
-278,16
+278,7
@@
"pinName": "O1"
},
"name": "unnamedWire#8",
"pinName": "O1"
},
"name": "unnamedWire#8",
- "path": [
- {
- "x": 75.0,
- "y": 45.0
- },
- {
- "x": 75.0,
- "y": 70.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-299,7
+290,16
@@
"pinName": "O2"
},
"name": "unnamedWire#9",
"pinName": "O2"
},
"name": "unnamedWire#9",
- "path": []
+ "path": [
+ {
+ "x": 75.0,
+ "y": 45.0
+ },
+ {
+ "x": 75.0,
+ "y": 70.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-313,12
+313,12
@@
"name": "unnamedWire#10",
"path": [
{
"name": "unnamedWire#10",
"path": [
{
- "x":
75
.0,
- "y":
9
0.0
+ "x":
80
.0,
+ "y":
6
0.0
},
{
},
{
- "x":
75
.0,
- "y": 1
15
.0
+ "x":
80
.0,
+ "y": 1
0
.0
}
]
},
}
]
},
@@
-341,17
+341,17
@@
},
"pin2": {
"compName": "halfadder#0",
},
"pin2": {
"compName": "halfadder#0",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#12",
"path": [
{
"x": 10.0,
},
"name": "unnamedWire#12",
"path": [
{
"x": 10.0,
- "y": 25.0
+ "y":
1
25.0
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y": 1
0
.0
+ "y": 1
35
.0
}
]
},
}
]
},
@@
-380,11
+380,11
@@
"path": [
{
"x": 10.0,
"path": [
{
"x": 10.0,
- "y": 1
35
.0
+ "y": 1
0
.0
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y":
1
25.0
+ "y": 25.0
}
]
}
}
]
}