projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed BZ to 16 bit
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
Am2900.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index
a6ac7ec
..
27be709
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@
-322,7
+322,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x":
200
.0,
+ "x":
199
.0,
"y": 236.0
},
"params": 1
"y": 236.0
},
"params": 1
@@
-331,7
+331,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x":
400
.0,
+ "x":
399
.0,
"y": 231.0
},
"params": 1
"y": 231.0
},
"params": 1
@@
-340,8
+340,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
- "x": 41
5
.0,
- "y": 2
20
.0
+ "x": 41
4
.0,
+ "y": 2
19
.0
},
"params": 4
},
},
"params": 4
},
@@
-349,8
+349,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
- "x": 4
10
.0,
- "y": 22
5
.0
+ "x": 4
09
.0,
+ "y": 22
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-359,7
+359,7
@@
"name": "WireCrossPoint#12",
"pos": {
"x": 266.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 266.0,
- "y": 55
5
.0
+ "y": 55
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-367,8
+367,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
- "x": 24
5
.0,
- "y": 4
90
.0
+ "x": 24
4
.0,
+ "y": 4
89
.0
},
"params": 1
},
},
"params": 1
},
@@
-377,15
+377,15
@@
"name": "WireCrossPoint#14",
"pos": {
"x": 355.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 355.0,
- "y": 5
05
.0
+ "y": 5
10
.0
},
},
- "params": 1
2
+ "params": 1
6
},
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
},
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
- "x": 4
70
.0,
+ "x": 4
69
.0,
"y": 231.0
},
"params": 1
"y": 231.0
},
"params": 1
@@
-394,7
+394,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x": 53
5
.0,
+ "x": 53
4
.0,
"y": 231.0
},
"params": 1
"y": 231.0
},
"params": 1
@@
-403,7
+403,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
- "x": 2
30
.0,
+ "x": 2
29
.0,
"y": 176.0
},
"params": 1
"y": 176.0
},
"params": 1
@@
-412,7
+412,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
- "x": 23
5
.0,
+ "x": 23
4
.0,
"y": 281.0
},
"params": 1
"y": 281.0
},
"params": 1
@@
-421,8
+421,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x": 52
5
.0,
- "y": 22
5
.0
+ "x": 52
4
.0,
+ "y": 22
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-430,8
+430,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
- "x": 5
30
.0,
- "y": 2
20
.0
+ "x": 5
29
.0,
+ "y": 2
19
.0
},
"params": 4
},
},
"params": 4
},
@@
-439,8
+439,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 46
5
.0,
- "y": 2
20
.0
+ "x": 46
4
.0,
+ "y": 2
19
.0
},
"params": 4
},
},
"params": 4
},
@@
-448,8
+448,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
- "x": 4
60
.0,
- "y": 22
5
.0
+ "x": 4
59
.0,
+ "y": 22
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-477,14
+477,6
@@
"y": 526.0
}
},
"y": 526.0
}
},
- {
- "id": "dff12_we",
- "name": "dff12_we#0",
- "pos": {
- "x": 290.0,
- "y": 485.0
- }
- },
{
"id": "dff16_invwe",
"name": "dff16_invwe#0",
{
"id": "dff16_invwe",
"name": "dff16_invwe#0",
@@
-494,16
+486,25
@@
}
},
{
}
},
{
- "id": "inc12",
- "name": "inc12#0",
+ "id": "dff16_we",
+ "name": "dff16_we#1",
+ "pos": {
+ "x": 290.0,
+ "y": 485.0
+ }
+ },
+ {
+ "id": "inc",
+ "name": "inc#0",
"pos": {
"x": 245.0,
"y": 525.0
"pos": {
"x": 245.0,
"y": 525.0
- }
+ },
+ "params": 16
},
{
},
{
- "id": "mux1_1
2
",
- "name": "mux1_1
2
#0",
+ "id": "mux1_1
6
",
+ "name": "mux1_1
6
#0",
"pos": {
"x": 170.0,
"y": 495.0
"pos": {
"x": 170.0,
"y": 495.0
@@
-917,7
+918,7
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "dff1
2_we#0
",
+ "compName": "dff1
6_we#1
",
"pinName": "WE"
},
"name": "unnamedWire#127",
"pinName": "WE"
},
"name": "unnamedWire#127",
@@
-925,11
+926,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc
12
#0",
+ "compName": "inc#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "dff1
2_we#0
",
+ "compName": "dff1
6_we#1
",
"pinName": "D"
},
"name": "unnamedWire#128",
"pinName": "D"
},
"name": "unnamedWire#128",
@@
-937,11
+938,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc
12
#0",
+ "compName": "inc#0",
"pinName": "A"
},
"pin2": {
"pinName": "A"
},
"pin2": {
- "compName": "mux1_1
2
#0",
+ "compName": "mux1_1
6
#0",
"pinName": "Y"
},
"name": "unnamedWire#129",
"pinName": "Y"
},
"name": "unnamedWire#129",
@@
-961,7
+962,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc
12
#0",
+ "compName": "inc#0",
"pinName": "CI"
},
"pin2": {
"pinName": "CI"
},
"pin2": {
@@
-1009,7
+1010,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "mux1_1
2
#0",
+ "compName": "mux1_1
6
#0",
"pinName": "I1"
},
"pin2": {
"pinName": "I1"
},
"pin2": {
@@
-1021,7
+1022,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "mux1_1
2
#0",
+ "compName": "mux1_1
6
#0",
"pinName": "S"
},
"pin2": {
"pinName": "S"
},
"pin2": {
@@
-1045,26
+1046,14
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#14",
- "pinName": ""
- },
- "pin2": {
- "compName": "WireCrossPoint#14",
- "pinName": ""
- },
- "name": "unnamedWire#137",
- "path": []
- },
- {
- "pin1": {
- "compName": "dff12_we#0",
+ "compName": "dff16_we#1",
"pinName": "Q"
},
"pin2": {
"compName": "WireCrossPoint#14",
"pinName": ""
},
"pinName": "Q"
},
"pin2": {
"compName": "WireCrossPoint#14",
"pinName": ""
},
- "name": "unnamedWire#13
8
",
+ "name": "unnamedWire#13
7
",
"path": []
},
{
"path": []
},
{