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
/
am2904
/
Am2904MSR.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
index
7d89099
..
927d41f
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
@@
-1,11
+1,11
@@
{
{
- "width":
45
.0,
- "height":
46
.0,
+ "width":
80
.0,
+ "height":
75
.0,
"interfacePins": [
{
"location": {
"interfacePins": [
{
"location": {
- "x":
14
.0,
- "y":
46
.0
+ "x":
50
.0,
+ "y":
0
.0
},
"name": "C",
"logicWidth": 1,
},
"name": "C",
"logicWidth": 1,
@@
-13,8
+13,8
@@
},
{
"location": {
},
{
"location": {
- "x":
27.5
,
- "y":
46
.0
+ "x":
60.0
,
+ "y":
0
.0
},
"name": "COVD_EN",
"logicWidth": 1,
},
"name": "COVD_EN",
"logicWidth": 1,
@@
-22,8
+22,8
@@
},
{
"location": {
},
{
"location": {
- "x":
37.5
,
- "y":
46
.0
+ "x":
70.0
,
+ "y":
0
.0
},
"name": "COVD_V",
"logicWidth": 1,
},
"name": "COVD_V",
"logicWidth": 1,
@@
-32,7
+32,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
31
.0
+ "y":
50
.0
},
"name": "I",
"logicWidth": 4,
},
"name": "I",
"logicWidth": 4,
@@
-40,8
+40,8
@@
},
{
"location": {
},
{
"location": {
- "x":
4
.0,
- "y":
46
.0
+ "x":
0
.0,
+ "y":
70
.0
},
"name": "MUX",
"logicWidth": 3,
},
"name": "MUX",
"logicWidth": 3,
@@
-49,8
+49,8
@@
},
{
"location": {
},
{
"location": {
- "x":
45
.0,
- "y":
19
.0
+ "x":
80
.0,
+ "y":
20
.0
},
"name": "Q",
"logicWidth": 4,
},
"name": "Q",
"logicWidth": 4,
@@
-59,7
+59,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
18
.0
+ "y":
30
.0
},
"name": "Y",
"logicWidth": 4,
},
"name": "Y",
"logicWidth": 4,
@@
-67,7
+67,7
@@
},
{
"location": {
},
{
"location": {
- "x":
15.5
,
+ "x":
20.0
,
"y": 0.0
},
"name": "_EC",
"y": 0.0
},
"name": "_EC",
@@
-76,7
+76,7
@@
},
{
"location": {
},
{
"location": {
- "x":
25.5
,
+ "x":
30.0
,
"y": 0.0
},
"name": "_EN",
"y": 0.0
},
"name": "_EN",
@@
-85,8
+85,8
@@
},
{
"location": {
},
{
"location": {
- "x":
35.5
,
- "y": 0.
2
+ "x":
40.0
,
+ "y": 0.
0
},
"name": "_EOVR",
"logicWidth": 1,
},
"name": "_EOVR",
"logicWidth": 1,
@@
-94,7
+94,7
@@
},
{
"location": {
},
{
"location": {
- "x":
5.5
,
+ "x":
10.0
,
"y": 0.0
},
"name": "_EZ",
"y": 0.0
},
"name": "_EZ",
@@
-104,31
+104,22
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
5
.0
+ "y":
10
.0
},
"name": "mu",
"logicWidth": 4,
"usage": "INPUT"
}
],
},
"name": "mu",
"logicWidth": 4,
"usage": "INPUT"
}
],
- "innerScale": 0.
1
,
+ "innerScale": 0.
2
,
"submodel": {
"components": [
"submodel": {
"components": [
- {
- "id": "Merger",
- "name": "Merger#0",
- "pos": {
- "x": 435.0,
- "y": 175.0
- },
- "params": 4
- },
{
"id": "NandGate",
"name": "NandGate#0",
"pos": {
{
"id": "NandGate",
"name": "NandGate#0",
"pos": {
- "x":
325
.0,
- "y":
90
.0
+ "x":
170
.0,
+ "y":
55
.0
},
"params": 1
},
},
"params": 1
},
@@
-139,41
+130,65
@@
"x": 5.0,
"y": 35.0
},
"x": 5.0,
"y": 35.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#1",
"pos": {
"x": 5.0,
},
{
"id": "Splitter",
"name": "Splitter#1",
"pos": {
"x": 5.0,
- "y": 1
6
5.0
+ "y": 1
3
5.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#2",
"pos": {
"x": 45.0,
},
{
"id": "Splitter",
"name": "Splitter#2",
"pos": {
"x": 45.0,
- "y":
425
.0
+ "y":
340
.0
},
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#3",
"pos": {
"x": 5.0,
},
{
"id": "Splitter",
"name": "Splitter#3",
"pos": {
"x": 5.0,
- "y": 2
9
5.0
+ "y": 2
3
5.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#4",
+ "pos": {
+ "x": 385.0,
+ "y": 85.0
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
},
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x":
2
9.0,
- "y": 2
8
4.0
+ "x":
1
9.0,
+ "y": 2
2
4.0
},
"params": 1
},
},
"params": 1
},
@@
-181,8
+196,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x":
41
4.0,
- "y":
17
4.0
+ "x":
36
4.0,
+ "y":
8
4.0
},
"params": 1
},
},
"params": 1
},
@@
-190,8
+205,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
- "x":
89
.0,
- "y":
8
4.0
+ "x":
74
.0,
+ "y":
5
4.0
},
"params": 1
},
},
"params": 1
},
@@
-199,8
+214,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
- "x":
89
.0,
- "y":
9
4.0
+ "x":
74
.0,
+ "y":
6
4.0
},
"params": 1
},
},
"params": 1
},
@@
-208,8
+223,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
- "x":
19
.0,
- "y": 2
9
4.0
+ "x":
34
.0,
+ "y": 2
3
4.0
},
"params": 1
},
},
"params": 1
},
@@
-217,8
+232,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
- "x": 1
9
4.0,
- "y":
23
4.0
+ "x": 1
2
4.0,
+ "y":
17
4.0
},
"params": 1
},
},
"params": 1
},
@@
-226,8
+241,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
- "x":
89
.0,
- "y":
10
4.0
+ "x":
74
.0,
+ "y":
7
4.0
},
"params": 1
},
},
"params": 1
},
@@
-235,8
+250,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
- "x":
319
.0,
- "y":
294
.0
+ "x":
164
.0,
+ "y":
59
.0
},
"params": 1
},
},
"params": 1
},
@@
-244,8
+259,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
- "x":
31
9.0,
- "y":
104
.0
+ "x":
26
9.0,
+ "y":
39
.0
},
"params": 1
},
},
"params": 1
},
@@
-253,8
+268,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
- "x":
41
9.0,
- "y":
18
4.0
+ "x":
36
9.0,
+ "y":
9
4.0
},
"params": 1
},
},
"params": 1
},
@@
-262,8
+277,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x":
42
4.0,
- "y": 1
9
4.0
+ "x":
37
4.0,
+ "y": 1
0
4.0
},
"params": 1
},
},
"params": 1
},
@@
-271,8
+286,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
- "x":
42
9.0,
- "y":
20
4.0
+ "x":
37
9.0,
+ "y":
11
4.0
},
"params": 1
},
},
"params": 1
},
@@
-280,8
+295,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
- "x":
84
.0,
- "y":
34
4.0
+ "x":
29
.0,
+ "y":
28
4.0
},
"params": 1
},
},
"params": 1
},
@@
-289,8
+304,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x":
94
.0,
- "y": 3
6
4.0
+ "x":
39
.0,
+ "y": 3
0
4.0
},
"params": 1
},
},
"params": 1
},
@@
-298,8
+313,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
- "x":
2
9.0,
- "y":
25
4.0
+ "x":
1
9.0,
+ "y":
19
4.0
},
"params": 1
},
},
"params": 1
},
@@
-307,8
+322,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 7
4
.0,
- "y":
31
4.0
+ "x": 7
9
.0,
+ "y":
25
4.0
},
"params": 1
},
},
"params": 1
},
@@
-316,8
+331,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
- "x":
4
9.0,
- "y":
11
4.0
+ "x":
3
9.0,
+ "y":
8
4.0
},
"params": 1
},
},
"params": 1
},
@@
-325,80
+340,80
@@
"id": "and",
"name": "and#0",
"pos": {
"id": "and",
"name": "and#0",
"pos": {
- "x":
380
.0,
- "y":
85
.0
+ "x":
195
.0,
+ "y":
50
.0
}
},
{
"id": "dff4_finewe",
"name": "dff4_finewe#0",
"pos": {
}
},
{
"id": "dff4_finewe",
"name": "dff4_finewe#0",
"pos": {
- "x": 3
7
5.0,
- "y":
17
0.0
+ "x": 3
2
5.0,
+ "y":
8
0.0
}
},
{
"id": "mux1",
"name": "mux1#0",
"pos": {
}
},
{
"id": "mux1",
"name": "mux1#0",
"pos": {
- "x":
325
.0,
- "y":
290
.0
+ "x":
280
.0,
+ "y":
175
.0
}
},
{
"id": "mux1_4",
"name": "mux1_4#0",
"pos": {
}
},
{
"id": "mux1_4",
"name": "mux1_4#0",
"pos": {
- "x":
5
5.0,
- "y":
11
0.0
+ "x":
4
5.0,
+ "y":
8
0.0
}
},
{
"id": "mux1_4",
"name": "mux1_4#1",
"pos": {
}
},
{
"id": "mux1_4",
"name": "mux1_4#1",
"pos": {
- "x":
150
.0,
- "y": 2
8
0.0
+ "x":
85
.0,
+ "y": 2
2
0.0
}
},
{
"id": "mux1_4",
"name": "mux1_4#2",
"pos": {
}
},
{
"id": "mux1_4",
"name": "mux1_4#2",
"pos": {
- "x":
11
0.0,
- "y":
6
0.0
+ "x":
9
0.0,
+ "y":
3
0.0
}
},
{
"id": "mux1_4",
"name": "mux1_4#3",
"pos": {
}
},
{
"id": "mux1_4",
"name": "mux1_4#3",
"pos": {
- "x":
20
0.0,
- "y":
23
0.0
+ "x":
13
0.0,
+ "y":
17
0.0
}
},
{
"id": "mux1_4",
"name": "mux1_4#4",
"pos": {
}
},
{
"id": "mux1_4",
"name": "mux1_4#4",
"pos": {
- "x":
250
.0,
- "y": 1
8
0.0
+ "x":
175
.0,
+ "y": 1
2
0.0
}
},
{
"id": "not4",
"name": "not4#0",
"pos": {
}
},
{
"id": "not4",
"name": "not4#0",
"pos": {
- "x":
100
.0,
- "y":
33
0.0
+ "x":
45
.0,
+ "y":
27
0.0
}
},
{
"id": "xor",
"name": "xor#0",
"pos": {
}
},
{
"id": "xor",
"name": "xor#0",
"pos": {
- "x":
35
.0,
- "y":
25
0.0
+ "x":
40
.0,
+ "y":
19
0.0
}
}
],
}
}
],
@@
-415,24
+430,8
@@
"name": "unnamedWire#0",
"path": [
{
"name": "unnamedWire#0",
"path": [
{
- "x": 140.0,
- "y": 445.0
- },
- {
- "x": 255.0,
- "y": 445.0
- },
- {
- "x": 255.0,
- "y": 280.0
- },
- {
- "x": 340.0,
- "y": 280.0
- },
- {
- "x": 340.0,
- "y": 175.0
+ "x": 250.0,
+ "y": 85.0
}
]
},
}
]
},
@@
-448,12
+447,16
@@
"name": "unnamedWire#1",
"path": [
{
"name": "unnamedWire#1",
"path": [
{
- "x":
355
.0,
+ "x":
200
.0,
"y": 30.0
},
{
"y": 30.0
},
{
- "x": 355.0,
- "y": 215.0
+ "x": 305.0,
+ "y": 30.0
+ },
+ {
+ "x": 305.0,
+ "y": 125.0
}
]
},
}
]
},
@@
-494,7
+497,7
@@
"path": [
{
"x": 35.0,
"path": [
{
"x": 35.0,
- "y":
12
5.0
+ "y":
9
5.0
},
{
"x": 35.0,
},
{
"x": 35.0,
@@
-519,7
+522,7
@@
},
{
"x": 30.0,
},
{
"x": 30.0,
- "y": 1
3
5.0
+ "y": 1
0
5.0
}
]
},
}
]
},
@@
-540,7
+543,7
@@
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y": 1
4
5.0
+ "y": 1
1
5.0
}
]
},
}
]
},
@@
-561,7
+564,7
@@
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y": 1
5
5.0
+ "y": 1
2
5.0
}
]
},
}
]
},
@@
-625,16
+628,16
@@
"name": "unnamedWire#2",
"path": [
{
"name": "unnamedWire#2",
"path": [
{
- "x":
255
.0,
+ "x":
150
.0,
"y": 25.0
},
{
"y": 25.0
},
{
- "x": 3
6
0.0,
+ "x": 3
1
0.0,
"y": 25.0
},
{
"y": 25.0
},
{
- "x": 3
6
0.0,
- "y":
20
5.0
+ "x": 3
1
0.0,
+ "y":
11
5.0
}
]
},
}
]
},
@@
-648,12
+651,7
@@
"pinName": "I"
},
"name": "unnamedWire#20",
"pinName": "I"
},
"name": "unnamedWire#20",
- "path": [
- {
- "x": 40.0,
- "y": 435.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-691,12
+689,12
@@
"name": "unnamedWire#23",
"path": [
{
"name": "unnamedWire#23",
"path": [
{
- "x":
25
.0,
- "y":
30
5.0
+ "x":
30
.0,
+ "y":
24
5.0
},
{
},
{
- "x":
25
.0,
- "y": 2
6
5.0
+ "x":
30
.0,
+ "y": 2
0
5.0
}
]
},
}
]
},
@@
-713,15
+711,15
@@
"path": [
{
"x": 60.0,
"path": [
{
"x": 60.0,
- "y":
445
.0
+ "y":
360
.0
},
{
"x": 60.0,
},
{
"x": 60.0,
- "y":
41
5.0
+ "y":
33
5.0
},
{
},
{
- "x":
3
0.0,
- "y":
41
5.0
+ "x":
2
0.0,
+ "y":
33
5.0
}
]
},
}
]
},
@@
-755,16
+753,16
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#4
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#27",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#27",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#4
",
+ "pinName": "
O
3"
},
"pin2": {
"compName": "WireCrossPoint#1",
},
"pin2": {
"compName": "WireCrossPoint#1",
@@
-797,16
+795,16
@@
"name": "unnamedWire#3",
"path": [
{
"name": "unnamedWire#3",
"path": [
{
- "x": 1
55
.0,
+ "x": 1
00
.0,
"y": 20.0
},
{
"y": 20.0
},
{
- "x":
365
.0,
+ "x":
190
.0,
"y": 20.0
},
{
"y": 20.0
},
{
- "x":
365
.0,
- "y":
90
.0
+ "x":
190
.0,
+ "y":
55
.0
}
]
},
}
]
},
@@
-870,16
+868,16
@@
"name": "unnamedWire#34",
"path": [
{
"name": "unnamedWire#34",
"path": [
{
- "x":
41
5.0,
- "y": 3
80
.0
+ "x":
36
5.0,
+ "y": 3
15
.0
},
{
},
{
- "x":
80
.0,
- "y": 3
80
.0
+ "x":
25
.0,
+ "y": 3
15
.0
},
{
},
{
- "x":
80
.0,
- "y":
33
5.0
+ "x":
25
.0,
+ "y":
27
5.0
}
]
},
}
]
},
@@
-895,12
+893,12
@@
"name": "unnamedWire#35",
"path": [
{
"name": "unnamedWire#35",
"path": [
{
- "x":
42
0.0,
- "y": 3
85
.0
+ "x":
37
0.0,
+ "y": 3
20
.0
},
{
},
{
- "x":
85
.0,
- "y": 3
85
.0
+ "x":
30
.0,
+ "y": 3
20
.0
}
]
},
}
]
},
@@
-916,16
+914,16
@@
"name": "unnamedWire#36",
"path": [
{
"name": "unnamedWire#36",
"path": [
{
- "x":
42
5.0,
- "y": 3
90
.0
+ "x":
37
5.0,
+ "y": 3
25
.0
},
{
},
{
- "x":
90
.0,
- "y": 3
90
.0
+ "x":
35
.0,
+ "y": 3
25
.0
},
{
},
{
- "x":
90
.0,
- "y":
35
5.0
+ "x":
35
.0,
+ "y":
29
5.0
}
]
},
}
]
},
@@
-941,12
+939,12
@@
"name": "unnamedWire#37",
"path": [
{
"name": "unnamedWire#37",
"path": [
{
- "x":
43
0.0,
- "y": 3
95
.0
+ "x":
38
0.0,
+ "y": 3
30
.0
},
{
},
{
- "x":
95
.0,
- "y": 3
95
.0
+ "x":
40
.0,
+ "y": 3
30
.0
}
]
},
}
]
},
@@
-974,8
+972,8
@@
"name": "unnamedWire#39",
"path": [
{
"name": "unnamedWire#39",
"path": [
{
- "x":
85
.0,
- "y":
32
5.0
+ "x":
30
.0,
+ "y":
26
5.0
}
]
},
}
]
},
@@
-991,16
+989,16
@@
"name": "unnamedWire#4",
"path": [
{
"name": "unnamedWire#4",
"path": [
{
- "x": 5
5
.0,
+ "x": 5
0
.0,
"y": 15.0
},
{
"y": 15.0
},
{
- "x": 3
7
0.0,
+ "x": 3
2
0.0,
"y": 15.0
},
{
"y": 15.0
},
{
- "x": 3
7
0.0,
- "y":
18
5.0
+ "x": 3
2
0.0,
+ "y":
9
5.0
}
]
},
}
]
},
@@
-1016,8
+1014,8
@@
"name": "unnamedWire#40",
"path": [
{
"name": "unnamedWire#40",
"path": [
{
- "x":
95
.0,
- "y":
30
5.0
+ "x":
40
.0,
+ "y":
24
5.0
}
]
},
}
]
},
@@
-1045,12
+1043,12
@@
"name": "unnamedWire#42",
"path": [
{
"name": "unnamedWire#42",
"path": [
{
- "x":
3
0.0,
- "y":
230
.0
+ "x":
2
0.0,
+ "y":
175
.0
},
{
},
{
- "x":
5
0.0,
- "y":
230
.0
+ "x":
4
0.0,
+ "y":
175
.0
}
]
},
}
]
},
@@
-1090,8
+1088,8
@@
"name": "unnamedWire#45",
"path": [
{
"name": "unnamedWire#45",
"path": [
{
- "x":
5
0.0,
- "y":
10
5.0
+ "x":
4
0.0,
+ "y":
7
5.0
}
]
},
}
]
},
@@
-1145,8
+1143,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
O
"
+ "compName": "
Splitter#4
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
@@
-1215,8
+1213,8
@@
"name": "unnamedWire#54",
"path": [
{
"name": "unnamedWire#54",
"path": [
{
- "x":
90
.0,
- "y":
7
5.0
+ "x":
75
.0,
+ "y":
4
5.0
}
]
},
}
]
},
@@
-1280,8
+1278,8
@@
"name": "unnamedWire#59",
"path": [
{
"name": "unnamedWire#59",
"path": [
{
- "x":
20
.0,
- "y":
24
5.0
+ "x":
35
.0,
+ "y":
18
5.0
}
]
},
}
]
},
@@
-1321,8
+1319,8
@@
"name": "unnamedWire#61",
"path": [
{
"name": "unnamedWire#61",
"path": [
{
- "x":
75
.0,
- "y": 2
6
5.0
+ "x":
80
.0,
+ "y": 2
0
5.0
}
]
},
}
]
},
@@
-1338,12
+1336,12
@@
"name": "unnamedWire#62",
"path": [
{
"name": "unnamedWire#62",
"path": [
{
- "x":
80
.0,
- "y":
32
5.0
+ "x":
25
.0,
+ "y":
26
5.0
},
{
},
{
- "x":
80
.0,
- "y": 2
7
5.0
+ "x":
25
.0,
+ "y": 2
1
5.0
}
]
},
}
]
},
@@
-1407,8
+1405,8
@@
"name": "unnamedWire#67",
"path": [
{
"name": "unnamedWire#67",
"path": [
{
- "x": 1
9
5.0,
- "y":
435
.0
+ "x": 1
2
5.0,
+ "y":
350
.0
}
]
},
}
]
},
@@
-1436,12
+1434,12
@@
"name": "unnamedWire#69",
"path": [
{
"name": "unnamedWire#69",
"path": [
{
- "x":
10
5.0,
- "y":
23
5.0
+ "x":
8
5.0,
+ "y":
17
5.0
},
{
},
{
- "x":
10
5.0,
- "y":
6
5.0
+ "x":
8
5.0,
+ "y":
3
5.0
}
]
},
}
]
},
@@
-1451,8
+1449,8
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#4
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#7",
"path": []
},
"name": "unnamedWire#7",
"path": []
@@
-1469,12
+1467,12
@@
"name": "unnamedWire#70",
"path": [
{
"name": "unnamedWire#70",
"path": [
{
- "x": 2
9
5.0,
- "y":
21
5.0
+ "x": 2
3
5.0,
+ "y":
15
5.0
},
{
},
{
- "x": 2
9
5.0,
- "y":
25
5.0
+ "x": 2
3
5.0,
+ "y":
16
5.0
}
]
},
}
]
},
@@
-1490,12
+1488,12
@@
"name": "unnamedWire#71",
"path": [
{
"name": "unnamedWire#71",
"path": [
{
- "x":
30
0.0,
- "y":
24
5.0
+ "x":
24
0.0,
+ "y":
15
5.0
},
{
},
{
- "x":
30
0.0,
- "y":
20
5.0
+ "x":
24
0.0,
+ "y":
14
5.0
}
]
},
}
]
},
@@
-1511,20
+1509,20
@@
"name": "unnamedWire#72",
"path": [
{
"name": "unnamedWire#72",
"path": [
{
- "x":
420
.0,
- "y":
90
.0
+ "x":
235
.0,
+ "y":
55
.0
},
{
},
{
- "x":
420
.0,
- "y":
11
0.0
+ "x":
235
.0,
+ "y":
2
0.0
},
{
},
{
- "x": 3
6
5.0,
- "y":
11
0.0
+ "x": 3
1
5.0,
+ "y":
2
0.0
},
{
},
{
- "x": 3
6
5.0,
- "y": 1
9
5.0
+ "x": 3
1
5.0,
+ "y": 1
0
5.0
}
]
},
}
]
},
@@
-1540,12
+1538,12
@@
"name": "unnamedWire#73",
"path": [
{
"name": "unnamedWire#73",
"path": [
{
- "x":
31
0.0,
- "y":
22
5.0
+ "x":
25
0.0,
+ "y":
13
5.0
},
{
},
{
- "x":
31
0.0,
- "y": 1
8
5.0
+ "x":
25
0.0,
+ "y": 1
2
5.0
}
]
},
}
]
},
@@
-1609,12
+1607,12
@@
"name": "unnamedWire#78",
"path": [
{
"name": "unnamedWire#78",
"path": [
{
- "x":
20
0.0,
- "y":
22
5.0
+ "x":
14
0.0,
+ "y":
16
5.0
},
{
},
{
- "x":
20
0.0,
- "y":
9
5.0
+ "x":
14
0.0,
+ "y":
6
5.0
}
]
},
}
]
},
@@
-1630,19
+1628,19
@@
"name": "unnamedWire#79",
"path": [
{
"name": "unnamedWire#79",
"path": [
{
- "x":
20
5.0,
- "y":
8
5.0
+ "x":
14
5.0,
+ "y":
5
5.0
},
{
},
{
- "x":
20
5.0,
- "y":
21
5.0
+ "x":
14
5.0,
+ "y":
15
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#4
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "WireCrossPoint#3",
},
"pin2": {
"compName": "WireCrossPoint#3",
@@
-1663,12
+1661,12
@@
"name": "unnamedWire#80",
"path": [
{
"name": "unnamedWire#80",
"path": [
{
- "x":
21
0.0,
- "y":
20
5.0
+ "x":
15
0.0,
+ "y":
14
5.0
},
{
},
{
- "x":
21
0.0,
- "y":
7
5.0
+ "x":
15
0.0,
+ "y":
4
5.0
}
]
},
}
]
},
@@
-1684,12
+1682,12
@@
"name": "unnamedWire#81",
"path": [
{
"name": "unnamedWire#81",
"path": [
{
- "x":
21
5.0,
- "y":
6
5.0
+ "x":
15
5.0,
+ "y":
3
5.0
},
{
},
{
- "x":
21
5.0,
- "y": 1
9
5.0
+ "x":
15
5.0,
+ "y": 1
3
5.0
}
]
},
}
]
},
@@
-1705,12
+1703,12
@@
"name": "unnamedWire#82",
"path": [
{
"name": "unnamedWire#82",
"path": [
{
- "x":
245
.0,
- "y":
425
.0
+ "x":
170
.0,
+ "y":
340
.0
},
{
},
{
- "x":
245
.0,
- "y": 1
8
5.0
+ "x":
170
.0,
+ "y": 1
2
5.0
}
]
},
}
]
},
@@
-1720,40
+1718,49
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#15
",
- "pinName": ""
+ "compName": "
NandGate#0
",
+ "pinName": "
A
"
},
"name": "unnamedWire#83",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#83",
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#15",
- "pinName": ""
- },
- "pin2": {
"compName": "_submodelinterface",
"pinName": "COVD_EN"
},
"compName": "_submodelinterface",
"pinName": "COVD_EN"
},
+ "pin2": {
+ "compName": "WireCrossPoint#16",
+ "pinName": ""
+ },
"name": "unnamedWire#84",
"path": [
{
"name": "unnamedWire#84",
"path": [
{
- "x": 275.0,
- "y": 295.0
+ "x": 300.0,
+ "y": 10.0
+ },
+ {
+ "x": 270.0,
+ "y": 10.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#1
5
",
+ "compName": "WireCrossPoint#1
6
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
mux1#0
",
- "pinName": "
S0
"
+ "compName": "
WireCrossPoint#15
",
+ "pinName": ""
},
"name": "unnamedWire#85",
},
"name": "unnamedWire#85",
- "path": []
+ "path": [
+ {
+ "x": 165.0,
+ "y": 40.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-1767,16
+1774,16
@@
"name": "unnamedWire#86",
"path": [
{
"name": "unnamedWire#86",
"path": [
{
- "x": 3
75
.0,
- "y":
325
.0
+ "x": 3
50
.0,
+ "y":
70
.0
},
{
},
{
- "x":
320
.0,
- "y":
325
.0
+ "x":
265
.0,
+ "y":
70
.0
},
{
},
{
- "x":
320
.0,
- "y":
315
.0
+ "x":
265
.0,
+ "y":
200
.0
}
]
},
}
]
},
@@
-1792,12
+1799,20
@@
"name": "unnamedWire#87",
"path": [
{
"name": "unnamedWire#87",
"path": [
{
- "x":
30
5.0,
- "y": 1
9
5.0
+ "x":
24
5.0,
+ "y": 1
3
5.0
},
{
},
{
- "x": 305.0,
- "y": 305.0
+ "x": 245.0,
+ "y": 145.0
+ },
+ {
+ "x": 275.0,
+ "y": 145.0
+ },
+ {
+ "x": 275.0,
+ "y": 190.0
}
]
},
}
]
},
@@
-1813,12
+1828,12
@@
"name": "unnamedWire#88",
"path": [
{
"name": "unnamedWire#88",
"path": [
{
- "x": 3
65
.0,
- "y":
295
.0
+ "x": 3
20
.0,
+ "y":
180
.0
},
{
},
{
- "x": 3
65
.0,
- "y":
23
5.0
+ "x": 3
20
.0,
+ "y":
14
5.0
}
]
},
}
]
},
@@
-1848,15
+1863,20
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#1
6
",
+ "compName": "WireCrossPoint#1
5
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#15
",
- "pinName": ""
+ "compName": "
NandGate#0
",
+ "pinName": "
B
"
},
"name": "unnamedWire#90",
},
"name": "unnamedWire#90",
- "path": []
+ "path": [
+ {
+ "x": 165.0,
+ "y": 70.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-1864,26
+1884,14
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
NandGate
#0",
- "pinName": "
B
"
+ "compName": "
mux1
#0",
+ "pinName": "
S0
"
},
"name": "unnamedWire#91",
},
"name": "unnamedWire#91",
- "path": []
- },
- {
- "pin1": {
- "compName": "NandGate#0",
- "pinName": "A"
- },
- "pin2": {
- "compName": "WireCrossPoint#16",
- "pinName": ""
- },
- "name": "unnamedWire#92",
"path": [
{
"path": [
{
- "x":
32
0.0,
- "y":
95
.0
+ "x":
27
0.0,
+ "y":
180
.0
}
]
},
}
]
},