projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished renaming logic.ui to logic.model
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUI_rsLatch.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
index
1e846c4
..
f644070
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@
-40,110
+40,115
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"x": 40.0,
"y": 12.5
},
"pos": {
"x": 40.0,
"y": 12.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"x": 10.0,
"y": 7.5
},
"pos": {
"x": 10.0,
"y": 7.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 64.0,
"y": 36.5
},
"pos": {
"x": 64.0,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
"y": 16.5
},
"pos": {
"x": 34.0,
"y": 16.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
_S
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#0
",
- "pinName": "
A
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
_Q
"
},
},
+ "name": "unnamedWire#7",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
_R
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#1
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q
"
},
},
+ "name": "unnamedWire#6",
"path": [
{
"x": 35.0,
"path": [
{
"x": 35.0,
- "y":
3
7.5
+ "y":
1
7.5
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y": 27.5
+ "y": 7.5
+ },
+ {
+ "x": 65.0,
+ "y": 7.5
+ },
+ {
+ "x": 65.0,
+ "y": 12.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
_R
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "path": []
- },
- {
- "pin1": {
"compName": "GUINandGate#1",
"compName": "GUINandGate#1",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
+ "pinName": "B"
},
},
+ "name": "unnamedWire#1",
"path": [
{
"path": [
{
- "x": 65.0,
- "y": 22.5
+ "x": 35.0,
+ "y": 37.5
+ },
+ {
+ "x": 35.0,
+ "y": 27.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
_S
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
0
",
"pinName": "A"
},
"pinName": "A"
},
+ "name": "unnamedWire#0",
"path": []
},
{
"path": []
},
{
@@
-155,6
+160,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#0",
"pinName": "B"
},
"compName": "GUINandGate#0",
"pinName": "B"
},
+ "name": "unnamedWire#5",
"path": [
{
"x": 65.0,
"path": [
{
"x": 65.0,
@@
-176,37
+182,39
@@
mograsim version: 0.1.3
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Q"
+ "compName": "GUINandGate#1",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#4",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "GUINandGate#1",
+ "pinName": "Y"
},
},
+ "pin2": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "name": "unnamedWire#3",
"path": [
"path": [
- {
- "x": 35.0,
- "y": 17.5
- },
- {
- "x": 35.0,
- "y": 7.5
- },
{
"x": 65.0,
{
"x": 65.0,
- "y": 7.5
- },
- {
- "x": 65.0,
- "y": 12.5
+ "y": 22.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
_Q
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
+ "name": "unnamedWire#2",
"path": []
}
]
"path": []
}
]