projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed two small bugs in the two Delegating...Handlers:
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
Am2900.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index
df6fc2c
..
74c0beb
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@
-100,8
+100,8
@@
"id": "Clock",
"name": "Clock#0",
"pos": {
"id": "Clock",
"name": "Clock#0",
"pos": {
- "x":
12
0.0,
- "y": 3
5
5.0
+ "x":
7
0.0,
+ "y": 3
6
5.0
},
"params": {
"delta": 500,
},
"params": {
"delta": 500,
@@
-212,6
+212,24
@@
]
}
},
]
}
},
+ {
+ "id": "ManualSwitch",
+ "name": "ManualSwitch#0",
+ "pos": {
+ "x": 70.0,
+ "y": 347.5
+ },
+ "params": 1
+ },
+ {
+ "id": "ManualSwitch",
+ "name": "ManualSwitch#1",
+ "pos": {
+ "x": 70.0,
+ "y": 387.5
+ },
+ "params": 1
+ },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-261,7
+279,7
@@
"id": "NandGate",
"name": "NandGate#5",
"pos": {
"id": "NandGate",
"name": "NandGate#5",
"pos": {
- "x":
60
.0,
+ "x":
105
.0,
"y": 235.0
},
"params": 1
"y": 235.0
},
"params": 1
@@
-270,7
+288,7
@@
"id": "NandGate",
"name": "NandGate#6",
"pos": {
"id": "NandGate",
"name": "NandGate#6",
"pos": {
- "x": 1
50
.0,
+ "x": 1
45
.0,
"y": 375.0
},
"params": 1
"y": 375.0
},
"params": 1
@@
-279,7
+297,7
@@
"id": "NandGate",
"name": "NandGate#7",
"pos": {
"id": "NandGate",
"name": "NandGate#7",
"pos": {
- "x":
65
.0,
+ "x":
110
.0,
"y": 270.0
},
"params": 1
"y": 270.0
},
"params": 1
@@
-839,15
+857,6
@@
},
"params": "MPM addr"
},
},
"params": "MPM addr"
},
- {
- "id": "TextComponent",
- "name": "TextComponent#3",
- "pos": {
- "x": 110.0,
- "y": 350.0
- },
- "params": "c"
- },
{
"id": "TriStateBuffer",
"name": "TriStateBuffer#0",
{
"id": "TriStateBuffer",
"name": "TriStateBuffer#0",
@@
-1266,7
+1275,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#38",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#38",
"pos": {
- "x": 1
74
.0,
+ "x": 1
69
.0,
"y": 384.0
},
"params": 1
"y": 384.0
},
"params": 1
@@
-1275,7
+1284,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#39",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#39",
"pos": {
- "x": 17
9
.0,
+ "x": 17
4
.0,
"y": 364.0
},
"params": 1
"y": 364.0
},
"params": 1
@@
-1284,7
+1293,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
- "x": 1
44
.0,
+ "x": 1
39
.0,
"y": 364.0
},
"params": 1
"y": 364.0
},
"params": 1
@@
-1293,7
+1302,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#41",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#41",
"pos": {
- "x": 1
44
.0,
+ "x": 1
39
.0,
"y": 379.0
},
"params": 1
"y": 379.0
},
"params": 1
@@
-1303,7
+1312,7
@@
"name": "WireCrossPoint#42",
"pos": {
"x": 364.0,
"name": "WireCrossPoint#42",
"pos": {
"x": 364.0,
- "y":
289
.0
+ "y":
314
.0
},
"params": 1
},
},
"params": 1
},
@@
-1321,7
+1330,7
@@
"name": "WireCrossPoint#44",
"pos": {
"x": 174.0,
"name": "WireCrossPoint#44",
"pos": {
"x": 174.0,
- "y": 2
89
.0
+ "y": 2
54
.0
},
"params": 1
},
},
"params": 1
},
@@
-1329,7
+1338,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#45",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#45",
"pos": {
- "x": 1
29
.0,
+ "x": 1
74
.0,
"y": 304.0
},
"params": 1
"y": 304.0
},
"params": 1
@@
-1338,7
+1347,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#46",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#46",
"pos": {
- "x": 1
29
.0,
+ "x": 1
74
.0,
"y": 279.0
},
"params": 1
"y": 279.0
},
"params": 1
@@
-1347,7
+1356,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#47",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#47",
"pos": {
- "x":
59
.0,
+ "x":
104
.0,
"y": 294.0
},
"params": 1
"y": 294.0
},
"params": 1
@@
-1356,7
+1365,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#48",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#48",
"pos": {
- "x":
84
.0,
+ "x":
129
.0,
"y": 244.0
},
"params": 1
"y": 244.0
},
"params": 1
@@
-1365,7
+1374,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#49",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#49",
"pos": {
- "x":
59
.0,
+ "x":
104
.0,
"y": 274.0
},
"params": 1
"y": 274.0
},
"params": 1
@@
-1392,20
+1401,11
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#52",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#52",
"pos": {
- "x":
59
.0,
+ "x":
104
.0,
"y": 284.0
},
"params": 1
},
"y": 284.0
},
"params": 1
},
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#53",
- "pos": {
- "x": 174.0,
- "y": 314.0
- },
- "params": 1
- },
{
"id": "and",
"name": "and#0",
{
"id": "and",
"name": "and#0",
@@
-1434,7
+1434,7
@@
"id": "and",
"name": "and#3",
"pos": {
"id": "and",
"name": "and#3",
"pos": {
- "x":
90
.0,
+ "x":
135
.0,
"y": 240.0
}
},
"y": 240.0
}
},
@@
-1442,18
+1442,10
@@
"id": "and",
"name": "and#4",
"pos": {
"id": "and",
"name": "and#4",
"pos": {
- "x":
90
.0,
+ "x":
135
.0,
"y": 265.0
}
},
"y": 265.0
}
},
- {
- "id": "and",
- "name": "and#5",
- "pos": {
- "x": 185.0,
- "y": 240.0
- }
- },
{
"id": "dff16",
"name": "dff16#0",
{
"id": "dff16",
"name": "dff16#0",
@@
-1482,7
+1474,7
@@
"id": "dff",
"name": "dff#0",
"pos": {
"id": "dff",
"name": "dff#0",
"pos": {
- "x": 1
35
.0,
+ "x": 1
80
.0,
"y": 265.0
}
},
"y": 265.0
}
},
@@
-1490,7
+1482,7
@@
"id": "dff",
"name": "dff#1",
"pos": {
"id": "dff",
"name": "dff#1",
"pos": {
- "x": 1
35
.0,
+ "x": 1
80
.0,
"y": 240.0
}
},
"y": 240.0
}
},
@@
-1498,7
+1490,7
@@
"id": "dff",
"name": "dff#2",
"pos": {
"id": "dff",
"name": "dff#2",
"pos": {
- "x": 1
35
.0,
+ "x": 1
80
.0,
"y": 290.0
}
},
"y": 290.0
}
},
@@
-1527,6
+1519,14
@@
},
"params": 16
},
},
"params": 16
},
+ {
+ "id": "mux1",
+ "name": "mux1#0",
+ "pos": {
+ "x": 100.0,
+ "y": 360.0
+ }
+ },
{
"id": "mux1_4",
"name": "mux1_4#0",
{
"id": "mux1_4",
"name": "mux1_4#0",
@@
-3169,8
+3169,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Clock
#0",
- "pinName": ""
+ "compName": "
mux1
#0",
+ "pinName": "
Y
"
},
"pin2": {
"compName": "WireCrossPoint#40",
},
"pin2": {
"compName": "WireCrossPoint#40",
@@
-3203,7
+3203,7
@@
"name": "unnamedWire#96",
"path": [
{
"name": "unnamedWire#96",
"path": [
{
- "x": 14
5
.0,
+ "x": 14
0
.0,
"y": 390.0
}
]
"y": 390.0
}
]
@@
-3244,7
+3244,7
@@
"name": "unnamedWire#99",
"path": [
{
"name": "unnamedWire#99",
"path": [
{
- "x": 17
5
.0,
+ "x": 17
0
.0,
"y": 485.0
},
{
"y": 485.0
},
{
@@
-3302,7
+3302,7
@@
"name": "unnamedWire#102",
"path": [
{
"name": "unnamedWire#102",
"path": [
{
- "x": 1
80
.0,
+ "x": 1
75
.0,
"y": 480.0
},
{
"y": 480.0
},
{
@@
-3641,11
+3641,11
@@
"y": 325.0
},
{
"y": 325.0
},
{
- "x":
55
.0,
+ "x":
100
.0,
"y": 325.0
},
{
"y": 325.0
},
{
- "x":
55
.0,
+ "x":
100
.0,
"y": 250.0
}
]
"y": 250.0
}
]
@@
-5337,7
+5337,7
@@
"y": 320.0
},
{
"y": 320.0
},
{
- "x":
60
.0,
+ "x":
105
.0,
"y": 320.0
}
]
"y": 320.0
}
]
@@
-6809,11
+6809,11
@@
"name": "unnamedWire#335",
"path": [
{
"name": "unnamedWire#335",
"path": [
{
- "x":
55
.0,
+ "x":
100
.0,
"y": 230.0
},
{
"y": 230.0
},
{
- "x":
55
.0,
+ "x":
100
.0,
"y": 240.0
}
]
"y": 240.0
}
]
@@
-6958,11
+6958,16
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "WireCrossPoint#
53
",
+ "compName": "WireCrossPoint#
42
",
"pinName": ""
},
"name": "unnamedWire#346",
"pinName": ""
},
"name": "unnamedWire#346",
- "path": []
+ "path": [
+ {
+ "x": 170.0,
+ "y": 315.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-6994,7
+6999,7
@@
"path": [
{
"x": 480.0,
"path": [
{
"x": 480.0,
- "y":
290
.0
+ "y":
315
.0
},
{
"x": 480.0,
},
{
"x": 480.0,
@@
-7062,11
+7067,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#4
4
",
+ "compName": "WireCrossPoint#4
6
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "WireCrossPoint#4
2
",
+ "compName": "WireCrossPoint#4
4
",
"pinName": ""
},
"name": "unnamedWire#352",
"pinName": ""
},
"name": "unnamedWire#352",
@@
-7074,11
+7079,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
53
",
+ "compName": "WireCrossPoint#
39
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "WireCrossPoint#4
4
",
+ "compName": "WireCrossPoint#4
5
",
"pinName": ""
},
"name": "unnamedWire#353",
"pinName": ""
},
"name": "unnamedWire#353",
@@
-7086,18
+7091,18
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
53
",
+ "compName": "WireCrossPoint#
44
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#45
",
- "pinName": ""
+ "compName": "
dff16#1
",
+ "pinName": "
C
"
},
"name": "unnamedWire#354",
"path": [
{
},
"name": "unnamedWire#354",
"path": [
{
- "x": 1
30
.0,
- "y":
315
.0
+ "x": 1
75
.0,
+ "y":
70
.0
}
]
},
}
]
},
@@
-7107,16
+7112,11
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "dff
16
#1",
+ "compName": "dff#1",
"pinName": "C"
},
"name": "unnamedWire#355",
"pinName": "C"
},
"name": "unnamedWire#355",
- "path": [
- {
- "x": 175.0,
- "y": 70.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-7144,8
+7144,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
and#5
",
- "pinName": "
Y
"
+ "compName": "
dff#1
",
+ "pinName": "
Q
"
},
"pin2": {
"compName": "TriStateBuffer#4",
},
"pin2": {
"compName": "TriStateBuffer#4",
@@
-7154,11
+7154,11
@@
"name": "unnamedWire#358",
"path": [
{
"name": "unnamedWire#358",
"path": [
{
- "x": 22
5
.0,
+ "x": 22
0
.0,
"y": 245.0
},
{
"y": 245.0
},
{
- "x": 22
5
.0,
+ "x": 22
0
.0,
"y": 200.0
},
{
"y": 200.0
},
{
@@
-7179,11
+7179,11
@@
"name": "unnamedWire#359",
"path": [
{
"name": "unnamedWire#359",
"path": [
{
- "x": 2
30
.0,
+ "x": 2
25
.0,
"y": 270.0
},
{
"y": 270.0
},
{
- "x": 2
30
.0,
+ "x": 2
25
.0,
"y": 170.0
},
{
"y": 170.0
},
{
@@
-7252,15
+7252,15
@@
"name": "unnamedWire#364",
"path": [
{
"name": "unnamedWire#364",
"path": [
{
- "x":
60
.0,
+ "x":
105
.0,
"y": 260.0
},
{
"y": 260.0
},
{
- "x":
80
.0,
+ "x":
125
.0,
"y": 260.0
},
{
"y": 260.0
},
{
- "x":
80
.0,
+ "x":
125
.0,
"y": 255.0
}
]
"y": 255.0
}
]
@@
-7277,7
+7277,7
@@
"name": "unnamedWire#365",
"path": [
{
"name": "unnamedWire#365",
"path": [
{
- "x":
85
.0,
+ "x":
130
.0,
"y": 270.0
}
]
"y": 270.0
}
]
@@
-7412,23
+7412,6
@@
"name": "unnamedWire#375",
"path": []
},
"name": "unnamedWire#375",
"path": []
},
- {
- "pin1": {
- "compName": "WireCrossPoint#46",
- "pinName": ""
- },
- "pin2": {
- "compName": "dff#1",
- "pinName": "C"
- },
- "name": "unnamedWire#376",
- "path": [
- {
- "x": 130.0,
- "y": 255.0
- }
- ]
- },
{
"pin1": {
"compName": "dff#2",
{
"pin1": {
"compName": "dff#2",
@@
-7438,14
+7421,14
@@
"compName": "Am2900MainMemory#0",
"pinName": "RW"
},
"compName": "Am2900MainMemory#0",
"pinName": "RW"
},
- "name": "unnamedWire#37
7
",
+ "name": "unnamedWire#37
6
",
"path": [
{
"path": [
{
- "x": 23
5
.0,
+ "x": 23
0
.0,
"y": 295.0
},
{
"y": 295.0
},
{
- "x": 23
5
.0,
+ "x": 23
0
.0,
"y": 210.0
},
{
"y": 210.0
},
{
@@
-7460,32
+7443,57
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
dff#1
",
- "pinName": "
Q
"
+ "compName": "
ManualSwitch#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
and#5
",
- "pinName": "
A
"
+ "compName": "
mux1#0
",
+ "pinName": "
S0
"
},
},
- "name": "unnamedWire#378",
- "path": []
+ "name": "unnamedWire#377",
+ "path": [
+ {
+ "x": 95.0,
+ "y": 355.0
+ },
+ {
+ "x": 95.0,
+ "y": 365.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#39
",
+ "compName": "
ManualSwitch#1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
and#5
",
- "pinName": "
B
"
+ "compName": "
mux1#0
",
+ "pinName": "
I1
"
},
},
- "name": "unnamedWire#37
9
",
+ "name": "unnamedWire#37
8
",
"path": [
{
"path": [
{
- "x": 180.0,
- "y": 255.0
+ "x": 95.0,
+ "y": 395.0
+ },
+ {
+ "x": 95.0,
+ "y": 385.0
}
]
}
]
+ },
+ {
+ "pin1": {
+ "compName": "Clock#0",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "mux1#0",
+ "pinName": "I0"
+ },
+ "name": "unnamedWire#379",
+ "path": []
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"