projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
29fb2e1
)
Adjusted GUImux2/3 to have the MSB (of the S wires) on top
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 10:37:36 +0000
(12:37 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 2 Sep 2019 10:37:36 +0000
(12:37 +0200)
net.mograsim.logic.model.am2900/components/GUImux2.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUImux3.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux2.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux3.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux2.json
b/net.mograsim.logic.model.am2900/components/GUImux2.json
index
b1cf3a6
..
c6b3930
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux2.json
@@
-41,7
+41,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
0.0
+ "y":
2
0.0
},
"name": "S0",
"logicWidth": 1,
},
"name": "S0",
"logicWidth": 1,
@@
-50,7
+50,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
0.0
+ "y":
1
0.0
},
"name": "S1",
"logicWidth": 1,
},
"name": "S1",
"logicWidth": 1,
@@
-102,15
+102,6
@@
},
"params": 1
},
},
"params": 1
},
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
- "pos": {
- "x": 24.0,
- "y": 24.0
- },
- "params": 1
- },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
@@
-142,20
+133,15
@@
"wires": [
{
"pin1": {
"wires": [
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"name": "unnamedWire#0",
"pinName": ""
},
"name": "unnamedWire#0",
- "path": [
- {
- "x": 25.0,
- "y": 20.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-171,12
+157,12
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
S0
"
},
"name": "unnamedWire#10",
"path": []
},
"name": "unnamedWire#10",
"path": []
@@
-193,30
+179,6
@@
"name": "unnamedWire#11",
"path": []
},
"name": "unnamedWire#11",
"path": []
},
- {
- "pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "name": "unnamedWire#12",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "S0"
- },
- "name": "unnamedWire#13",
- "path": []
- },
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
@@
-280,6
+242,23
@@
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#18",
+ "path": [
+ {
+ "x": 25.0,
+ "y": 20.0
+ }
+ ]
+ },
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
@@
-422,7
+401,7
@@
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
50
.0
+ "y":
25
.0
},
{
"x": 15.0,
},
{
"x": 15.0,
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux3.json
b/net.mograsim.logic.model.am2900/components/GUImux3.json
index
a27f5ca
..
222e948
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux3.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux3.json
@@
-77,7
+77,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
0.0
+ "y":
3
0.0
},
"name": "S0",
"logicWidth": 1,
},
"name": "S0",
"logicWidth": 1,
@@
-95,7
+95,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
3
0.0
+ "y":
1
0.0
},
"name": "S2",
"logicWidth": 1,
},
"name": "S2",
"logicWidth": 1,
@@
-164,20
+164,20
@@
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"name": "unnamedWire#0",
"path": [
{
"pinName": ""
},
"name": "unnamedWire#0",
"path": [
{
- "x": 2
5
.0,
- "y":
2
5.0
+ "x": 2
0
.0,
+ "y":
7
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
@@
-187,7
+187,7
@@
"name": "unnamedWire#1",
"path": [
{
"name": "unnamedWire#1",
"path": [
{
- "x": 2
0
.0,
+ "x": 2
5
.0,
"y": 50.0
}
]
"y": 50.0
}
]
@@
-340,16
+340,7
@@
"pinName": "S2"
},
"name": "unnamedWire#17",
"pinName": "S2"
},
"name": "unnamedWire#17",
- "path": [
- {
- "x": 70.0,
- "y": 25.0
- },
- {
- "x": 70.0,
- "y": 75.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-358,19
+349,19
@@
},
"pin2": {
"compName": "DeserializedSubmodelComponent#3",
},
"pin2": {
"compName": "DeserializedSubmodelComponent#3",
- "pinName": "S
0
"
+ "pinName": "S
1
"
},
"name": "unnamedWire#2",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#2",
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
DeserializedSubmodelComponent#3
",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#3
",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"name": "unnamedWire#3",
"path": []
},
"name": "unnamedWire#3",
"path": []
@@
-378,7
+369,7
@@
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
- "pinName": "S
0
"
+ "pinName": "S
1
"
},
"pin2": {
"compName": "WireCrossPoint#1",
},
"pin2": {
"compName": "WireCrossPoint#1",
@@
-394,12
+385,12
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoi
nt#0",
- "pinName": ""
+ "compName": "
DeserializedSubmodelCompone
nt#0",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
DeserializedSubmodelCompone
nt#0",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoi
nt#0",
+ "pinName": ""
},
"name": "unnamedWire#5",
"path": [
},
"name": "unnamedWire#5",
"path": [
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
index
b6a42db
..
95fd786
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
@@
-653,7
+653,7
@@
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
- "y": 5
7
5.0
+ "y": 5
8
5.0
},
"params": 3
},
},
"params": 3
},
@@
-661,8
+661,8
@@
"id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
"id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
- "x": 4
05
.0,
- "y": 6
5
5.0
+ "x": 4
10
.0,
+ "y": 6
6
5.0
},
"params": 3
},
},
"params": 3
},
@@
-680,7
+680,7
@@
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
- "y": 7
2
0.0
+ "y": 7
3
0.0
},
"params": 3
},
},
"params": 3
},
@@
-995,7
+995,7
@@
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
- "y": 7
2
5.0
+ "y": 7
4
5.0
},
"params": 1
},
},
"params": 1
},
diff --git
a/net.mograsim.logic.model.editor/components/GUImux2.json
b/net.mograsim.logic.model.editor/components/GUImux2.json
index
b1cf3a6
..
c6b3930
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux2.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux2.json
@@
-41,7
+41,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
0.0
+ "y":
2
0.0
},
"name": "S0",
"logicWidth": 1,
},
"name": "S0",
"logicWidth": 1,
@@
-50,7
+50,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
0.0
+ "y":
1
0.0
},
"name": "S1",
"logicWidth": 1,
},
"name": "S1",
"logicWidth": 1,
@@
-102,15
+102,6
@@
},
"params": 1
},
},
"params": 1
},
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
- "pos": {
- "x": 24.0,
- "y": 24.0
- },
- "params": 1
- },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
@@
-142,20
+133,15
@@
"wires": [
{
"pin1": {
"wires": [
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"name": "unnamedWire#0",
"pinName": ""
},
"name": "unnamedWire#0",
- "path": [
- {
- "x": 25.0,
- "y": 20.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-171,12
+157,12
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
S0
"
},
"name": "unnamedWire#10",
"path": []
},
"name": "unnamedWire#10",
"path": []
@@
-193,30
+179,6
@@
"name": "unnamedWire#11",
"path": []
},
"name": "unnamedWire#11",
"path": []
},
- {
- "pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "name": "unnamedWire#12",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "S0"
- },
- "name": "unnamedWire#13",
- "path": []
- },
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
@@
-280,6
+242,23
@@
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#18",
+ "path": [
+ {
+ "x": 25.0,
+ "y": 20.0
+ }
+ ]
+ },
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
@@
-422,7
+401,7
@@
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
50
.0
+ "y":
25
.0
},
{
"x": 15.0,
},
{
"x": 15.0,
diff --git
a/net.mograsim.logic.model.editor/components/GUImux3.json
b/net.mograsim.logic.model.editor/components/GUImux3.json
index
a27f5ca
..
222e948
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux3.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux3.json
@@
-77,7
+77,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
0.0
+ "y":
3
0.0
},
"name": "S0",
"logicWidth": 1,
},
"name": "S0",
"logicWidth": 1,
@@
-95,7
+95,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
3
0.0
+ "y":
1
0.0
},
"name": "S2",
"logicWidth": 1,
},
"name": "S2",
"logicWidth": 1,
@@
-164,20
+164,20
@@
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"name": "unnamedWire#0",
"path": [
{
"pinName": ""
},
"name": "unnamedWire#0",
"path": [
{
- "x": 2
5
.0,
- "y":
2
5.0
+ "x": 2
0
.0,
+ "y":
7
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
@@
-187,7
+187,7
@@
"name": "unnamedWire#1",
"path": [
{
"name": "unnamedWire#1",
"path": [
{
- "x": 2
0
.0,
+ "x": 2
5
.0,
"y": 50.0
}
]
"y": 50.0
}
]
@@
-340,16
+340,7
@@
"pinName": "S2"
},
"name": "unnamedWire#17",
"pinName": "S2"
},
"name": "unnamedWire#17",
- "path": [
- {
- "x": 70.0,
- "y": 25.0
- },
- {
- "x": 70.0,
- "y": 75.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-358,19
+349,19
@@
},
"pin2": {
"compName": "DeserializedSubmodelComponent#3",
},
"pin2": {
"compName": "DeserializedSubmodelComponent#3",
- "pinName": "S
0
"
+ "pinName": "S
1
"
},
"name": "unnamedWire#2",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#2",
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
DeserializedSubmodelComponent#3
",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#3
",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"name": "unnamedWire#3",
"path": []
},
"name": "unnamedWire#3",
"path": []
@@
-378,7
+369,7
@@
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
{
"pin1": {
"compName": "DeserializedSubmodelComponent#0",
- "pinName": "S
0
"
+ "pinName": "S
1
"
},
"pin2": {
"compName": "WireCrossPoint#1",
},
"pin2": {
"compName": "WireCrossPoint#1",
@@
-394,12
+385,12
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoi
nt#0",
- "pinName": ""
+ "compName": "
DeserializedSubmodelCompone
nt#0",
+ "pinName": "
S0
"
},
"pin2": {
},
"pin2": {
- "compName": "
DeserializedSubmodelCompone
nt#0",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoi
nt#0",
+ "pinName": ""
},
"name": "unnamedWire#5",
"path": [
},
"name": "unnamedWire#5",
"path": [
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
index
b6a42db
..
95fd786
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
@@
-653,7
+653,7
@@
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
- "y": 5
7
5.0
+ "y": 5
8
5.0
},
"params": 3
},
},
"params": 3
},
@@
-661,8
+661,8
@@
"id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
"id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
- "x": 4
05
.0,
- "y": 6
5
5.0
+ "x": 4
10
.0,
+ "y": 6
6
5.0
},
"params": 3
},
},
"params": 3
},
@@
-680,7
+680,7
@@
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
- "y": 7
2
0.0
+ "y": 7
3
0.0
},
"params": 3
},
},
"params": 3
},
@@
-995,7
+995,7
@@
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
- "y": 7
2
5.0
+ "y": 7
4
5.0
},
"params": 1
},
},
"params": 1
},