From 5ab24a2ac9468d77d20b5ec41dcfafcb88e8c206 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 8 Sep 2019 17:43:06 +0200 Subject: [PATCH] Started layouting the Am2904 --- .../am2900/components/am2904/Am2904.json | 1405 ++++++++++++----- .../am2900/components/am2904/Am2904MSR.json | 523 +++--- .../am2900/components/am2904/Am2904muSR.json | 423 ++--- 3 files changed, 1520 insertions(+), 831 deletions(-) diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index f4e3df63..a204e434 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -4,8 +4,8 @@ "interfacePins": [ { "location": { - "x": 0.0, - "y": 5.0 + "x": 55.0, + "y": 0.0 }, "name": "C", "logicWidth": 1, @@ -14,7 +14,7 @@ { "location": { "x": 120.0, - "y": 108.0 + "y": 85.0 }, "name": "C0", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 120.0, - "y": 60.0 + "y": 54.0 }, "name": "CT", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 110.0 + "y": 85.0 }, "name": "Cx", "logicWidth": 1, @@ -41,7 +41,7 @@ { "location": { "x": 0.0, - "y": 61.0 + "y": 42.0 }, "name": "I", "logicWidth": 13, @@ -104,7 +104,7 @@ { "location": { "x": 120.0, - "y": 118.0 + "y": 120.0 }, "name": "SIO0", "logicWidth": 1, @@ -122,7 +122,7 @@ { "location": { "x": 120.0, - "y": 17.0 + "y": 10.0 }, "name": "YC", "logicWidth": 1, @@ -131,7 +131,7 @@ { "location": { "x": 120.0, - "y": 21.0 + "y": 15.0 }, "name": "YN", "logicWidth": 1, @@ -140,7 +140,7 @@ { "location": { "x": 120.0, - "y": 25.0 + "y": 20.0 }, "name": "YOVR", "logicWidth": 1, @@ -149,7 +149,7 @@ { "location": { "x": 120.0, - "y": 11.0 + "y": 5.0 }, "name": "YZ", "logicWidth": 1, @@ -157,8 +157,8 @@ }, { "location": { - "x": 0.0, - "y": 30.0 + "x": 5.0, + "y": 0.0 }, "name": "_CEM", "logicWidth": 1, @@ -166,8 +166,8 @@ }, { "location": { - "x": 0.0, - "y": 33.0 + "x": 45.0, + "y": 0.0 }, "name": "_CEmu", "logicWidth": 1, @@ -175,8 +175,8 @@ }, { "location": { - "x": 0.0, - "y": 38.0 + "x": 15.0, + "y": 0.0 }, "name": "_EC", "logicWidth": 1, @@ -184,8 +184,8 @@ }, { "location": { - "x": 0.0, - "y": 40.0 + "x": 20.0, + "y": 0.0 }, "name": "_EN", "logicWidth": 1, @@ -193,8 +193,8 @@ }, { "location": { - "x": 0.0, - "y": 42.0 + "x": 25.0, + "y": 0.0 }, "name": "_EOVR", "logicWidth": 1, @@ -202,8 +202,8 @@ }, { "location": { - "x": 0.0, - "y": 36.0 + "x": 10.0, + "y": 0.0 }, "name": "_EZ", "logicWidth": 1, @@ -211,8 +211,8 @@ }, { "location": { - "x": 120.0, - "y": 51.0 + "x": 113.0, + "y": 0.0 }, "name": "_OECT", "logicWidth": 1, @@ -220,7 +220,7 @@ }, { "location": { - "x": 61.0, + "x": 90.0, "y": 0.0 }, "name": "_OEY", @@ -230,7 +230,7 @@ { "location": { "x": 0.0, - "y": 83.0 + "y": 110.0 }, "name": "_SE", "logicWidth": 1, @@ -244,84 +244,48 @@ "id": "Am2904MSR", "name": "Am2904MSR#0", "pos": { - "x": 225.0, - "y": 95.0 + "x": 205.0, + "y": 90.0 } }, { "id": "Am2904RegCTInstrDecode", "name": "Am2904RegCTInstrDecode#0", "pos": { - "x": 50.0, - "y": 240.0 + "x": 180.0, + "y": 190.0 } }, { "id": "Am2904ShiftInstrDecode", "name": "Am2904ShiftInstrDecode#0", "pos": { - "x": 50.0, - "y": 360.0 + "x": 100.0, + "y": 495.0 } }, { "id": "Am2904TestLogic", "name": "Am2904TestLogic#0", "pos": { - "x": 225.0, - "y": 340.0 + "x": 260.0, + "y": 330.0 } }, { "id": "Am2904muSR", "name": "Am2904muSR#0", "pos": { - "x": 270.0, - "y": 250.0 + "x": 350.0, + "y": 95.0 } }, - { - "id": "BitDisplay", - "name": "BitDisplay#0", - "pos": { - "x": 530.0, - "y": 70.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#1", - "pos": { - "x": 565.0, - "y": 180.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#2", - "pos": { - "x": 530.0, - "y": 200.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#3", - "pos": { - "x": 560.0, - "y": 150.0 - }, - "params": 1 - }, { "id": "Merger", "name": "Merger#0", "pos": { - "x": 25.0, - "y": 315.0 + "x": 20.0, + "y": 220.0 }, "params": 6 }, @@ -329,8 +293,8 @@ "id": "Merger", "name": "Merger#1", "pos": { - "x": 25.0, - "y": 265.0 + "x": 20.0, + "y": 170.0 }, "params": 5 }, @@ -347,8 +311,8 @@ "id": "Merger", "name": "Merger#3", "pos": { - "x": 510.0, - "y": 165.0 + "x": 520.0, + "y": 95.0 }, "params": 4 }, @@ -356,8 +320,8 @@ "id": "Merger", "name": "Merger#4", "pos": { - "x": 25.0, - "y": 245.0 + "x": 20.0, + "y": 150.0 }, "params": 2 }, @@ -365,8 +329,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 190.0, - "y": 145.0 + "x": 230.0, + "y": 10.0 }, "params": 1 }, @@ -374,7 +338,7 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 130.0, + "x": 140.0, "y": 5.0 }, "params": 1 @@ -383,8 +347,8 @@ "id": "NandGate", "name": "NandGate#10", "pos": { - "x": 340.0, - "y": 120.0 + "x": 455.0, + "y": 60.0 }, "params": 1 }, @@ -392,8 +356,8 @@ "id": "NandGate", "name": "NandGate#11", "pos": { - "x": 540.0, - "y": 265.0 + "x": 555.0, + "y": 235.0 }, "params": 1 }, @@ -401,8 +365,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 225.0, - "y": 195.0 + "x": 325.0, + "y": 55.0 }, "params": 1 }, @@ -410,8 +374,8 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 225.0, - "y": 215.0 + "x": 325.0, + "y": 75.0 }, "params": 1 }, @@ -419,8 +383,8 @@ "id": "NandGate", "name": "NandGate#4", "pos": { - "x": 225.0, - "y": 155.0 + "x": 325.0, + "y": 15.0 }, "params": 1 }, @@ -428,8 +392,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 225.0, - "y": 175.0 + "x": 325.0, + "y": 35.0 }, "params": 1 }, @@ -437,7 +401,7 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 205.0, + "x": 185.0, "y": 70.0 }, "params": 1 @@ -446,7 +410,7 @@ "id": "NandGate", "name": "NandGate#7", "pos": { - "x": 205.0, + "x": 185.0, "y": 50.0 }, "params": 1 @@ -455,7 +419,7 @@ "id": "NandGate", "name": "NandGate#8", "pos": { - "x": 205.0, + "x": 185.0, "y": 30.0 }, "params": 1 @@ -464,7 +428,7 @@ "id": "NandGate", "name": "NandGate#9", "pos": { - "x": 205.0, + "x": 185.0, "y": 10.0 }, "params": 1 @@ -473,8 +437,8 @@ "id": "Splitter", "name": "Splitter#0", "pos": { - "x": 10.0, - "y": 245.0 + "x": 5.0, + "y": 150.0 }, "params": 13 }, @@ -482,8 +446,8 @@ "id": "Splitter", "name": "Splitter#1", "pos": { - "x": 555.0, - "y": 80.0 + "x": 575.0, + "y": 40.0 }, "params": 4 }, @@ -491,8 +455,8 @@ "id": "Splitter", "name": "Splitter#10", "pos": { - "x": 420.0, - "y": 410.0 + "x": 445.0, + "y": 300.0 }, "params": 4 }, @@ -536,8 +500,8 @@ "id": "Splitter", "name": "Splitter#15", "pos": { - "x": 120.0, - "y": 455.0 + "x": 430.0, + "y": 535.0 }, "params": 2 }, @@ -545,8 +509,8 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 395.0, - "y": 195.0 + "x": 440.0, + "y": 95.0 }, "params": 2 }, @@ -554,8 +518,8 @@ "id": "Splitter", "name": "Splitter#3", "pos": { - "x": 450.0, - "y": 175.0 + "x": 465.0, + "y": 105.0 }, "params": 4 }, @@ -563,8 +527,8 @@ "id": "Splitter", "name": "Splitter#4", "pos": { - "x": 395.0, - "y": 225.0 + "x": 425.0, + "y": 155.0 }, "params": 4 }, @@ -572,8 +536,8 @@ "id": "Splitter", "name": "Splitter#5", "pos": { - "x": 395.0, - "y": 265.0 + "x": 425.0, + "y": 195.0 }, "params": 4 }, @@ -581,8 +545,8 @@ "id": "Splitter", "name": "Splitter#6", "pos": { - "x": 285.0, - "y": 320.0 + "x": 320.0, + "y": 310.0 }, "params": 3 }, @@ -590,8 +554,8 @@ "id": "Splitter", "name": "Splitter#7", "pos": { - "x": 420.0, - "y": 325.0 + "x": 445.0, + "y": 340.0 }, "params": 4 }, @@ -599,8 +563,8 @@ "id": "Splitter", "name": "Splitter#8", "pos": { - "x": 420.0, - "y": 365.0 + "x": 445.0, + "y": 380.0 }, "params": 4 }, @@ -608,8 +572,8 @@ "id": "Splitter", "name": "Splitter#9", "pos": { - "x": 240.0, - "y": 475.0 + "x": 255.0, + "y": 430.0 }, "params": 4 }, @@ -617,8 +581,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#0", "pos": { - "x": 535.0, - "y": 165.0 + "x": 540.0, + "y": 75.0 }, "params": { "logicWidth": 4, @@ -677,8 +641,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#5", "pos": { - "x": 560.0, - "y": 290.0 + "x": 575.0, + "y": 260.0 }, "params": { "logicWidth": 1, @@ -689,8 +653,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 165.0, - "y": 150.0 + "x": 275.0, + "y": 60.0 }, "params": 1 }, @@ -698,8 +662,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 180.0, - "y": 135.0 + "x": 190.0, + "y": 140.0 }, "params": 4 }, @@ -707,7 +671,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 195.0, + "x": 180.0, "y": 55.0 }, "params": 1 @@ -716,7 +680,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 195.0, + "x": 180.0, "y": 15.0 }, "params": 1 @@ -725,7 +689,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { - "x": 195.0, + "x": 180.0, "y": 35.0 }, "params": 1 @@ -734,8 +698,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 330.0, - "y": 125.0 + "x": 450.0, + "y": 65.0 }, "params": 1 }, @@ -743,8 +707,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 520.0, - "y": 190.0 + "x": 535.0, + "y": 110.0 }, "params": 4 }, @@ -752,8 +716,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 255.0, - "y": 265.0 + "x": 335.0, + "y": 175.0 }, "params": 4 }, @@ -761,8 +725,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 255.0, - "y": 255.0 + "x": 385.0, + "y": 165.0 }, "params": 4 }, @@ -770,8 +734,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#17", "pos": { - "x": 360.0, - "y": 495.0 + "x": 350.0, + "y": 440.0 }, "params": 1 }, @@ -797,8 +761,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 295.0, - "y": 120.0 + "x": 330.0, + "y": 125.0 }, "params": 4 }, @@ -824,8 +788,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#22", "pos": { - "x": 250.0, - "y": 540.0 + "x": 270.0, + "y": 515.0 }, "params": 1 }, @@ -833,7 +797,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#23", "pos": { - "x": 330.0, + "x": 325.0, "y": 640.0 }, "params": 1 @@ -869,8 +833,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#27", "pos": { - "x": 440.0, - "y": 385.0 + "x": 470.0, + "y": 400.0 }, "params": 1 }, @@ -878,8 +842,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#28", "pos": { - "x": 440.0, - "y": 345.0 + "x": 465.0, + "y": 350.0 }, "params": 1 }, @@ -896,8 +860,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 335.0, - "y": 270.0 + "x": 405.0, + "y": 120.0 }, "params": 4 }, @@ -914,17 +878,35 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#31", "pos": { - "x": 530.0, - "y": 270.0 + "x": 550.0, + "y": 240.0 }, "params": 1 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#32", + "pos": { + "x": 405.0, + "y": 170.0 + }, + "params": 4 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#33", + "pos": { + "x": 390.0, + "y": 210.0 + }, + "params": 4 + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 150.0, - "y": 160.0 + "x": 225.0, + "y": 15.0 }, "params": 1 }, @@ -932,8 +914,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 530.0, - "y": 100.0 + "x": 570.0, + "y": 55.0 }, "params": 4 }, @@ -941,8 +923,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 120.0, - "y": 15.0 + "x": 135.0, + "y": 20.0 }, "params": 1 }, @@ -950,8 +932,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 215.0, - "y": 180.0 + "x": 320.0, + "y": 40.0 }, "params": 1 }, @@ -959,8 +941,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 215.0, - "y": 160.0 + "x": 320.0, + "y": 20.0 }, "params": 1 }, @@ -968,8 +950,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 215.0, - "y": 200.0 + "x": 320.0, + "y": 60.0 }, "params": 1 }, @@ -977,72 +959,72 @@ "id": "and", "name": "and#0", "pos": { - "x": 380.0, - "y": 125.0 + "x": 495.0, + "y": 65.0 } }, { "id": "mux1", "name": "mux1#0", "pos": { - "x": 450.0, - "y": 310.0 + "x": 495.0, + "y": 275.0 } }, { "id": "mux1", "name": "mux1#1", "pos": { - "x": 265.0, - "y": 515.0 + "x": 275.0, + "y": 475.0 } }, { "id": "mux1", "name": "mux1#2", "pos": { - "x": 365.0, - "y": 485.0 + "x": 355.0, + "y": 445.0 } }, { "id": "mux1", "name": "mux1#3", "pos": { - "x": 415.0, - "y": 465.0 + "x": 395.0, + "y": 425.0 } }, { "id": "mux1", "name": "mux1#4", "pos": { - "x": 190.0, - "y": 460.0 + "x": 490.0, + "y": 530.0 } }, { "id": "mux1", "name": "mux1#5", "pos": { - "x": 135.0, - "y": 470.0 + "x": 445.0, + "y": 540.0 } }, { "id": "mux1_4", "name": "mux1_4#0", "pos": { - "x": 470.0, - "y": 160.0 + "x": 480.0, + "y": 90.0 } }, { "id": "mux1_4", "name": "mux1_4#1", "pos": { - "x": 415.0, - "y": 210.0 + "x": 440.0, + "y": 140.0 } }, { @@ -1073,8 +1055,8 @@ "id": "mux3", "name": "mux3#0", "pos": { - "x": 300.0, - "y": 310.0 + "x": 335.0, + "y": 300.0 } }, { @@ -1089,7 +1071,7 @@ "id": "not4", "name": "not4#0", "pos": { - "x": 135.0, + "x": 130.0, "y": 40.0 } }, @@ -1097,16 +1079,16 @@ "id": "xor", "name": "xor#0", "pos": { - "x": 495.0, - "y": 295.0 + "x": 535.0, + "y": 265.0 } }, { "id": "xor", "name": "xor#1", "pos": { - "x": 455.0, - "y": 355.0 + "x": 475.0, + "y": 315.0 } }, { @@ -1114,7 +1096,7 @@ "name": "xor#2", "pos": { "x": 315.0, - "y": 505.0 + "y": 465.0 } }, { @@ -1137,16 +1119,7 @@ "pinName": "" }, "name": "unnamedWire#0", - "path": [ - { - "x": 5.0, - "y": 25.0 - }, - { - "x": 5.0, - "y": 10.0 - } - ] + "path": [] }, { "pin1": { @@ -1158,7 +1131,16 @@ "pinName": "MUX" }, "name": "unnamedWire#1", - "path": [] + "path": [ + { + "x": 325.0, + "y": 200.0 + }, + { + "x": 325.0, + "y": 115.0 + } + ] }, { "pin1": { @@ -1246,15 +1228,20 @@ }, { "pin1": { - "compName": "Splitter#4", - "pinName": "I" + "compName": "WireCrossPoint#16", + "pinName": "" }, "pin2": { "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#106", - "path": [] + "path": [ + { + "x": 330.0, + "y": 165.0 + } + ] }, { "pin1": { @@ -1318,15 +1305,28 @@ }, { "pin1": { - "compName": "Splitter#5", + "compName": "Splitter#7", "pinName": "I" }, "pin2": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#33", "pinName": "" }, "name": "unnamedWire#111", - "path": [] + "path": [ + { + "x": 435.0, + "y": 355.0 + }, + { + "x": 435.0, + "y": 245.0 + }, + { + "x": 390.0, + "y": 245.0 + } + ] }, { "pin1": { @@ -1338,7 +1338,12 @@ "pinName": "IN" }, "name": "unnamedWire#112", - "path": [] + "path": [ + { + "x": 535.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -1350,7 +1355,28 @@ "pinName": "I" }, "name": "unnamedWire#113", - "path": [] + "path": [ + { + "x": 535.0, + "y": 260.0 + }, + { + "x": 385.0, + "y": 260.0 + }, + { + "x": 385.0, + "y": 290.0 + }, + { + "x": 255.0, + "y": 290.0 + }, + { + "x": 255.0, + "y": 380.0 + } + ] }, { "pin1": { @@ -1470,7 +1496,12 @@ "pinName": "EN" }, "name": "unnamedWire#122", - "path": [] + "path": [ + { + "x": 585.0, + "y": 245.0 + } + ] }, { "pin1": { @@ -1494,7 +1525,12 @@ "pinName": "CT_MUX" }, "name": "unnamedWire#124", - "path": [] + "path": [ + { + "x": 210.0, + "y": 320.0 + } + ] }, { "pin1": { @@ -1542,7 +1578,12 @@ "pinName": "S0" }, "name": "unnamedWire#128", - "path": [] + "path": [ + { + "x": 230.0, + "y": 280.0 + } + ] }, { "pin1": { @@ -1554,7 +1595,16 @@ "pinName": "I0" }, "name": "unnamedWire#129", - "path": [] + "path": [ + { + "x": 420.0, + "y": 310.0 + }, + { + "x": 420.0, + "y": 290.0 + } + ] }, { "pin1": { @@ -1578,7 +1628,20 @@ "pinName": "CT_INV" }, "name": "unnamedWire#130", - "path": [] + "path": [ + { + "x": 415.0, + "y": 270.0 + }, + { + "x": 415.0, + "y": 285.0 + }, + { + "x": 220.0, + "y": 285.0 + } + ] }, { "pin1": { @@ -1590,7 +1653,24 @@ "pinName": "I1" }, "name": "unnamedWire#131", - "path": [] + "path": [ + { + "x": 515.0, + "y": 320.0 + }, + { + "x": 515.0, + "y": 310.0 + }, + { + "x": 490.0, + "y": 310.0 + }, + { + "x": 490.0, + "y": 300.0 + } + ] }, { "pin1": { @@ -1602,19 +1682,29 @@ "pinName": "I" }, "name": "unnamedWire#132", - "path": [] + "path": [ + { + "x": 335.0, + "y": 135.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#33", "pinName": "" }, "pin2": { - "compName": "Splitter#7", - "pinName": "I" + "compName": "WireCrossPoint#15", + "pinName": "" }, "name": "unnamedWire#133", - "path": [] + "path": [ + { + "x": 390.0, + "y": 175.0 + } + ] }, { "pin1": { @@ -1642,12 +1732,12 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "Am2904muSR#0", - "pinName": "M" + "compName": "WireCrossPoint#32", + "pinName": "" }, "name": "unnamedWire#136", "path": [] @@ -1662,7 +1752,20 @@ "pinName": "I" }, "name": "unnamedWire#137", - "path": [] + "path": [ + { + "x": 385.0, + "y": 250.0 + }, + { + "x": 430.0, + "y": 250.0 + }, + { + "x": 430.0, + "y": 395.0 + } + ] }, { "pin1": { @@ -1674,7 +1777,28 @@ "pinName": "B" }, "name": "unnamedWire#138", - "path": [] + "path": [ + { + "x": 240.0, + "y": 185.0 + }, + { + "x": 410.0, + "y": 185.0 + }, + { + "x": 410.0, + "y": 85.0 + }, + { + "x": 485.0, + "y": 85.0 + }, + { + "x": 485.0, + "y": 80.0 + } + ] }, { "pin1": { @@ -1722,7 +1846,16 @@ "pinName": "I12-11" }, "name": "unnamedWire#141", - "path": [] + "path": [ + { + "x": 105.0, + "y": 155.0 + }, + { + "x": 105.0, + "y": 220.0 + } + ] }, { "pin1": { @@ -1734,7 +1867,12 @@ "pinName": "I" }, "name": "unnamedWire#142", - "path": [] + "path": [ + { + "x": 250.0, + "y": 445.0 + } + ] }, { "pin1": { @@ -1746,19 +1884,33 @@ "pinName": "" }, "name": "unnamedWire#143", - "path": [] + "path": [ + { + "x": 270.0, + "y": 500.0 + } + ] }, { "pin1": { - "compName": "Splitter#10", - "pinName": "I" + "compName": "WireCrossPoint#32", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "Am2904MSR#0", + "pinName": "mu" }, "name": "unnamedWire#144", - "path": [] + "path": [ + { + "x": 185.0, + "y": 170.0 + }, + { + "x": 185.0, + "y": 100.0 + } + ] }, { "pin1": { @@ -1770,7 +1922,24 @@ "pinName": "O2" }, "name": "unnamedWire#145", - "path": [] + "path": [ + { + "x": 265.0, + "y": 490.0 + }, + { + "x": 265.0, + "y": 510.0 + }, + { + "x": 460.0, + "y": 510.0 + }, + { + "x": 460.0, + "y": 310.0 + } + ] }, { "pin1": { @@ -1782,7 +1951,16 @@ "pinName": "S0" }, "name": "unnamedWire#146", - "path": [] + "path": [ + { + "x": 270.0, + "y": 450.0 + }, + { + "x": 270.0, + "y": 480.0 + } + ] }, { "pin1": { @@ -1806,7 +1984,16 @@ "pinName": "O0" }, "name": "unnamedWire#148", - "path": [] + "path": [ + { + "x": 290.0, + "y": 470.0 + }, + { + "x": 290.0, + "y": 460.0 + } + ] }, { "pin1": { @@ -1830,7 +2017,16 @@ "pinName": "I5-0" }, "name": "unnamedWire#15", - "path": [] + "path": [ + { + "x": 105.0, + "y": 245.0 + }, + { + "x": 105.0, + "y": 240.0 + } + ] }, { "pin1": { @@ -1842,7 +2038,12 @@ "pinName": "S0" }, "name": "unnamedWire#150", - "path": [] + "path": [ + { + "x": 350.0, + "y": 450.0 + } + ] }, { "pin1": { @@ -1866,7 +2067,24 @@ "pinName": "Cx" }, "name": "unnamedWire#152", - "path": [] + "path": [ + { + "x": 300.0, + "y": 460.0 + }, + { + "x": 300.0, + "y": 465.0 + }, + { + "x": 240.0, + "y": 465.0 + }, + { + "x": 240.0, + "y": 425.0 + } + ] }, { "pin1": { @@ -1914,7 +2132,16 @@ "pinName": "C0" }, "name": "unnamedWire#156", - "path": [] + "path": [ + { + "x": 560.0, + "y": 430.0 + }, + { + "x": 560.0, + "y": 425.0 + } + ] }, { "pin1": { @@ -1964,12 +2191,12 @@ "name": "unnamedWire#16", "path": [ { - "x": 40.0, - "y": 385.0 + "x": 75.0, + "y": 520.0 }, { - "x": 40.0, - "y": 285.0 + "x": 75.0, + "y": 190.0 } ] }, @@ -2103,7 +2330,16 @@ "pinName": "I0" }, "name": "unnamedWire#17", - "path": [] + "path": [ + { + "x": 10.0, + "y": 125.0 + }, + { + "x": 10.0, + "y": 95.0 + } + ] }, { "pin1": { @@ -2139,7 +2375,16 @@ "pinName": "" }, "name": "unnamedWire#172", - "path": [] + "path": [ + { + "x": 485.0, + "y": 390.0 + }, + { + "x": 485.0, + "y": 515.0 + } + ] }, { "pin1": { @@ -2235,7 +2480,16 @@ "pinName": "I1" }, "name": "unnamedWire#18", - "path": [] + "path": [ + { + "x": 5.0, + "y": 100.0 + }, + { + "x": 5.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -2439,7 +2693,12 @@ "pinName": "" }, "name": "unnamedWire#195", - "path": [] + "path": [ + { + "x": 470.0, + "y": 445.0 + } + ] }, { "pin1": { @@ -2451,7 +2710,16 @@ "pinName": "O1" }, "name": "unnamedWire#196", - "path": [] + "path": [ + { + "x": 475.0, + "y": 445.0 + }, + { + "x": 475.0, + "y": 360.0 + } + ] }, { "pin1": { @@ -2499,7 +2767,16 @@ "pinName": "OVRRET" }, "name": "unnamedWire#2", - "path": [] + "path": [ + { + "x": 345.0, + "y": 210.0 + }, + { + "x": 345.0, + "y": 155.0 + } + ] }, { "pin1": { @@ -2511,7 +2788,16 @@ "pinName": "I3" }, "name": "unnamedWire#20", - "path": [] + "path": [ + { + "x": 5.0, + "y": 50.0 + }, + { + "x": 5.0, + "y": 65.0 + } + ] }, { "pin1": { @@ -2523,7 +2809,12 @@ "pinName": "B" }, "name": "unnamedWire#200", - "path": [] + "path": [ + { + "x": 470.0, + "y": 330.0 + } + ] }, { "pin1": { @@ -2571,7 +2862,12 @@ "pinName": "A" }, "name": "unnamedWire#204", - "path": [] + "path": [ + { + "x": 465.0, + "y": 320.0 + } + ] }, { "pin1": { @@ -2583,7 +2879,12 @@ "pinName": "A" }, "name": "unnamedWire#205", - "path": [] + "path": [ + { + "x": 465.0, + "y": 445.0 + } + ] }, { "pin1": { @@ -2595,7 +2896,16 @@ "pinName": "O0" }, "name": "unnamedWire#206", - "path": [] + "path": [ + { + "x": 480.0, + "y": 445.0 + }, + { + "x": 480.0, + "y": 370.0 + } + ] }, { "pin1": { @@ -2643,7 +2953,16 @@ "pinName": "CINV" }, "name": "unnamedWire#21", - "path": [] + "path": [ + { + "x": 340.0, + "y": 220.0 + }, + { + "x": 340.0, + "y": 145.0 + } + ] }, { "pin1": { @@ -2719,9 +3038,46 @@ }, { "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "EN" - }, + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "Am2904muSR#0", + "pinName": "M" + }, + "name": "unnamedWire#216", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#32", + "pinName": "" + }, + "pin2": { + "compName": "Splitter#10", + "pinName": "I" + }, + "name": "unnamedWire#217", + "path": [ + { + "x": 405.0, + "y": 240.0 + }, + { + "x": 440.0, + "y": 240.0 + }, + { + "x": 440.0, + "y": 315.0 + } + ] + }, + { + "pin1": { + "compName": "TriStateBuffer#2", + "pinName": "EN" + }, "pin2": { "compName": "WireCrossPoint#30", "pinName": "" @@ -2751,7 +3107,16 @@ "pinName": "" }, "name": "unnamedWire#22", - "path": [] + "path": [ + { + "x": 105.0, + "y": 80.0 + }, + { + "x": 105.0, + "y": 140.0 + } + ] }, { "pin1": { @@ -2775,7 +3140,36 @@ "pinName": "COVD_V" }, "name": "unnamedWire#222", - "path": [] + "path": [ + { + "x": 530.0, + "y": 535.0 + }, + { + "x": 530.0, + "y": 525.0 + }, + { + "x": 230.0, + "y": 530.0 + }, + { + "x": 230.0, + "y": 310.0 + }, + { + "x": 295.0, + "y": 310.0 + }, + { + "x": 295.0, + "y": 85.0 + }, + { + "x": 275.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -2849,18 +3243,6 @@ "name": "unnamedWire#228", "path": [] }, - { - "pin1": { - "compName": "BitDisplay#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" - }, - "name": "unnamedWire#229", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#1", @@ -2873,42 +3255,6 @@ "name": "unnamedWire#23", "path": [] }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "OUT" - }, - "pin2": { - "compName": "BitDisplay#1", - "pinName": "" - }, - "name": "unnamedWire#230", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "IN" - }, - "pin2": { - "compName": "BitDisplay#2", - "pinName": "" - }, - "name": "unnamedWire#231", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#0", - "pinName": "EN" - }, - "pin2": { - "compName": "BitDisplay#3", - "pinName": "" - }, - "name": "unnamedWire#232", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#31", @@ -2931,7 +3277,12 @@ "pinName": "" }, "name": "unnamedWire#234", - "path": [] + "path": [ + { + "x": 550.0, + "y": 250.0 + } + ] }, { "pin1": { @@ -2943,7 +3294,16 @@ "pinName": "_OECT" }, "name": "unnamedWire#235", - "path": [] + "path": [ + { + "x": 550.0, + "y": 215.0 + }, + { + "x": 565.0, + "y": 215.0 + } + ] }, { "pin1": { @@ -2979,7 +3339,12 @@ "pinName": "" }, "name": "unnamedWire#24", - "path": [] + "path": [ + { + "x": 190.0, + "y": 175.0 + } + ] }, { "pin1": { @@ -2991,19 +3356,33 @@ "pinName": "" }, "name": "unnamedWire#25", - "path": [] + "path": [ + { + "x": 300.0, + "y": 110.0 + }, + { + "x": 300.0, + "y": 125.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" + "compName": "Splitter#4", + "pinName": "I" }, "name": "unnamedWire#26", - "path": [] + "path": [ + { + "x": 425.0, + "y": 165.0 + } + ] }, { "pin1": { @@ -3015,16 +3394,21 @@ "pinName": "" }, "name": "unnamedWire#27", - "path": [] + "path": [ + { + "x": 405.0, + "y": 105.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#33", "pinName": "" }, "pin2": { - "compName": "Am2904MSR#0", - "pinName": "mu" + "compName": "Splitter#5", + "pinName": "I" }, "name": "unnamedWire#28", "path": [] @@ -3039,7 +3423,12 @@ "pinName": "C" }, "name": "unnamedWire#29", - "path": [] + "path": [ + { + "x": 255.0, + "y": 60.0 + } + ] }, { "pin1": { @@ -3063,7 +3452,16 @@ "pinName": "C" }, "name": "unnamedWire#30", - "path": [] + "path": [ + { + "x": 300.0, + "y": 60.0 + }, + { + "x": 300.0, + "y": 105.0 + } + ] }, { "pin1": { @@ -3075,7 +3473,12 @@ "pinName": "MUX" }, "name": "unnamedWire#31", - "path": [] + "path": [ + { + "x": 200.0, + "y": 160.0 + } + ] }, { "pin1": { @@ -3087,7 +3490,28 @@ "pinName": "COVD_EN" }, "name": "unnamedWire#32", - "path": [] + "path": [ + { + "x": 225.0, + "y": 570.0 + }, + { + "x": 225.0, + "y": 305.0 + }, + { + "x": 290.0, + "y": 305.0 + }, + { + "x": 290.0, + "y": 80.0 + }, + { + "x": 265.0, + "y": 80.0 + } + ] }, { "pin1": { @@ -3111,7 +3535,12 @@ "pinName": "B" }, "name": "unnamedWire#34", - "path": [] + "path": [ + { + "x": 225.0, + "y": 25.0 + } + ] }, { "pin1": { @@ -3219,7 +3648,12 @@ "pinName": "" }, "name": "unnamedWire#42", - "path": [] + "path": [ + { + "x": 320.0, + "y": 80.0 + } + ] }, { "pin1": { @@ -3231,7 +3665,12 @@ "pinName": "_EOVR" }, "name": "unnamedWire#43", - "path": [] + "path": [ + { + "x": 390.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -3243,7 +3682,12 @@ "pinName": "_EN" }, "name": "unnamedWire#44", - "path": [] + "path": [ + { + "x": 380.0, + "y": 65.0 + } + ] }, { "pin1": { @@ -3255,7 +3699,12 @@ "pinName": "Y" }, "name": "unnamedWire#45", - "path": [] + "path": [ + { + "x": 370.0, + "y": 45.0 + } + ] }, { "pin1": { @@ -3267,7 +3716,12 @@ "pinName": "_EZ" }, "name": "unnamedWire#46", - "path": [] + "path": [ + { + "x": 360.0, + "y": 25.0 + } + ] }, { "pin1": { @@ -3279,7 +3733,16 @@ "pinName": "muSR_WEZ" }, "name": "unnamedWire#47", - "path": [] + "path": [ + { + "x": 305.0, + "y": 30.0 + }, + { + "x": 305.0, + "y": 230.0 + } + ] }, { "pin1": { @@ -3291,7 +3754,16 @@ "pinName": "B" }, "name": "unnamedWire#48", - "path": [] + "path": [ + { + "x": 310.0, + "y": 240.0 + }, + { + "x": 310.0, + "y": 50.0 + } + ] }, { "pin1": { @@ -3303,7 +3775,16 @@ "pinName": "YZ" }, "name": "unnamedWire#49", - "path": [] + "path": [ + { + "x": 595.0, + "y": 40.0 + }, + { + "x": 595.0, + "y": 25.0 + } + ] }, { "pin1": { @@ -3339,7 +3820,16 @@ "pinName": "YN" }, "name": "unnamedWire#51", - "path": [] + "path": [ + { + "x": 595.0, + "y": 60.0 + }, + { + "x": 595.0, + "y": 75.0 + } + ] }, { "pin1": { @@ -3351,7 +3841,16 @@ "pinName": "O0" }, "name": "unnamedWire#52", - "path": [] + "path": [ + { + "x": 590.0, + "y": 100.0 + }, + { + "x": 590.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -3375,7 +3874,24 @@ "pinName": "Y" }, "name": "unnamedWire#54", - "path": [] + "path": [ + { + "x": 415.0, + "y": 55.0 + }, + { + "x": 415.0, + "y": 180.0 + }, + { + "x": 195.0, + "y": 180.0 + }, + { + "x": 195.0, + "y": 120.0 + } + ] }, { "pin1": { @@ -3387,7 +3903,12 @@ "pinName": "A" }, "name": "unnamedWire#55", - "path": [] + "path": [ + { + "x": 135.0, + "y": 10.0 + } + ] }, { "pin1": { @@ -3411,7 +3932,12 @@ "pinName": "" }, "name": "unnamedWire#57", - "path": [] + "path": [ + { + "x": 25.0, + "y": 20.0 + } + ] }, { "pin1": { @@ -3423,7 +3949,16 @@ "pinName": "muSR_WEN" }, "name": "unnamedWire#58", - "path": [] + "path": [ + { + "x": 315.0, + "y": 70.0 + }, + { + "x": 315.0, + "y": 250.0 + } + ] }, { "pin1": { @@ -3435,7 +3970,16 @@ "pinName": "B" }, "name": "unnamedWire#59", - "path": [] + "path": [ + { + "x": 320.0, + "y": 260.0 + }, + { + "x": 320.0, + "y": 90.0 + } + ] }, { "pin1": { @@ -3459,7 +4003,12 @@ "pinName": "A" }, "name": "unnamedWire#60", - "path": [] + "path": [ + { + "x": 180.0, + "y": 75.0 + } + ] }, { "pin1": { @@ -3531,7 +4080,12 @@ "pinName": "_EOVR" }, "name": "unnamedWire#66", - "path": [] + "path": [ + { + "x": 245.0, + "y": 80.0 + } + ] }, { "pin1": { @@ -3543,7 +4097,12 @@ "pinName": "Y" }, "name": "unnamedWire#67", - "path": [] + "path": [ + { + "x": 235.0, + "y": 60.0 + } + ] }, { "pin1": { @@ -3555,7 +4114,12 @@ "pinName": "_EC" }, "name": "unnamedWire#68", - "path": [] + "path": [ + { + "x": 225.0, + "y": 40.0 + } + ] }, { "pin1": { @@ -3567,7 +4131,12 @@ "pinName": "_EZ" }, "name": "unnamedWire#69", - "path": [] + "path": [ + { + "x": 215.0, + "y": 20.0 + } + ] }, { "pin1": { @@ -3603,7 +4172,16 @@ "pinName": "B" }, "name": "unnamedWire#71", - "path": [] + "path": [ + { + "x": 170.0, + "y": 45.0 + }, + { + "x": 170.0, + "y": 25.0 + } + ] }, { "pin1": { @@ -3615,7 +4193,16 @@ "pinName": "Y2" }, "name": "unnamedWire#72", - "path": [] + "path": [ + { + "x": 175.0, + "y": 45.0 + }, + { + "x": 175.0, + "y": 55.0 + } + ] }, { "pin1": { @@ -3639,7 +4226,16 @@ "pinName": "B" }, "name": "unnamedWire#74", - "path": [] + "path": [ + { + "x": 175.0, + "y": 75.0 + }, + { + "x": 175.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -3651,7 +4247,12 @@ "pinName": "_EZ" }, "name": "unnamedWire#75", - "path": [] + "path": [ + { + "x": 50.0, + "y": 45.0 + } + ] }, { "pin1": { @@ -3663,7 +4264,12 @@ "pinName": "A2" }, "name": "unnamedWire#76", - "path": [] + "path": [ + { + "x": 75.0, + "y": 55.0 + } + ] }, { "pin1": { @@ -3675,7 +4281,12 @@ "pinName": "_EN" }, "name": "unnamedWire#77", - "path": [] + "path": [ + { + "x": 100.0, + "y": 65.0 + } + ] }, { "pin1": { @@ -3687,7 +4298,12 @@ "pinName": "A4" }, "name": "unnamedWire#78", - "path": [] + "path": [ + { + "x": 125.0, + "y": 75.0 + } + ] }, { "pin1": { @@ -3699,7 +4315,12 @@ "pinName": "" }, "name": "unnamedWire#79", - "path": [] + "path": [ + { + "x": 570.0, + "y": 85.0 + } + ] }, { "pin1": { @@ -3735,7 +4356,12 @@ "pinName": "" }, "name": "unnamedWire#81", - "path": [] + "path": [ + { + "x": 450.0, + "y": 75.0 + } + ] }, { "pin1": { @@ -3771,7 +4397,12 @@ "pinName": "EN" }, "name": "unnamedWire#84", - "path": [] + "path": [ + { + "x": 550.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -3883,13 +4514,13 @@ }, { "pin1": { - "compName": "Merger#3", - "pinName": "O" - }, - "pin2": { "compName": "WireCrossPoint#14", "pinName": "" }, + "pin2": { + "compName": "Merger#3", + "pinName": "O" + }, "name": "unnamedWire#93", "path": [] }, @@ -3903,7 +4534,28 @@ "pinName": "I" }, "name": "unnamedWire#94", - "path": [] + "path": [ + { + "x": 190.0, + "y": 275.0 + }, + { + "x": 360.0, + "y": 275.0 + }, + { + "x": 360.0, + "y": 225.0 + }, + { + "x": 420.0, + "y": 225.0 + }, + { + "x": 420.0, + "y": 100.0 + } + ] }, { "pin1": { @@ -3915,7 +4567,24 @@ "pinName": "S0" }, "name": "unnamedWire#95", - "path": [] + "path": [ + { + "x": 455.0, + "y": 105.0 + }, + { + "x": 455.0, + "y": 135.0 + }, + { + "x": 435.0, + "y": 135.0 + }, + { + "x": 435.0, + "y": 145.0 + } + ] }, { "pin1": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 7d890990..a5b084d7 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -1,11 +1,11 @@ { - "width": 45.0, - "height": 46.0, + "width": 80.0, + "height": 75.0, "interfacePins": [ { "location": { - "x": 14.0, - "y": 46.0 + "x": 50.0, + "y": 0.0 }, "name": "C", "logicWidth": 1, @@ -13,8 +13,8 @@ }, { "location": { - "x": 27.5, - "y": 46.0 + "x": 60.0, + "y": 0.0 }, "name": "COVD_EN", "logicWidth": 1, @@ -22,8 +22,8 @@ }, { "location": { - "x": 37.5, - "y": 46.0 + "x": 70.0, + "y": 0.0 }, "name": "COVD_V", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 31.0 + "y": 50.0 }, "name": "I", "logicWidth": 4, @@ -40,8 +40,8 @@ }, { "location": { - "x": 4.0, - "y": 46.0 + "x": 0.0, + "y": 70.0 }, "name": "MUX", "logicWidth": 3, @@ -49,8 +49,8 @@ }, { "location": { - "x": 45.0, - "y": 19.0 + "x": 80.0, + "y": 20.0 }, "name": "Q", "logicWidth": 4, @@ -59,7 +59,7 @@ { "location": { "x": 0.0, - "y": 18.0 + "y": 30.0 }, "name": "Y", "logicWidth": 4, @@ -67,7 +67,7 @@ }, { "location": { - "x": 15.5, + "x": 20.0, "y": 0.0 }, "name": "_EC", @@ -76,7 +76,7 @@ }, { "location": { - "x": 25.5, + "x": 30.0, "y": 0.0 }, "name": "_EN", @@ -85,8 +85,8 @@ }, { "location": { - "x": 35.5, - "y": 0.2 + "x": 40.0, + "y": 0.0 }, "name": "_EOVR", "logicWidth": 1, @@ -94,7 +94,7 @@ }, { "location": { - "x": 5.5, + "x": 10.0, "y": 0.0 }, "name": "_EZ", @@ -104,22 +104,22 @@ { "location": { "x": 0.0, - "y": 5.0 + "y": 10.0 }, "name": "mu", "logicWidth": 4, "usage": "INPUT" } ], - "innerScale": 0.1, + "innerScale": 0.2, "submodel": { "components": [ { "id": "Merger", "name": "Merger#0", "pos": { - "x": 435.0, - "y": 175.0 + "x": 385.0, + "y": 85.0 }, "params": 4 }, @@ -127,8 +127,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 325.0, - "y": 90.0 + "x": 170.0, + "y": 55.0 }, "params": 1 }, @@ -146,7 +146,7 @@ "name": "Splitter#1", "pos": { "x": 5.0, - "y": 165.0 + "y": 135.0 }, "params": 4 }, @@ -155,7 +155,7 @@ "name": "Splitter#2", "pos": { "x": 45.0, - "y": 425.0 + "y": 340.0 }, "params": 3 }, @@ -164,7 +164,7 @@ "name": "Splitter#3", "pos": { "x": 5.0, - "y": 295.0 + "y": 235.0 }, "params": 4 }, @@ -172,8 +172,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 29.0, - "y": 284.0 + "x": 19.0, + "y": 224.0 }, "params": 1 }, @@ -181,8 +181,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 414.0, - "y": 174.0 + "x": 364.0, + "y": 84.0 }, "params": 1 }, @@ -190,8 +190,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 89.0, - "y": 84.0 + "x": 74.0, + "y": 54.0 }, "params": 1 }, @@ -199,8 +199,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 89.0, - "y": 94.0 + "x": 74.0, + "y": 64.0 }, "params": 1 }, @@ -208,8 +208,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { - "x": 19.0, - "y": 294.0 + "x": 34.0, + "y": 234.0 }, "params": 1 }, @@ -217,8 +217,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 194.0, - "y": 234.0 + "x": 124.0, + "y": 174.0 }, "params": 1 }, @@ -226,8 +226,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 89.0, - "y": 104.0 + "x": 74.0, + "y": 74.0 }, "params": 1 }, @@ -235,8 +235,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 319.0, - "y": 294.0 + "x": 164.0, + "y": 59.0 }, "params": 1 }, @@ -244,8 +244,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 319.0, - "y": 104.0 + "x": 269.0, + "y": 39.0 }, "params": 1 }, @@ -253,8 +253,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 419.0, - "y": 184.0 + "x": 369.0, + "y": 94.0 }, "params": 1 }, @@ -262,8 +262,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 424.0, - "y": 194.0 + "x": 374.0, + "y": 104.0 }, "params": 1 }, @@ -271,8 +271,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 429.0, - "y": 204.0 + "x": 379.0, + "y": 114.0 }, "params": 1 }, @@ -280,8 +280,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 84.0, - "y": 344.0 + "x": 29.0, + "y": 284.0 }, "params": 1 }, @@ -289,8 +289,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 94.0, - "y": 364.0 + "x": 39.0, + "y": 304.0 }, "params": 1 }, @@ -298,8 +298,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 29.0, - "y": 254.0 + "x": 19.0, + "y": 194.0 }, "params": 1 }, @@ -307,8 +307,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 74.0, - "y": 314.0 + "x": 79.0, + "y": 254.0 }, "params": 1 }, @@ -316,8 +316,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 49.0, - "y": 114.0 + "x": 39.0, + "y": 84.0 }, "params": 1 }, @@ -325,80 +325,80 @@ "id": "and", "name": "and#0", "pos": { - "x": 380.0, - "y": 85.0 + "x": 195.0, + "y": 50.0 } }, { "id": "dff4_finewe", "name": "dff4_finewe#0", "pos": { - "x": 375.0, - "y": 170.0 + "x": 325.0, + "y": 80.0 } }, { "id": "mux1", "name": "mux1#0", "pos": { - "x": 325.0, - "y": 290.0 + "x": 280.0, + "y": 175.0 } }, { "id": "mux1_4", "name": "mux1_4#0", "pos": { - "x": 55.0, - "y": 110.0 + "x": 45.0, + "y": 80.0 } }, { "id": "mux1_4", "name": "mux1_4#1", "pos": { - "x": 150.0, - "y": 280.0 + "x": 85.0, + "y": 220.0 } }, { "id": "mux1_4", "name": "mux1_4#2", "pos": { - "x": 110.0, - "y": 60.0 + "x": 90.0, + "y": 30.0 } }, { "id": "mux1_4", "name": "mux1_4#3", "pos": { - "x": 200.0, - "y": 230.0 + "x": 130.0, + "y": 170.0 } }, { "id": "mux1_4", "name": "mux1_4#4", "pos": { - "x": 250.0, - "y": 180.0 + "x": 175.0, + "y": 120.0 } }, { "id": "not4", "name": "not4#0", "pos": { - "x": 100.0, - "y": 330.0 + "x": 45.0, + "y": 270.0 } }, { "id": "xor", "name": "xor#0", "pos": { - "x": 35.0, - "y": 250.0 + "x": 40.0, + "y": 190.0 } } ], @@ -415,24 +415,8 @@ "name": "unnamedWire#0", "path": [ { - "x": 140.0, - "y": 445.0 - }, - { - "x": 255.0, - "y": 445.0 - }, - { - "x": 255.0, - "y": 280.0 - }, - { - "x": 340.0, - "y": 280.0 - }, - { - "x": 340.0, - "y": 175.0 + "x": 250.0, + "y": 85.0 } ] }, @@ -448,12 +432,16 @@ "name": "unnamedWire#1", "path": [ { - "x": 355.0, + "x": 200.0, "y": 30.0 }, { - "x": 355.0, - "y": 215.0 + "x": 305.0, + "y": 30.0 + }, + { + "x": 305.0, + "y": 125.0 } ] }, @@ -494,7 +482,7 @@ "path": [ { "x": 35.0, - "y": 125.0 + "y": 95.0 }, { "x": 35.0, @@ -519,7 +507,7 @@ }, { "x": 30.0, - "y": 135.0 + "y": 105.0 } ] }, @@ -540,7 +528,7 @@ }, { "x": 25.0, - "y": 145.0 + "y": 115.0 } ] }, @@ -561,7 +549,7 @@ }, { "x": 20.0, - "y": 155.0 + "y": 125.0 } ] }, @@ -625,16 +613,16 @@ "name": "unnamedWire#2", "path": [ { - "x": 255.0, + "x": 150.0, "y": 25.0 }, { - "x": 360.0, + "x": 310.0, "y": 25.0 }, { - "x": 360.0, - "y": 205.0 + "x": 310.0, + "y": 115.0 } ] }, @@ -648,12 +636,7 @@ "pinName": "I" }, "name": "unnamedWire#20", - "path": [ - { - "x": 40.0, - "y": 435.0 - } - ] + "path": [] }, { "pin1": { @@ -691,12 +674,12 @@ "name": "unnamedWire#23", "path": [ { - "x": 25.0, - "y": 305.0 + "x": 30.0, + "y": 245.0 }, { - "x": 25.0, - "y": 265.0 + "x": 30.0, + "y": 205.0 } ] }, @@ -713,15 +696,15 @@ "path": [ { "x": 60.0, - "y": 445.0 + "y": 360.0 }, { "x": 60.0, - "y": 415.0 + "y": 335.0 }, { - "x": 30.0, - "y": 415.0 + "x": 20.0, + "y": 335.0 } ] }, @@ -797,16 +780,16 @@ "name": "unnamedWire#3", "path": [ { - "x": 155.0, + "x": 100.0, "y": 20.0 }, { - "x": 365.0, + "x": 190.0, "y": 20.0 }, { - "x": 365.0, - "y": 90.0 + "x": 190.0, + "y": 55.0 } ] }, @@ -870,16 +853,16 @@ "name": "unnamedWire#34", "path": [ { - "x": 415.0, - "y": 380.0 + "x": 365.0, + "y": 315.0 }, { - "x": 80.0, - "y": 380.0 + "x": 25.0, + "y": 315.0 }, { - "x": 80.0, - "y": 335.0 + "x": 25.0, + "y": 275.0 } ] }, @@ -895,12 +878,12 @@ "name": "unnamedWire#35", "path": [ { - "x": 420.0, - "y": 385.0 + "x": 370.0, + "y": 320.0 }, { - "x": 85.0, - "y": 385.0 + "x": 30.0, + "y": 320.0 } ] }, @@ -916,16 +899,16 @@ "name": "unnamedWire#36", "path": [ { - "x": 425.0, - "y": 390.0 + "x": 375.0, + "y": 325.0 }, { - "x": 90.0, - "y": 390.0 + "x": 35.0, + "y": 325.0 }, { - "x": 90.0, - "y": 355.0 + "x": 35.0, + "y": 295.0 } ] }, @@ -941,12 +924,12 @@ "name": "unnamedWire#37", "path": [ { - "x": 430.0, - "y": 395.0 + "x": 380.0, + "y": 330.0 }, { - "x": 95.0, - "y": 395.0 + "x": 40.0, + "y": 330.0 } ] }, @@ -974,8 +957,8 @@ "name": "unnamedWire#39", "path": [ { - "x": 85.0, - "y": 325.0 + "x": 30.0, + "y": 265.0 } ] }, @@ -991,16 +974,16 @@ "name": "unnamedWire#4", "path": [ { - "x": 55.0, + "x": 50.0, "y": 15.0 }, { - "x": 370.0, + "x": 320.0, "y": 15.0 }, { - "x": 370.0, - "y": 185.0 + "x": 320.0, + "y": 95.0 } ] }, @@ -1016,8 +999,8 @@ "name": "unnamedWire#40", "path": [ { - "x": 95.0, - "y": 305.0 + "x": 40.0, + "y": 245.0 } ] }, @@ -1045,12 +1028,12 @@ "name": "unnamedWire#42", "path": [ { - "x": 30.0, - "y": 230.0 + "x": 20.0, + "y": 175.0 }, { - "x": 50.0, - "y": 230.0 + "x": 40.0, + "y": 175.0 } ] }, @@ -1090,8 +1073,8 @@ "name": "unnamedWire#45", "path": [ { - "x": 50.0, - "y": 105.0 + "x": 40.0, + "y": 75.0 } ] }, @@ -1215,8 +1198,8 @@ "name": "unnamedWire#54", "path": [ { - "x": 90.0, - "y": 75.0 + "x": 75.0, + "y": 45.0 } ] }, @@ -1280,8 +1263,8 @@ "name": "unnamedWire#59", "path": [ { - "x": 20.0, - "y": 245.0 + "x": 35.0, + "y": 185.0 } ] }, @@ -1321,8 +1304,8 @@ "name": "unnamedWire#61", "path": [ { - "x": 75.0, - "y": 265.0 + "x": 80.0, + "y": 205.0 } ] }, @@ -1338,12 +1321,12 @@ "name": "unnamedWire#62", "path": [ { - "x": 80.0, - "y": 325.0 + "x": 25.0, + "y": 265.0 }, { - "x": 80.0, - "y": 275.0 + "x": 25.0, + "y": 215.0 } ] }, @@ -1407,8 +1390,8 @@ "name": "unnamedWire#67", "path": [ { - "x": 195.0, - "y": 435.0 + "x": 125.0, + "y": 350.0 } ] }, @@ -1436,12 +1419,12 @@ "name": "unnamedWire#69", "path": [ { - "x": 105.0, - "y": 235.0 + "x": 85.0, + "y": 175.0 }, { - "x": 105.0, - "y": 65.0 + "x": 85.0, + "y": 35.0 } ] }, @@ -1469,12 +1452,12 @@ "name": "unnamedWire#70", "path": [ { - "x": 295.0, - "y": 215.0 + "x": 235.0, + "y": 155.0 }, { - "x": 295.0, - "y": 255.0 + "x": 235.0, + "y": 165.0 } ] }, @@ -1490,12 +1473,12 @@ "name": "unnamedWire#71", "path": [ { - "x": 300.0, - "y": 245.0 + "x": 240.0, + "y": 155.0 }, { - "x": 300.0, - "y": 205.0 + "x": 240.0, + "y": 145.0 } ] }, @@ -1511,20 +1494,20 @@ "name": "unnamedWire#72", "path": [ { - "x": 420.0, - "y": 90.0 + "x": 235.0, + "y": 55.0 }, { - "x": 420.0, - "y": 110.0 + "x": 235.0, + "y": 20.0 }, { - "x": 365.0, - "y": 110.0 + "x": 315.0, + "y": 20.0 }, { - "x": 365.0, - "y": 195.0 + "x": 315.0, + "y": 105.0 } ] }, @@ -1540,12 +1523,12 @@ "name": "unnamedWire#73", "path": [ { - "x": 310.0, - "y": 225.0 + "x": 250.0, + "y": 135.0 }, { - "x": 310.0, - "y": 185.0 + "x": 250.0, + "y": 125.0 } ] }, @@ -1609,12 +1592,12 @@ "name": "unnamedWire#78", "path": [ { - "x": 200.0, - "y": 225.0 + "x": 140.0, + "y": 165.0 }, { - "x": 200.0, - "y": 95.0 + "x": 140.0, + "y": 65.0 } ] }, @@ -1630,12 +1613,12 @@ "name": "unnamedWire#79", "path": [ { - "x": 205.0, - "y": 85.0 + "x": 145.0, + "y": 55.0 }, { - "x": 205.0, - "y": 215.0 + "x": 145.0, + "y": 155.0 } ] }, @@ -1663,12 +1646,12 @@ "name": "unnamedWire#80", "path": [ { - "x": 210.0, - "y": 205.0 + "x": 150.0, + "y": 145.0 }, { - "x": 210.0, - "y": 75.0 + "x": 150.0, + "y": 45.0 } ] }, @@ -1684,12 +1667,12 @@ "name": "unnamedWire#81", "path": [ { - "x": 215.0, - "y": 65.0 + "x": 155.0, + "y": 35.0 }, { - "x": 215.0, - "y": 195.0 + "x": 155.0, + "y": 135.0 } ] }, @@ -1705,12 +1688,12 @@ "name": "unnamedWire#82", "path": [ { - "x": 245.0, - "y": 425.0 + "x": 170.0, + "y": 340.0 }, { - "x": 245.0, - "y": 185.0 + "x": 170.0, + "y": 125.0 } ] }, @@ -1720,40 +1703,49 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "NandGate#0", + "pinName": "A" }, "name": "unnamedWire#83", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#15", - "pinName": "" - }, - "pin2": { "compName": "_submodelinterface", "pinName": "COVD_EN" }, + "pin2": { + "compName": "WireCrossPoint#16", + "pinName": "" + }, "name": "unnamedWire#84", "path": [ { - "x": 275.0, - "y": 295.0 + "x": 300.0, + "y": 10.0 + }, + { + "x": 270.0, + "y": 10.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "mux1#0", - "pinName": "S0" + "compName": "WireCrossPoint#15", + "pinName": "" }, "name": "unnamedWire#85", - "path": [] + "path": [ + { + "x": 165.0, + "y": 40.0 + } + ] }, { "pin1": { @@ -1767,16 +1759,16 @@ "name": "unnamedWire#86", "path": [ { - "x": 375.0, - "y": 325.0 + "x": 350.0, + "y": 70.0 }, { - "x": 320.0, - "y": 325.0 + "x": 265.0, + "y": 70.0 }, { - "x": 320.0, - "y": 315.0 + "x": 265.0, + "y": 200.0 } ] }, @@ -1792,12 +1784,20 @@ "name": "unnamedWire#87", "path": [ { - "x": 305.0, - "y": 195.0 + "x": 245.0, + "y": 135.0 }, { - "x": 305.0, - "y": 305.0 + "x": 245.0, + "y": 145.0 + }, + { + "x": 275.0, + "y": 145.0 + }, + { + "x": 275.0, + "y": 190.0 } ] }, @@ -1813,12 +1813,12 @@ "name": "unnamedWire#88", "path": [ { - "x": 365.0, - "y": 295.0 + "x": 320.0, + "y": 180.0 }, { - "x": 365.0, - "y": 235.0 + "x": 320.0, + "y": 145.0 } ] }, @@ -1848,15 +1848,20 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", - "pinName": "" + "compName": "NandGate#0", + "pinName": "B" }, "name": "unnamedWire#90", - "path": [] + "path": [ + { + "x": 165.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -1864,26 +1869,14 @@ "pinName": "" }, "pin2": { - "compName": "NandGate#0", - "pinName": "B" + "compName": "mux1#0", + "pinName": "S0" }, "name": "unnamedWire#91", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#0", - "pinName": "A" - }, - "pin2": { - "compName": "WireCrossPoint#16", - "pinName": "" - }, - "name": "unnamedWire#92", "path": [ { - "x": 320.0, - "y": 95.0 + "x": 270.0, + "y": 180.0 } ] }, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 2e37aa15..7faf69d3 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -1,11 +1,11 @@ { - "width": 45.0, - "height": 46.0, + "width": 50.0, + "height": 65.0, "interfacePins": [ { "location": { - "x": 14.0, - "y": 46.0 + "x": 0.0, + "y": 10.0 }, "name": "C", "logicWidth": 1, @@ -13,8 +13,8 @@ }, { "location": { - "x": 27.5, - "y": 46.0 + "x": 0.0, + "y": 50.0 }, "name": "CINV", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 0.0, - "y": 31.0 + "y": 40.0 }, "name": "I", "logicWidth": 4, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 13.5 + "y": 30.0 }, "name": "M", "logicWidth": 4, @@ -40,8 +40,8 @@ }, { "location": { - "x": 4.0, - "y": 46.0 + "x": 0.0, + "y": 20.0 }, "name": "MUX", "logicWidth": 2, @@ -49,8 +49,8 @@ }, { "location": { - "x": 37.5, - "y": 46.0 + "x": 0.0, + "y": 60.0 }, "name": "OVRRET", "logicWidth": 1, @@ -58,8 +58,8 @@ }, { "location": { - "x": 45.0, - "y": 19.0 + "x": 50.0, + "y": 10.0 }, "name": "Q", "logicWidth": 4, @@ -67,7 +67,7 @@ }, { "location": { - "x": 15.5, + "x": 20.0, "y": 0.0 }, "name": "_EC", @@ -76,7 +76,7 @@ }, { "location": { - "x": 25.5, + "x": 30.0, "y": 0.0 }, "name": "_EN", @@ -85,7 +85,7 @@ }, { "location": { - "x": 35.5, + "x": 40.0, "y": 0.0 }, "name": "_EOVR", @@ -94,7 +94,7 @@ }, { "location": { - "x": 5.5, + "x": 10.0, "y": 0.0 }, "name": "_EZ", @@ -102,15 +102,15 @@ "usage": "INPUT" } ], - "innerScale": 0.1, + "innerScale": 0.2, "submodel": { "components": [ { "id": "Merger", "name": "Merger#0", "pos": { - "x": 435.0, - "y": 175.0 + "x": 230.0, + "y": 30.0 }, "params": 4 }, @@ -118,8 +118,8 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 245.0, - "y": 245.0 + "x": 155.0, + "y": 135.0 }, "params": 1 }, @@ -127,8 +127,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 215.0, - "y": 255.0 + "x": 125.0, + "y": 150.0 }, "params": 1 }, @@ -136,8 +136,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 215.0, - "y": 235.0 + "x": 125.0, + "y": 130.0 }, "params": 1 }, @@ -146,7 +146,7 @@ "name": "Splitter#0", "pos": { "x": 5.0, - "y": 120.0 + "y": 135.0 }, "params": 4 }, @@ -155,7 +155,7 @@ "name": "Splitter#1", "pos": { "x": 5.0, - "y": 295.0 + "y": 185.0 }, "params": 4 }, @@ -163,8 +163,8 @@ "id": "Splitter", "name": "Splitter#2", "pos": { - "x": 45.0, - "y": 430.0 + "x": 5.0, + "y": 95.0 }, "params": 2 }, @@ -172,8 +172,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 89.0, - "y": 234.0 + "x": 19.0, + "y": 119.0 }, "params": 1 }, @@ -181,8 +181,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 89.0, - "y": 224.0 + "x": 59.0, + "y": 109.0 }, "params": 1 }, @@ -190,8 +190,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 89.0, - "y": 214.0 + "x": 59.0, + "y": 99.0 }, "params": 1 }, @@ -199,8 +199,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 429.0, - "y": 204.0 + "x": 224.0, + "y": 59.0 }, "params": 1 }, @@ -208,8 +208,17 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 209.0, - "y": 244.0 + "x": 114.0, + "y": 134.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#5", + "pos": { + "x": 59.0, + "y": 119.0 }, "params": 1 }, @@ -217,32 +226,32 @@ "id": "dff4_finewe", "name": "dff4_finewe#0", "pos": { - "x": 375.0, - "y": 170.0 + "x": 185.0, + "y": 25.0 } }, { "id": "mux1_4", "name": "mux1_4#0", "pos": { - "x": 45.0, - "y": 240.0 + "x": 25.0, + "y": 125.0 } }, { "id": "mux1_4", "name": "mux1_4#1", "pos": { - "x": 100.0, - "y": 190.0 + "x": 65.0, + "y": 75.0 } }, { "id": "xor", "name": "xor#0", "pos": { - "x": 215.0, - "y": 200.0 + "x": 130.0, + "y": 105.0 } } ], @@ -281,7 +290,16 @@ "pinName": "O0" }, "name": "unnamedWire#10", - "path": [] + "path": [ + { + "x": 20.0, + "y": 210.0 + }, + { + "x": 20.0, + "y": 215.0 + } + ] }, { "pin1": { @@ -308,11 +326,11 @@ "path": [ { "x": 20.0, - "y": 150.0 + "y": 165.0 }, { "x": 20.0, - "y": 285.0 + "y": 170.0 } ] }, @@ -328,12 +346,12 @@ "name": "unnamedWire#13", "path": [ { - "x": 25.0, - "y": 140.0 + "x": 20.0, + "y": 155.0 }, { - "x": 25.0, - "y": 275.0 + "x": 20.0, + "y": 160.0 } ] }, @@ -349,12 +367,12 @@ "name": "unnamedWire#14", "path": [ { - "x": 30.0, - "y": 130.0 + "x": 20.0, + "y": 145.0 }, { - "x": 30.0, - "y": 265.0 + "x": 20.0, + "y": 150.0 } ] }, @@ -368,12 +386,7 @@ "pinName": "I" }, "name": "unnamedWire#15", - "path": [ - { - "x": 40.0, - "y": 435.0 - } - ] + "path": [] }, { "pin1": { @@ -387,8 +400,8 @@ "name": "unnamedWire#16", "path": [ { - "x": 90.0, - "y": 440.0 + "x": 20.0, + "y": 105.0 } ] }, @@ -464,8 +477,8 @@ "name": "unnamedWire#21", "path": [ { - "x": 90.0, - "y": 205.0 + "x": 60.0, + "y": 90.0 } ] }, @@ -507,11 +520,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#25", @@ -519,7 +532,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { @@ -541,12 +554,8 @@ "name": "unnamedWire#27", "path": [ { - "x": 40.0, - "y": 235.0 - }, - { - "x": 40.0, - "y": 245.0 + "x": 20.0, + "y": 130.0 } ] }, @@ -562,15 +571,27 @@ "name": "unnamedWire#28", "path": [ { - "x": 85.0, - "y": 430.0 + "x": 20.0, + "y": 95.0 }, { - "x": 85.0, - "y": 195.0 + "x": 20.0, + "y": 80.0 } ] }, + { + "pin1": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#29", + "path": [] + }, { "pin1": { "compName": "dff4_finewe#0", @@ -593,16 +614,7 @@ "pinName": "A" }, "name": "unnamedWire#30", - "path": [ - { - "x": 240.0, - "y": 245.0 - }, - { - "x": 240.0, - "y": 250.0 - } - ] + "path": [] }, { "pin1": { @@ -616,12 +628,12 @@ "name": "unnamedWire#31", "path": [ { - "x": 240.0, - "y": 260.0 + "x": 150.0, + "y": 150.0 }, { - "x": 240.0, - "y": 265.0 + "x": 150.0, + "y": 160.0 } ] }, @@ -637,16 +649,12 @@ "name": "unnamedWire#32", "path": [ { - "x": 375.0, - "y": 360.0 - }, - { - "x": 205.0, - "y": 360.0 + "x": 115.0, + "y": 300.0 }, { - "x": 205.0, - "y": 260.0 + "x": 115.0, + "y": 155.0 } ] }, @@ -674,16 +682,16 @@ "name": "unnamedWire#34", "path": [ { - "x": 430.0, - "y": 280.0 + "x": 225.0, + "y": 175.0 }, { - "x": 210.0, - "y": 280.0 + "x": 120.0, + "y": 175.0 }, { - "x": 210.0, - "y": 270.0 + "x": 120.0, + "y": 165.0 } ] }, @@ -697,7 +705,16 @@ "pinName": "A" }, "name": "unnamedWire#35", - "path": [] + "path": [ + { + "x": 125.0, + "y": 90.0 + }, + { + "x": 125.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -711,16 +728,12 @@ "name": "unnamedWire#36", "path": [ { - "x": 275.0, - "y": 390.0 - }, - { - "x": 190.0, - "y": 390.0 + "x": 105.0, + "y": 250.0 }, { - "x": 190.0, - "y": 215.0 + "x": 105.0, + "y": 120.0 } ] }, @@ -736,15 +749,15 @@ "name": "unnamedWire#37", "path": [ { - "x": 370.0, - "y": 185.0 + "x": 180.0, + "y": 40.0 }, { - "x": 370.0, + "x": 180.0, "y": 5.0 }, { - "x": 55.0, + "x": 50.0, "y": 5.0 } ] @@ -761,16 +774,12 @@ "name": "unnamedWire#38", "path": [ { - "x": 140.0, - "y": 325.0 - }, - { - "x": 345.0, - "y": 325.0 + "x": 55.0, + "y": 50.0 }, { - "x": 345.0, - "y": 175.0 + "x": 55.0, + "y": 30.0 } ] }, @@ -786,8 +795,16 @@ "name": "unnamedWire#39", "path": [ { - "x": 355.0, - "y": 215.0 + "x": 200.0, + "y": 20.0 + }, + { + "x": 165.0, + "y": 20.0 + }, + { + "x": 165.0, + "y": 70.0 } ] }, @@ -801,7 +818,16 @@ "pinName": "Q" }, "name": "unnamedWire#4", - "path": [] + "path": [ + { + "x": 245.0, + "y": 45.0 + }, + { + "x": 245.0, + "y": 50.0 + } + ] }, { "pin1": { @@ -815,15 +841,15 @@ "name": "unnamedWire#40", "path": [ { - "x": 360.0, - "y": 205.0 + "x": 170.0, + "y": 60.0 }, { - "x": 360.0, + "x": 170.0, "y": 15.0 }, { - "x": 255.0, + "x": 150.0, "y": 15.0 } ] @@ -840,16 +866,16 @@ "name": "unnamedWire#41", "path": [ { - "x": 155.0, + "x": 100.0, "y": 10.0 }, { - "x": 365.0, + "x": 175.0, "y": 10.0 }, { - "x": 365.0, - "y": 195.0 + "x": 175.0, + "y": 50.0 } ] }, @@ -863,16 +889,7 @@ "pinName": "Y1" }, "name": "unnamedWire#42", - "path": [ - { - "x": 315.0, - "y": 225.0 - }, - { - "x": 315.0, - "y": 195.0 - } - ] + "path": [] }, { "pin1": { @@ -886,12 +903,12 @@ "name": "unnamedWire#43", "path": [ { - "x": 310.0, - "y": 205.0 + "x": 170.0, + "y": 110.0 }, { - "x": 310.0, - "y": 235.0 + "x": 170.0, + "y": 90.0 } ] }, @@ -905,24 +922,7 @@ "pinName": "Y3" }, "name": "unnamedWire#44", - "path": [ - { - "x": 305.0, - "y": 245.0 - }, - { - "x": 305.0, - "y": 225.0 - }, - { - "x": 170.0, - "y": 225.0 - }, - { - "x": 170.0, - "y": 215.0 - } - ] + "path": [] }, { "pin1": { @@ -936,12 +936,8 @@ "name": "unnamedWire#45", "path": [ { - "x": 160.0, - "y": 245.0 - }, - { - "x": 160.0, - "y": 225.0 + "x": 115.0, + "y": 110.0 } ] }, @@ -955,7 +951,16 @@ "pinName": "D4" }, "name": "unnamedWire#46", - "path": [] + "path": [ + { + "x": 180.0, + "y": 145.0 + }, + { + "x": 180.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -967,12 +972,7 @@ "pinName": "A" }, "name": "unnamedWire#47", - "path": [ - { - "x": 210.0, - "y": 240.0 - } - ] + "path": [] }, { "pin1": { @@ -986,8 +986,8 @@ "name": "unnamedWire#48", "path": [ { - "x": 210.0, - "y": 250.0 + "x": 115.0, + "y": 145.0 } ] }, @@ -1003,12 +1003,12 @@ "name": "unnamedWire#49", "path": [ { - "x": 35.0, - "y": 120.0 + "x": 20.0, + "y": 135.0 }, { - "x": 35.0, - "y": 255.0 + "x": 20.0, + "y": 140.0 } ] }, @@ -1046,7 +1046,16 @@ "pinName": "I1_1" }, "name": "unnamedWire#7", - "path": [] + "path": [ + { + "x": 20.0, + "y": 185.0 + }, + { + "x": 20.0, + "y": 180.0 + } + ] }, { "pin1": { @@ -1058,7 +1067,16 @@ "pinName": "O2" }, "name": "unnamedWire#8", - "path": [] + "path": [ + { + "x": 20.0, + "y": 190.0 + }, + { + "x": 20.0, + "y": 195.0 + } + ] }, { "pin1": { @@ -1070,14 +1088,23 @@ "pinName": "I1_3" }, "name": "unnamedWire#9", - "path": [] + "path": [ + { + "x": 20.0, + "y": 205.0 + }, + { + "x": 20.0, + "y": 200.0 + } + ] } ], "version": "0.1.1" }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "\u00b5SR", + "centerText": "µSR", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, -- 2.17.1