projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/development' into development
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
am2901
/
GUIAm2901QReg.json
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
index
ec0983e
..
05bd783
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
@@
-88,141
+88,178
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUIdff",
+ "name": "GUIdff#1",
"pos": {
"x": 50.0,
"y": 32.5
"pos": {
"x": 50.0,
"y": 32.5
- },
- "id": "GUIdff",
- "name": "GUIdff#1"
+ }
},
{
},
{
+ "id": "GUIdff",
+ "name": "GUIdff#0",
"pos": {
"x": 50.0,
"y": 7.5
"pos": {
"x": 50.0,
"y": 7.5
- },
- "id": "GUIdff",
- "name": "GUIdff#0"
+ }
},
{
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 41.5,
"y": 36.5
},
"pos": {
"x": 41.5,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 41.5,
"y": 19.0
},
"pos": {
"x": 41.5,
"y": 19.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"pos": {
"x": 41.5,
"y": 61.5
},
"pos": {
"x": 41.5,
"y": 61.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUIand",
+ "name": "GUIand#0",
"pos": {
"x": 5.0,
"y": 15.0
"pos": {
"x": 5.0,
"y": 15.0
- },
- "id": "GUIand",
- "name": "GUIand#0"
+ }
},
{
},
{
+ "id": "GUIdff",
+ "name": "GUIdff#3",
"pos": {
"x": 50.0,
"y": 82.5
"pos": {
"x": 50.0,
"y": 82.5
- },
- "id": "GUIdff",
- "name": "GUIdff#3"
+ }
},
{
},
{
+ "id": "GUIdff",
+ "name": "GUIdff#2",
"pos": {
"x": 50.0,
"y": 57.5
"pos": {
"x": 50.0,
"y": 57.5
- },
- "id": "GUIdff",
- "name": "GUIdff#2"
+ }
}
],
"innerWires": [
{
"pin1": {
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C
"
+ "compName": "
GUIdff#1
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIand#0",
- "pinName": "A"
- }
+ "compName": "_submodelinterface",
+ "pinName": "Q2"
+ },
+ "name": "unnamedWire#14",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
+ "compName": "GUIdff#0",
+ "pinName": "Q"
+ },
+ "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "WE"
+ "pinName": "Q1"
+ },
+ "name": "unnamedWire#13",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "GUIdff#3",
+ "pinName": "Q"
},
"pin2": {
},
"pin2": {
- "compName": "GUIand#0",
- "pinName": "B"
- }
+ "compName": "_submodelinterface",
+ "pinName": "Q4"
+ },
+ "name": "unnamedWire#16",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUI
and#0
",
- "pinName": "
Y
"
+ "compName": "GUI
dff#2
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q3
"
},
},
+ "name": "unnamedWire#15",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
D1
"
},
"pin2": {
"compName": "GUIdff#0",
},
"pin2": {
"compName": "GUIdff#0",
- "pinName": "
C
"
+ "pinName": "
D
"
},
},
+ "name": "unnamedWire#9",
"path": [
{
"path": [
{
- "x": 42.5,
- "y": 12.5
+ "x": 17.5,
+ "y": 62.5
+ },
+ {
+ "x": 17.5,
+ "y": 42.5
+ },
+ {
+ "x": 45.0,
+ "y": 42.5
+ },
+ {
+ "x": 45.0,
+ "y": 22.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUIdff#3
",
+ "pinName": "
C
"
},
},
- "path": []
+ "name": "unnamedWire#8",
+ "path": [
+ {
+ "x": 42.5,
+ "y": 87.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIdff#
1
",
+ "compName": "GUIdff#
2
",
"pinName": "C"
},
"pinName": "C"
},
+ "name": "unnamedWire#7",
"path": []
},
{
"path": []
},
{
@@
-234,62
+271,42
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#2",
"pinName": ""
},
"compName": "WireCrossPoint#2",
"pinName": ""
},
+ "name": "unnamedWire#6",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
WE
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
dff#2
",
- "pinName": "
C
"
+ "compName": "GUI
and#0
",
+ "pinName": "
B
"
},
},
- "
path": []
+ "
name": "unnamedWire#1"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
C
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
dff#3
",
- "pinName": "
C
"
+ "compName": "GUI
and#0
",
+ "pinName": "
A
"
},
},
- "path": [
- {
- "x": 42.5,
- "y": 87.5
- }
- ]
+ "name": "unnamedWire#0"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D1
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUIdff#
0
",
- "pinName": "
D
"
+ "compName": "GUIdff#
1
",
+ "pinName": "
C
"
},
},
- "path": [
- {
- "x": 17.5,
- "y": 62.5
- },
- {
- "x": 17.5,
- "y": 42.5
- },
- {
- "x": 45.0,
- "y": 42.5
- },
- {
- "x": 45.0,
- "y": 22.5
- }
- ]
+ "name": "unnamedWire#5",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-300,6
+317,7
@@
mograsim version: 0.1.3
"compName": "GUIdff#1",
"pinName": "D"
},
"compName": "GUIdff#1",
"pinName": "D"
},
+ "name": "unnamedWire#10",
"path": [
{
"x": 22.5,
"path": [
{
"x": 22.5,
@@
-313,21
+331,30
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D3
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUIdff#2",
- "pinName": "D"
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "name": "unnamedWire#4",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
},
},
+ "pin2": {
+ "compName": "GUIdff#0",
+ "pinName": "C"
+ },
+ "name": "unnamedWire#3",
"path": [
{
"path": [
{
- "x": 27.5,
- "y": 112.5
- },
- {
- "x": 27.5,
- "y": 72.5
+ "x": 42.5,
+ "y": 12.5
}
]
},
}
]
},
@@
-340,6
+367,7
@@
mograsim version: 0.1.3
"compName": "GUIdff#3",
"pinName": "D"
},
"compName": "GUIdff#3",
"pinName": "D"
},
+ "name": "unnamedWire#12",
"path": [
{
"x": 32.5,
"path": [
{
"x": 32.5,
@@
-353,47
+381,36
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUIdff#0",
- "pinName": "Q"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Q1"
- },
- "path": []
- },
- {
- "pin1": {
- "compName": "GUIdff#1",
- "pinName": "Q"
+ "compName": "GUIand#0",
+ "pinName": "Y"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q2
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
+ "name": "unnamedWire#2",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "GUIdff#2",
- "pinName": "Q"
- },
- "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Q3"
- },
- "path": []
- },
- {
- "pin1": {
- "compName": "GUIdff#3",
- "pinName": "Q"
+ "pinName": "D3"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q4
"
+ "compName": "
GUIdff#2
",
+ "pinName": "
D
"
},
},
- "path": []
+ "name": "unnamedWire#11",
+ "path": [
+ {
+ "x": 27.5,
+ "y": 112.5
+ },
+ {
+ "x": 27.5,
+ "y": 72.5
+ }
+ ]
}
]
},
}
]
},