projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed Am2901 D input bit order
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
mux3.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
index
7b54b5d
..
ac5aa8a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json
@@
-115,16
+115,26
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
mux2
",
- "name": "
DeserializedSubmodelCompone
nt#0",
+ "id": "
WireCrossPoint
",
+ "name": "
WireCrossPoi
nt#0",
"pos": {
"pos": {
- "x": 35.0,
- "y": 185.0
- }
+ "x": 19.0,
+ "y": 104.0
+ },
+ "params": 1
+ },
+ {
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "pos": {
+ "x": 24.0,
+ "y": 94.0
+ },
+ "params": 1
},
{
"id": "mux1",
},
{
"id": "mux1",
- "name": "
DeserializedSubmodelComponent#2
",
+ "name": "
mux1#0
",
"pos": {
"x": 125.0,
"y": 20.0
"pos": {
"x": 125.0,
"y": 20.0
@@
-132,29
+142,19
@@
},
{
"id": "mux2",
},
{
"id": "mux2",
- "name": "
DeserializedSubmodelComponent#3
",
+ "name": "
mux2#0
",
"pos": {
"x": 35.0,
"pos": {
"x": 35.0,
- "y": 85.0
+ "y":
1
85.0
}
},
{
}
},
{
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
- "pos": {
- "x": 19.0,
- "y": 104.0
- },
- "params": 1
- },
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
+ "id": "mux2",
+ "name": "mux2#1",
"pos": {
"pos": {
- "x": 24.0,
- "y": 94.0
- },
- "params": 1
+ "x": 35.0,
+ "y": 85.0
+ }
}
],
"wires": [
}
],
"wires": [
@@
-194,7
+194,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "I11"
},
"pin2": {
"pinName": "I11"
},
"pin2": {
@@
-215,7
+215,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "I00"
},
"pin2": {
"pinName": "I00"
},
"pin2": {
@@
-240,7
+240,7
@@
"pinName": "I101"
},
"pin2": {
"pinName": "I101"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "I01"
},
"name": "unnamedWire#12",
"pinName": "I01"
},
"name": "unnamedWire#12",
@@
-248,7
+248,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "I10"
},
"pin2": {
"pinName": "I10"
},
"pin2": {
@@
-273,7
+273,7
@@
"pinName": "I111"
},
"pin2": {
"pinName": "I111"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "I11"
},
"name": "unnamedWire#14",
"pinName": "I11"
},
"name": "unnamedWire#14",
@@
-290,11
+290,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#2
",
+ "compName": "
mux1#0
",
"pinName": "I1"
},
"name": "unnamedWire#15",
"pinName": "I1"
},
"name": "unnamedWire#15",
@@
-311,11
+311,11
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#2
",
+ "compName": "
mux1#0
",
"pinName": "I0"
},
"name": "unnamedWire#16",
"pinName": "I0"
},
"name": "unnamedWire#16",
@@
-332,7
+332,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#2
",
+ "compName": "
mux1#0
",
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
@@
-348,7
+348,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "S1"
},
"name": "unnamedWire#2",
"pinName": "S1"
},
"name": "unnamedWire#2",
@@
-356,7
+356,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
@@
-368,7
+368,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "S1"
},
"pin2": {
"pinName": "S1"
},
"pin2": {
@@
-385,7
+385,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
mux2
#0",
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
@@
-402,7
+402,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#2
",
+ "compName": "
mux1#0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
@@
-418,7
+418,7
@@
"pinName": "I000"
},
"pin2": {
"pinName": "I000"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "I00"
},
"name": "unnamedWire#7",
"pinName": "I00"
},
"name": "unnamedWire#7",
@@
-435,7
+435,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "I01"
},
"pin2": {
"pinName": "I01"
},
"pin2": {
@@
-451,7
+451,7
@@
"pinName": "I010"
},
"pin2": {
"pinName": "I010"
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#3
",
+ "compName": "
mux2#1
",
"pinName": "I10"
},
"name": "unnamedWire#9",
"pinName": "I10"
},
"name": "unnamedWire#9",