projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[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
6f679a9
..
4dd03a9
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 20.0,
{
"width": 35.0,
"height": 20.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Q",
"y": 5.0
},
"name": "Q",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "_Q",
"y": 15.0
},
"name": "_Q",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-25,7
+26,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "_R",
"y": 15.0
},
"name": "_R",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-33,23
+35,15
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "_S",
"y": 5.0
},
"name": "_S",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
{
- "id": "GUINandGate",
- "name": "GUINandGate#1",
- "pos": {
- "x": 40.0,
- "y": 12.5
- },
- "params": 1
- },
- {
- "id": "GUINandGate",
+ "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-58,25
+52,46
@@
mograsim version: 0.1.3
"params": 1
},
{
"params": 1
},
{
- "id": "
WireCrossPoint
",
- "name": "
WireCrossPoint
#1",
+ "id": "
class:net.mograsim.logic.model.model.components.atomic.GUINandGate
",
+ "name": "
GUINandGate
#1",
"pos": {
"pos": {
- "x":
64
.0,
- "y":
36
.5
+ "x":
40
.0,
+ "y":
12
.5
},
"params": 1
},
{
},
"params": 1
},
{
- "id": "WireCrossPoint",
+ "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
"y": 16.5
},
"params": 1
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
"y": 16.5
},
"params": 1
+ },
+ {
+ "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "pos": {
+ "x": 64.0,
+ "y": 36.5
+ },
+ "params": 1
}
],
}
],
- "innerWires": [
+ "wires": [
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "_Q"
+ },
+ "name": "_q",
+ "path": []
+ },
{
"pin1": {
"compName": "WireCrossPoint#0",
{
"pin1": {
"compName": "WireCrossPoint#0",
@@
-108,14
+123,14
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
_S
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
_Q
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
A
"
},
},
- "name": "
_q
",
+ "name": "
unnamedWire#0
",
"path": []
},
{
"path": []
},
{
@@
-141,37
+156,29
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
_S
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate
#0",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint
#0",
+ "pinName": ""
},
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
2
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint
#1",
- "pinName": ""
+ "compName": "
GUINandGate
#1",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#0
",
- "pinName": "
B
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "name": "unnamedWire#
5
",
+ "name": "unnamedWire#
3
",
"path": [
{
"x": 65.0,
"path": [
{
"x": 65.0,
- "y": 42.5
- },
- {
- "x": 5.0,
- "y": 42.5
- },
- {
- "x": 5.0,
"y": 22.5
}
]
"y": 22.5
}
]
@@
-190,36
+197,33
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#1",
- "pinName": "Y"
- },
- "pin2": {
"compName": "WireCrossPoint#1",
"pinName": ""
},
"compName": "WireCrossPoint#1",
"pinName": ""
},
- "name": "unnamedWire#3",
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "B"
+ },
+ "name": "unnamedWire#5",
"path": [
{
"x": 65.0,
"path": [
{
"x": 65.0,
+ "y": 42.5
+ },
+ {
+ "x": 5.0,
+ "y": 42.5
+ },
+ {
+ "x": 5.0,
"y": 22.5
}
]
"y": 22.5
}
]
- },
- {
- "pin1": {
- "compName": "GUINandGate#0",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "name": "unnamedWire#2",
- "path": []
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
simpleRectangularLike
",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
@@
-227,13
+231,13
@@
mograsim version: 0.1.3
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
default
",
- "highLevelStateHandlerSnippetID": "
standard
",
+ "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
+ "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
wireForcing
",
+ "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler
",
"params": {
"wiresToForce": [
"q"
"params": {
"wiresToForce": [
"q"
@@
-244,5
+248,6
@@
mograsim version: 0.1.3
}
}
}
}
}
}
- }
+ },
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file