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
/
GUIfulladder.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIfulladder.json
b/net.mograsim.logic.model.am2900/components/GUIfulladder.json
index
d464701
..
8b41bd3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIfulladder.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIfulladder.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": 5.0
},
"name": "A",
"y": 5.0
},
"name": "A",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "B",
"y": 15.0
},
"name": "B",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,7
+26,8
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "C",
"y": 25.0
},
"name": "C",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-33,7
+35,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y",
"y": 5.0
},
"name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-41,12
+44,13
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "Z",
"y": 15.0
},
"name": "Z",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
"id": "GUINandGate",
"name": "GUINandGate#0",
{
"id": "GUINandGate",
"name": "GUINandGate#0",
@@
-73,46
+77,18
@@
mograsim version: 0.1.3
}
}
],
}
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "GUINandGate#0",
- "pinName": "Y"
- },
- "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Z"
- },
- "name": "unnamedWire#7"
- },
- {
- "pin1": {
- "compName": "GUIhalfadder#1",
- "pinName": "_Z"
+ "pinName": "A"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
NandGate#0
",
+ "compName": "GUI
halfadder#1
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#6",
- "path": [
- {
- "x": 82.5,
- "y": 22.5
- },
- {
- "x": 82.5,
- "y": 35.0
- },
- {
- "x": 52.5,
- "y": 35.0
- },
- {
- "x": 52.5,
- "y": 45.0
- }
- ]
+ "name": "unnamedWire#0",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-128,26
+104,24
@@
mograsim version: 0.1.3
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
A
"
+ "pinName": "
C
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIhalfadder#
1
",
- "pinName": "
A
"
+ "compName": "GUIhalfadder#
0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#0",
- "path": []
+ "name": "unnamedWire#2"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUIhalfadder#
1
",
+ "compName": "GUIhalfadder#
0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
"
+ "compName": "
GUIhalfadder#1
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#5",
- "path": []
+ "name": "unnamedWire#3"
},
{
"pin1": {
},
{
"pin1": {
@@
-163,27
+137,58
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUIhalfadder#
0
",
+ "compName": "GUIhalfadder#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#5",
+ "path": []
+ },
+ {
+ "pin1": {
"compName": "GUIhalfadder#1",
"compName": "GUIhalfadder#1",
- "pinName": "
B
"
+ "pinName": "
_Z
"
},
},
- "name": "unnamedWire#3"
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#6",
+ "path": [
+ {
+ "x": 82.5,
+ "y": 22.5
+ },
+ {
+ "x": 82.5,
+ "y": 35.0
+ },
+ {
+ "x": 52.5,
+ "y": 35.0
+ },
+ {
+ "x": 52.5,
+ "y": 45.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIhalfadder#0
",
- "pinName": "
B
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Z
"
},
},
- "name": "unnamedWire#
2
"
+ "name": "unnamedWire#
7
"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-193,5
+198,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