projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redo reserializing components since the problem doesn't lie there
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2904
/
Am2904TestLogic.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
index
3ec88ac
..
ab44304
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json
@@
-87,14
+87,6
@@
"innerScale": 0.4,
"submodel": {
"components": [
"innerScale": 0.4,
"submodel": {
"components": [
- {
- "id": "xor",
- "name": "DeserializedSubmodelComponent#0",
- "pos": {
- "x": 40.0,
- "y": 20.0
- }
- },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-256,6
+248,14
@@
"y": 149.0
},
"params": 1
"y": 149.0
},
"params": 1
+ },
+ {
+ "id": "xor",
+ "name": "xor#0",
+ "pos": {
+ "x": 40.0,
+ "y": 20.0
+ }
}
],
"wires": [
}
],
"wires": [
@@
-581,7
+581,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
xor
#0",
"pinName": "A"
},
"name": "unnamedWire#3",
"pinName": "A"
},
"name": "unnamedWire#3",
@@
-683,7
+683,7
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
xor
#0",
"pinName": "B"
},
"name": "unnamedWire#4",
"pinName": "B"
},
"name": "unnamedWire#4",
@@
-696,7
+696,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent
#0",
+ "compName": "
xor
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
@@
-766,10
+766,6
@@
"pinLabelMargin": 0.5
},
"outlineRendererSnippetID": "default",
"pinLabelMargin": 0.5
},
"outlineRendererSnippetID": "default",
- "highLevelStateHandlerSnippetID": "standard",
- "highLevelStateHandlerParams": {
- "subcomponentHighLevelStates": {},
- "atomicHighLevelStates": {}
- },
+ "highLevelStateHandlerSnippetID": "default",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file