projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made GUIMerger and GUISplitter the same thing
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
dff16_we.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
index
bbc264b
..
3fc94f9
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_we.json
@@
-43,22
+43,28
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
Merg
er",
- "name": "
Merg
er#0",
+ "id": "
Splitt
er",
+ "name": "
Splitt
er#0",
"pos": {
"pos": {
- "x":
2
75.0,
- "y":
5
0.0
+ "x": 75.0,
+ "y":
7
0.0
},
},
- "params": 16
+ "params": {
+ "logicWidth": 16,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
- "name": "Splitter#
0
",
+ "name": "Splitter#
1
",
"pos": {
"pos": {
- "x": 75.0,
- "y":
7
0.0
+ "x":
2
75.0,
+ "y":
5
0.0
},
},
- "params": 16
+ "params": {
+ "logicWidth": 16,
+ "orientation": "LEFT"
+ }
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
@@
-978,8
+984,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
15"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
15"
},
"pin2": {
"compName": "dff#0",
},
"pin2": {
"compName": "dff#0",
@@
-1024,8
+1030,8
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
14"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
14"
},
"name": "unnamedWire#50",
"path": [
},
"name": "unnamedWire#50",
"path": [
@@
-1041,8
+1047,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
13"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
13"
},
"pin2": {
"compName": "dff#3",
},
"pin2": {
"compName": "dff#3",
@@
-1062,8
+1068,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
12"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
12"
},
"pin2": {
"compName": "dff#2",
},
"pin2": {
"compName": "dff#2",
@@
-1083,8
+1089,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
11"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
11"
},
"pin2": {
"compName": "dff#6",
},
"pin2": {
"compName": "dff#6",
@@
-1108,8
+1114,8
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
10"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
10"
},
"name": "unnamedWire#54",
"path": [
},
"name": "unnamedWire#54",
"path": [
@@
-1125,8
+1131,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
9"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
9"
},
"pin2": {
"compName": "dff#7",
},
"pin2": {
"compName": "dff#7",
@@
-1141,16
+1147,16
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
8"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
8"
},
"name": "unnamedWire#56",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#56",
"path": []
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
7"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
7"
},
"pin2": {
"compName": "dff#8",
},
"pin2": {
"compName": "dff#8",
@@
-1174,8
+1180,8
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
6"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
6"
},
"name": "unnamedWire#58",
"path": [
},
"name": "unnamedWire#58",
"path": [
@@
-1191,8
+1197,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
5"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
5"
},
"pin2": {
"compName": "dff#15",
},
"pin2": {
"compName": "dff#15",
@@
-1233,8
+1239,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
4"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
4"
},
"pin2": {
"compName": "dff#14",
},
"pin2": {
"compName": "dff#14",
@@
-1254,8
+1260,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
3"
},
"pin2": {
"compName": "dff#12",
},
"pin2": {
"compName": "dff#12",
@@
-1279,8
+1285,8
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#62",
"path": [
},
"name": "unnamedWire#62",
"path": [
@@
-1296,8
+1302,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "dff#11",
},
"pin2": {
"compName": "dff#11",
@@
-1321,8
+1327,8
@@
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#1
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#64",
"path": [
},
"name": "unnamedWire#64",
"path": [
@@
-1338,8
+1344,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
O
"
+ "compName": "
Splitter#1
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "WireCrossPoint#7",
},
"pin2": {
"compName": "WireCrossPoint#7",