projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIWires now have names
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIdlatch.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch.json
index
d83cc99
..
4280559
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
@@
-40,115
+40,130
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"x": 15.0,
"y": 27.5
},
"pos": {
"x": 15.0,
"y": 27.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUI_rsLatch",
+ "name": "GUI_rsLatch#0",
"pos": {
"x": 45.0,
"y": 7.5
"pos": {
"x": 45.0,
"y": 7.5
- },
- "id": "GUI_rsLatch",
- "name": "GUI_rsLatch#0"
+ }
},
{
},
{
+ "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": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"y": 11.5
},
"pos": {
"x": 34.0,
"y": 11.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"y": 36.5
},
"pos": {
"x": 4.0,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D
"
+ "compName": "
GUI_rsLatch#0
",
+ "pinName": "
_Q
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#0",
- "pinName": "A"
- }
+ "compName": "_submodelinterface",
+ "pinName": "_Q"
+ },
+ "name": "unnamedWire#9"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
E
"
+ "compName": "
GUI_rsLatch#0
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q
"
},
},
+ "name": "unnamedWire#8",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUINandGate#1
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
NandGate
#0",
- "pinName": "
B
"
+ "compName": "GUI
_rsLatch
#0",
+ "pinName": "
_R
"
},
},
+ "name": "unnamedWire#7",
"path": [
{
"path": [
{
- "x": 5.0,
- "y": 17.5
+ "x": 40.0,
+ "y": 37.5
+ },
+ {
+ "x": 40.0,
+ "y": 22.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
NandGate#1
",
- "pinName": "
B
"
+ "compName": "GUI
_rsLatch#0
",
+ "pinName": "
_S
"
},
},
- "path": [
- {
- "x": 5.0,
- "y": 42.5
- }
- ]
+ "name": "unnamedWire#6",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
E
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pinName": ""
},
+ "name": "unnamedWire#1",
"path": []
},
"path": []
},
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "D"
+ },
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#0"
+ },
{
"pin1": {
"compName": "WireCrossPoint#1",
{
"pin1": {
"compName": "WireCrossPoint#1",
@@
-158,6
+173,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#1",
"pinName": "A"
},
"compName": "GUINandGate#1",
"pinName": "A"
},
+ "name": "unnamedWire#5",
"path": [
{
"x": 35.0,
"path": [
{
"x": 35.0,
@@
-175,55
+191,49
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUI_rsLatch#0
",
- "pinName": "
_S
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
+ "name": "unnamedWire#4",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUINandGate#1
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUI
_rsLatch#0
",
- "pinName": "
_R
"
+ "compName": "GUI
NandGate#1
",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#3",
"path": [
{
"path": [
{
- "x": 40.0,
- "y": 37.5
- },
- {
- "x": 40.0,
- "y": 22.5
+ "x": 5.0,
+ "y": 42.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUI_rsLatch
#0",
- "pinName": "
Q
"
+ "compName": "
WireCrossPoint
#0",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Q"
- },
- "path": []
- },
- {
- "pin1": {
- "compName": "GUI_rsLatch#0",
- "pinName": "_Q"
+ "compName": "GUINandGate#0",
+ "pinName": "B"
},
},
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "_Q"
- }
+ "name": "unnamedWire#2",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 17.5
+ }
+ ]
}
]
},
}
]
},