projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Undo reserializing components since something broke
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
dff4_invwe.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
index
0320f12
..
2902594
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
@@
-96,6
+96,14
@@
"innerScale": 0.2,
"submodel": {
"components": [
"innerScale": 0.2,
"submodel": {
"components": [
+ {
+ "id": "mux1_4",
+ "name": "DeserializedSubmodelComponent#0",
+ "pos": {
+ "x": 55.0,
+ "y": 70.0
+ }
+ },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
@@
-190,14
+198,6
@@
"x": 115.0,
"y": 170.0
}
"x": 115.0,
"y": 170.0
}
- },
- {
- "id": "mux1_4",
- "name": "mux1_4#0",
- "pos": {
- "x": 55.0,
- "y": 70.0
- }
}
],
"wires": [
}
],
"wires": [
@@
-215,7
+215,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "Y1"
},
"pin2": {
"pinName": "Y1"
},
"pin2": {
@@
-240,7
+240,7
@@
"pinName": "D1"
},
"pin2": {
"pinName": "D1"
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I0_1"
},
"name": "unnamedWire#10",
"pinName": "I0_1"
},
"name": "unnamedWire#10",
@@
-261,7
+261,7
@@
"pinName": "D2"
},
"pin2": {
"pinName": "D2"
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I0_2"
},
"name": "unnamedWire#11",
"pinName": "I0_2"
},
"name": "unnamedWire#11",
@@
-282,7
+282,7
@@
"pinName": "D3"
},
"pin2": {
"pinName": "D3"
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I0_3"
},
"name": "unnamedWire#12",
"pinName": "I0_3"
},
"name": "unnamedWire#12",
@@
-351,7
+351,7
@@
"pinName": "D4"
},
"pin2": {
"pinName": "D4"
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I0_4"
},
"name": "unnamedWire#17",
"pinName": "I0_4"
},
"name": "unnamedWire#17",
@@
-392,7
+392,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "Y2"
},
"pin2": {
"pinName": "Y2"
},
"pin2": {
@@
-428,7
+428,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
@@
-449,7
+449,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "Y4"
},
"pin2": {
"pinName": "Y4"
},
"pin2": {
@@
-474,7
+474,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I1_1"
},
"name": "unnamedWire#24",
"pinName": "I1_1"
},
"name": "unnamedWire#24",
@@
-499,7
+499,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I1_2"
},
"name": "unnamedWire#25",
"pinName": "I1_2"
},
"name": "unnamedWire#25",
@@
-524,7
+524,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I1_3"
},
"name": "unnamedWire#26",
"pinName": "I1_3"
},
"name": "unnamedWire#26",
@@
-561,7
+561,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "I1_4"
},
"name": "unnamedWire#28",
"pinName": "I1_4"
},
"name": "unnamedWire#28",
@@
-663,7
+663,7
@@
"pinName": "_WE"
},
"pin2": {
"pinName": "_WE"
},
"pin2": {
- "compName": "
mux1_4
#0",
+ "compName": "
DeserializedSubmodelComponent
#0",
"pinName": "S0"
},
"name": "unnamedWire#9",
"pinName": "S0"
},
"name": "unnamedWire#9",