projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
My proposal for resolving add92039f433cd315f2087da9c1a0de899927d96
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
am2910
/
GUIAm2910.json
diff --git
a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
index
ae71c6d
..
647afc3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
+++ b/
net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
@@
-1,24
+1,8
@@
mograsim version: 0.1.3
{
"width": 72.0,
mograsim version: 0.1.3
{
"width": 72.0,
- "height": 6
1
.0,
+ "height": 6
7
.0,
"interfacePins": [
"interfacePins": [
- {
- "location": {
- "x": 19.0,
- "y": 61.0
- },
- "name": "_MAP",
- "logicWidth": 1
- },
- {
- "location": {
- "x": 0.0,
- "y": 44.0
- },
- "name": "_CCEN",
- "logicWidth": 1
- },
{
"location": {
"x": 60.0,
{
"location": {
"x": 60.0,
@@
-35,14
+19,6
@@
mograsim version: 0.1.3
"name": "D",
"logicWidth": 12
},
"name": "D",
"logicWidth": 12
},
- {
- "location": {
- "x": 72.0,
- "y": 14.0
- },
- "name": "_FULL",
- "logicWidth": 1
- },
{
"location": {
"x": 72.0,
{
"location": {
"x": 72.0,
@@
-67,10
+43,42
@@
mograsim version: 0.1.3
"name": "I",
"logicWidth": 4
},
"name": "I",
"logicWidth": 4
},
+ {
+ "location": {
+ "x": 19.0,
+ "y": 67.0
+ },
+ "name": "_MAP",
+ "logicWidth": 1
+ },
+ {
+ "location": {
+ "x": 0.0,
+ "y": 44.0
+ },
+ "name": "_CCEN",
+ "logicWidth": 1
+ },
+ {
+ "location": {
+ "x": 49.0,
+ "y": 67.0
+ },
+ "name": "_OE",
+ "logicWidth": 1
+ },
+ {
+ "location": {
+ "x": 72.0,
+ "y": 14.0
+ },
+ "name": "_FULL",
+ "logicWidth": 1
+ },
{
"location": {
"x": 38.0,
{
"location": {
"x": 38.0,
- "y": 6
1
.0
+ "y": 6
7
.0
},
"name": "Y",
"logicWidth": 12
},
"name": "Y",
"logicWidth": 12
@@
-78,7
+86,7
@@
mograsim version: 0.1.3
{
"location": {
"x": 13.0,
{
"location": {
"x": 13.0,
- "y": 6
1
.0
+ "y": 6
7
.0
},
"name": "_PL",
"logicWidth": 1
},
"name": "_PL",
"logicWidth": 1
@@
-86,7
+94,7
@@
mograsim version: 0.1.3
{
"location": {
"x": 25.0,
{
"location": {
"x": 25.0,
- "y": 6
1
.0
+ "y": 6
7
.0
},
"name": "_VECT",
"logicWidth": 1
},
"name": "_VECT",
"logicWidth": 1
@@
-217,6
+225,18
@@
mograsim version: 0.1.3
},
"params": 1
},
},
"params": 1
},
+ {
+ "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+ "name": "GUITriStateBuffer#0",
+ "pos": {
+ "x": 180.0,
+ "y": 290.0
+ },
+ "params": {
+ "logicWidth": 12,
+ "orientation": "DOWN_ALT"
+ }
+ },
{
"id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
"name": "WireCrossPoint#6",
{
"id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
"name": "WireCrossPoint#6",
@@
-244,14
+264,6
@@
mograsim version: 0.1.3
},
"params": 1
},
},
"params": 1
},
- {
- "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12",
- "name": "GUIsel4_12#0",
- "pos": {
- "x": 150.0,
- "y": 175.0
- }
- },
{
"id": "class:net.mograsim.logic.model.am2900.components.GUInor12",
"name": "GUInor12#0",
{
"id": "class:net.mograsim.logic.model.am2900.components.GUInor12",
"name": "GUInor12#0",
@@
-303,6
+315,14
@@
mograsim version: 0.1.3
},
"params": 12
},
},
"params": 12
},
+ {
+ "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12",
+ "name": "GUIsel4_12#0",
+ "pos": {
+ "x": 150.0,
+ "y": 175.0
+ }
+ },
{
"id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
"name": "GUIAm2910RegCntr#0",
{
"id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr",
"name": "GUIAm2910RegCntr#0",
@@
-604,6
+624,18
@@
mograsim version: 0.1.3
"name": "unnamedWire#0",
"path": []
},
"name": "unnamedWire#0",
"path": []
},
+ {
+ "pin1": {
+ "compName": "GUITriStateBuffer#0",
+ "pinName": "OUT"
+ },
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#52",
+ "path": []
+ },
{
"pin1": {
"compName": "WireCrossPoint#9",
{
"pin1": {
"compName": "WireCrossPoint#9",
@@
-665,6
+697,23
@@
mograsim version: 0.1.3
"name": "unnamedWire#4",
"path": []
},
"name": "unnamedWire#4",
"path": []
},
+ {
+ "pin1": {
+ "compName": "GUITriStateBuffer#0",
+ "pinName": "EN"
+ },
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "_OE"
+ },
+ "name": "unnamedWire#53",
+ "path": [
+ {
+ "x": 245.0,
+ "y": 300.0
+ }
+ ]
+ },
{
"pin1": {
"compName": "GUIAm2910InstrPLA#0",
{
"pin1": {
"compName": "GUIAm2910InstrPLA#0",
@@
-936,12
+985,12
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUITriStateBuffer#0
",
+ "pinName": "
IN
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
"name": "unnamedWire#27",
"path": []
},
"name": "unnamedWire#27",
"path": []