projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug in Am2900; created dlatch8/80; relayouted some components
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
ram4.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
index
51a7451
..
de91b6b
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
@@
-195,126
+195,6
@@
"innerScale": 0.1,
"submodel": {
"components": [
"innerScale": 0.1,
"submodel": {
"components": [
- {
- "id": "and41",
- "name": "and41#0",
- "pos": {
- "x": 235.0,
- "y": 150.0
- }
- },
- {
- "id": "and41",
- "name": "and41#1",
- "pos": {
- "x": 250.0,
- "y": 375.0
- }
- },
- {
- "id": "and41",
- "name": "and41#2",
- "pos": {
- "x": 155.0,
- "y": 325.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#0",
- "pos": {
- "x": 250.0,
- "y": 485.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#1",
- "pos": {
- "x": 250.0,
- "y": 635.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#2",
- "pos": {
- "x": 250.0,
- "y": 785.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#3",
- "pos": {
- "x": 155.0,
- "y": 435.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#4",
- "pos": {
- "x": 155.0,
- "y": 585.0
- }
- },
- {
- "id": "andor414",
- "name": "andor414#5",
- "pos": {
- "x": 155.0,
- "y": 735.0
- }
- },
- {
- "id": "demux2",
- "name": "demux2#0",
- "pos": {
- "x": 55.0,
- "y": 45.0
- }
- },
- {
- "id": "demux2",
- "name": "demux2#1",
- "pos": {
- "x": 55.0,
- "y": 150.0
- }
- },
- {
- "id": "ram2",
- "name": "ram2#0",
- "pos": {
- "x": 80.0,
- "y": 330.0
- }
- },
- {
- "id": "ram2",
- "name": "ram2#1",
- "pos": {
- "x": 80.0,
- "y": 480.0
- }
- },
- {
- "id": "ram2",
- "name": "ram2#2",
- "pos": {
- "x": 80.0,
- "y": 630.0
- }
- },
- {
- "id": "ram2",
- "name": "ram2#3",
- "pos": {
- "x": 80.0,
- "y": 780.0
- }
- },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
@@
-566,6
+446,126
@@
"y": 694.0
},
"params": 1
"y": 694.0
},
"params": 1
+ },
+ {
+ "id": "and41",
+ "name": "and41#0",
+ "pos": {
+ "x": 235.0,
+ "y": 150.0
+ }
+ },
+ {
+ "id": "and41",
+ "name": "and41#1",
+ "pos": {
+ "x": 250.0,
+ "y": 375.0
+ }
+ },
+ {
+ "id": "and41",
+ "name": "and41#2",
+ "pos": {
+ "x": 155.0,
+ "y": 325.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#0",
+ "pos": {
+ "x": 250.0,
+ "y": 485.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#1",
+ "pos": {
+ "x": 250.0,
+ "y": 635.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#2",
+ "pos": {
+ "x": 250.0,
+ "y": 785.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#3",
+ "pos": {
+ "x": 155.0,
+ "y": 435.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#4",
+ "pos": {
+ "x": 155.0,
+ "y": 585.0
+ }
+ },
+ {
+ "id": "andor414",
+ "name": "andor414#5",
+ "pos": {
+ "x": 155.0,
+ "y": 735.0
+ }
+ },
+ {
+ "id": "demux2",
+ "name": "demux2#0",
+ "pos": {
+ "x": 55.0,
+ "y": 45.0
+ }
+ },
+ {
+ "id": "demux2",
+ "name": "demux2#1",
+ "pos": {
+ "x": 55.0,
+ "y": 150.0
+ }
+ },
+ {
+ "id": "ram2",
+ "name": "ram2#0",
+ "pos": {
+ "x": 80.0,
+ "y": 330.0
+ }
+ },
+ {
+ "id": "ram2",
+ "name": "ram2#1",
+ "pos": {
+ "x": 80.0,
+ "y": 480.0
+ }
+ },
+ {
+ "id": "ram2",
+ "name": "ram2#2",
+ "pos": {
+ "x": 80.0,
+ "y": 630.0
+ }
+ },
+ {
+ "id": "ram2",
+ "name": "ram2#3",
+ "pos": {
+ "x": 80.0,
+ "y": 780.0
+ }
}
],
"wires": [
}
],
"wires": [
@@
-3370,133
+3370,133
@@
"delegateTarget": "ram2#0"
}
},
"delegateTarget": "ram2#0"
}
},
- "c
11
": {
+ "c
0000
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#3"
+ "delegateTarget": "ram2#0",
+ "prefix": "c00"
}
},
}
},
- "c
10
": {
+ "c
0001
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#2"
+ "delegateTarget": "ram2#1",
+ "prefix": "c00"
}
},
}
},
- "c0
1
": {
+ "c0
010
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#1"
+ "delegateTarget": "ram2#2",
+ "prefix": "c00"
}
},
}
},
- "c
1000
": {
+ "c
0011
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
1
0"
+ "delegateTarget": "ram2#
3
",
+ "prefix": "c
0
0"
}
},
}
},
- "c
101
1": {
+ "c
0
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#3",
- "prefix": "c10"
+ "delegateTarget": "ram2#1"
}
},
}
},
- "c
111
0": {
+ "c
010
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
- "prefix": "c
1
1"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
0
1"
}
},
}
},
- "c
10
01": {
+ "c
01
01": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#1",
"id": "delegating",
"params": {
"delegateTarget": "ram2#1",
- "prefix": "c
10
"
+ "prefix": "c
01
"
}
},
}
},
- "c
110
0": {
+ "c
011
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
1
1"
+ "delegateTarget": "ram2#
2
",
+ "prefix": "c
0
1"
}
},
}
},
- "c
1
111": {
+ "c
0
111": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#3",
"id": "delegating",
"params": {
"delegateTarget": "ram2#3",
- "prefix": "c
1
1"
+ "prefix": "c
0
1"
}
},
}
},
- "c
000
0": {
+ "c
1
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#0",
- "prefix": "c00"
+ "delegateTarget": "ram2#2"
}
},
}
},
- "c
0011
": {
+ "c
1000
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
3
",
- "prefix": "c
0
0"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
1
0"
}
},
}
},
- "c
0110
": {
+ "c
1001
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
- "prefix": "c
01
"
+ "delegateTarget": "ram2#
1
",
+ "prefix": "c
10
"
}
},
}
},
- "c
0
010": {
+ "c
1
010": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#2",
"id": "delegating",
"params": {
"delegateTarget": "ram2#2",
- "prefix": "c
0
0"
+ "prefix": "c
1
0"
}
},
}
},
- "c101
0
": {
+ "c101
1
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
+ "delegateTarget": "ram2#
3
",
"prefix": "c10"
}
},
"prefix": "c10"
}
},
- "c
010
1": {
+ "c
1
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#1",
- "prefix": "c01"
+ "delegateTarget": "ram2#3"
}
},
}
},
- "c
0001
": {
+ "c
1100
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
1
",
- "prefix": "c
00
"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
11
"
}
},
}
},
- "c
0100
": {
+ "c
1101
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
0
1"
+ "delegateTarget": "ram2#
1
",
+ "prefix": "c
1
1"
}
},
}
},
- "c
0111
": {
+ "c
1110
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
3
",
- "prefix": "c
0
1"
+ "delegateTarget": "ram2#
2
",
+ "prefix": "c
1
1"
}
},
}
},
- "c11
0
1": {
+ "c11
1
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
1
",
+ "delegateTarget": "ram2#
3
",
"prefix": "c11"
}
}
"prefix": "c11"
}
}