projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced mux1_4_sb with mux1_4 in Am2901
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
inc4.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
index
9e1126b
..
a6c8106
100755
(executable)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/inc4.json
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y": 5.0
+ "y":
2
5.0
},
"name": "CI",
"logicWidth": 1,
},
"name": "CI",
"logicWidth": 1,
@@
-32,7
+32,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y": 5.0
},
"name": "Z",
"logicWidth": 1,
},
"name": "Z",
"logicWidth": 1,
@@
-51,7
+51,7
@@
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "RIGHT
_ALT
"
+ "orientation": "RIGHT"
}
},
{
}
},
{
@@
-63,7
+63,7
@@
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
- "orientation": "LEFT
_ALT
"
+ "orientation": "LEFT"
}
},
{
}
},
{
@@
-71,7
+71,7
@@
"name": "halfadder#0",
"pos": {
"x": 40.0,
"name": "halfadder#0",
"pos": {
"x": 40.0,
- "y":
5
.0
+ "y":
110
.0
}
},
{
}
},
{
@@
-79,7
+79,7
@@
"name": "halfadder#1",
"pos": {
"x": 40.0,
"name": "halfadder#1",
"pos": {
"x": 40.0,
- "y":
40
.0
+ "y":
75
.0
}
},
{
}
},
{
@@
-87,7
+87,7
@@
"name": "halfadder#2",
"pos": {
"x": 40.0,
"name": "halfadder#2",
"pos": {
"x": 40.0,
- "y":
75
.0
+ "y":
40
.0
}
},
{
}
},
{
@@
-95,7
+95,7
@@
"name": "halfadder#3",
"pos": {
"x": 40.0,
"name": "halfadder#3",
"pos": {
"x": 40.0,
- "y":
110
.0
+ "y":
5
.0
}
}
],
}
}
],
@@
-107,17
+107,17
@@
},
"pin2": {
"compName": "halfadder#1",
},
"pin2": {
"compName": "halfadder#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#0",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#0",
"path": [
{
"x": 35.0,
- "y":
30
.0
+ "y":
115
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
45
.0
+ "y":
100
.0
}
]
},
}
]
},
@@
-128,17
+128,17
@@
},
"pin2": {
"compName": "halfadder#2",
},
"pin2": {
"compName": "halfadder#2",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#1",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#1",
"path": [
{
"x": 35.0,
- "y":
65
.0
+ "y":
80
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
80
.0
+ "y":
65
.0
}
]
},
}
]
},
@@
-149,17
+149,17
@@
},
"pin2": {
"compName": "halfadder#3",
},
"pin2": {
"compName": "halfadder#3",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#2",
"path": [
{
"x": 35.0,
},
"name": "unnamedWire#2",
"path": [
{
"x": 35.0,
- "y":
100
.0
+ "y":
45
.0
},
{
"x": 35.0,
},
{
"x": 35.0,
- "y":
115
.0
+ "y":
30
.0
}
]
},
}
]
},
@@
-170,17
+170,17
@@
},
"pin2": {
"compName": "halfadder#0",
},
"pin2": {
"compName": "halfadder#0",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#3",
"path": [
{
"x": 20.0,
},
"name": "unnamedWire#3",
"path": [
{
"x": 20.0,
- "y":
6
0.0
+ "y":
9
0.0
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
20
.0
+ "y":
125
.0
}
]
},
}
]
},
@@
-191,17
+191,17
@@
},
"pin2": {
"compName": "halfadder#1",
},
"pin2": {
"compName": "halfadder#1",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#4",
"path": [
{
"x": 25.0,
},
"name": "unnamedWire#4",
"path": [
{
"x": 25.0,
- "y":
7
0.0
+ "y":
8
0.0
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
55
.0
+ "y":
90
.0
}
]
},
}
]
},
@@
-212,17
+212,17
@@
},
"pin2": {
"compName": "halfadder#2",
},
"pin2": {
"compName": "halfadder#2",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#5",
"path": [
{
"x": 25.0,
},
"name": "unnamedWire#5",
"path": [
{
"x": 25.0,
- "y":
8
0.0
+ "y":
7
0.0
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
90
.0
+ "y":
55
.0
}
]
},
}
]
},
@@
-233,17
+233,17
@@
},
"pin2": {
"compName": "halfadder#3",
},
"pin2": {
"compName": "halfadder#3",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"name": "unnamedWire#6",
"path": [
{
"x": 20.0,
},
"name": "unnamedWire#6",
"path": [
{
"x": 20.0,
- "y":
9
0.0
+ "y":
6
0.0
},
{
"x": 20.0,
},
{
"x": 20.0,
- "y":
125
.0
+ "y":
20
.0
}
]
},
}
]
},
@@
-260,11
+260,11
@@
"path": [
{
"x": 80.0,
"path": [
{
"x": 80.0,
- "y":
6
0.0
+ "y":
9
0.0
},
{
"x": 80.0,
},
{
"x": 80.0,
- "y": 1
0
.0
+ "y": 1
15
.0
}
]
},
}
]
},
@@
-278,16
+278,7
@@
"pinName": "O1"
},
"name": "unnamedWire#8",
"pinName": "O1"
},
"name": "unnamedWire#8",
- "path": [
- {
- "x": 75.0,
- "y": 45.0
- },
- {
- "x": 75.0,
- "y": 70.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-299,7
+290,16
@@
"pinName": "O2"
},
"name": "unnamedWire#9",
"pinName": "O2"
},
"name": "unnamedWire#9",
- "path": []
+ "path": [
+ {
+ "x": 75.0,
+ "y": 45.0
+ },
+ {
+ "x": 75.0,
+ "y": 70.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-313,12
+313,12
@@
"name": "unnamedWire#10",
"path": [
{
"name": "unnamedWire#10",
"path": [
{
- "x":
75
.0,
- "y":
9
0.0
+ "x":
80
.0,
+ "y":
6
0.0
},
{
},
{
- "x":
75
.0,
- "y": 1
15
.0
+ "x":
80
.0,
+ "y": 1
0
.0
}
]
},
}
]
},
@@
-341,17
+341,17
@@
},
"pin2": {
"compName": "halfadder#0",
},
"pin2": {
"compName": "halfadder#0",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"name": "unnamedWire#12",
"path": [
{
"x": 10.0,
},
"name": "unnamedWire#12",
"path": [
{
"x": 10.0,
- "y": 25.0
+ "y":
1
25.0
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y": 1
0
.0
+ "y": 1
35
.0
}
]
},
}
]
},
@@
-380,11
+380,11
@@
"path": [
{
"x": 10.0,
"path": [
{
"x": 10.0,
- "y": 1
35
.0
+ "y": 1
0
.0
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y":
1
25.0
+ "y": 25.0
}
]
}
}
]
}