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
/
dff12_we.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
index
4d5ef60
..
188770f
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json
@@
-1,6
+1,6
@@
{
"width": 55.0,
{
"width": 55.0,
- "height": 4
0
.0,
+ "height": 4
5
.0,
"interfacePins": [
{
"location": {
"interfacePins": [
{
"location": {
@@
-47,7
+47,7
@@
"name": "Splitter#0",
"pos": {
"x": 70.0,
"name": "Splitter#0",
"pos": {
"x": 70.0,
- "y":
6
5.0
+ "y":
4
5.0
},
"params": {
"logicWidth": 12,
},
"params": {
"logicWidth": 12,
@@
-58,7
+58,7
@@
"id": "Splitter",
"name": "Splitter#1",
"pos": {
"id": "Splitter",
"name": "Splitter#1",
"pos": {
- "x": 25
0
.0,
+ "x": 25
5
.0,
"y": 45.0
},
"params": {
"y": 45.0
},
"params": {
@@
-71,7
+71,7
@@
"name": "WireCrossPoint#0",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 124.0,
- "y":
1
4.0
+ "y":
2
4.0
},
"params": 1
},
},
"params": 1
},
@@
-80,7
+80,7
@@
"name": "WireCrossPoint#1",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 124.0,
- "y":
4
4.0
+ "y":
5
4.0
},
"params": 1
},
},
"params": 1
},
@@
-88,8
+88,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
- "x": 1
6
9.0,
- "y": 1
1
4.0
+ "x": 1
7
9.0,
+ "y": 1
3
4.0
},
"params": 1
},
},
"params": 1
},
@@
-98,7
+98,7
@@
"name": "WireCrossPoint#2",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 124.0,
- "y": 1
0
4.0
+ "y": 1
1
4.0
},
"params": 1
},
},
"params": 1
},
@@
-107,7
+107,7
@@
"name": "WireCrossPoint#3",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 124.0,
- "y": 1
3
4.0
+ "y": 1
4
4.0
},
"params": 1
},
},
"params": 1
},
@@
-116,7
+116,7
@@
"name": "WireCrossPoint#4",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 124.0,
- "y":
7
4.0
+ "y":
8
4.0
},
"params": 1
},
},
"params": 1
},
@@
-124,7
+124,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
- "x": 26
4
.0,
+ "x": 26
9
.0,
"y": 99.0
},
"params": 12
"y": 99.0
},
"params": 12
@@
-133,8
+133,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x": 1
6
9.0,
- "y":
5
4.0
+ "x": 1
7
9.0,
+ "y":
7
4.0
},
"params": 1
},
},
"params": 1
},
@@
-142,8
+142,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
- "x": 1
6
9.0,
- "y": 1
4
4.0
+ "x": 1
7
9.0,
+ "y": 1
6
4.0
},
"params": 1
},
},
"params": 1
},
@@
-151,8
+151,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 1
6
9.0,
- "y":
2
4.0
+ "x": 1
7
9.0,
+ "y":
4
4.0
},
"params": 1
},
},
"params": 1
},
@@
-160,8
+160,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
- "x": 1
6
9.0,
- "y":
8
4.0
+ "x": 1
7
9.0,
+ "y":
10
4.0
},
"params": 1
},
},
"params": 1
},
@@
-169,24
+169,24
@@
"id": "dff",
"name": "dff#0",
"pos": {
"id": "dff",
"name": "dff#0",
"pos": {
- "x": 1
7
5.0,
- "y":
2
0.0
+ "x": 1
8
5.0,
+ "y":
3
0.0
}
},
{
"id": "dff",
"name": "dff#1",
"pos": {
}
},
{
"id": "dff",
"name": "dff#1",
"pos": {
- "x": 1
7
5.0,
- "y":
5
0.0
+ "x": 1
8
5.0,
+ "y":
6
0.0
}
},
{
"id": "dff",
"name": "dff#10",
"pos": {
}
},
{
"id": "dff",
"name": "dff#10",
"pos": {
- "x": 1
7
5.0,
- "y": 1
1
0.0
+ "x": 1
8
5.0,
+ "y": 1
2
0.0
}
},
{
}
},
{
@@
-225,16
+225,16
@@
"id": "dff",
"name": "dff#5",
"pos": {
"id": "dff",
"name": "dff#5",
"pos": {
- "x": 1
7
5.0,
- "y": 1
4
0.0
+ "x": 1
8
5.0,
+ "y": 1
5
0.0
}
},
{
"id": "dff",
"name": "dff#6",
"pos": {
}
},
{
"id": "dff",
"name": "dff#6",
"pos": {
- "x": 1
7
5.0,
- "y": 1
7
0.0
+ "x": 1
8
5.0,
+ "y": 1
8
0.0
}
},
{
}
},
{
@@
-257,8
+257,8
@@
"id": "dff",
"name": "dff#9",
"pos": {
"id": "dff",
"name": "dff#9",
"pos": {
- "x": 1
7
5.0,
- "y":
8
0.0
+ "x": 1
8
5.0,
+ "y":
9
0.0
}
},
{
}
},
{
@@
-266,7
+266,7
@@
"name": "mux1_12#0",
"pos": {
"x": 15.0,
"name": "mux1_12#0",
"pos": {
"x": 15.0,
- "y":
9
0.0
+ "y":
7
0.0
}
}
],
}
}
],
@@
-287,7
+287,7
@@
"y": 5.0
},
{
"y": 5.0
},
{
- "x": 1
7
0.0,
+ "x": 1
8
0.0,
"y": 5.0
}
]
"y": 5.0
}
]
@@
-302,16
+302,7
@@
"pinName": "C"
},
"name": "unnamedWire#1",
"pinName": "C"
},
"name": "unnamedWire#1",
- "path": [
- {
- "x": 55.0,
- "y": 15.0
- },
- {
- "x": 55.0,
- "y": 25.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-323,16
+314,7
@@
"pinName": "O5"
},
"name": "unnamedWire#10",
"pinName": "O5"
},
"name": "unnamedWire#10",
- "path": [
- {
- "x": 115.0,
- "y": 115.0
- },
- {
- "x": 115.0,
- "y": 125.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-346,11
+328,11
@@
"name": "unnamedWire#11",
"path": [
{
"name": "unnamedWire#11",
"path": [
{
- "x": 1
20
.0,
- "y": 1
3
5.0
+ "x": 1
15
.0,
+ "y": 1
1
5.0
},
{
},
{
- "x": 1
20
.0,
+ "x": 1
15
.0,
"y": 125.0
}
]
"y": 125.0
}
]
@@
-365,7
+347,16
@@
"pinName": "O3"
},
"name": "unnamedWire#12",
"pinName": "O3"
},
"name": "unnamedWire#12",
- "path": []
+ "path": [
+ {
+ "x": 110.0,
+ "y": 135.0
+ },
+ {
+ "x": 110.0,
+ "y": 125.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-377,7
+368,16
@@
"pinName": "D"
},
"name": "unnamedWire#13",
"pinName": "D"
},
"name": "unnamedWire#13",
- "path": []
+ "path": [
+ {
+ "x": 105.0,
+ "y": 135.0
+ },
+ {
+ "x": 105.0,
+ "y": 155.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-391,12
+391,12
@@
"name": "unnamedWire#14",
"path": [
{
"name": "unnamedWire#14",
"path": [
{
- "x":
9
0.0,
- "y": 1
7
5.0
+ "x":
10
0.0,
+ "y": 1
6
5.0
},
{
},
{
- "x":
9
0.0,
- "y": 1
6
5.0
+ "x":
10
0.0,
+ "y": 1
4
5.0
}
]
},
}
]
},
@@
-412,11
+412,11
@@
"name": "unnamedWire#15",
"path": [
{
"name": "unnamedWire#15",
"path": [
{
- "x":
8
5.0,
- "y": 1
7
5.0
+ "x":
9
5.0,
+ "y": 1
5
5.0
},
{
},
{
- "x":
8
5.0,
+ "x":
9
5.0,
"y": 185.0
}
]
"y": 185.0
}
]
@@
-433,12
+433,12
@@
"name": "unnamedWire#16",
"path": [
{
"name": "unnamedWire#16",
"path": [
{
- "x":
10
.0,
+ "x":
5
.0,
"y": 100.0
},
{
"y": 100.0
},
{
- "x":
10
.0,
- "y":
9
5.0
+ "x":
5
.0,
+ "y":
7
5.0
}
]
},
}
]
},
@@
-459,7
+459,7
@@
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y": 1
5
0.0
+ "y": 1
3
0.0
}
]
},
}
]
},
@@
-596,15
+596,15
@@
"path": [
{
"x": 10.0,
"path": [
{
"x": 10.0,
- "y":
11
0.0
+ "y":
9
0.0
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y":
19
5.0
+ "y":
20
5.0
},
{
},
{
- "x": 2
65
.0,
- "y":
19
5.0
+ "x": 2
70
.0,
+ "y":
20
5.0
}
]
},
}
]
},
@@
-621,7
+621,7
@@
"path": [
{
"x": 125.0,
"path": [
{
"x": 125.0,
- "y": 1
6
5.0
+ "y": 1
7
5.0
}
]
},
}
]
},
@@
-637,8
+637,8
@@
"name": "unnamedWire#31",
"path": [
{
"name": "unnamedWire#31",
"path": [
{
- "x": 1
7
0.0,
- "y": 1
7
5.0
+ "x": 1
8
0.0,
+ "y": 1
9
5.0
}
]
},
}
]
},
@@
-751,11
+751,11
@@
"path": [
{
"x": 85.0,
"path": [
{
"x": 85.0,
- "y":
6
5.0
+ "y":
4
5.0
},
{
"x": 85.0,
},
{
"x": 85.0,
- "y":
2
5.0
+ "y":
1
5.0
}
]
},
}
]
},
@@
-788,7
+788,7
@@
},
{
"x": 90.0,
},
{
"x": 90.0,
- "y":
7
5.0
+ "y":
5
5.0
}
]
},
}
]
},
@@
-804,11
+804,19
@@
"name": "unnamedWire#53",
"path": [
{
"name": "unnamedWire#53",
"path": [
{
- "x": 2
45
.0,
+ "x": 2
50
.0,
"y": 45.0
},
{
"y": 45.0
},
{
- "x": 245.0,
+ "x": 250.0,
+ "y": 25.0
+ },
+ {
+ "x": 170.0,
+ "y": 25.0
+ },
+ {
+ "x": 170.0,
"y": 15.0
}
]
"y": 15.0
}
]
@@
-825,11
+833,11
@@
"name": "unnamedWire#54",
"path": [
{
"name": "unnamedWire#54",
"path": [
{
- "x": 2
35
.0,
- "y":
2
5.0
+ "x": 2
40
.0,
+ "y":
3
5.0
},
{
},
{
- "x": 2
35
.0,
+ "x": 2
40
.0,
"y": 55.0
}
]
"y": 55.0
}
]
@@
-846,11
+854,19
@@
"name": "unnamedWire#55",
"path": [
{
"name": "unnamedWire#55",
"path": [
{
- "x": 23
0
.0,
+ "x": 23
5
.0,
"y": 65.0
},
{
"y": 65.0
},
{
- "x": 230.0,
+ "x": 235.0,
+ "y": 55.0
+ },
+ {
+ "x": 170.0,
+ "y": 55.0
+ },
+ {
+ "x": 170.0,
"y": 45.0
}
]
"y": 45.0
}
]
@@
-867,11
+883,11
@@
"name": "unnamedWire#56",
"path": [
{
"name": "unnamedWire#56",
"path": [
{
- "x": 2
25
.0,
- "y":
5
5.0
+ "x": 2
30
.0,
+ "y":
6
5.0
},
{
},
{
- "x": 2
25
.0,
+ "x": 2
30
.0,
"y": 75.0
}
]
"y": 75.0
}
]
@@
-888,11
+904,11
@@
"name": "unnamedWire#57",
"path": [
{
"name": "unnamedWire#57",
"path": [
{
- "x":
22
0.0,
+ "x":
17
0.0,
"y": 85.0
},
{
"y": 85.0
},
{
- "x":
22
0.0,
+ "x":
17
0.0,
"y": 75.0
}
]
"y": 75.0
}
]
@@
-907,16
+923,7
@@
"pinName": "O6"
},
"name": "unnamedWire#58",
"pinName": "O6"
},
"name": "unnamedWire#58",
- "path": [
- {
- "x": 215.0,
- "y": 85.0
- },
- {
- "x": 215.0,
- "y": 95.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-928,7
+935,24
@@
"pinName": "Q"
},
"name": "unnamedWire#59",
"pinName": "Q"
},
"name": "unnamedWire#59",
- "path": []
+ "path": [
+ {
+ "x": 225.0,
+ "y": 105.0
+ },
+ {
+ "x": 225.0,
+ "y": 115.0
+ },
+ {
+ "x": 170.0,
+ "y": 115.0
+ },
+ {
+ "x": 170.0,
+ "y": 105.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-943,11
+967,11
@@
"path": [
{
"x": 95.0,
"path": [
{
"x": 95.0,
- "y":
5
5.0
+ "y":
4
5.0
},
{
"x": 95.0,
},
{
"x": 95.0,
- "y":
8
5.0
+ "y":
6
5.0
}
]
},
}
]
},
@@
-961,7
+985,16
@@
"pinName": "Q"
},
"name": "unnamedWire#60",
"pinName": "Q"
},
"name": "unnamedWire#60",
- "path": []
+ "path": [
+ {
+ "x": 230.0,
+ "y": 115.0
+ },
+ {
+ "x": 230.0,
+ "y": 125.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-975,11
+1008,19
@@
"name": "unnamedWire#61",
"path": [
{
"name": "unnamedWire#61",
"path": [
{
- "x": 2
1
5.0,
+ "x": 2
3
5.0,
"y": 125.0
},
{
"y": 125.0
},
{
- "x": 215.0,
+ "x": 235.0,
+ "y": 145.0
+ },
+ {
+ "x": 170.0,
+ "y": 145.0
+ },
+ {
+ "x": 170.0,
"y": 135.0
}
]
"y": 135.0
}
]
@@
-996,11
+1037,11
@@
"name": "unnamedWire#62",
"path": [
{
"name": "unnamedWire#62",
"path": [
{
- "x": 2
2
0.0,
- "y": 1
4
5.0
+ "x": 2
4
0.0,
+ "y": 1
5
5.0
},
{
},
{
- "x": 2
2
0.0,
+ "x": 2
4
0.0,
"y": 135.0
}
]
"y": 135.0
}
]
@@
-1017,11
+1058,19
@@
"name": "unnamedWire#63",
"path": [
{
"name": "unnamedWire#63",
"path": [
{
- "x": 2
2
5.0,
+ "x": 2
4
5.0,
"y": 145.0
},
{
"y": 145.0
},
{
- "x": 225.0,
+ "x": 245.0,
+ "y": 175.0
+ },
+ {
+ "x": 170.0,
+ "y": 175.0
+ },
+ {
+ "x": 170.0,
"y": 165.0
}
]
"y": 165.0
}
]
@@
-1038,11
+1087,11
@@
"name": "unnamedWire#64",
"path": [
{
"name": "unnamedWire#64",
"path": [
{
- "x": 2
3
0.0,
- "y": 1
7
5.0
+ "x": 2
5
0.0,
+ "y": 1
8
5.0
},
{
},
{
- "x": 2
3
0.0,
+ "x": 2
5
0.0,
"y": 155.0
}
]
"y": 155.0
}
]
@@
-1084,7
+1133,7
@@
"path": [
{
"x": 100.0,
"path": [
{
"x": 100.0,
- "y":
9
5.0
+ "y":
7
5.0
},
{
"x": 100.0,
},
{
"x": 100.0,
@@
-1105,11
+1154,11
@@
"path": [
{
"x": 105.0,
"path": [
{
"x": 105.0,
- "y":
8
5.0
+ "y":
7
5.0
},
{
"x": 105.0,
},
{
"x": 105.0,
- "y":
10
5.0
+ "y":
8
5.0
}
]
},
}
]
},
@@
-1123,16
+1172,7
@@
"pinName": "D"
},
"name": "unnamedWire#9",
"pinName": "D"
},
"name": "unnamedWire#9",
- "path": [
- {
- "x": 110.0,
- "y": 115.0
- },
- {
- "x": 110.0,
- "y": 95.0
- }
- ]
+ "path": []
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"