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
/
Am2900.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index
27be709
..
dbca8f2
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@
-157,94
+157,118
@@
}
},
{
}
},
{
- "id": "
Merger
",
- "name": "
Merger
#0",
+ "id": "
NandGate
",
+ "name": "
NandGate
#0",
"pos": {
"pos": {
- "x": 2
3
5.0,
- "y":
56
.0
+ "x": 2
5
5.0,
+ "y":
495
.0
},
},
- "params":
8
+ "params":
1
},
{
},
{
- "id": "
Merger
",
- "name": "
Merger
#1",
+ "id": "
NandGate
",
+ "name": "
NandGate
#1",
"pos": {
"pos": {
- "x": 2
35
.0,
- "y":
136
.0
+ "x": 2
70
.0,
+ "y":
550
.0
},
},
- "params":
4
+ "params":
1
},
{
},
{
- "id": "
Merg
er",
- "name": "
Merger#2
",
+ "id": "
Splitt
er",
+ "name": "
Splitter#0
",
"pos": {
"pos": {
- "x": 2
3
5.0,
- "y":
17
6.0
+ "x": 2
1
5.0,
+ "y":
5
6.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 16,
+ "orientation": "RIGHT"
+ }
},
{
},
{
- "id": "
Merg
er",
- "name": "
Merger#3
",
+ "id": "
Splitt
er",
+ "name": "
Splitter#1
",
"pos": {
"pos": {
- "x": 3
60
.0,
- "y":
2
0.0
+ "x": 3
05
.0,
+ "y":
3
0.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
},
{
- "id": "
Merg
er",
- "name": "
Merger#4
",
+ "id": "
Splitt
er",
+ "name": "
Splitter#10
",
"pos": {
"pos": {
- "x":
36
0.0,
- "y":
12
5.0
+ "x":
60
0.0,
+ "y":
39
5.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
},
{
- "id": "
NandGate
",
- "name": "
NandGate#0
",
+ "id": "
Splitter
",
+ "name": "
Splitter#11
",
"pos": {
"pos": {
- "x": 2
5
5.0,
- "y":
495
.0
+ "x": 2
3
5.0,
+ "y":
56
.0
},
},
- "params": 1
+ "params": {
+ "logicWidth": 8,
+ "orientation": "LEFT"
+ }
},
{
},
{
- "id": "
NandGate
",
- "name": "
NandGate#1
",
+ "id": "
Splitter
",
+ "name": "
Splitter#12
",
"pos": {
"pos": {
- "x": 2
70
.0,
- "y":
550
.0
+ "x": 2
35
.0,
+ "y":
136
.0
},
},
- "params": 1
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
- "name": "Splitter#
0
",
+ "name": "Splitter#
13
",
"pos": {
"pos": {
- "x": 2
1
5.0,
- "y":
5
6.0
+ "x": 2
3
5.0,
+ "y":
17
6.0
},
},
- "params": 16
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
- "name": "Splitter#1",
+ "name": "Splitter#1
4
",
"pos": {
"pos": {
- "x": 3
05
.0,
- "y":
3
0.0
+ "x": 3
60
.0,
+ "y":
2
0.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
- "name": "Splitter#1
0
",
+ "name": "Splitter#1
5
",
"pos": {
"pos": {
- "x":
60
0.0,
- "y":
39
5.0
+ "x":
36
0.0,
+ "y":
12
5.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-253,7
+277,10
@@
"x": 305.0,
"y": 135.0
},
"x": 305.0,
"y": 135.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-262,7
+289,10
@@
"x": 405.0,
"y": 395.0
},
"x": 405.0,
"y": 395.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-271,7
+301,10
@@
"x": 405.0,
"y": 435.0
},
"x": 405.0,
"y": 435.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-280,7
+313,10
@@
"x": 470.0,
"y": 395.0
},
"x": 470.0,
"y": 395.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-289,7
+325,10
@@
"x": 470.0,
"y": 435.0
},
"x": 470.0,
"y": 435.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-298,7
+337,10
@@
"x": 535.0,
"y": 435.0
},
"x": 535.0,
"y": 435.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-307,7
+349,10
@@
"x": 535.0,
"y": 395.0
},
"x": 535.0,
"y": 395.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-316,7
+361,10
@@
"x": 600.0,
"y": 435.0
},
"x": 600.0,
"y": 435.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
@@
-376,8
+424,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
- "x": 35
5
.0,
- "y": 5
10
.0
+ "x": 35
4
.0,
+ "y": 5
09
.0
},
"params": 16
},
},
"params": 16
},
@@
-487,7
+535,7
@@
},
{
"id": "dff16_we",
},
{
"id": "dff16_we",
- "name": "dff16_we#
1
",
+ "name": "dff16_we#
0
",
"pos": {
"x": 290.0,
"y": 485.0
"pos": {
"x": 290.0,
"y": 485.0
@@
-734,8
+782,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#3
",
- "pinName": "
O
"
+ "compName": "
Splitter#14
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "WireCrossPoint#10",
},
"pin2": {
"compName": "WireCrossPoint#10",
@@
-750,8
+798,8
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#4
",
- "pinName": "
O
"
+ "compName": "
Splitter#15
",
+ "pinName": "
I
"
},
"name": "unnamedWire#114",
"path": []
},
"name": "unnamedWire#114",
"path": []
@@
-918,7
+966,7
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "dff16_we#
1
",
+ "compName": "dff16_we#
0
",
"pinName": "WE"
},
"name": "unnamedWire#127",
"pinName": "WE"
},
"name": "unnamedWire#127",
@@
-930,7
+978,7
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "dff16_we#
1
",
+ "compName": "dff16_we#
0
",
"pinName": "D"
},
"name": "unnamedWire#128",
"pinName": "D"
},
"name": "unnamedWire#128",
@@
-1046,7
+1094,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "dff16_we#
1
",
+ "compName": "dff16_we#
0
",
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
@@
-1482,16
+1530,16
@@
"pinName": "O15"
},
"pin2": {
"pinName": "O15"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
7"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
7"
},
"name": "unnamedWire#46",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#46",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
6"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
6"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1506,16
+1554,16
@@
"pinName": "O13"
},
"pin2": {
"pinName": "O13"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
5"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
5"
},
"name": "unnamedWire#48",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#48",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
4"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
4"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1542,8
+1590,8
@@
"pinName": "O11"
},
"pin2": {
"pinName": "O11"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#50",
"path": []
},
"name": "unnamedWire#50",
"path": []
@@
-1554,16
+1602,16
@@
"pinName": "O10"
},
"pin2": {
"pinName": "O10"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#51",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#51",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1578,8
+1626,8
@@
"pinName": "O8"
},
"pin2": {
"pinName": "O8"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#11
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#53",
"path": []
},
"name": "unnamedWire#53",
"path": []
@@
-1607,8
+1655,8
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
I
3"
+ "compName": "
Splitter#12
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#55",
"path": [
},
"name": "unnamedWire#55",
"path": [
@@
-1624,16
+1672,16
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#2
",
- "pinName": "
I
3"
+ "compName": "
Splitter#13
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#56",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#56",
"path": []
},
{
"pin1": {
- "compName": "
Merger#2
",
- "pinName": "
I
2"
+ "compName": "
Splitter#13
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1648,16
+1696,16
@@
"pinName": "O1"
},
"pin2": {
"pinName": "O1"
},
"pin2": {
- "compName": "
Merger#2
",
- "pinName": "
I
1"
+ "compName": "
Splitter#13
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#58",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#58",
"path": []
},
{
"pin1": {
- "compName": "
Merger#2
",
- "pinName": "
I
0"
+ "compName": "
Splitter#13
",
+ "pinName": "
O
0"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1680,8
+1728,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#1
",
- "pinName": "
I
0"
+ "compName": "
Splitter#12
",
+ "pinName": "
O
0"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1696,16
+1744,16
@@
"pinName": "O5"
},
"pin2": {
"pinName": "O5"
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
I
1"
+ "compName": "
Splitter#12
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#61",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#61",
"path": []
},
{
"pin1": {
- "compName": "
Merger#1
",
- "pinName": "
I
2"
+ "compName": "
Splitter#12
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1824,8
+1872,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#2
",
- "pinName": "
O
"
+ "compName": "
Splitter#13
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Splitter#2",
},
"pin2": {
"compName": "Splitter#2",
@@
-1836,8
+1884,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#1
",
- "pinName": "
O
"
+ "compName": "
Splitter#12
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Splitter#1",
},
"pin2": {
"compName": "Splitter#1",
@@
-1852,16
+1900,16
@@
"pinName": "Y1"
},
"pin2": {
"pinName": "Y1"
},
"pin2": {
- "compName": "
Merger#3
",
- "pinName": "
I
3"
+ "compName": "
Splitter#14
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#73",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#73",
"path": []
},
{
"pin1": {
- "compName": "
Merger#3
",
- "pinName": "
I
2"
+ "compName": "
Splitter#14
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "mux1_4#0",
},
"pin2": {
"compName": "mux1_4#0",
@@
-1876,16
+1924,16
@@
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
- "compName": "
Merger#3
",
- "pinName": "
I
1"
+ "compName": "
Splitter#14
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#75",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#75",
"path": []
},
{
"pin1": {
- "compName": "
Merger#3
",
- "pinName": "
I
0"
+ "compName": "
Splitter#14
",
+ "pinName": "
O
0"
},
"pin2": {
"compName": "mux1_4#0",
},
"pin2": {
"compName": "mux1_4#0",
@@
-1900,16
+1948,16
@@
"pinName": "Y1"
},
"pin2": {
"pinName": "Y1"
},
"pin2": {
- "compName": "
Merger#4
",
- "pinName": "
I
3"
+ "compName": "
Splitter#15
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#77",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#77",
"path": []
},
{
"pin1": {
- "compName": "
Merger#4
",
- "pinName": "
I
2"
+ "compName": "
Splitter#15
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "mux1_4#1",
},
"pin2": {
"compName": "mux1_4#1",
@@
-1924,8
+1972,8
@@
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
- "compName": "
Merger#4
",
- "pinName": "
I
1"
+ "compName": "
Splitter#15
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#79",
"path": []
},
"name": "unnamedWire#79",
"path": []
@@
-1944,8
+1992,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#4
",
- "pinName": "
I
0"
+ "compName": "
Splitter#15
",
+ "pinName": "
O
0"
},
"pin2": {
"compName": "mux1_4#1",
},
"pin2": {
"compName": "mux1_4#1",