projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reserialized TestableAm2904
[Mograsim.git]
/
tests
/
net.mograsim.logic.model.am2900.tests
/
src
/
net
/
mograsim
/
logic
/
model
/
am2900
/
am2904
/
TestableAm2904.json
diff --git
a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
index
964d7d3
..
06aa591
100644
(file)
--- a/
tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
+++ b/
tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/am2904/TestableAm2904.json
@@
-268,13
+268,24
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "Merger",
+ "id": "Am2904",
+ "name": "Am2904#0",
+ "pos": {
+ "x": 20.0,
+ "y": 15.0
+ }
+ },
+ {
+ "id": "Splitter",
"name": "Merger#0",
"pos": {
"x": -30.0,
"y": 70.0
},
"name": "Merger#0",
"pos": {
"x": -30.0,
"y": 70.0
},
- "params": 13
+ "params": {
+ "logicWidth": 13,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-283,7
+294,10
@@
"x": -45.0,
"y": 140.0
},
"x": -45.0,
"y": 140.0
},
- "params": 6
+ "params": {
+ "logicWidth": 6,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-292,7
+306,10
@@
"x": -45.0,
"y": 100.0
},
"x": -45.0,
"y": 100.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-301,14
+318,9
@@
"x": -45.0,
"y": 70.0
},
"x": -45.0,
"y": 70.0
},
- "params": 2
- },
- {
- "id": "Am2904",
- "name": "Am2904#0",
- "pos": {
- "x": 20.0,
- "y": 15.0
+ "params": {
+ "logicWidth": 2,
+ "orientation": "RIGHT"
}
}
],
}
}
],
@@
-364,7
+376,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
0"
+ "pinName": "
O
0"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-380,7
+392,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
1"
+ "pinName": "
O
1"
},
"name": "unnamedWire#13",
"path": []
},
"name": "unnamedWire#13",
"path": []
@@
-388,7
+400,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
2"
+ "pinName": "
O
2"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-404,7
+416,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
3"
+ "pinName": "
O
3"
},
"name": "unnamedWire#15",
"path": []
},
"name": "unnamedWire#15",
"path": []
@@
-412,7
+424,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
4"
+ "pinName": "
O
4"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-428,7
+440,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
5"
+ "pinName": "
O
5"
},
"name": "unnamedWire#17",
"path": []
},
"name": "unnamedWire#17",
"path": []
@@
-440,7
+452,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
6"
+ "pinName": "
O
6"
},
"name": "unnamedWire#18",
"path": []
},
"name": "unnamedWire#18",
"path": []
@@
-448,7
+460,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
7"
+ "pinName": "
O
7"
},
"pin2": {
"compName": "Splitter#1",
},
"pin2": {
"compName": "Splitter#1",
@@
-476,7
+488,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
8"
+ "pinName": "
O
8"
},
"name": "unnamedWire#20",
"path": []
},
"name": "unnamedWire#20",
"path": []
@@
-484,7
+496,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
9"
+ "pinName": "
O
9"
},
"pin2": {
"compName": "Splitter#1",
},
"pin2": {
"compName": "Splitter#1",
@@
-500,7
+512,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
11"
+ "pinName": "
O
11"
},
"name": "unnamedWire#22",
"path": []
},
"name": "unnamedWire#22",
"path": []
@@
-508,7
+520,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
12"
+ "pinName": "
O
12"
},
"pin2": {
"compName": "Splitter#2",
},
"pin2": {
"compName": "Splitter#2",
@@
-532,7
+544,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
O
"
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2904#0",
},
"pin2": {
"compName": "Am2904#0",
@@
-548,7
+560,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
10"
+ "pinName": "
O
10"
},
"name": "unnamedWire#26",
"path": []
},
"name": "unnamedWire#26",
"path": []
@@
-825,18
+837,18
@@
"highLevelStateHandlerSnippetID": "standard",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"highLevelStateHandlerSnippetID": "standard",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
- "m
u
sr": {
+ "msr": {
"id": "delegating",
"params": {
"delegateTarget": "Am2904#0",
"id": "delegating",
"params": {
"delegateTarget": "Am2904#0",
- "prefix": "m
u
sr"
+ "prefix": "msr"
}
},
}
},
- "msr": {
+ "m
u
sr": {
"id": "delegating",
"params": {
"delegateTarget": "Am2904#0",
"id": "delegating",
"params": {
"delegateTarget": "Am2904#0",
- "prefix": "msr"
+ "prefix": "m
u
sr"
}
}
},
}
}
},