projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made GUIMerger/GUISplitter bit order more intuitive (MSB on top)
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUImux1.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1.json
b/net.mograsim.logic.model.am2900/components/GUImux1.json
index
c0d53e5
..
279f905
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 30.0,
{
"width": 35.0,
"height": 30.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "I0",
"y": 15.0
},
"name": "I0",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,28
+17,40
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "I1",
"y": 25.0
},
"name": "I1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
+ "x":
0
.0,
"y": 5.0
},
"y": 5.0
},
- "name": "Y",
- "logicWidth": 1
+ "name": "S0",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
+ "x":
35
.0,
"y": 5.0
},
"y": 5.0
},
- "name": "S0",
- "logicWidth": 1
+ "name": "Y",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
+ {
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
+ "pos": {
+ "x": 10.0,
+ "y": 7.5
+ },
+ "params": 1
+ },
{
"id": "GUINandGate",
"name": "GUINandGate#1",
{
"id": "GUINandGate",
"name": "GUINandGate#1",
@@
-50,10
+62,10
@@
mograsim version: 0.1.3
},
{
"id": "GUINandGate",
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
0
",
+ "name": "GUINandGate#
2
",
"pos": {
"pos": {
- "x":
10
.0,
- "y": 7.5
+ "x":
35
.0,
+ "y":
4
7.5
},
"params": 1
},
},
"params": 1
},
@@
-68,107
+80,93
@@
mograsim version: 0.1.3
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
1
",
+ "name": "WireCrossPoint#
0
",
"pos": {
"x": 4.0,
"pos": {
"x": 4.0,
- "y": 21.5
- },
- "params": 1
- },
- {
- "id": "GUINandGate",
- "name": "GUINandGate#2",
- "pos": {
- "x": 35.0,
- "y": 47.5
+ "y": 11.5
},
"params": 1
},
{
"id": "WireCrossPoint",
},
"params": 1
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
0
",
+ "name": "WireCrossPoint#
1
",
"pos": {
"x": 4.0,
"pos": {
"x": 4.0,
- "y":
1
1.5
+ "y":
2
1.5
},
"params": 1
}
],
},
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
GUINandGate#2
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#3
",
- "pinName": "
B
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
- "name": "unnamedWire#9"
+ "name": "unnamedWire#0",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUINandGate#1
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#
3
",
+ "compName": "GUINandGate#
0
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#8"
+ "name": "unnamedWire#1",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
I1
"
+ "compName": "
GUINandGate#3
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#2
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
"
},
},
- "name": "unnamedWire#7",
- "path": []
+ "name": "unnamedWire#10"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
GUINandGate#2
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "name": "unnamedWire#6",
- "path": [
- {
- "x": 5.0,
- "y": 52.5
- }
- ]
+ "name": "unnamedWire#2",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#0",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
1
",
+ "name": "unnamedWire#
3
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
S0
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUINandGate#1
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#0",
- "path": []
+ "name": "unnamedWire#4"
},
{
"pin1": {
},
{
"pin1": {
@@
-184,51
+182,57
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUINandGate#3
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
"
+ "compName": "
GUINandGate#2
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#10"
+ "name": "unnamedWire#6",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 52.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
I1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#
1
",
- "pinName": "
A
"
+ "compName": "GUINandGate#
2
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#4"
+ "name": "unnamedWire#7",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint
#1",
- "pinName": ""
+ "compName": "
GUINandGate
#1",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#
0
",
- "pinName": "
B
"
+ "compName": "GUINandGate#
3
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#3",
- "path": []
+ "name": "unnamedWire#8"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUINandGate#2
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUINandGate#3
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#2",
- "path": []
+ "name": "unnamedWire#9"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-238,5
+242,7
@@
mograsim version: 0.1.3
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "default"
+ "outlineRendererSnippetID": "default",
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file