projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed _WE pin from GUIdff4_finewe
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIdemux2.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdemux2.json
b/net.mograsim.logic.model.am2900/components/GUIdemux2.json
index
5ded84b
..
55e3c8a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
@@
-56,215
+56,242
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"x": 10.0,
"y": 27.5
},
"pos": {
"x": 10.0,
"y": 27.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"x": 10.0,
"y": 2.5
},
"pos": {
"x": 10.0,
"y": 2.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUIand",
+ "name": "GUIand#0",
"pos": {
"x": 40.0,
"y": 2.5
"pos": {
"x": 40.0,
"y": 2.5
- },
- "id": "GUIand",
- "name": "GUIand#0"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#2",
"pos": {
"x": 40.0,
"y": 52.5
"pos": {
"x": 40.0,
"y": 52.5
- },
- "id": "GUIand",
- "name": "GUIand#2"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#1",
"pos": {
"x": 40.0,
"y": 27.5
"pos": {
"x": 40.0,
"y": 27.5
- },
- "id": "GUIand",
- "name": "GUIand#1"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#3",
"pos": {
"x": 40.0,
"y": 77.5
"pos": {
"x": 40.0,
"y": 77.5
- },
- "id": "GUIand",
- "name": "GUIand#3"
+ }
},
{
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"y": 16.5
},
"pos": {
"x": 6.5,
"y": 16.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"y": 11.5
},
"pos": {
"x": 6.5,
"y": 11.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
"y": 36.5
},
"pos": {
"x": 4.0,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#3",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"pos": {
"x": 36.5,
"y": 61.5
},
"pos": {
"x": 36.5,
"y": 61.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#5",
"pos": {
"x": 31.5,
"y": 66.5
},
"pos": {
"x": 31.5,
"y": 66.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#5",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
"y": 41.5
},
"pos": {
"x": 4.0,
"y": 41.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#4",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
"y": 36.5
},
"pos": {
"x": 34.0,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#7",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
"y": 11.5
},
"pos": {
"x": 31.5,
"y": 11.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#6",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
S0
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUIand#1
",
+ "pinName": "
A
"
},
},
- "path": []
+ "name": "unnamedWire#14",
+ "path": [
+ {
+ "x": 37.5,
+ "y": 32.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoint#7
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#3
",
- "pinName": ""
+ "compName": "
GUIand#0
",
+ "pinName": "
B
"
},
},
- "path": []
+ "name": "unnamedWire#13",
+ "path": [
+ {
+ "x": 35.0,
+ "y": 17.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
6
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
NandGate#0
",
+ "compName": "GUI
and#2
",
"pinName": "A"
},
"pinName": "A"
},
+ "name": "unnamedWire#16",
"path": [
{
"path": [
{
- "x":
7
.5,
- "y": 7.5
+ "x":
32
.5,
+ "y":
5
7.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
7
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
NandGate
#1",
- "pinName": "
A
"
+ "compName": "GUI
and
#1",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#15",
"path": [
{
"path": [
{
- "x": 5.0,
- "y":
3
2.5
+ "x":
3
5.0,
+ "y":
4
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUIand#3
",
+ "pinName": "
A
"
},
},
- "path": []
+ "name": "unnamedWire#18",
+ "path": [
+ {
+ "x": 37.5,
+ "y": 82.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
5
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#4
",
- "pinName": ""
+ "compName": "
GUIand#2
",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#17",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
5
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
NandGate#0
",
+ "compName": "GUI
and#3
",
"pinName": "B"
},
"pinName": "B"
},
- "path": []
+ "name": "unnamedWire#19",
+ "path": [
+ {
+ "x": 32.5,
+ "y": 92.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-272,10
+299,20
@@
mograsim version: 0.1.3
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
GUINandGate#1
",
- "pinName": "
B
"
+ "compName": "
WireCrossPoint#5
",
+ "pinName": ""
},
},
- "path": []
+ "name": "unnamedWire#9",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 67.5
+ },
+ {
+ "x": 32.5,
+ "y": 67.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-286,6
+323,7
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#2",
"pinName": ""
},
"compName": "WireCrossPoint#2",
"pinName": ""
},
+ "name": "unnamedWire#8",
"path": [
{
"x": 7.5,
"path": [
{
"x": 7.5,
@@
-299,213
+337,200
@@
mograsim version: 0.1.3
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#5
",
- "pinName": ""
+ "compName": "
GUINandGate#1
",
+ "pinName": "
B
"
},
},
- "path": [
- {
- "x": 5.0,
- "y": 67.5
- },
- {
- "x": 32.5,
- "y": 67.5
- }
- ]
+ "name": "unnamedWire#7",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#6
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#6",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUINandGate#1
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
S1
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
7
",
+ "compName": "WireCrossPoint#
3
",
"pinName": ""
},
"pinName": ""
},
+ "name": "unnamedWire#1",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#6
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand
#0",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint
#0",
+ "pinName": ""
},
},
- "path": [
- {
- "x": 32.5,
- "y": 7.5
- }
- ]
+ "name": "unnamedWire#0",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
7
",
+ "compName": "WireCrossPoint#
3
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
GUIand#0
",
- "pinName": "
B
"
+ "compName": "
WireCrossPoint#4
",
+ "pinName": ""
},
},
- "path": [
- {
- "x": 35.0,
- "y": 17.5
- }
- ]
+ "name": "unnamedWire#5",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand#1
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#6
",
+ "pinName": ""
},
},
- "path": [
- {
- "x": 37.5,
- "y": 32.5
- }
- ]
+ "name": "unnamedWire#10",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#7
",
- "pinName": ""
+ "compName": "
GUIand#1
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand#1
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y01
"
},
},
- "path": [
- {
- "x": 35.0,
- "y": 42.5
- }
- ]
+ "name": "unnamedWire#21"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
6
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
GUIand#2
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "path": [
- {
- "x": 32.5,
- "y": 57.5
- }
- ]
+ "name": "unnamedWire#4",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#5
",
- "pinName": ""
+ "compName": "
GUIand#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand#2
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y00
"
},
},
- "
path": []
+ "
name": "unnamedWire#20"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
3
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
and#3
",
+ "compName": "GUI
NandGate#1
",
"pinName": "A"
},
"pinName": "A"
},
+ "name": "unnamedWire#3",
"path": [
{
"path": [
{
- "x":
37.5
,
- "y":
8
2.5
+ "x":
5.0
,
+ "y":
3
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
5
",
+ "compName": "WireCrossPoint#
6
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIand#
3
",
- "pinName": "
B
"
+ "compName": "GUIand#
0
",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#12",
"path": [
{
"x": 32.5,
"path": [
{
"x": 32.5,
- "y":
92
.5
+ "y":
7
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUIand#
0
",
+ "compName": "GUIand#
3
",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "Y00"
- }
+ "pinName": "Y11"
+ },
+ "name": "unnamedWire#23"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIand#1
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y01"
- }
+ "compName": "GUINandGate#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#2",
+ "path": [
+ {
+ "x": 7.5,
+ "y": 7.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUI
and#2
",
+ "compName": "GUI
NandGate#1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y10"
- }
+ "compName": "WireCrossPoint#7",
+ "pinName": ""
+ },
+ "name": "unnamedWire#11",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUIand#
3
",
+ "compName": "GUIand#
2
",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "Y11"
- }
+ "pinName": "Y10"
+ },
+ "name": "unnamedWire#22"
}
]
},
}
]
},
- "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.
SimpleRectangularLikeSymbolRenderer",
"symbolRendererParams": {
"centerText": "GUIdemux2",
"symbolRendererParams": {
"centerText": "GUIdemux2",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
- }
+ },
+ "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
}
\ No newline at end of file
}
\ No newline at end of file