projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2afca4
)
Reversed pin order of or4
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Tue, 13 Oct 2020 22:29:39 +0000
(
00:29
+0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Tue, 13 Oct 2020 22:29:39 +0000
(
00:29
+0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nor12.json
patch
|
blob
|
history
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
patch
|
blob
|
history
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index
83bcb60
..
33a0135
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@
-1938,7
+1938,7
@@
},
"pin2": {
"compName": "or4#0",
},
"pin2": {
"compName": "or4#0",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"name": "unnamedWire#73",
"path": []
},
"name": "unnamedWire#73",
"path": []
@@
-2013,7
+2013,7
@@
{
"pin1": {
"compName": "or4#0",
{
"pin1": {
"compName": "or4#0",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"pin2": {
"compName": "Splitter#4",
},
"pin2": {
"compName": "Splitter#4",
@@
-2029,7
+2029,7
@@
},
"pin2": {
"compName": "or4#0",
},
"pin2": {
"compName": "or4#0",
- "pinName": "A
3
"
+ "pinName": "A
2
"
},
"name": "unnamedWire#79",
"path": []
},
"name": "unnamedWire#79",
"path": []
@@
-2037,7
+2037,7
@@
{
"pin1": {
"compName": "or4#0",
{
"pin1": {
"compName": "or4#0",
- "pinName": "A
4
"
+ "pinName": "A
1
"
},
"pin2": {
"compName": "Splitter#4",
},
"pin2": {
"compName": "Splitter#4",
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nor12.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nor12.json
index
0dddc1e
..
946d73d
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nor12.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nor12.json
@@
-189,7
+189,7
@@
},
"pin2": {
"compName": "or4#0",
},
"pin2": {
"compName": "or4#0",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"name": "unnamedWire#1",
"path": [
},
"name": "unnamedWire#1",
"path": [
@@
-206,7
+206,7
@@
{
"pin1": {
"compName": "or4#0",
{
"pin1": {
"compName": "or4#0",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-227,7
+227,7
@@
{
"pin1": {
"compName": "or4#0",
{
"pin1": {
"compName": "or4#0",
- "pinName": "A
3
"
+ "pinName": "A
2
"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-252,7
+252,7
@@
},
"pin2": {
"compName": "or4#0",
},
"pin2": {
"compName": "or4#0",
- "pinName": "A
4
"
+ "pinName": "A
1
"
},
"name": "unnamedWire#4",
"path": [
},
"name": "unnamedWire#4",
"path": [
@@
-273,7
+273,7
@@
},
"pin2": {
"compName": "or4#1",
},
"pin2": {
"compName": "or4#1",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"name": "unnamedWire#5",
"path": []
},
"name": "unnamedWire#5",
"path": []
@@
-281,7
+281,7
@@
{
"pin1": {
"compName": "or4#1",
{
"pin1": {
"compName": "or4#1",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-297,7
+297,7
@@
},
"pin2": {
"compName": "or4#1",
},
"pin2": {
"compName": "or4#1",
- "pinName": "A
3
"
+ "pinName": "A
2
"
},
"name": "unnamedWire#7",
"path": []
},
"name": "unnamedWire#7",
"path": []
@@
-305,7
+305,7
@@
{
"pin1": {
"compName": "or4#1",
{
"pin1": {
"compName": "or4#1",
- "pinName": "A
4
"
+ "pinName": "A
1
"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-321,7
+321,7
@@
},
"pin2": {
"compName": "or4#2",
},
"pin2": {
"compName": "or4#2",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"name": "unnamedWire#9",
"path": [
},
"name": "unnamedWire#9",
"path": [
@@
-342,7
+342,7
@@
},
"pin2": {
"compName": "or4#2",
},
"pin2": {
"compName": "or4#2",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"name": "unnamedWire#10",
"path": [
},
"name": "unnamedWire#10",
"path": [
@@
-363,7
+363,7
@@
},
"pin2": {
"compName": "or4#2",
},
"pin2": {
"compName": "or4#2",
- "pinName": "A
3
"
+ "pinName": "A
2
"
},
"name": "unnamedWire#11",
"path": [
},
"name": "unnamedWire#11",
"path": [
@@
-384,7
+384,7
@@
},
"pin2": {
"compName": "or4#2",
},
"pin2": {
"compName": "or4#2",
- "pinName": "A
4
"
+ "pinName": "A
1
"
},
"name": "unnamedWire#12",
"path": [
},
"name": "unnamedWire#12",
"path": [
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
index
6ce2d29
..
44d8a91
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json
@@
-5,7
+5,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y": 5.0
+ "y":
3
5.0
},
"name": "A1",
"logicWidth": 1,
},
"name": "A1",
"logicWidth": 1,
@@
-14,7
+14,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
1
5.0
+ "y":
2
5.0
},
"name": "A2",
"logicWidth": 1,
},
"name": "A2",
"logicWidth": 1,
@@
-23,7
+23,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y":
1
5.0
},
"name": "A3",
"logicWidth": 1,
},
"name": "A3",
"logicWidth": 1,
@@
-32,7
+32,7
@@
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
3
5.0
+ "y": 5.0
},
"name": "A4",
"logicWidth": 1,
},
"name": "A4",
"logicWidth": 1,
@@
-191,7
+191,7
@@
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"pin2": {
"compName": "WireCrossPoint#0",
},
"pin2": {
"compName": "WireCrossPoint#0",
@@
-203,7
+203,7
@@
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"pin2": {
"compName": "WireCrossPoint#1",
},
"pin2": {
"compName": "WireCrossPoint#1",
@@
-215,7
+215,7
@@
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
3
"
+ "pinName": "A
2
"
},
"pin2": {
"compName": "WireCrossPoint#2",
},
"pin2": {
"compName": "WireCrossPoint#2",
@@
-227,7
+227,7
@@
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
4
"
+ "pinName": "A
1
"
},
"pin2": {
"compName": "WireCrossPoint#3",
},
"pin2": {
"compName": "WireCrossPoint#3",