projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned or_4
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
ram2.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
index
64d509c
..
8de3e2a
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@
-187,8
+187,8
@@
"id": "Splitter",
"name": "Splitter#2",
"pos": {
"id": "Splitter",
"name": "Splitter#2",
"pos": {
- "x":
28
5.0,
- "y":
705
.0
+ "x":
30
5.0,
+ "y":
560
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-200,7
+200,7
@@
"name": "Splitter#3",
"pos": {
"x": 285.0,
"name": "Splitter#3",
"pos": {
"x": 285.0,
- "y":
63
5.0
+ "y":
50
5.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-211,8
+211,8
@@
"id": "Splitter",
"name": "Splitter#4",
"pos": {
"id": "Splitter",
"name": "Splitter#4",
"pos": {
- "x":
32.5
,
- "y": 6
17.5
+ "x":
20.0
,
+ "y": 6
00.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-260,7
+260,7
@@
"name": "WireCrossPoint#4",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 49.0,
- "y":
62
9.0
+ "y":
51
9.0
},
"params": 4
},
},
"params": 4
},
@@
-269,7
+269,7
@@
"name": "WireCrossPoint#5",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 49.0,
- "y":
55
4.0
+ "y":
46
4.0
},
"params": 4
},
},
"params": 4
},
@@
-278,7
+278,7
@@
"name": "WireCrossPoint#6",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 49.0,
- "y": 4
4
9.0
+ "y": 4
0
9.0
},
"params": 4
},
},
"params": 4
},
@@
-296,7
+296,7
@@
"name": "WireCrossPoint#8",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 109.0,
- "y": 4
4
9.0
+ "y": 4
0
9.0
},
"params": 4
},
},
"params": 4
},
@@
-305,7
+305,7
@@
"name": "WireCrossPoint#9",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 109.0,
- "y":
55
4.0
+ "y":
46
4.0
},
"params": 4
},
},
"params": 4
},
@@
-314,7
+314,7
@@
"name": "WireCrossPoint#10",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 109.0,
- "y":
65
9.0
+ "y":
51
9.0
},
"params": 4
},
},
"params": 4
},
@@
-346,31
+346,31
@@
"id": "andor414",
"name": "andor414#0",
"pos": {
"id": "andor414",
"name": "andor414#0",
"pos": {
- "x": 2
35
.0,
- "y": 41
5
.0
+ "x": 2
40
.0,
+ "y": 41
0
.0
}
},
{
"id": "andor414",
"name": "andor414#1",
"pos": {
}
},
{
"id": "andor414",
"name": "andor414#1",
"pos": {
- "x": 2
35
.0,
- "y":
520
.0
+ "x": 2
40
.0,
+ "y":
465
.0
}
},
{
"id": "andor414",
"name": "andor414#2",
"pos": {
}
},
{
"id": "andor414",
"name": "andor414#2",
"pos": {
- "x": 2
35
.0,
- "y":
62
5.0
+ "x": 2
40
.0,
+ "y":
51
5.0
}
},
{
"id": "andor414",
"name": "andor414#3",
"pos": {
}
},
{
"id": "andor414",
"name": "andor414#3",
"pos": {
- "x": 1
35
.0,
+ "x": 1
40
.0,
"y": 385.0
}
},
"y": 385.0
}
},
@@
-378,16
+378,16
@@
"id": "andor414",
"name": "andor414#4",
"pos": {
"id": "andor414",
"name": "andor414#4",
"pos": {
- "x": 1
35
.0,
- "y": 4
9
0.0
+ "x": 1
40
.0,
+ "y": 4
4
0.0
}
},
{
"id": "andor414",
"name": "andor414#5",
"pos": {
}
},
{
"id": "andor414",
"name": "andor414#5",
"pos": {
- "x": 1
35
.0,
- "y":
5
95.0
+ "x": 1
40
.0,
+ "y":
4
95.0
}
},
{
}
},
{
@@
-419,7
+419,7
@@
"name": "dlatch4#1",
"pos": {
"x": 55.0,
"name": "dlatch4#1",
"pos": {
"x": 55.0,
- "y":
43
5.0
+ "y":
39
5.0
}
},
{
}
},
{
@@
-427,7
+427,7
@@
"name": "dlatch4#2",
"pos": {
"x": 55.0,
"name": "dlatch4#2",
"pos": {
"x": 55.0,
- "y":
54
0.0
+ "y":
45
0.0
}
},
{
}
},
{
@@
-435,7
+435,7
@@
"name": "dlatch4#3",
"pos": {
"x": 55.0,
"name": "dlatch4#3",
"pos": {
"x": 55.0,
- "y":
64
5.0
+ "y":
50
5.0
}
}
],
}
}
],
@@
-678,7
+678,7
@@
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y": 4
7
0.0
+ "y": 4
3
0.0
}
]
},
}
]
},
@@
-699,7
+699,7
@@
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
57
5.0
+ "y":
48
5.0
}
]
},
}
]
},
@@
-720,7
+720,7
@@
},
{
"x": 15.0,
},
{
"x": 15.0,
- "y":
68
0.0
+ "y":
54
0.0
}
]
},
}
]
},
@@
-782,7
+782,12
@@
"pinName": ""
},
"name": "unnamedWire#21",
"pinName": ""
},
"name": "unnamedWire#21",
- "path": []
+ "path": [
+ {
+ "x": 50.0,
+ "y": 615.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-794,12
+799,7
@@
"pinName": "D"
},
"name": "unnamedWire#22",
"pinName": "D"
},
"name": "unnamedWire#22",
- "path": [
- {
- "x": 50.0,
- "y": 660.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-939,7
+939,7
@@
"path": [
{
"x": 110.0,
"path": [
{
"x": 110.0,
- "y":
69
0.0
+ "y":
54
0.0
}
]
},
}
]
},
@@
-981,7
+981,7
@@
},
{
"x": 205.0,
},
{
"x": 205.0,
- "y":
500
.0
+ "y":
445
.0
}
]
},
}
]
},
@@
-1002,7
+1002,7
@@
},
{
"x": 200.0,
},
{
"x": 200.0,
- "y":
605
.0
+ "y":
500
.0
}
]
},
}
]
},
@@
-1023,7
+1023,7
@@
},
{
"x": 195.0,
},
{
"x": 195.0,
- "y":
71
0.0
+ "y":
55
0.0
}
]
},
}
]
},
@@
-1057,7
+1057,7
@@
"path": [
{
"x": 125.0,
"path": [
{
"x": 125.0,
- "y": 4
7
0.0
+ "y": 4
2
0.0
}
]
},
}
]
},
@@
-1074,7
+1074,7
@@
"path": [
{
"x": 120.0,
"path": [
{
"x": 120.0,
- "y":
5
75.0
+ "y":
4
75.0
}
]
},
}
]
},
@@
-1091,7
+1091,7
@@
"path": [
{
"x": 115.0,
"path": [
{
"x": 115.0,
- "y":
68
0.0
+ "y":
53
0.0
}
]
},
}
]
},
@@
-1144,12
+1144,12
@@
"y": 380.0
},
{
"y": 380.0
},
{
- "x": 13
0
.0,
+ "x": 13
5
.0,
"y": 380.0
},
{
"y": 380.0
},
{
- "x": 13
0
.0,
- "y":
41
0.0
+ "x": 13
5
.0,
+ "y":
39
0.0
}
]
},
}
]
},
@@
-1178,7
+1178,7
@@
"path": [
{
"x": 110.0,
"path": [
{
"x": 110.0,
- "y": 4
80
.0
+ "y": 4
35
.0
}
]
},
}
]
},
@@
-1207,19
+1207,19
@@
"path": [
{
"x": 175.0,
"path": [
{
"x": 175.0,
- "y":
41
0.0
+ "y":
39
0.0
},
{
"x": 175.0,
},
{
"x": 175.0,
- "y": 4
85
.0
+ "y": 4
30
.0
},
{
},
{
- "x": 13
0
.0,
- "y": 4
85
.0
+ "x": 13
5
.0,
+ "y": 4
30
.0
},
{
},
{
- "x": 13
0
.0,
- "y":
51
5.0
+ "x": 13
5
.0,
+ "y":
44
5.0
}
]
},
}
]
},
@@
-1236,19
+1236,19
@@
"path": [
{
"x": 175.0,
"path": [
{
"x": 175.0,
- "y":
51
5.0
+ "y":
44
5.0
},
{
"x": 175.0,
},
{
"x": 175.0,
- "y":
590
.0
+ "y":
485
.0
},
{
},
{
- "x": 13
0
.0,
- "y":
590
.0
+ "x": 13
5
.0,
+ "y":
485
.0
},
{
},
{
- "x": 13
0
.0,
- "y":
62
0.0
+ "x": 13
5
.0,
+ "y":
50
0.0
}
]
},
}
]
},
@@
-1265,11
+1265,11
@@
"path": [
{
"x": 175.0,
"path": [
{
"x": 175.0,
- "y":
62
0.0
+ "y":
50
0.0
},
{
"x": 175.0,
},
{
"x": 175.0,
- "y":
720
.0
+ "y":
575
.0
}
]
},
}
]
},
@@
-1286,7
+1286,7
@@
"path": [
{
"x": 335.0,
"path": [
{
"x": 335.0,
- "y":
735
.0
+ "y":
590
.0
},
{
"x": 335.0,
},
{
"x": 335.0,
@@
-1307,7
+1307,7
@@
"path": [
{
"x": 110.0,
"path": [
{
"x": 110.0,
- "y":
585
.0
+ "y":
490
.0
}
]
},
}
]
},
@@
-1328,15
+1328,15
@@
},
{
"x": 275.0,
},
{
"x": 275.0,
- "y": 4
10
.0
+ "y": 4
05
.0
},
{
},
{
- "x": 23
0
.0,
- "y": 4
10
.0
+ "x": 23
5
.0,
+ "y": 4
05
.0
},
{
},
{
- "x": 23
0
.0,
- "y": 4
40
.0
+ "x": 23
5
.0,
+ "y": 4
15
.0
}
]
},
}
]
},
@@
-1353,19
+1353,19
@@
"path": [
{
"x": 275.0,
"path": [
{
"x": 275.0,
- "y": 4
40
.0
+ "y": 4
15
.0
},
{
"x": 275.0,
},
{
"x": 275.0,
- "y":
515
.0
+ "y":
460
.0
},
{
},
{
- "x": 23
0
.0,
- "y":
515
.0
+ "x": 23
5
.0,
+ "y":
460
.0
},
{
},
{
- "x": 23
0
.0,
- "y":
545
.0
+ "x": 23
5
.0,
+ "y":
470
.0
}
]
},
}
]
},
@@
-1382,19
+1382,19
@@
"path": [
{
"x": 275.0,
"path": [
{
"x": 275.0,
- "y":
545
.0
+ "y":
470
.0
},
{
"x": 275.0,
},
{
"x": 275.0,
- "y":
62
0.0
+ "y":
51
0.0
},
{
},
{
- "x": 23
0
.0,
- "y":
62
0.0
+ "x": 23
5
.0,
+ "y":
51
0.0
},
{
},
{
- "x": 23
0
.0,
- "y":
65
0.0
+ "x": 23
5
.0,
+ "y":
52
0.0
}
]
},
}
]
},
@@
-1423,7
+1423,7
@@
"path": [
{
"x": 315.0,
"path": [
{
"x": 315.0,
- "y":
66
5.0
+ "y":
53
5.0
},
{
"x": 317.5,
},
{
"x": 317.5,
@@
-1448,7
+1448,7
@@
},
{
"x": 310.0,
},
{
"x": 310.0,
- "y":
65
5.0
+ "y":
52
5.0
}
]
},
}
]
},
@@
-1465,7
+1465,7
@@
"path": [
{
"x": 305.0,
"path": [
{
"x": 305.0,
- "y":
64
5.0
+ "y":
51
5.0
},
{
"x": 307.5,
},
{
"x": 307.5,
@@
-1490,7
+1490,7
@@
},
{
"x": 300.0,
},
{
"x": 300.0,
- "y":
63
5.0
+ "y":
50
5.0
}
]
},
}
]
},
@@
-1511,7
+1511,7
@@
},
{
"x": 330.0,
},
{
"x": 330.0,
- "y":
725
.0
+ "y":
580
.0
}
]
},
}
]
},
@@
-1528,7
+1528,7
@@
"path": [
{
"x": 325.0,
"path": [
{
"x": 325.0,
- "y":
715
.0
+ "y":
570
.0
},
{
"x": 325.0,
},
{
"x": 325.0,
@@
-1553,7
+1553,7
@@
},
{
"x": 320.0,
},
{
"x": 320.0,
- "y":
705
.0
+ "y":
560
.0
}
]
},
}
]
},