projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added small test checking the status register content after Load_Load
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
am2904
/
GUIAm2904TestLogic.json
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
index
e4017fe
..
3acca4f
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
@@
-96,7
+96,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
@@
-105,7
+105,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
@@
-114,7
+114,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
@@
-123,7
+123,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
@@
-132,7
+132,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
@@
-141,7
+141,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
@@
-150,7
+150,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-159,7
+159,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-168,7
+168,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
@@
-177,7
+177,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-186,7
+186,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
@@
-195,7
+195,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
@@
-204,7
+204,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
@@
-213,7
+213,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
@@
-222,7
+222,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
@@
-231,7
+231,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
@@
-240,7
+240,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
@@
-249,7
+249,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
@@
-273,12
+273,12
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUISplitter#0
",
- "pinName": "
O2
"
+ "compName": "
WireCrossPoint#5
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint
#0",
- "pinName": ""
+ "compName": "
GUISplitter
#0",
+ "pinName": "
O2
"
},
"name": "unnamedWire#1",
"path": []
},
"name": "unnamedWire#1",
"path": []
@@
-435,28
+435,11
@@
"pinName": "O1"
},
"pin2": {
"pinName": "O1"
},
"pin2": {
- "compName": "WireCrossPoint#5",
- "pinName": ""
- },
- "name": "unnamedWire#19",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#1",
+ "compName": "WireCrossPoint#0",
"pinName": ""
},
"pinName": ""
},
- "pin2": {
- "compName": "GUISplitter#0",
- "pinName": "O3"
- },
"name": "unnamedWire#2",
"name": "unnamedWire#2",
- "path": [
- {
- "x": 35.0,
- "y": 140.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-476,14
+459,14
@@
"pinName": "O0"
},
"pin2": {
"pinName": "O0"
},
"pin2": {
- "compName": "WireCrossPoint#
4
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"name": "unnamedWire#21",
"path": [
{
"pinName": ""
},
"name": "unnamedWire#21",
"path": [
{
- "x":
20
.0,
- "y": 1
1
0.0
+ "x":
35
.0,
+ "y": 1
4
0.0
}
]
},
}
]
},
@@
-677,6
+660,23
@@
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "GUISplitter#0",
+ "pinName": "O3"
+ },
+ "pin2": {
+ "compName": "WireCrossPoint#4",
+ "pinName": ""
+ },
+ "name": "unnamedWire#34",
+ "path": [
+ {
+ "x": 20.0,
+ "y": 110.0
+ }
+ ]
+ },
{
"pin1": {
"compName": "WireCrossPoint#1",
{
"pin1": {
"compName": "WireCrossPoint#1",
@@
-757,7
+757,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
@@
-765,8
+765,8
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}