projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified BitVector (de)serializing
[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
b8eb665
..
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
@@
-120,40
+120,28
@@
"id": "FixedOutput",
"name": "FixedOutput#0",
"pos": {
"id": "FixedOutput",
"name": "FixedOutput#0",
"pos": {
- "x": 5
40
.0,
+ "x": 5
55
.0,
"y": 270.0
},
"y": 270.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
"name": "FixedOutput#1",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#1",
"pos": {
- "x": 6
3
5.0,
- "y": 3
8
0.0
+ "x": 6
4
5.0,
+ "y": 3
9
0.0
},
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
"name": "FixedOutput#2",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#2",
"pos": {
- "x": 3
70
.0,
- "y": 5
05
.0
+ "x": 3
85
.0,
+ "y": 5
10
.0
},
},
- "params": {
- "bits": [
- "ONE"
- ]
- }
+ "params": "1"
},
{
"id": "FixedOutput",
},
{
"id": "FixedOutput",
@@
-162,63
+150,43
@@
"x": 455.0,
"y": 560.0
},
"x": 455.0,
"y": 560.0
},
- "params": {
- "bits": [
- "ONE"
- ]
- }
+ "params": "1"
},
{
"id": "FixedOutput",
"name": "FixedOutput#4",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#4",
"pos": {
- "x": 4
2
0.0,
+ "x": 4
3
0.0,
"y": 570.0
},
"y": 570.0
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
"name": "FixedOutput#5",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#5",
"pos": {
- "x": 4
7
5.0,
- "y": 5
05
.0
+ "x": 4
8
5.0,
+ "y": 5
10
.0
},
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
"name": "FixedOutput#6",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#6",
"pos": {
- "x": 5
3
5.0,
- "y": 3
7
0.0
+ "x": 5
4
5.0,
+ "y": 3
8
0.0
},
},
- "params": {
- "bits": [
- "ZERO"
- ]
- }
+ "params": "0"
},
{
"id": "FixedOutput",
"name": "FixedOutput#7",
"pos": {
},
{
"id": "FixedOutput",
"name": "FixedOutput#7",
"pos": {
- "x": 2
6
0.0,
- "y": 3
7
0.0
+ "x": 2
7
0.0,
+ "y": 3
8
0.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",
@@
-2173,7
+2140,7
@@
"path": [
{
"x": 660.0,
"path": [
{
"x": 660.0,
- "y": 39
0
.0
+ "y": 39
5
.0
}
]
},
}
]
},
@@
-2201,12
+2168,12
@@
"name": "unnamedWire#37",
"path": [
{
"name": "unnamedWire#37",
"path": [
{
- "x": 4
8
0.0,
+ "x": 4
7
0.0,
"y": 540.0
},
{
"y": 540.0
},
{
- "x": 4
8
0.0,
- "y": 5
70
.0
+ "x": 4
7
0.0,
+ "y": 5
65
.0
}
]
},
}
]
},
@@
-2223,7
+2190,7
@@
"path": [
{
"x": 445.0,
"path": [
{
"x": 445.0,
- "y": 5
80
.0
+ "y": 5
75
.0
}
]
},
}
]
},
@@
-2252,7
+2219,7
@@
"path": [
{
"x": 560.0,
"path": [
{
"x": 560.0,
- "y": 38
0
.0
+ "y": 38
5
.0
}
]
},
}
]
},
@@
-2430,7
+2397,7
@@
"path": [
{
"x": 570.0,
"path": [
{
"x": 570.0,
- "y": 2
80
.0
+ "y": 2
75
.0
}
]
},
}
]
},
@@
-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,
@@
-3705,7
+3679,7
@@
"path": [
{
"x": 285.0,
"path": [
{
"x": 285.0,
- "y": 38
0
.0
+ "y": 38
5
.0
}
]
},
}
]
},