projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a layouting bug in Am2910InstrPLA
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2910
/
Am2910.json
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
a8a5878
..
70a7d77
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
@@
-170,7
+170,7
@@
"name": "NandGate#2",
"pos": {
"x": 205.0,
"name": "NandGate#2",
"pos": {
"x": 205.0,
- "y":
195
.0
+ "y":
200
.0
},
"params": 1
},
},
"params": 1
},
@@
-179,7
+179,7
@@
"name": "TriStateBuffer#0",
"pos": {
"x": 165.0,
"name": "TriStateBuffer#0",
"pos": {
"x": 165.0,
- "y": 18
0
.0
+ "y": 18
5
.0
},
"params": {
"logicWidth": 12,
},
"params": {
"logicWidth": 12,
@@
-209,7
+209,7
@@
"name": "WireCrossPoint#2",
"pos": {
"x": 174.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 174.0,
- "y": 17
4
.0
+ "y": 17
9
.0
},
"params": 12
},
},
"params": 12
},
@@
-272,7
+272,7
@@
"name": "WireCrossPoint#9",
"pos": {
"x": 199.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 199.0,
- "y": 2
09
.0
+ "y": 2
14
.0
},
"params": 1
},
},
"params": 1
},
@@
-285,13
+285,12
@@
}
},
{
}
},
{
- "id": "inc",
- "name": "inc#0",
+ "id": "inc
12
",
+ "name": "inc
12
#0",
"pos": {
"pos": {
- "x": 245.0,
- "y": 140.0
- },
- "params": 12
+ "x": 255.0,
+ "y": 165.0
+ }
},
{
"id": "nor12",
},
{
"id": "nor12",
@@
-369,7
+368,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
@@
-377,19
+376,45
@@
"pinName": "D"
},
"name": "unnamedWire#4",
"pinName": "D"
},
"name": "unnamedWire#4",
- "path": []
+ "path": [
+ {
+ "x": 280.0,
+ "y": 180.0
+ },
+ {
+ "x": 280.0,
+ "y": 150.0
+ },
+ {
+ "x": 240.0,
+ "y": 150.0
+ },
+ {
+ "x": 240.0,
+ "y": 125.0
+ }
+ ]
},
{
"pin1": {
"compName": "dff12#0",
},
{
"pin1": {
"compName": "dff12#0",
- "pinName": "
Y
"
+ "pinName": "
Q
"
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#5",
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#5",
- "path": []
+ "path": [
+ {
+ "x": 290.0,
+ "y": 125.0
+ },
+ {
+ "x": 290.0,
+ "y": 100.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-596,16
+621,11
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "A"
},
"name": "unnamedWire#18",
"pinName": "A"
},
"name": "unnamedWire#18",
- "path": [
- {
- "x": 265.0,
- "y": 175.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-767,12
+787,8
@@
"y": 85.0
},
{
"y": 85.0
},
{
- "x":
2
5.0,
+ "x":
3
5.0,
"y": 85.0
"y": 85.0
- },
- {
- "x": 25.0,
- "y": 95.0
}
]
},
}
]
},
@@
-875,7
+891,7
@@
"path": [
{
"x": 240.0,
"path": [
{
"x": 240.0,
- "y": 11
5
.0
+ "y": 11
0
.0
}
]
},
}
]
},
@@
-941,7
+957,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "CI"
},
"pin2": {
"pinName": "CI"
},
"pin2": {
@@
-949,7
+965,24
@@
"pinName": "CI"
},
"name": "unnamedWire#41",
"pinName": "CI"
},
"name": "unnamedWire#41",
- "path": []
+ "path": [
+ {
+ "x": 250.0,
+ "y": 170.0
+ },
+ {
+ "x": 250.0,
+ "y": 160.0
+ },
+ {
+ "x": 290.0,
+ "y": 160.0
+ },
+ {
+ "x": 290.0,
+ "y": 150.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-984,7
+1017,7
@@
"name": "unnamedWire#43",
"path": [
{
"name": "unnamedWire#43",
"path": [
{
- "x":
55
.0,
+ "x":
60
.0,
"y": 185.0
},
{
"y": 185.0
},
{
@@
-1005,7
+1038,7
@@
"name": "unnamedWire#44",
"path": [
{
"name": "unnamedWire#44",
"path": [
{
- "x":
6
5.0,
+ "x":
7
5.0,
"y": 180.0
},
{
"y": 180.0
},
{
@@
-1031,7
+1064,7
@@
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
110
.0
+ "y":
95
.0
}
]
},
}
]
},
@@
-1096,7
+1129,7
@@
"path": [
{
"x": 200.0,
"path": [
{
"x": 200.0,
- "y": 20
0
.0
+ "y": 20
5
.0
}
]
},
}
]
},
@@
-1113,11
+1146,11
@@
"path": [
{
"x": 230.0,
"path": [
{
"x": 230.0,
- "y": 19
0
.0
+ "y": 19
5
.0
},
{
"x": 230.0,
},
{
"x": 230.0,
- "y": 2
05
.0
+ "y": 2
10
.0
}
]
}
}
]
}