From de50afe9150ec4d6430eb4347768798a40993ced Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 11 Oct 2020 18:56:58 +0200 Subject: [PATCH] Cleaned not4 --- .../am2900/components/am2904/Am2904.json | 131 ++++++-- .../am2900/components/am2904/Am2904MSR.json | 154 ++++------ .../logic/model/am2900/components/not4.json | 282 +++++++++++------- .../logic/model/am2900/components/sel3_4.json | 117 ++++++-- 4 files changed, 422 insertions(+), 262 deletions(-) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index 868bbba5..c6773688 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -592,6 +592,30 @@ "orientation": "LEFT" } }, + { + "id": "Splitter", + "name": "Splitter#17", + "pos": { + "x": 160.0, + "y": 40.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#18", + "pos": { + "x": 105.0, + "y": 40.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "TriStateBuffer", "name": "TriStateBuffer#0", @@ -1158,8 +1182,8 @@ "id": "not4", "name": "not4#0", "pos": { - "x": 130.0, - "y": 40.0 + "x": 120.0, + "y": 35.0 } }, { @@ -2344,8 +2368,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "Y1" + "compName": "Splitter#17", + "pinName": "O3" }, "pin2": { "compName": "NandGate#9", @@ -2354,52 +2378,61 @@ "name": "unnamedWire#71", "path": [ { - "x": 170.0, - "y": 45.0 + "x": 175.0, + "y": 40.0 }, { - "x": 170.0, + "x": 175.0, "y": 25.0 } ] }, { "pin1": { - "compName": "NandGate#8", - "pinName": "B" + "compName": "Splitter#17", + "pinName": "O2" }, "pin2": { - "compName": "not4#0", - "pinName": "Y2" + "compName": "NandGate#8", + "pinName": "B" }, "name": "unnamedWire#72", "path": [ { "x": 175.0, - "y": 45.0 + "y": 50.0 }, { "x": 175.0, - "y": 55.0 + "y": 45.0 } ] }, { "pin1": { - "compName": "not4#0", - "pinName": "Y3" + "compName": "Splitter#17", + "pinName": "O1" }, "pin2": { "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#73", - "path": [] + "path": [ + { + "x": 175.0, + "y": 60.0 + }, + { + "x": 175.0, + "y": 65.0 + } + ] }, { "pin1": { - "compName": "not4#0", - "pinName": "Y4" + "compName": "Splitter#17", + "pinName": "O0" }, "pin2": { "compName": "NandGate#6", @@ -2409,7 +2442,7 @@ "path": [ { "x": 175.0, - "y": 75.0 + "y": 70.0 }, { "x": 175.0, @@ -2419,8 +2452,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "A1" + "compName": "Splitter#18", + "pinName": "O3" }, "pin2": { "compName": "_submodelinterface", @@ -2430,31 +2463,31 @@ "path": [ { "x": 50.0, - "y": 45.0 + "y": 40.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "_EC" + "compName": "Splitter#18", + "pinName": "O2" }, "pin2": { - "compName": "not4#0", - "pinName": "A2" + "compName": "_submodelinterface", + "pinName": "_EC" }, "name": "unnamedWire#76", "path": [ { "x": 75.0, - "y": 55.0 + "y": 50.0 } ] }, { "pin1": { - "compName": "not4#0", - "pinName": "A3" + "compName": "Splitter#18", + "pinName": "O1" }, "pin2": { "compName": "_submodelinterface", @@ -2464,7 +2497,7 @@ "path": [ { "x": 100.0, - "y": 65.0 + "y": 60.0 } ] }, @@ -2474,14 +2507,22 @@ "pinName": "_EOVR" }, "pin2": { - "compName": "not4#0", - "pinName": "A4" + "compName": "Splitter#18", + "pinName": "O0" }, "name": "unnamedWire#78", "path": [ { "x": 125.0, - "y": 75.0 + "y": 30.0 + }, + { + "x": 90.0, + "y": 30.0 + }, + { + "x": 90.0, + "y": 70.0 } ] }, @@ -4924,6 +4965,30 @@ "y": 615.0 } ] + }, + { + "pin1": { + "compName": "Splitter#17", + "pinName": "I" + }, + "pin2": { + "compName": "not4#0", + "pinName": "Y" + }, + "name": "unnamedWire#222", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#18", + "pinName": "I" + }, + "pin2": { + "compName": "not4#0", + "pinName": "A" + }, + "name": "unnamedWire#223", + "path": [] } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 9ee25417..58f3f4d2 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -199,7 +199,7 @@ "id": "Splitter", "name": "Splitter#6", "pos": { - "x": 100.0, + "x": 60.0, "y": 275.0 }, "params": { @@ -437,7 +437,7 @@ "id": "not4", "name": "not4#0", "pos": { - "x": 60.0, + "x": 75.0, "y": 270.0 } }, @@ -928,47 +928,61 @@ { "pin1": { "compName": "not4#0", - "pinName": "Y1" + "pinName": "Y" }, "pin2": { - "compName": "Splitter#6", - "pinName": "O3" + "compName": "mux1_4#4", + "pinName": "I1" }, "name": "unnamedWire#27", - "path": [] + "path": [ + { + "x": 115.0, + "y": 290.0 + }, + { + "x": 115.0, + "y": 270.0 + } + ] }, { "pin1": { "compName": "Splitter#6", - "pinName": "O2" + "pinName": "I" }, "pin2": { "compName": "not4#0", - "pinName": "Y2" + "pinName": "A" }, "name": "unnamedWire#28", "path": [] }, { "pin1": { - "compName": "not4#0", - "pinName": "Y3" + "compName": "Splitter#9", + "pinName": "O3" }, "pin2": { "compName": "Splitter#6", - "pinName": "O1" + "pinName": "O3" }, "name": "unnamedWire#29", - "path": [] + "path": [ + { + "x": 25.0, + "y": 275.0 + } + ] }, { "pin1": { - "compName": "Splitter#6", - "pinName": "O0" + "compName": "WireCrossPoint#2", + "pinName": "" }, "pin2": { - "compName": "not4#0", - "pinName": "Y4" + "compName": "Splitter#6", + "pinName": "O2" }, "name": "unnamedWire#30", "path": [] @@ -976,17 +990,17 @@ { "pin1": { "compName": "Splitter#9", - "pinName": "O3" + "pinName": "O1" }, "pin2": { - "compName": "not4#0", - "pinName": "A1" + "compName": "Splitter#6", + "pinName": "O1" }, "name": "unnamedWire#31", "path": [ { - "x": 25.0, - "y": 275.0 + "x": 45.0, + "y": 295.0 } ] }, @@ -1004,20 +1018,15 @@ }, { "pin1": { - "compName": "Splitter#9", - "pinName": "O1" + "compName": "WireCrossPoint#3", + "pinName": "" }, "pin2": { - "compName": "not4#0", - "pinName": "A3" + "compName": "Splitter#6", + "pinName": "O0" }, "name": "unnamedWire#33", - "path": [ - { - "x": 45.0, - "y": 295.0 - } - ] + "path": [] }, { "pin1": { @@ -1281,30 +1290,6 @@ } ] }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A4" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "not4#0", - "pinName": "A2" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#53", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#9", @@ -1314,7 +1299,7 @@ "compName": "Splitter#7", "pinName": "O3" }, - "name": "unnamedWire#54", + "name": "unnamedWire#52", "path": [] }, { @@ -1326,7 +1311,7 @@ "compName": "WireCrossPoint#5", "pinName": "" }, - "name": "unnamedWire#55", + "name": "unnamedWire#53", "path": [] }, { @@ -1338,7 +1323,7 @@ "compName": "WireCrossPoint#9", "pinName": "" }, - "name": "unnamedWire#56", + "name": "unnamedWire#54", "path": [ { "x": 35.0, @@ -1355,7 +1340,7 @@ "compName": "Splitter#1", "pinName": "O2" }, - "name": "unnamedWire#57", + "name": "unnamedWire#55", "path": [] }, { @@ -1367,7 +1352,7 @@ "compName": "Splitter#1", "pinName": "O1" }, - "name": "unnamedWire#58", + "name": "unnamedWire#56", "path": [ { "x": 80.0, @@ -1384,7 +1369,7 @@ "compName": "Splitter#1", "pinName": "O0" }, - "name": "unnamedWire#59", + "name": "unnamedWire#57", "path": [ { "x": 25.0, @@ -1405,7 +1390,7 @@ "compName": "mux1_4#4", "pinName": "Y" }, - "name": "unnamedWire#60", + "name": "unnamedWire#58", "path": [ { "x": 185.0, @@ -1426,30 +1411,9 @@ "compName": "mux1_4#3", "pinName": "I0" }, - "name": "unnamedWire#61", + "name": "unnamedWire#59", "path": [] }, - { - "pin1": { - "compName": "Splitter#6", - "pinName": "I" - }, - "pin2": { - "compName": "mux1_4#4", - "pinName": "I1" - }, - "name": "unnamedWire#62", - "path": [ - { - "x": 115.0, - "y": 290.0 - }, - { - "x": 115.0, - "y": 270.0 - } - ] - }, { "pin1": { "compName": "Splitter#7", @@ -1459,7 +1423,7 @@ "compName": "mux1_4#4", "pinName": "I0" }, - "name": "unnamedWire#63", + "name": "unnamedWire#60", "path": [ { "x": 115.0, @@ -1480,7 +1444,7 @@ "compName": "WireCrossPoint#10", "pinName": "" }, - "name": "unnamedWire#64", + "name": "unnamedWire#61", "path": [ { "x": 120.0, @@ -1497,7 +1461,7 @@ "compName": "mux1_4#0", "pinName": "S0" }, - "name": "unnamedWire#65", + "name": "unnamedWire#62", "path": [ { "x": 120.0, @@ -1522,7 +1486,7 @@ "compName": "NandGate#0", "pinName": "A" }, - "name": "unnamedWire#66", + "name": "unnamedWire#63", "path": [] }, { @@ -1534,7 +1498,7 @@ "compName": "WireCrossPoint#13", "pinName": "" }, - "name": "unnamedWire#67", + "name": "unnamedWire#64", "path": [ { "x": 300.0, @@ -1551,7 +1515,7 @@ "compName": "WireCrossPoint#12", "pinName": "" }, - "name": "unnamedWire#68", + "name": "unnamedWire#65", "path": [ { "x": 155.0, @@ -1568,7 +1532,7 @@ "compName": "mux1#0", "pinName": "I1" }, - "name": "unnamedWire#69", + "name": "unnamedWire#66", "path": [ { "x": 350.0, @@ -1593,7 +1557,7 @@ "compName": "and#0", "pinName": "B" }, - "name": "unnamedWire#70", + "name": "unnamedWire#67", "path": [] }, { @@ -1605,7 +1569,7 @@ "compName": "NandGate#0", "pinName": "B" }, - "name": "unnamedWire#71", + "name": "unnamedWire#68", "path": [ { "x": 155.0, @@ -1622,7 +1586,7 @@ "compName": "mux1#0", "pinName": "S0" }, - "name": "unnamedWire#72", + "name": "unnamedWire#69", "path": [ { "x": 260.0, @@ -1639,7 +1603,7 @@ "compName": "mux1_4#0", "pinName": "I0" }, - "name": "unnamedWire#73", + "name": "unnamedWire#70", "path": [ { "x": 75.0, diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json index 90cfcc7e..2cd7024e 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json @@ -5,73 +5,19 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 20.0 }, - "name": "A1", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "A2", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "A3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 35.0 - }, - "name": "A4", - "logicWidth": 1, + "name": "A", + "logicWidth": 4, "usage": "INPUT" }, { "location": { "x": 35.0, - "y": 5.0 + "y": 20.0 }, - "name": "Y1", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Y2", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 25.0 - }, - "name": "Y3", - "logicWidth": 1, - "usage": "OUTPUT" - }, - { - "location": { - "x": 35.0, - "y": 35.0 - }, - "name": "Y4", - "logicWidth": 1, + "name": "Y", + "logicWidth": 4, "usage": "OUTPUT" } ], @@ -82,7 +28,7 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 30.0, + "x": 35.0, "y": 2.5 }, "params": 1 @@ -91,7 +37,7 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 30.0, + "x": 35.0, "y": 27.5 }, "params": 1 @@ -100,7 +46,7 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 30.0, + "x": 35.0, "y": 52.5 }, "params": 1 @@ -109,16 +55,40 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 30.0, + "x": 35.0, "y": 77.5 }, "params": 1 }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 35.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 70.0, + "y": 35.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 14.0, + "x": 29.0, "y": 11.5 }, "params": 1 @@ -127,7 +97,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 14.0, + "x": 29.0, "y": 36.5 }, "params": 1 @@ -136,7 +106,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 14.0, + "x": 29.0, "y": 61.5 }, "params": 1 @@ -145,7 +115,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 14.0, + "x": 29.0, "y": 86.5 }, "params": 1 @@ -154,51 +124,87 @@ "wires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" - }, - "pin2": { "compName": "WireCrossPoint#0", "pinName": "" }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O3" + }, "name": "unnamedWire#0", - "path": [] + "path": [ + { + "x": 20.0, + "y": 12.5 + }, + { + "x": 20.0, + "y": 35.0 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" - }, - "pin2": { "compName": "WireCrossPoint#1", "pinName": "" }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O2" + }, "name": "unnamedWire#1", - "path": [] + "path": [ + { + "x": 25.0, + "y": 37.5 + }, + { + "x": 25.0, + "y": 45.0 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A3" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#2", - "path": [] + "path": [ + { + "x": 25.0, + "y": 55.0 + }, + { + "x": 25.0, + "y": 62.5 + } + ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#3", - "path": [] + "path": [ + { + "x": 20.0, + "y": 65.0 + }, + { + "x": 20.0, + "y": 87.5 + } + ] }, { "pin1": { @@ -212,7 +218,7 @@ "name": "unnamedWire#4", "path": [ { - "x": 15.0, + "x": 30.0, "y": 7.5 } ] @@ -229,7 +235,7 @@ "name": "unnamedWire#5", "path": [ { - "x": 15.0, + "x": 30.0, "y": 32.5 } ] @@ -246,7 +252,7 @@ "name": "unnamedWire#6", "path": [ { - "x": 15.0, + "x": 30.0, "y": 57.5 } ] @@ -263,7 +269,7 @@ "name": "unnamedWire#7", "path": [ { - "x": 15.0, + "x": 30.0, "y": 82.5 } ] @@ -280,7 +286,7 @@ "name": "unnamedWire#8", "path": [ { - "x": 15.0, + "x": 30.0, "y": 17.5 } ] @@ -297,7 +303,7 @@ "name": "unnamedWire#9", "path": [ { - "x": 15.0, + "x": 30.0, "y": 42.5 } ] @@ -314,7 +320,7 @@ "name": "unnamedWire#10", "path": [ { - "x": 15.0, + "x": 30.0, "y": 67.5 } ] @@ -331,57 +337,117 @@ "name": "unnamedWire#11", "path": [ { - "x": 15.0, + "x": 30.0, "y": 92.5 } ] }, { "pin1": { - "compName": "NandGate#0", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y1" + "compName": "NandGate#0", + "pinName": "Y" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 65.0, + "y": 35.0 + }, + { + "x": 65.0, + "y": 12.5 + } + ] }, { "pin1": { - "compName": "NandGate#1", - "pinName": "Y" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "NandGate#1", + "pinName": "Y" }, "name": "unnamedWire#13", - "path": [] + "path": [ + { + "x": 60.0, + "y": 45.0 + }, + { + "x": 60.0, + "y": 37.5 + } + ] }, { "pin1": { + "compName": "Splitter#1", + "pinName": "O1" + }, + "pin2": { "compName": "NandGate#2", "pinName": "Y" }, + "name": "unnamedWire#14", + "path": [ + { + "x": 60.0, + "y": 55.0 + }, + { + "x": 60.0, + "y": 62.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O0" + }, + "pin2": { + "compName": "NandGate#3", + "pinName": "Y" + }, + "name": "unnamedWire#15", + "path": [ + { + "x": 65.0, + "y": 65.0 + }, + { + "x": 65.0, + "y": 87.5 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, "pin2": { "compName": "_submodelinterface", - "pinName": "Y3" + "pinName": "Y" }, - "name": "unnamedWire#14", + "name": "unnamedWire#16", "path": [] }, { "pin1": { - "compName": "NandGate#3", - "pinName": "Y" + "compName": "Splitter#0", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", - "pinName": "Y4" + "pinName": "A" }, - "name": "unnamedWire#15", + "name": "unnamedWire#17", "path": [] } ], diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json index a9fdefe0..aaddfdf3 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json @@ -249,6 +249,30 @@ }, "params": 1 }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 100.0, + "y": 205.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 75.0, + "y": 255.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -280,8 +304,8 @@ "id": "not4", "name": "not4#0", "pos": { - "x": 75.0, - "y": 250.0 + "x": 60.0, + "y": 200.0 } }, { @@ -510,20 +534,20 @@ "pinName": "Y1" }, "pin2": { - "compName": "not4#0", - "pinName": "A1" + "compName": "Splitter#1", + "pinName": "O3" }, "name": "unnamedWire#10", "path": [] }, { "pin1": { - "compName": "sel2_4#0", - "pinName": "Y2" + "compName": "Splitter#1", + "pinName": "O2" }, "pin2": { - "compName": "not4#0", - "pinName": "A2" + "compName": "sel2_4#0", + "pinName": "Y2" }, "name": "unnamedWire#11", "path": [] @@ -534,20 +558,20 @@ "pinName": "Y3" }, "pin2": { - "compName": "not4#0", - "pinName": "A3" + "compName": "Splitter#1", + "pinName": "O1" }, "name": "unnamedWire#12", "path": [] }, { "pin1": { - "compName": "sel2_4#0", - "pinName": "Y4" + "compName": "Splitter#1", + "pinName": "O0" }, "pin2": { - "compName": "not4#0", - "pinName": "A4" + "compName": "sel2_4#0", + "pinName": "Y4" }, "name": "unnamedWire#13", "path": [] @@ -706,8 +730,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "Y1" + "compName": "Splitter#0", + "pinName": "O3" }, "pin2": { "compName": "NandGate#4", @@ -717,7 +741,7 @@ "path": [ { "x": 115.0, - "y": 255.0 + "y": 205.0 }, { "x": 115.0, @@ -727,8 +751,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "Y2" + "compName": "Splitter#0", + "pinName": "O2" }, "pin2": { "compName": "NandGate#5", @@ -738,7 +762,7 @@ "path": [ { "x": 120.0, - "y": 265.0 + "y": 215.0 }, { "x": 120.0, @@ -748,8 +772,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "Y3" + "compName": "Splitter#0", + "pinName": "O1" }, "pin2": { "compName": "NandGate#6", @@ -759,7 +783,7 @@ "path": [ { "x": 125.0, - "y": 275.0 + "y": 225.0 }, { "x": 125.0, @@ -769,8 +793,8 @@ }, { "pin1": { - "compName": "not4#0", - "pinName": "Y4" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { "compName": "NandGate#7", @@ -780,7 +804,7 @@ "path": [ { "x": 130.0, - "y": 285.0 + "y": 235.0 }, { "x": 130.0, @@ -919,6 +943,47 @@ }, "name": "unnamedWire#36", "path": [] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, + "pin2": { + "compName": "not4#0", + "pinName": "A" + }, + "name": "unnamedWire#37", + "path": [ + { + "x": 90.0, + "y": 270.0 + }, + { + "x": 90.0, + "y": 245.0 + }, + { + "x": 55.0, + "y": 245.0 + }, + { + "x": 55.0, + "y": 220.0 + } + ] + }, + { + "pin1": { + "compName": "not4#0", + "pinName": "Y" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#38", + "path": [] } ], "version": "0.1.1" -- 2.17.1