projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made GUIMerger and GUISplitter the same thing
[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
a5b084d
..
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
@@
-114,15
+114,6
@@
"innerScale": 0.2,
"submodel": {
"components": [
"innerScale": 0.2,
"submodel": {
"components": [
- {
- "id": "Merger",
- "name": "Merger#0",
- "pos": {
- "x": 385.0,
- "y": 85.0
- },
- "params": 4
- },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-139,7
+130,10
@@
"x": 5.0,
"y": 35.0
},
"x": 5.0,
"y": 35.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-148,7
+142,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
+154,10
@@
"x": 45.0,
"y": 340.0
},
"x": 45.0,
"y": 340.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-166,7
+166,22
@@
"x": 5.0,
"y": 235.0
},
"x": 5.0,
"y": 235.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",
},
{
"id": "WireCrossPoint",
@@
-738,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",
@@
-1128,8
+1143,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
O
"
+ "compName": "
Splitter#4
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
@@
-1434,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": []
@@
-1624,8
+1639,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#4
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "WireCrossPoint#3",
},
"pin2": {
"compName": "WireCrossPoint#3",