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
/
mux1_16.json
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
index
c282fa5
..
e29bbbf
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json
@@
-42,15
+42,6
@@
"innerScale": 0.2,
"submodel": {
"components": [
"innerScale": 0.2,
"submodel": {
"components": [
- {
- "id": "Merger",
- "name": "Merger#0",
- "pos": {
- "x": 260.0,
- "y": 175.0
- },
- "params": 16
- },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-67,7
+58,10
@@
"x": 5.0,
"y": 50.0
},
"x": 5.0,
"y": 50.0
},
- "params": 16
+ "params": {
+ "logicWidth": 16,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-76,7
+70,22
@@
"x": 5.0,
"y": 375.0
},
"x": 5.0,
"y": 375.0
},
- "params": 16
+ "params": {
+ "logicWidth": 16,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#2",
+ "pos": {
+ "x": 260.0,
+ "y": 175.0
+ },
+ "params": {
+ "logicWidth": 16,
+ "orientation": "LEFT"
+ }
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
@@
-534,8
+543,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
14"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
14"
},
"pin2": {
"compName": "sel1#1",
},
"pin2": {
"compName": "sel1#1",
@@
-559,8
+568,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
13"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
13"
},
"name": "unnamedWire#101",
"path": [
},
"name": "unnamedWire#101",
"path": [
@@
-576,8
+585,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
12"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
12"
},
"pin2": {
"compName": "sel1#3",
},
"pin2": {
"compName": "sel1#3",
@@
-601,8
+610,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
11"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
11"
},
"name": "unnamedWire#103",
"path": [
},
"name": "unnamedWire#103",
"path": [
@@
-622,8
+631,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
10"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
10"
},
"name": "unnamedWire#104",
"path": [
},
"name": "unnamedWire#104",
"path": [
@@
-639,8
+648,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
9"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
9"
},
"pin2": {
"compName": "sel1#5",
},
"pin2": {
"compName": "sel1#5",
@@
-664,8
+673,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
8"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
8"
},
"name": "unnamedWire#106",
"path": [
},
"name": "unnamedWire#106",
"path": [
@@
-681,8
+690,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
7"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
7"
},
"pin2": {
"compName": "sel1#10",
},
"pin2": {
"compName": "sel1#10",
@@
-706,8
+715,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
6"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
6"
},
"name": "unnamedWire#108",
"path": [
},
"name": "unnamedWire#108",
"path": [
@@
-723,8
+732,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
5"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
5"
},
"pin2": {
"compName": "sel1#11",
},
"pin2": {
"compName": "sel1#11",
@@
-760,8
+769,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
4"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
4"
},
"name": "unnamedWire#110",
"path": [
},
"name": "unnamedWire#110",
"path": [
@@
-777,8
+786,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
3"
},
"pin2": {
"compName": "sel1#14",
},
"pin2": {
"compName": "sel1#14",
@@
-802,8
+811,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#112",
"path": [
},
"name": "unnamedWire#112",
"path": [
@@
-819,8
+828,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "sel1#8",
},
"pin2": {
"compName": "sel1#8",
@@
-844,8
+853,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#114",
"path": [
},
"name": "unnamedWire#114",
"path": [
@@
-861,8
+870,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
O
"
+ "compName": "
Splitter#2
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
@@
-2343,8
+2352,8
@@
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
15"
+ "compName": "
Splitter#2
",
+ "pinName": "
O
15"
},
"name": "unnamedWire#99",
"path": [
},
"name": "unnamedWire#99",
"path": [