projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed GUIMerger/Splitter read end array order; removed resolved TODO
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
am2901
/
GUIAm2901ALUOneBit.json
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
index
5abfdb5
..
1fd3ed8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 90.0,
{
"width": 35.0,
"height": 90.0,
@@
-6,95
+5,106
@@
mograsim version: 0.1.3
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
3
5.0
+ "y": 5.0
},
},
- "name": "R",
- "logicWidth": 1
+ "name": "Cin",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
5
5.0
+ "y":
2
5.0
},
},
- "name": "S",
- "logicWidth": 1
+ "name": "CinE",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 35.0,
},
{
"location": {
"x": 35.0,
- "y":
1
5.0
+ "y": 5.0
},
},
- "name": "F",
- "logicWidth": 1
+ "name": "Cout",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
7
5.0
+ "y":
1
5.0
},
},
- "name": "FN",
- "logicWidth": 1
+ "name": "CoutE",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y": 5.0
+ "x":
35
.0,
+ "y":
1
5.0
},
},
- "name": "Cin",
- "logicWidth": 1
+ "name": "F",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
6
5.0
+ "y":
7
5.0
},
},
- "name": "SN",
- "logicWidth": 1
+ "name": "FN",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
- "y": 5.0
+ "x":
0
.0,
+ "y":
8
5.0
},
},
- "name": "Cout",
- "logicWidth": 1
+ "name": "L",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
4
5.0
+ "y":
3
5.0
},
},
- "name": "RN",
- "logicWidth": 1
+ "name": "R",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
8
5.0
+ "y":
4
5.0
},
},
- "name": "L",
- "logicWidth": 1
+ "name": "RN",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y":
5
5.0
},
},
- "name": "CinE",
- "logicWidth": 1
+ "name": "S",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
1
5.0
+ "y":
6
5.0
},
},
- "name": "CoutE",
- "logicWidth": 1
+ "name": "SN",
+ "logicWidth": 1,
+ "usage": "INPUT"
}
],
}
],
+ "innerScale": 0.2,
"submodel": {
"submodel": {
- "innerScale": 0.2,
- "subComps": [
+ "components": [
{
"id": "GUINandGate",
"name": "GUINandGate#0",
{
"id": "GUINandGate",
"name": "GUINandGate#0",
@@
-105,22
+115,28
@@
mograsim version: 0.1.3
"params": 1
},
{
"params": 1
},
{
- "id": "
WireCrossPoint
",
- "name": "
WireCrossPoint#1
",
+ "id": "
GUIand
",
+ "name": "
GUIand#0
",
"pos": {
"pos": {
- "x": 54.0,
- "y": 69.0
- },
- "params": 1
+ "x": 10.0,
+ "y": 20.0
+ }
},
{
},
{
- "id": "
WireCrossPoint
",
- "name": "
WireCrossPoint#0
",
+ "id": "
GUIand
",
+ "name": "
GUIand#1
",
"pos": {
"pos": {
- "x": 49.0,
- "y": 59.0
- },
- "params": 1
+ "x": 135.0,
+ "y": 20.0
+ }
+ },
+ {
+ "id": "GUIfulladder",
+ "name": "GUIfulladder#0",
+ "pos": {
+ "x": 60.0,
+ "y": 20.0
+ }
},
{
"id": "GUImux1",
},
{
"id": "GUImux1",
@@
-131,11
+147,11
@@
mograsim version: 0.1.3
}
},
{
}
},
{
- "id": "GUI
and
",
- "name": "GUI
and
#0",
+ "id": "GUI
xor
",
+ "name": "GUI
xor
#0",
"pos": {
"x": 10.0,
"pos": {
"x": 10.0,
- "y":
2
0.0
+ "y":
19
0.0
}
},
{
}
},
{
@@
-155,284
+171,264
@@
mograsim version: 0.1.3
}
},
{
}
},
{
- "id": "GUIfulladder",
- "name": "GUIfulladder#0",
- "pos": {
- "x": 60.0,
- "y": 20.0
- }
- },
- {
- "id": "GUIxor",
- "name": "GUIxor#0",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"pos": {
- "x": 10.0,
- "y": 190.0
- }
+ "x": 49.0,
+ "y": 59.0
+ },
+ "params": 1
},
{
},
{
- "id": "
GUIand
",
- "name": "
GUIand
#1",
+ "id": "
WireCrossPoint
",
+ "name": "
WireCrossPoint
#1",
"pos": {
"pos": {
- "x": 135.0,
- "y": 20.0
- }
+ "x": 54.0,
+ "y": 69.0
+ },
+ "params": 1
}
],
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Cin
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
fulladder
#0",
- "pinName": "
C
"
+ "compName": "GUI
and
#0",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#14",
+ "name": "unnamedWire#0",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "CoutE"
+ },
+ "pin2": {
+ "compName": "GUIand#1",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#1",
"path": [
{
"path": [
{
- "x": 55.0,
- "y": 45.0
+ "x": 5.0,
+ "y": 75.0
+ },
+ {
+ "x": 5.0,
+ "y": 10.0
+ },
+ {
+ "x": 130.0,
+ "y": 10.0
+ },
+ {
+ "x": 130.0,
+ "y": 25.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUIxor#
1
",
+ "compName": "GUIxor#
0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#1
3
",
+ "name": "unnamedWire#1
0
",
"path": [
{
"path": [
{
- "x": 5
5
.0,
- "y":
2
95.0
+ "x": 5
0
.0,
+ "y":
1
95.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUIfulladder
#0",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint
#0",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUI
mux1
#0",
- "pinName": "
I0
"
+ "compName": "GUI
fulladder
#0",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#1
6
",
+ "name": "unnamedWire#1
1
",
"path": [
{
"path": [
{
- "x": 100.0,
- "y": 25.0
- },
- {
- "x": 100.0,
- "y": 65.0
- },
- {
- "x": 85.0,
- "y": 65.0
- },
- {
- "x": 85.0,
- "y": 85.0
+ "x": 50.0,
+ "y": 35.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#0",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "
B
"
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#1
5
",
+ "name": "unnamedWire#1
2
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "GUI
NandGate#0
",
+ "compName": "GUI
xor#1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
GUImux1#0
",
- "pinName": "
I1
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "name": "unnamedWire#1
8
",
+ "name": "unnamedWire#1
3
",
"path": [
{
"path": [
{
- "x": 82.5,
- "y": 65.0
- },
- {
- "x": 82.5,
- "y": 95.0
+ "x": 55.0,
+ "y": 295.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUIfulladder#0
",
- "pinName": "
Z
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and#1
",
- "pinName": "
B
"
+ "compName": "GUI
fulladder#0
",
+ "pinName": "
C
"
},
},
- "name": "unnamedWire#17",
- "path": []
+ "name": "unnamedWire#14",
+ "path": [
+ {
+ "x": 55.0,
+ "y": 45.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUImux1#0
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUI
xor#2
",
- "pinName": "
A
"
+ "compName": "GUI
NandGate#0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#1
9
",
+ "name": "unnamedWire#1
5
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "GUIand#0",
- "pinName": "Y"
- },
- "pin2": {
"compName": "GUIfulladder#0",
"compName": "GUIfulladder#0",
- "pinName": "A"
- },
- "name": "unnamedWire#9",
- "path": []
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "L"
+ "pinName": "Y"
},
"pin2": {
"compName": "GUImux1#0",
},
"pin2": {
"compName": "GUImux1#0",
- "pinName": "
S
0"
+ "pinName": "
I
0"
},
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
16
",
"path": [
{
"path": [
{
- "x":
87.5
,
- "y":
4
25.0
+ "x":
100.0
,
+ "y": 25.0
},
{
},
{
- "x": 87.5,
- "y": 75.0
- }
- ]
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "FN"
- },
- "pin2": {
- "compName": "GUIxor#2",
- "pinName": "B"
- },
- "name": "unnamedWire#7",
- "path": [
+ "x": 100.0,
+ "y": 65.0
+ },
{
{
- "x":
130
.0,
- "y":
37
5.0
+ "x":
85
.0,
+ "y":
6
5.0
},
{
},
{
- "x":
130
.0,
+ "x":
85
.0,
"y": 85.0
}
]
},
{
"pin1": {
"y": 85.0
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
SN
"
+ "compName": "
GUIfulladder#0
",
+ "pinName": "
Z
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
xor
#1",
+ "compName": "GUI
and
#1",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#6"
+ "name": "unnamedWire#17",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
CoutE
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and#1
",
- "pinName": "
A
"
+ "compName": "GUI
mux1#0
",
+ "pinName": "
I1
"
},
},
- "name": "unnamedWire#1",
+ "name": "unnamedWire#1
8
",
"path": [
{
"path": [
{
- "x": 5.0,
- "y": 75.0
- },
- {
- "x": 5.0,
- "y": 10.0
- },
- {
- "x": 130.0,
- "y": 10.0
+ "x": 82.5,
+ "y": 65.0
},
{
},
{
- "x":
130.0
,
- "y":
2
5.0
+ "x":
82.5
,
+ "y":
9
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
Cin
"
+ "compName": "
GUImux1#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and#0
",
+ "compName": "GUI
xor#2
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
19
",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
S
"
+ "pinName": "
CinE
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
xor#1
",
- "pinName": "
A
"
+ "compName": "GUI
and#0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#5"
+ "name": "unnamedWire#2",
+ "path": [
+ {
+ "x": 7.5,
+ "y": 125.0
+ },
+ {
+ "x": 7.5,
+ "y": 35.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUI
xor#0
",
+ "compName": "GUI
and#1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Cout
"
},
},
- "name": "unnamedWire#10",
- "path": [
- {
- "x": 50.0,
- "y": 195.0
- }
- ]
+ "name": "unnamedWire#20",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-449,90
+445,105
@@
mograsim version: 0.1.3
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "R
N
"
+ "pinName": "R"
},
"pin2": {
"compName": "GUIxor#0",
},
"pin2": {
"compName": "GUIxor#0",
- "pinName": "
B
"
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
4
"
+ "name": "unnamedWire#
3
"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIand#1
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
RN
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Cout
"
+ "compName": "
GUIxor#0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#20",
- "path": []
+ "name": "unnamedWire#4"
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
R
"
+ "pinName": "
S
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIxor#
0
",
+ "compName": "GUIxor#
1
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#
3
"
+ "name": "unnamedWire#
5
"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
SN
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
NandGate#0
",
- "pinName": "
A
"
+ "compName": "GUI
xor#1
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#12",
- "path": []
+ "name": "unnamedWire#6"
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
CinE
"
+ "pinName": "
FN
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and#0
",
+ "compName": "GUI
xor#2
",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#
2
",
+ "name": "unnamedWire#
7
",
"path": [
{
"path": [
{
- "x":
7.5
,
- "y":
12
5.0
+ "x":
130.0
,
+ "y":
37
5.0
},
{
},
{
- "x":
7.5
,
- "y":
3
5.0
+ "x":
130.0
,
+ "y":
8
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
L
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
fulladder
#0",
- "pinName": "
B
"
+ "compName": "GUI
mux1
#0",
+ "pinName": "
S0
"
},
},
- "name": "unnamedWire#
11
",
+ "name": "unnamedWire#
8
",
"path": [
{
"path": [
{
- "x": 50.0,
- "y": 35.0
+ "x": 87.5,
+ "y": 425.0
+ },
+ {
+ "x": 87.5,
+ "y": 75.0
}
]
}
]
+ },
+ {
+ "pin1": {
+ "compName": "GUIand#0",
+ "pinName": "Y"
+ },
+ "pin2": {
+ "compName": "GUIfulladder#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#9",
+ "path": []
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
@@
-540,5
+551,7
@@
mograsim version: 0.1.3
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
+ "outlineRendererSnippetID": "default",
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file