projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug in Am2900; created dlatch8/80; relayouted some components
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
dff16.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
index
3b2dbb4
..
6efc903
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16.json
@@
-61,8
+61,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x":
7
4.0,
- "y":
1
9.0
+ "x":
6
4.0,
+ "y":
2
9.0
},
"params": 1
},
},
"params": 1
},
@@
-70,8
+70,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x":
7
4.0,
- "y":
4
9.0
+ "x":
6
4.0,
+ "y":
5
9.0
},
"params": 1
},
},
"params": 1
},
@@
-79,8
+79,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
- "x": 11
9
.0,
- "y": 1
1
9.0
+ "x": 11
4
.0,
+ "y": 1
3
9.0
},
"params": 1
},
},
"params": 1
},
@@
-88,8
+88,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
- "x": 11
9
.0,
- "y": 2
0
9.0
+ "x": 11
4
.0,
+ "y": 2
2
9.0
},
"params": 1
},
},
"params": 1
},
@@
-97,8
+97,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
- "x": 11
9
.0,
- "y":
8
9.0
+ "x": 11
4
.0,
+ "y":
10
9.0
},
"params": 1
},
},
"params": 1
},
@@
-106,8
+106,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
- "x": 11
9
.0,
- "y": 1
4
9.0
+ "x": 11
4
.0,
+ "y": 1
6
9.0
},
"params": 1
},
},
"params": 1
},
@@
-115,8
+115,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
- "x": 11
9
.0,
- "y": 1
7
9.0
+ "x": 11
4
.0,
+ "y": 1
9
9.0
},
"params": 1
},
},
"params": 1
},
@@
-124,8
+124,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
- "x":
7
4.0,
- "y":
7
9.0
+ "x":
6
4.0,
+ "y":
8
9.0
},
"params": 1
},
},
"params": 1
},
@@
-133,8
+133,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x":
7
4.0,
- "y": 1
0
9.0
+ "x":
6
4.0,
+ "y": 1
1
9.0
},
"params": 1
},
},
"params": 1
},
@@
-142,8
+142,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
- "x":
7
4.0,
- "y": 1
6
9.0
+ "x":
6
4.0,
+ "y": 1
7
9.0
},
"params": 1
},
},
"params": 1
},
@@
-151,8
+151,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
- "x":
7
4.0,
- "y":
19
9.0
+ "x":
6
4.0,
+ "y":
20
9.0
},
"params": 1
},
},
"params": 1
},
@@
-160,8
+160,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x":
7
4.0,
- "y": 1
3
9.0
+ "x":
6
4.0,
+ "y": 1
4
9.0
},
"params": 1
},
},
"params": 1
},
@@
-169,8
+169,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 11
9
.0,
- "y":
5
9.0
+ "x": 11
4
.0,
+ "y":
7
9.0
},
"params": 1
},
},
"params": 1
},
@@
-178,8
+178,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
- "x": 11
9
.0,
- "y":
2
9.0
+ "x": 11
4
.0,
+ "y":
4
9.0
},
"params": 1
},
},
"params": 1
},
@@
-187,7
+187,7
@@
"id": "dff",
"name": "dff#0",
"pos": {
"id": "dff",
"name": "dff#0",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 15.0
}
},
"y": 15.0
}
},
@@
-195,23
+195,23
@@
"id": "dff",
"name": "dff#1",
"pos": {
"id": "dff",
"name": "dff#1",
"pos": {
- "x": 12
5
.0,
- "y":
2
5.0
+ "x": 12
0
.0,
+ "y":
3
5.0
}
},
{
"id": "dff",
"name": "dff#10",
"pos": {
}
},
{
"id": "dff",
"name": "dff#10",
"pos": {
- "x": 12
5
.0,
- "y": 2
3
5.0
+ "x": 12
0
.0,
+ "y": 2
4
5.0
}
},
{
"id": "dff",
"name": "dff#11",
"pos": {
}
},
{
"id": "dff",
"name": "dff#11",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 225.0
}
},
"y": 225.0
}
},
@@
-219,7
+219,7
@@
"id": "dff",
"name": "dff#12",
"pos": {
"id": "dff",
"name": "dff#12",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 195.0
}
},
"y": 195.0
}
},
@@
-227,23
+227,23
@@
"id": "dff",
"name": "dff#13",
"pos": {
"id": "dff",
"name": "dff#13",
"pos": {
- "x": 12
5
.0,
- "y": 1
4
5.0
+ "x": 12
0
.0,
+ "y": 1
5
5.0
}
},
{
"id": "dff",
"name": "dff#14",
"pos": {
}
},
{
"id": "dff",
"name": "dff#14",
"pos": {
- "x": 12
5
.0,
- "y": 1
7
5.0
+ "x": 12
0
.0,
+ "y": 1
8
5.0
}
},
{
"id": "dff",
"name": "dff#15",
"pos": {
}
},
{
"id": "dff",
"name": "dff#15",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 165.0
}
},
"y": 165.0
}
},
@@
-251,15
+251,15
@@
"id": "dff",
"name": "dff#2",
"pos": {
"id": "dff",
"name": "dff#2",
"pos": {
- "x": 12
5
.0,
- "y":
5
5.0
+ "x": 12
0
.0,
+ "y":
6
5.0
}
},
{
"id": "dff",
"name": "dff#3",
"pos": {
}
},
{
"id": "dff",
"name": "dff#3",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 45.0
}
},
"y": 45.0
}
},
@@
-267,23
+267,23
@@
"id": "dff",
"name": "dff#4",
"pos": {
"id": "dff",
"name": "dff#4",
"pos": {
- "x": 12
5
.0,
- "y":
8
5.0
+ "x": 12
0
.0,
+ "y":
9
5.0
}
},
{
"id": "dff",
"name": "dff#5",
"pos": {
}
},
{
"id": "dff",
"name": "dff#5",
"pos": {
- "x": 12
5
.0,
- "y": 1
1
5.0
+ "x": 12
0
.0,
+ "y": 1
2
5.0
}
},
{
"id": "dff",
"name": "dff#6",
"pos": {
}
},
{
"id": "dff",
"name": "dff#6",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 75.0
}
},
"y": 75.0
}
},
@@
-291,7
+291,7
@@
"id": "dff",
"name": "dff#7",
"pos": {
"id": "dff",
"name": "dff#7",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 105.0
}
},
"y": 105.0
}
},
@@
-299,7
+299,7
@@
"id": "dff",
"name": "dff#8",
"pos": {
"id": "dff",
"name": "dff#8",
"pos": {
- "x":
8
0.0,
+ "x":
7
0.0,
"y": 135.0
}
},
"y": 135.0
}
},
@@
-307,8
+307,8
@@
"id": "dff",
"name": "dff#9",
"pos": {
"id": "dff",
"name": "dff#9",
"pos": {
- "x": 12
5
.0,
- "y": 2
0
5.0
+ "x": 12
0
.0,
+ "y": 2
1
5.0
}
}
],
}
}
],
@@
-330,7
+330,7
@@
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
3
0.0
+ "y":
2
0.0
}
]
},
}
]
},
@@
-368,7
+368,7
@@
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
- "y": 1
8
0.0
+ "y": 1
7
0.0
},
{
"x": 45.0,
},
{
"x": 45.0,
@@
-410,7
+410,7
@@
"path": [
{
"x": 35.0,
"path": [
{
"x": 35.0,
- "y": 2
1
0.0
+ "y": 2
0
0.0
},
{
"x": 35.0,
},
{
"x": 35.0,
@@
-452,7
+452,7
@@
"path": [
{
"x": 25.0,
"path": [
{
"x": 25.0,
- "y": 2
4
0.0
+ "y": 2
3
0.0
},
{
"x": 25.0,
},
{
"x": 25.0,
@@
-546,7
+546,7
@@
},
{
"x": 30.0,
},
{
"x": 30.0,
- "y":
6
0.0
+ "y":
5
0.0
}
]
},
}
]
},
@@
-703,8
+703,8
@@
"name": "unnamedWire#30",
"path": [
{
"name": "unnamedWire#30",
"path": [
{
- "x":
7
5.0,
- "y": 2
3
0.0
+ "x":
6
5.0,
+ "y": 2
4
0.0
}
]
},
}
]
},
@@
-720,8
+720,8
@@
"name": "unnamedWire#31",
"path": [
{
"name": "unnamedWire#31",
"path": [
{
- "x": 1
20
.0,
- "y": 2
4
0.0
+ "x": 1
15
.0,
+ "y": 2
6
0.0
}
]
},
}
]
},
@@
-831,7
+831,16
@@
"pinName": "D"
},
"name": "unnamedWire#4",
"pinName": "D"
},
"name": "unnamedWire#4",
- "path": []
+ "path": [
+ {
+ "x": 40.0,
+ "y": 90.0
+ },
+ {
+ "x": 40.0,
+ "y": 80.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-905,11
+914,11
@@
"name": "unnamedWire#45",
"path": [
{
"name": "unnamedWire#45",
"path": [
{
- "x":
7
5.0,
+ "x":
6
5.0,
"y": 10.0
},
{
"y": 10.0
},
{
- "x": 1
20
.0,
+ "x": 1
15
.0,
"y": 10.0
}
]
"y": 10.0
}
]
@@
-939,7
+948,7
@@
"path": [
{
"x": 10.0,
"path": [
{
"x": 10.0,
- "y":
2
0.0
+ "y":
3
0.0
},
{
"x": 10.0,
},
{
"x": 10.0,
@@
-964,6
+973,14
@@
},
{
"x": 200.0,
},
{
"x": 200.0,
+ "y": 30.0
+ },
+ {
+ "x": 110.0,
+ "y": 30.0
+ },
+ {
+ "x": 110.0,
"y": 20.0
}
]
"y": 20.0
}
]
@@
-993,7
+1010,7
@@
"path": [
{
"x": 195.0,
"path": [
{
"x": 195.0,
- "y":
3
0.0
+ "y":
4
0.0
},
{
"x": 195.0,
},
{
"x": 195.0,
@@
-1018,6
+1035,14
@@
},
{
"x": 190.0,
},
{
"x": 190.0,
+ "y": 60.0
+ },
+ {
+ "x": 110.0,
+ "y": 60.0
+ },
+ {
+ "x": 110.0,
"y": 50.0
}
]
"y": 50.0
}
]
@@
-1039,7
+1064,7
@@
},
{
"x": 185.0,
},
{
"x": 185.0,
- "y":
6
0.0
+ "y":
7
0.0
}
]
},
}
]
},
@@
-1055,11
+1080,11
@@
"name": "unnamedWire#53",
"path": [
{
"name": "unnamedWire#53",
"path": [
{
- "x": 1
8
0.0,
+ "x": 1
1
0.0,
"y": 90.0
},
{
"y": 90.0
},
{
- "x": 1
8
0.0,
+ "x": 1
1
0.0,
"y": 80.0
}
]
"y": 80.0
}
]
@@
-1074,16
+1099,7
@@
"pinName": "O10"
},
"name": "unnamedWire#54",
"pinName": "O10"
},
"name": "unnamedWire#54",
- "path": [
- {
- "x": 175.0,
- "y": 90.0
- },
- {
- "x": 175.0,
- "y": 100.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-1095,7
+1111,24
@@
"pinName": "Q"
},
"name": "unnamedWire#55",
"pinName": "Q"
},
"name": "unnamedWire#55",
- "path": []
+ "path": [
+ {
+ "x": 160.0,
+ "y": 110.0
+ },
+ {
+ "x": 160.0,
+ "y": 120.0
+ },
+ {
+ "x": 110.0,
+ "y": 120.0
+ },
+ {
+ "x": 110.0,
+ "y": 110.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-1107,7
+1140,16
@@
"pinName": "O8"
},
"name": "unnamedWire#56",
"pinName": "O8"
},
"name": "unnamedWire#56",
- "path": []
+ "path": [
+ {
+ "x": 165.0,
+ "y": 130.0
+ },
+ {
+ "x": 165.0,
+ "y": 120.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-1126,6
+1168,14
@@
},
{
"x": 170.0,
},
{
"x": 170.0,
+ "y": 150.0
+ },
+ {
+ "x": 110.0,
+ "y": 150.0
+ },
+ {
+ "x": 110.0,
"y": 140.0
}
]
"y": 140.0
}
]
@@
-1143,7
+1193,7
@@
"path": [
{
"x": 175.0,
"path": [
{
"x": 175.0,
- "y": 1
5
0.0
+ "y": 1
6
0.0
},
{
"x": 175.0,
},
{
"x": 175.0,
@@
-1168,6
+1218,14
@@
},
{
"x": 180.0,
},
{
"x": 180.0,
+ "y": 180.0
+ },
+ {
+ "x": 110.0,
+ "y": 180.0
+ },
+ {
+ "x": 110.0,
"y": 170.0
}
]
"y": 170.0
}
]
@@
-1182,16
+1240,7
@@
"pinName": "O9"
},
"name": "unnamedWire#6",
"pinName": "O9"
},
"name": "unnamedWire#6",
- "path": [
- {
- "x": 65.0,
- "y": 120.0
- },
- {
- "x": 65.0,
- "y": 110.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-1210,7
+1259,7
@@
},
{
"x": 185.0,
},
{
"x": 185.0,
- "y": 1
8
0.0
+ "y": 1
9
0.0
}
]
},
}
]
},
@@
-1231,6
+1280,14
@@
},
{
"x": 190.0,
},
{
"x": 190.0,
+ "y": 210.0
+ },
+ {
+ "x": 110.0,
+ "y": 210.0
+ },
+ {
+ "x": 110.0,
"y": 200.0
}
]
"y": 200.0
}
]
@@
-1248,7
+1305,7
@@
"path": [
{
"x": 195.0,
"path": [
{
"x": 195.0,
- "y": 2
1
0.0
+ "y": 2
2
0.0
},
{
"x": 195.0,
},
{
"x": 195.0,
@@
-1273,6
+1330,14
@@
},
{
"x": 200.0,
},
{
"x": 200.0,
+ "y": 240.0
+ },
+ {
+ "x": 110.0,
+ "y": 240.0
+ },
+ {
+ "x": 110.0,
"y": 230.0
}
]
"y": 230.0
}
]
@@
-1290,7
+1355,7
@@
"path": [
{
"x": 205.0,
"path": [
{
"x": 205.0,
- "y": 2
4
0.0
+ "y": 2
5
0.0
},
{
"x": 205.0,
},
{
"x": 205.0,
@@
-1332,7
+1397,7
@@
"path": [
{
"x": 55.0,
"path": [
{
"x": 55.0,
- "y": 1
5
0.0
+ "y": 1
4
0.0
},
{
"x": 55.0,
},
{
"x": 55.0,