projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed problems found by ReserializeAndVerifyJSONs
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2904
/
Am2904muSR.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
index
7faf69d
..
2949d8d
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@
-105,15
+105,6
@@
"innerScale": 0.2,
"submodel": {
"components": [
"innerScale": 0.2,
"submodel": {
"components": [
- {
- "id": "Merger",
- "name": "Merger#0",
- "pos": {
- "x": 230.0,
- "y": 30.0
- },
- "params": 4
- },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-148,7
+139,10
@@
"x": 5.0,
"y": 135.0
},
"x": 5.0,
"y": 135.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-157,7
+151,10
@@
"x": 5.0,
"y": 185.0
},
"x": 5.0,
"y": 185.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-166,7
+163,22
@@
"x": 5.0,
"y": 95.0
},
"x": 5.0,
"y": 95.0
},
- "params": 2
+ "params": {
+ "logicWidth": 2,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#3",
+ "pos": {
+ "x": 230.0,
+ "y": 30.0
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
@@
-262,16
+274,16
@@
"pinName": "Q1"
},
"pin2": {
"pinName": "Q1"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#3
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#0",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#0",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#3
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "dff4_finewe#0",
},
"pin2": {
"compName": "dff4_finewe#0",
@@
-307,8
+319,8
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#3
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#11",
"path": []
},
"name": "unnamedWire#11",
"path": []
@@
-443,8
+455,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#3
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "dff4_finewe#0",
},
"pin2": {
"compName": "dff4_finewe#0",
@@
-658,18
+670,6
@@
}
]
},
}
]
},
- {
- "pin1": {
- "compName": "WireCrossPoint#3",
- "pinName": ""
- },
- "pin2": {
- "compName": "WireCrossPoint#3",
- "pinName": ""
- },
- "name": "unnamedWire#33",
- "path": []
- },
{
"pin1": {
"compName": "WireCrossPoint#3",
{
"pin1": {
"compName": "WireCrossPoint#3",
@@
-679,7
+679,7
@@
"compName": "NandGate#1",
"pinName": "B"
},
"compName": "NandGate#1",
"pinName": "B"
},
- "name": "unnamedWire#3
4
",
+ "name": "unnamedWire#3
3
",
"path": [
{
"x": 225.0,
"path": [
{
"x": 225.0,
@@
-704,7
+704,7
@@
"compName": "xor#0",
"pinName": "A"
},
"compName": "xor#0",
"pinName": "A"
},
- "name": "unnamedWire#3
5
",
+ "name": "unnamedWire#3
4
",
"path": [
{
"x": 125.0,
"path": [
{
"x": 125.0,
@@
-725,7
+725,7
@@
"compName": "xor#0",
"pinName": "B"
},
"compName": "xor#0",
"pinName": "B"
},
- "name": "unnamedWire#3
6
",
+ "name": "unnamedWire#3
5
",
"path": [
{
"x": 105.0,
"path": [
{
"x": 105.0,
@@
-746,7
+746,7
@@
"compName": "_submodelinterface",
"pinName": "_EZ"
},
"compName": "_submodelinterface",
"pinName": "_EZ"
},
- "name": "unnamedWire#3
7
",
+ "name": "unnamedWire#3
6
",
"path": [
{
"x": 180.0,
"path": [
{
"x": 180.0,
@@
-771,7
+771,7
@@
"compName": "dff4_finewe#0",
"pinName": "C"
},
"compName": "dff4_finewe#0",
"pinName": "C"
},
- "name": "unnamedWire#3
8
",
+ "name": "unnamedWire#3
7
",
"path": [
{
"x": 55.0,
"path": [
{
"x": 55.0,
@@
-792,7
+792,7
@@
"compName": "dff4_finewe#0",
"pinName": "_WE4"
},
"compName": "dff4_finewe#0",
"pinName": "_WE4"
},
- "name": "unnamedWire#3
9
",
+ "name": "unnamedWire#3
8
",
"path": [
{
"x": 200.0,
"path": [
{
"x": 200.0,
@@
-810,47
+810,47
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger
#0",
- "pinName": "
O
"
+ "compName": "
dff4_finewe
#0",
+ "pinName": "
_WE3
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "
Q
"
+ "pinName": "
_EN
"
},
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
39
",
"path": [
{
"path": [
{
- "x":
245
.0,
- "y":
45
.0
+ "x":
170
.0,
+ "y":
60
.0
},
{
},
{
- "x": 245.0,
- "y": 50.0
+ "x": 170.0,
+ "y": 15.0
+ },
+ {
+ "x": 150.0,
+ "y": 15.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
dff4_finewe#0
",
- "pinName": "
_WE3
"
+ "compName": "
Splitter#3
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "
_EN
"
+ "pinName": "
Q
"
},
},
- "name": "unnamedWire#4
0
",
+ "name": "unnamedWire#4",
"path": [
{
"path": [
{
- "x": 170.0,
- "y": 60.0
- },
- {
- "x": 170.0,
- "y": 15.0
+ "x": 245.0,
+ "y": 45.0
},
{
},
{
- "x":
150
.0,
- "y":
15
.0
+ "x":
245
.0,
+ "y":
50
.0
}
]
},
}
]
},
@@
-863,7
+863,7
@@
"compName": "dff4_finewe#0",
"pinName": "_WE2"
},
"compName": "dff4_finewe#0",
"pinName": "_WE2"
},
- "name": "unnamedWire#4
1
",
+ "name": "unnamedWire#4
0
",
"path": [
{
"x": 100.0,
"path": [
{
"x": 100.0,
@@
-888,7
+888,7
@@
"compName": "mux1_4#1",
"pinName": "Y1"
},
"compName": "mux1_4#1",
"pinName": "Y1"
},
- "name": "unnamedWire#4
2
",
+ "name": "unnamedWire#4
1
",
"path": []
},
{
"path": []
},
{
@@
-900,7
+900,7
@@
"compName": "dff4_finewe#0",
"pinName": "D2"
},
"compName": "dff4_finewe#0",
"pinName": "D2"
},
- "name": "unnamedWire#4
3
",
+ "name": "unnamedWire#4
2
",
"path": [
{
"x": 170.0,
"path": [
{
"x": 170.0,
@@
-921,7
+921,7
@@
"compName": "mux1_4#1",
"pinName": "Y3"
},
"compName": "mux1_4#1",
"pinName": "Y3"
},
- "name": "unnamedWire#4
4
",
+ "name": "unnamedWire#4
3
",
"path": []
},
{
"path": []
},
{
@@
-933,7
+933,7
@@
"compName": "mux1_4#1",
"pinName": "Y4"
},
"compName": "mux1_4#1",
"pinName": "Y4"
},
- "name": "unnamedWire#4
5
",
+ "name": "unnamedWire#4
4
",
"path": [
{
"x": 115.0,
"path": [
{
"x": 115.0,
@@
-950,7
+950,7
@@
"compName": "dff4_finewe#0",
"pinName": "D4"
},
"compName": "dff4_finewe#0",
"pinName": "D4"
},
- "name": "unnamedWire#4
6
",
+ "name": "unnamedWire#4
5
",
"path": [
{
"x": 180.0,
"path": [
{
"x": 180.0,
@@
-971,7
+971,7
@@
"compName": "NandGate#2",
"pinName": "A"
},
"compName": "NandGate#2",
"pinName": "A"
},
- "name": "unnamedWire#4
7
",
+ "name": "unnamedWire#4
6
",
"path": []
},
{
"path": []
},
{
@@
-983,7
+983,7
@@
"compName": "NandGate#2",
"pinName": "B"
},
"compName": "NandGate#2",
"pinName": "B"
},
- "name": "unnamedWire#4
8
",
+ "name": "unnamedWire#4
7
",
"path": [
{
"x": 115.0,
"path": [
{
"x": 115.0,
@@
-1000,7
+1000,7
@@
"compName": "mux1_4#0",
"pinName": "I0_1"
},
"compName": "mux1_4#0",
"pinName": "I0_1"
},
- "name": "unnamedWire#4
9
",
+ "name": "unnamedWire#4
8
",
"path": [
{
"x": 20.0,
"path": [
{
"x": 20.0,