projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjusted Am2910 layout to new sel4_12
[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
ae825b1
..
ceb1351
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
@@
-123,11
+123,7
@@
"x": 555.0,
"y": 270.0
},
"x": 555.0,
"y": 270.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-136,11
+132,7
@@
"x": 645.0,
"y": 390.0
},
"x": 645.0,
"y": 390.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-149,11
+141,7
@@
"x": 385.0,
"y": 510.0
},
"x": 385.0,
"y": 510.0
},
- "params": {
- "bits": [
- "ONE"
- ]
- }
+ "params": "1"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-162,11
+150,7
@@
"x": 455.0,
"y": 560.0
},
"x": 455.0,
"y": 560.0
},
- "params": {
- "bits": [
- "ONE"
- ]
- }
+ "params": "1"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-175,11
+159,7
@@
"x": 430.0,
"y": 570.0
},
"x": 430.0,
"y": 570.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-188,11
+168,7
@@
"x": 485.0,
"y": 510.0
},
"x": 485.0,
"y": 510.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-201,11
+177,7
@@
"x": 545.0,
"y": 380.0
},
"x": 545.0,
"y": 380.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-214,11
+186,7
@@
"x": 270.0,
"y": 380.0
},
"x": 270.0,
"y": 380.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "NandGate",
},
{
"id": "NandGate",
@@
-1348,13
+1316,12
@@
}
},
{
}
},
{
- "id": "inc",
- "name": "inc#0",
+ "id": "inc
16
",
+ "name": "inc
16
#0",
"pos": {
"pos": {
- "x": 315.0,
- "y": 135.0
- },
- "params": 16
+ "x": 335.0,
+ "y": 115.0
+ }
},
{
"id": "mux1_4",
},
{
"id": "mux1_4",
@@
-3610,7
+3577,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
16
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
@@
-3618,16
+3585,11
@@
"pinName": "D"
},
"name": "unnamedWire#128",
"pinName": "D"
},
"name": "unnamedWire#128",
- "path": [
- {
- "x": 335.0,
- "y": 130.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
16
#0",
"pinName": "A"
},
"pin2": {
"pinName": "A"
},
"pin2": {
@@
-3637,14
+3599,18
@@
"name": "unnamedWire#129",
"path": [
{
"name": "unnamedWire#129",
"path": [
{
- "x": 335.0,
+ "x": 315.0,
+ "y": 130.0
+ },
+ {
+ "x": 315.0,
"y": 160.0
}
]
},
{
"pin1": {
"y": 160.0
}
]
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
16
#0",
"pinName": "CI"
},
"pin2": {
"pinName": "CI"
},
"pin2": {
@@
-3653,9
+3619,17
@@
},
"name": "unnamedWire#130",
"path": [
},
"name": "unnamedWire#130",
"path": [
+ {
+ "x": 330.0,
+ "y": 120.0
+ },
+ {
+ "x": 330.0,
+ "y": 160.0
+ },
{
"x": 360.0,
{
"x": 360.0,
- "y": 1
45
.0
+ "y": 1
60
.0
},
{
"x": 360.0,
},
{
"x": 360.0,