From: Daniel Kirschten Date: Tue, 7 Apr 2020 22:11:58 +0000 (+0200) Subject: Re-layouted the rest of the Am2910InstrPLA X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=8b9032058298903de7946205a08d59e7fbf3a986 Re-layouted the rest of the Am2910InstrPLA --- diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json index 496ffc84..5925fe78 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910InstrPLA.json @@ -1,5 +1,5 @@ { - "width": 80.0, + "width": 60.0, "height": 85.0, "interfacePins": [ { @@ -31,7 +31,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 15.0 }, "name": "RDEC", @@ -40,7 +40,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 5.0 }, "name": "RLD", @@ -49,7 +49,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 65.0 }, "name": "STKI0", @@ -58,7 +58,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 75.0 }, "name": "STKI1", @@ -67,7 +67,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 25.0 }, "name": "YD", @@ -76,7 +76,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 45.0 }, "name": "YF", @@ -85,7 +85,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 35.0 }, "name": "YR", @@ -94,7 +94,7 @@ }, { "location": { - "x": 80.0, + "x": 60.0, "y": 55.0 }, "name": "YmuPC", @@ -181,8 +181,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 740.0, - "y": 155.0 + "x": 415.0, + "y": 150.0 }, "params": 1 }, @@ -190,8 +190,8 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 705.0, - "y": 165.0 + "x": 385.0, + "y": 170.0 }, "params": 1 }, @@ -199,8 +199,8 @@ "id": "NandGate", "name": "NandGate#7", "pos": { - "x": 700.0, - "y": 140.0 + "x": 385.0, + "y": 145.0 }, "params": 1 }, @@ -226,8 +226,8 @@ "id": "NandGate", "name": "NandGate#10", "pos": { - "x": 550.0, - "y": 275.0 + "x": 420.0, + "y": 260.0 }, "params": 1 }, @@ -235,8 +235,8 @@ "id": "NandGate", "name": "NandGate#11", "pos": { - "x": 580.0, - "y": 280.0 + "x": 450.0, + "y": 265.0 }, "params": 1 }, @@ -244,8 +244,8 @@ "id": "NandGate", "name": "NandGate#12", "pos": { - "x": 605.0, - "y": 275.0 + "x": 480.0, + "y": 270.0 }, "params": 1 }, @@ -253,7 +253,7 @@ "id": "NandGate", "name": "NandGate#13", "pos": { - "x": 740.0, + "x": 480.0, "y": 710.0 }, "params": 1 @@ -262,8 +262,8 @@ "id": "NandGate", "name": "NandGate#14", "pos": { - "x": 640.0, - "y": 280.0 + "x": 510.0, + "y": 275.0 }, "params": 1 }, @@ -271,8 +271,8 @@ "id": "NandGate", "name": "NandGate#15", "pos": { - "x": 665.0, - "y": 250.0 + "x": 485.0, + "y": 220.0 }, "params": 1 }, @@ -280,8 +280,8 @@ "id": "NandGate", "name": "NandGate#16", "pos": { - "x": 605.0, - "y": 255.0 + "x": 385.0, + "y": 230.0 }, "params": 1 }, @@ -289,8 +289,8 @@ "id": "NandGate", "name": "NandGate#17", "pos": { - "x": 605.0, - "y": 230.0 + "x": 420.0, + "y": 200.0 }, "params": 1 }, @@ -298,8 +298,8 @@ "id": "NandGate", "name": "NandGate#18", "pos": { - "x": 640.0, - "y": 255.0 + "x": 455.0, + "y": 225.0 }, "params": 1 }, @@ -307,8 +307,8 @@ "id": "NandGate", "name": "NandGate#19", "pos": { - "x": 695.0, - "y": 255.0 + "x": 515.0, + "y": 235.0 }, "params": 1 }, @@ -325,8 +325,8 @@ "id": "NandGate", "name": "NandGate#21", "pos": { - "x": 670.0, - "y": 275.0 + "x": 540.0, + "y": 280.0 }, "params": 1 }, @@ -334,8 +334,8 @@ "id": "NandGate", "name": "NandGate#22", "pos": { - "x": 730.0, - "y": 225.0 + "x": 420.0, + "y": 305.0 }, "params": 1 }, @@ -343,8 +343,8 @@ "id": "NandGate", "name": "NandGate#23", "pos": { - "x": 730.0, - "y": 250.0 + "x": 545.0, + "y": 235.0 }, "params": 1 }, @@ -352,7 +352,7 @@ "id": "NandGate", "name": "NandGate#24", "pos": { - "x": 765.0, + "x": 575.0, "y": 240.0 }, "params": 1 @@ -361,8 +361,8 @@ "id": "NandGate", "name": "NandGate#25", "pos": { - "x": 630.0, - "y": 500.0 + "x": 415.0, + "y": 495.0 }, "params": 1 }, @@ -370,8 +370,8 @@ "id": "NandGate", "name": "NandGate#26", "pos": { - "x": 600.0, - "y": 490.0 + "x": 385.0, + "y": 500.0 }, "params": 1 }, @@ -379,8 +379,8 @@ "id": "NandGate", "name": "NandGate#27", "pos": { - "x": 665.0, - "y": 500.0 + "x": 445.0, + "y": 490.0 }, "params": 1 }, @@ -388,7 +388,7 @@ "id": "NandGate", "name": "NandGate#28", "pos": { - "x": 700.0, + "x": 475.0, "y": 515.0 }, "params": 1 @@ -397,7 +397,7 @@ "id": "NandGate", "name": "NandGate#29", "pos": { - "x": 665.0, + "x": 415.0, "y": 520.0 }, "params": 1 @@ -406,8 +406,8 @@ "id": "NandGate", "name": "NandGate#30", "pos": { - "x": 735.0, - "y": 520.0 + "x": 505.0, + "y": 510.0 }, "params": 1 }, @@ -415,7 +415,7 @@ "id": "NandGate", "name": "NandGate#31", "pos": { - "x": 770.0, + "x": 535.0, "y": 540.0 }, "params": 1 @@ -424,8 +424,8 @@ "id": "NandGate", "name": "NandGate#32", "pos": { - "x": 735.0, - "y": 545.0 + "x": 505.0, + "y": 560.0 }, "params": 1 }, @@ -433,8 +433,8 @@ "id": "NandGate", "name": "NandGate#33", "pos": { - "x": 705.0, - "y": 535.0 + "x": 475.0, + "y": 555.0 }, "params": 1 }, @@ -442,7 +442,7 @@ "id": "NandGate", "name": "NandGate#34", "pos": { - "x": 670.0, + "x": 445.0, "y": 550.0 }, "params": 1 @@ -451,7 +451,7 @@ "id": "NandGate", "name": "NandGate#35", "pos": { - "x": 650.0, + "x": 415.0, "y": 545.0 }, "params": 1 @@ -460,8 +460,8 @@ "id": "NandGate", "name": "NandGate#36", "pos": { - "x": 620.0, - "y": 550.0 + "x": 385.0, + "y": 540.0 }, "params": 1 }, @@ -478,8 +478,8 @@ "id": "NandGate", "name": "NandGate#38", "pos": { - "x": 635.0, - "y": 230.0 + "x": 455.0, + "y": 195.0 }, "params": 1 }, @@ -505,8 +505,8 @@ "id": "NandGate", "name": "NandGate#41", "pos": { - "x": 675.0, - "y": 670.0 + "x": 415.0, + "y": 660.0 }, "params": 1 }, @@ -514,7 +514,7 @@ "id": "NandGate", "name": "NandGate#42", "pos": { - "x": 705.0, + "x": 445.0, "y": 665.0 }, "params": 1 @@ -523,8 +523,8 @@ "id": "NandGate", "name": "NandGate#43", "pos": { - "x": 740.0, - "y": 650.0 + "x": 475.0, + "y": 645.0 }, "params": 1 }, @@ -532,7 +532,7 @@ "id": "NandGate", "name": "NandGate#44", "pos": { - "x": 770.0, + "x": 535.0, "y": 640.0 }, "params": 1 @@ -541,8 +541,8 @@ "id": "NandGate", "name": "NandGate#45", "pos": { - "x": 615.0, - "y": 590.0 + "x": 385.0, + "y": 595.0 }, "params": 1 }, @@ -550,8 +550,8 @@ "id": "NandGate", "name": "NandGate#46", "pos": { - "x": 645.0, - "y": 595.0 + "x": 415.0, + "y": 590.0 }, "params": 1 }, @@ -568,8 +568,8 @@ "id": "NandGate", "name": "NandGate#48", "pos": { - "x": 675.0, - "y": 595.0 + "x": 445.0, + "y": 585.0 }, "params": 1 }, @@ -577,8 +577,8 @@ "id": "NandGate", "name": "NandGate#49", "pos": { - "x": 705.0, - "y": 615.0 + "x": 475.0, + "y": 610.0 }, "params": 1 }, @@ -586,8 +586,8 @@ "id": "NandGate", "name": "NandGate#50", "pos": { - "x": 740.0, - "y": 625.0 + "x": 505.0, + "y": 620.0 }, "params": 1 }, @@ -595,8 +595,8 @@ "id": "NandGate", "name": "NandGate#51", "pos": { - "x": 670.0, - "y": 620.0 + "x": 415.0, + "y": 615.0 }, "params": 1 }, @@ -622,7 +622,7 @@ "id": "NandGate", "name": "NandGate#54", "pos": { - "x": 640.0, + "x": 385.0, "y": 730.0 }, "params": 1 @@ -631,7 +631,7 @@ "id": "NandGate", "name": "NandGate#55", "pos": { - "x": 675.0, + "x": 420.0, "y": 730.0 }, "params": 1 @@ -640,7 +640,7 @@ "id": "NandGate", "name": "NandGate#56", "pos": { - "x": 705.0, + "x": 450.0, "y": 750.0 }, "params": 1 @@ -649,7 +649,7 @@ "id": "NandGate", "name": "NandGate#57", "pos": { - "x": 640.0, + "x": 385.0, "y": 755.0 }, "params": 1 @@ -658,7 +658,7 @@ "id": "NandGate", "name": "NandGate#58", "pos": { - "x": 675.0, + "x": 420.0, "y": 755.0 }, "params": 1 @@ -667,7 +667,7 @@ "id": "NandGate", "name": "NandGate#59", "pos": { - "x": 740.0, + "x": 480.0, "y": 745.0 }, "params": 1 @@ -676,7 +676,7 @@ "id": "NandGate", "name": "NandGate#60", "pos": { - "x": 770.0, + "x": 510.0, "y": 740.0 }, "params": 1 @@ -685,7 +685,7 @@ "id": "NandGate", "name": "NandGate#61", "pos": { - "x": 740.0, + "x": 385.0, "y": 340.0 }, "params": 1 @@ -694,8 +694,8 @@ "id": "NandGate", "name": "NandGate#62", "pos": { - "x": 655.0, - "y": 415.0 + "x": 385.0, + "y": 400.0 }, "params": 1 }, @@ -703,8 +703,8 @@ "id": "NandGate", "name": "NandGate#63", "pos": { - "x": 680.0, - "y": 415.0 + "x": 415.0, + "y": 410.0 }, "params": 1 }, @@ -712,8 +712,8 @@ "id": "NandGate", "name": "NandGate#64", "pos": { - "x": 710.0, - "y": 435.0 + "x": 445.0, + "y": 420.0 }, "params": 1 }, @@ -721,8 +721,8 @@ "id": "NandGate", "name": "NandGate#65", "pos": { - "x": 745.0, - "y": 440.0 + "x": 475.0, + "y": 445.0 }, "params": 1 }, @@ -730,8 +730,8 @@ "id": "NandGate", "name": "NandGate#66", "pos": { - "x": 720.0, - "y": 460.0 + "x": 415.0, + "y": 450.0 }, "params": 1 }, @@ -850,8 +850,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 299.0, - "y": 259.0 + "x": 294.0, + "y": 234.0 }, "params": 1 }, @@ -859,8 +859,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 264.0, - "y": 159.0 + "x": 259.0, + "y": 174.0 }, "params": 1 }, @@ -877,8 +877,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 334.0, - "y": 149.0 + "x": 329.0, + "y": 159.0 }, "params": 1 }, @@ -895,8 +895,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 309.0, - "y": 449.0 + "x": 304.0, + "y": 444.0 }, "params": 1 }, @@ -913,8 +913,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 319.0, - "y": 409.0 + "x": 314.0, + "y": 404.0 }, "params": 1 }, @@ -922,8 +922,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 294.0, - "y": 489.0 + "x": 289.0, + "y": 504.0 }, "params": 1 }, @@ -931,8 +931,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#17", "pos": { - "x": 299.0, - "y": 429.0 + "x": 294.0, + "y": 434.0 }, "params": 1 }, @@ -949,7 +949,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#19", "pos": { - "x": 634.0, + "x": 379.0, "y": 724.0 }, "params": 1 @@ -958,8 +958,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#20", "pos": { - "x": 279.0, - "y": 279.0 + "x": 274.0, + "y": 289.0 }, "params": 1 }, @@ -976,8 +976,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#22", "pos": { - "x": 304.0, - "y": 419.0 + "x": 299.0, + "y": 414.0 }, "params": 1 }, @@ -985,8 +985,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#23", "pos": { - "x": 299.0, - "y": 554.0 + "x": 294.0, + "y": 579.0 }, "params": 1 }, @@ -1003,8 +1003,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#25", "pos": { - "x": 369.0, - "y": 264.0 + "x": 364.0, + "y": 244.0 }, "params": 1 }, @@ -1012,8 +1012,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#26", "pos": { - "x": 299.0, - "y": 634.0 + "x": 294.0, + "y": 684.0 }, "params": 1 }, @@ -1021,8 +1021,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#27", "pos": { - "x": 289.0, - "y": 139.0 + "x": 284.0, + "y": 134.0 }, "params": 1 }, @@ -1030,8 +1030,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#28", "pos": { - "x": 329.0, - "y": 134.0 + "x": 324.0, + "y": 149.0 }, "params": 1 }, @@ -1039,8 +1039,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#29", "pos": { - "x": 269.0, - "y": 349.0 + "x": 264.0, + "y": 364.0 }, "params": 1 }, @@ -1048,8 +1048,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#30", "pos": { - "x": 539.0, - "y": 229.0 + "x": 324.0, + "y": 199.0 }, "params": 1 }, @@ -1057,8 +1057,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#31", "pos": { - "x": 359.0, - "y": 169.0 + "x": 354.0, + "y": 184.0 }, "params": 1 }, @@ -1084,7 +1084,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#34", "pos": { - "x": 289.0, + "x": 284.0, "y": 29.0 }, "params": 1 @@ -1093,8 +1093,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#35", "pos": { - "x": 719.0, - "y": 259.0 + "x": 539.0, + "y": 244.0 }, "params": 1 }, @@ -1102,8 +1102,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#36", "pos": { - "x": 304.0, - "y": 519.0 + "x": 299.0, + "y": 514.0 }, "params": 1 }, @@ -1120,8 +1120,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 284.0, - "y": 269.0 + "x": 279.0, + "y": 299.0 }, "params": 1 }, @@ -1129,8 +1129,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#39", "pos": { - "x": 629.0, - "y": 234.0 + "x": 449.0, + "y": 199.0 }, "params": 1 }, @@ -1138,8 +1138,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 284.0, - "y": 514.0 + "x": 279.0, + "y": 494.0 }, "params": 1 }, @@ -1147,8 +1147,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 264.0, - "y": 534.0 + "x": 259.0, + "y": 524.0 }, "params": 1 }, @@ -1156,8 +1156,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#42", "pos": { - "x": 269.0, - "y": 249.0 + "x": 264.0, + "y": 219.0 }, "params": 1 }, @@ -1165,8 +1165,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#43", "pos": { - "x": 289.0, - "y": 239.0 + "x": 284.0, + "y": 209.0 }, "params": 1 }, @@ -1201,8 +1201,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#47", "pos": { - "x": 374.0, - "y": 229.0 + "x": 369.0, + "y": 194.0 }, "params": 1 }, @@ -1210,8 +1210,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#48", "pos": { - "x": 264.0, - "y": 444.0 + "x": 259.0, + "y": 394.0 }, "params": 1 }, @@ -1237,7 +1237,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#51", "pos": { - "x": 269.0, + "x": 264.0, "y": 9.0 }, "params": 1 @@ -1264,8 +1264,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#54", "pos": { - "x": 319.0, - "y": 219.0 + "x": 314.0, + "y": 304.0 }, "params": 1 }, @@ -1300,7 +1300,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#58", "pos": { - "x": 354.0, + "x": 349.0, "y": 94.0 }, "params": 1 @@ -1399,8 +1399,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#69", "pos": { - "x": 339.0, - "y": 479.0 + "x": 334.0, + "y": 474.0 }, "params": 1 }, @@ -1426,7 +1426,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#72", "pos": { - "x": 344.0, + "x": 339.0, "y": 424.0 }, "params": 1 @@ -1435,7 +1435,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#73", "pos": { - "x": 634.0, + "x": 379.0, "y": 759.0 }, "params": 1 @@ -1453,7 +1453,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#75", "pos": { - "x": 364.0, + "x": 359.0, "y": 629.0 }, "params": 1 @@ -1480,7 +1480,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#78", "pos": { - "x": 664.0, + "x": 409.0, "y": 724.0 }, "params": 1 @@ -1489,8 +1489,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#79", "pos": { - "x": 264.0, - "y": 274.0 + "x": 259.0, + "y": 269.0 }, "params": 1 }, @@ -1498,8 +1498,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#80", "pos": { - "x": 264.0, - "y": 629.0 + "x": 259.0, + "y": 634.0 }, "params": 1 }, @@ -1507,8 +1507,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#81", "pos": { - "x": 734.0, - "y": 344.0 + "x": 379.0, + "y": 354.0 }, "params": 1 }, @@ -1516,8 +1516,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#82", "pos": { - "x": 384.0, - "y": 334.0 + "x": 379.0, + "y": 344.0 }, "params": 1 }, @@ -1525,8 +1525,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#83", "pos": { - "x": 289.0, - "y": 539.0 + "x": 284.0, + "y": 544.0 }, "params": 1 }, @@ -1534,8 +1534,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#84", "pos": { - "x": 299.0, - "y": 749.0 + "x": 294.0, + "y": 779.0 }, "params": 1 }, @@ -1543,7 +1543,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#85", "pos": { - "x": 339.0, + "x": 334.0, "y": 619.0 }, "params": 1 @@ -1552,8 +1552,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#86", "pos": { - "x": 344.0, - "y": 604.0 + "x": 339.0, + "y": 589.0 }, "params": 1 }, @@ -1561,8 +1561,71 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#87", "pos": { - "x": 354.0, - "y": 599.0 + "x": 349.0, + "y": 609.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#88", + "pos": { + "x": 294.0, + "y": 259.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#89", + "pos": { + "x": 259.0, + "y": 284.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#90", + "pos": { + "x": 299.0, + "y": 554.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#91", + "pos": { + "x": 279.0, + "y": 534.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#92", + "pos": { + "x": 259.0, + "y": 569.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#93", + "pos": { + "x": 294.0, + "y": 584.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#94", + "pos": { + "x": 79.0, + "y": 149.0 }, "params": 1 }, @@ -1570,16 +1633,16 @@ "id": "and", "name": "and#0", "pos": { - "x": 680.0, - "y": 465.0 + "x": 385.0, + "y": 460.0 } }, { "id": "and", "name": "and#1", "pos": { - "x": 770.0, - "y": 440.0 + "x": 505.0, + "y": 445.0 } }, { @@ -1594,8 +1657,8 @@ "id": "and", "name": "and#3", "pos": { - "x": 245.0, - "y": 820.0 + "x": 240.0, + "y": 800.0 } }, { @@ -1626,7 +1689,7 @@ "id": "and", "name": "and#7", "pos": { - "x": 770.0, + "x": 445.0, "y": 145.0 } }, @@ -1642,15 +1705,15 @@ "id": "and", "name": "and#9", "pos": { - "x": 735.0, - "y": 55.0 + "x": 355.0, + "y": 45.0 } }, { "id": "and", "name": "and#10", "pos": { - "x": 765.0, + "x": 390.0, "y": 45.0 } }, @@ -1658,31 +1721,31 @@ "id": "and", "name": "and#11", "pos": { - "x": 515.0, - "y": 270.0 + "x": 385.0, + "y": 255.0 } }, { "id": "and", "name": "and#12", "pos": { - "x": 695.0, - "y": 225.0 + "x": 385.0, + "y": 310.0 } }, { "id": "and", "name": "and#13", "pos": { - "x": 570.0, - "y": 240.0 + "x": 385.0, + "y": 205.0 } }, { "id": "and", "name": "and#14", "pos": { - "x": 705.0, + "x": 385.0, "y": 640.0 } }, @@ -1698,7 +1761,7 @@ "id": "and", "name": "and#16", "pos": { - "x": 705.0, + "x": 450.0, "y": 720.0 } }, @@ -1706,7 +1769,7 @@ "id": "and", "name": "and#17", "pos": { - "x": 765.0, + "x": 415.0, "y": 345.0 } }, @@ -1714,8 +1777,8 @@ "id": "and", "name": "and#18", "pos": { - "x": 680.0, - "y": 440.0 + "x": 385.0, + "y": 430.0 } } ], @@ -1897,7 +1960,7 @@ "y": 50.0 }, { - "x": 310.0, + "x": 305.0, "y": 50.0 } ] @@ -1926,7 +1989,7 @@ "name": "unnamedWire#15", "path": [ { - "x": 280.0, + "x": 275.0, "y": 20.0 } ] @@ -1959,7 +2022,7 @@ "y": 40.0 }, { - "x": 300.0, + "x": 295.0, "y": 40.0 } ] @@ -1975,17 +2038,9 @@ }, "name": "unnamedWire#18", "path": [ - { - "x": 205.0, - "y": 825.0 - }, - { - "x": 205.0, - "y": 810.0 - }, { "x": 30.0, - "y": 810.0 + "y": 805.0 } ] }, @@ -2011,7 +2066,16 @@ "pinName": "A" }, "name": "unnamedWire#20", - "path": [] + "path": [ + { + "x": 475.0, + "y": 780.0 + }, + { + "x": 475.0, + "y": 750.0 + } + ] }, { "pin1": { @@ -2020,10 +2084,19 @@ }, "pin2": { "compName": "NandGate#67", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#21", - "path": [] + "path": [ + { + "x": 270.0, + "y": 805.0 + }, + { + "x": 270.0, + "y": 815.0 + } + ] }, { "pin1": { @@ -2062,7 +2135,7 @@ "y": 75.0 }, { - "x": 335.0, + "x": 330.0, "y": 75.0 } ] @@ -2237,16 +2310,11 @@ "pinName": "" }, "pin2": { - "compName": "and#5", - "pinName": "A" + "compName": "WireCrossPoint#94", + "pinName": "" }, "name": "unnamedWire#36", - "path": [ - { - "x": 80.0, - "y": 150.0 - } - ] + "path": [] }, { "pin1": { @@ -2268,7 +2336,7 @@ "y": 100.0 }, { - "x": 360.0, + "x": 355.0, "y": 100.0 } ] @@ -2279,7 +2347,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#88", "pinName": "" }, "name": "unnamedWire#38", @@ -2301,7 +2369,7 @@ "y": 5.0 }, { - "x": 265.0, + "x": 260.0, "y": 5.0 } ] @@ -2316,7 +2384,16 @@ "pinName": "B" }, "name": "unnamedWire#40", - "path": [] + "path": [ + { + "x": 410.0, + "y": 180.0 + }, + { + "x": 410.0, + "y": 165.0 + } + ] }, { "pin1": { @@ -2419,7 +2496,7 @@ "name": "unnamedWire#48", "path": [ { - "x": 335.0, + "x": 330.0, "y": 825.0 } ] @@ -2456,7 +2533,7 @@ "y": 70.0 }, { - "x": 330.0, + "x": 325.0, "y": 70.0 } ] @@ -2636,7 +2713,7 @@ "name": "unnamedWire#63", "path": [ { - "x": 295.0, + "x": 290.0, "y": 35.0 }, { @@ -2671,13 +2748,13 @@ }, { "pin1": { - "compName": "and#10", - "pinName": "B" - }, - "pin2": { "compName": "and#9", "pinName": "Y" }, + "pin2": { + "compName": "and#10", + "pinName": "A" + }, "name": "unnamedWire#66", "path": [] }, @@ -2687,7 +2764,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#93", "pinName": "" }, "name": "unnamedWire#67", @@ -2695,12 +2772,12 @@ }, { "pin1": { - "compName": "and#11", - "pinName": "A" + "compName": "WireCrossPoint#88", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#8", - "pinName": "" + "compName": "and#11", + "pinName": "A" }, "name": "unnamedWire#68", "path": [] @@ -2739,7 +2816,16 @@ "pinName": "A" }, "name": "unnamedWire#71", - "path": [] + "path": [ + { + "x": 415.0, + "y": 260.0 + }, + { + "x": 415.0, + "y": 265.0 + } + ] }, { "pin1": { @@ -2753,11 +2839,19 @@ "name": "unnamedWire#72", "path": [ { - "x": 275.0, - "y": 285.0 + "x": 415.0, + "y": 275.0 }, { - "x": 275.0, + "x": 415.0, + "y": 280.0 + }, + { + "x": 270.0, + "y": 280.0 + }, + { + "x": 270.0, "y": 15.0 } ] @@ -2774,7 +2868,7 @@ "name": "unnamedWire#73", "path": [ { - "x": 370.0, + "x": 365.0, "y": 835.0 } ] @@ -2793,7 +2887,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#79", + "compName": "WireCrossPoint#89", "pinName": "" }, "pin2": { @@ -2801,7 +2895,16 @@ "pinName": "B" }, "name": "unnamedWire#75", - "path": [] + "path": [ + { + "x": 445.0, + "y": 285.0 + }, + { + "x": 445.0, + "y": 280.0 + } + ] }, { "pin1": { @@ -2834,10 +2937,19 @@ }, "pin2": { "compName": "NandGate#12", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#78", - "path": [] + "path": [ + { + "x": 475.0, + "y": 290.0 + }, + { + "x": 475.0, + "y": 285.0 + } + ] }, { "pin1": { @@ -2846,7 +2958,7 @@ }, "pin2": { "compName": "NandGate#12", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#79", "path": [] @@ -2858,13 +2970,13 @@ }, "pin2": { "compName": "NandGate#67", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#80", "path": [ { "x": 185.0, - "y": 815.0 + "y": 825.0 } ] }, @@ -2896,12 +3008,20 @@ "y": 120.0 }, { - "x": 380.0, + "x": 375.0, "y": 120.0 }, { - "x": 380.0, + "x": 375.0, + "y": 295.0 + }, + { + "x": 505.0, "y": 295.0 + }, + { + "x": 505.0, + "y": 290.0 } ] }, @@ -2941,7 +3061,7 @@ "name": "unnamedWire#85", "path": [ { - "x": 365.0, + "x": 360.0, "y": 715.0 } ] @@ -2982,7 +3102,7 @@ "name": "unnamedWire#88", "path": [ { - "x": 285.0, + "x": 280.0, "y": 25.0 } ] @@ -2994,7 +3114,7 @@ }, "pin2": { "compName": "NandGate#21", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#89", "path": [] @@ -3011,8 +3131,16 @@ "name": "unnamedWire#90", "path": [ { - "x": 340.0, - "y": 730.0 + "x": 335.0, + "y": 710.0 + }, + { + "x": 445.0, + "y": 710.0 + }, + { + "x": 445.0, + "y": 735.0 } ] }, @@ -3062,7 +3190,16 @@ "pinName": "A" }, "name": "unnamedWire#94", - "path": [] + "path": [ + { + "x": 415.0, + "y": 200.0 + }, + { + "x": 415.0, + "y": 205.0 + } + ] }, { "pin1": { @@ -3098,7 +3235,16 @@ "pinName": "B" }, "name": "unnamedWire#97", - "path": [] + "path": [ + { + "x": 415.0, + "y": 210.0 + }, + { + "x": 415.0, + "y": 215.0 + } + ] }, { "pin1": { @@ -3112,12 +3258,12 @@ "name": "unnamedWire#98", "path": [ { - "x": 340.0, + "x": 350.0, "y": 10.0 }, { - "x": 340.0, - "y": 60.0 + "x": 350.0, + "y": 50.0 } ] }, @@ -3131,7 +3277,16 @@ "pinName": "A" }, "name": "unnamedWire#99", - "path": [] + "path": [ + { + "x": 440.0, + "y": 135.0 + }, + { + "x": 440.0, + "y": 150.0 + } + ] }, { "pin1": { @@ -3143,12 +3298,7 @@ "pinName": "" }, "name": "unnamedWire#100", - "path": [ - { - "x": 330.0, - "y": 225.0 - } - ] + "path": [] }, { "pin1": { @@ -3160,7 +3310,16 @@ "pinName": "A" }, "name": "unnamedWire#101", - "path": [] + "path": [ + { + "x": 445.0, + "y": 210.0 + }, + { + "x": 445.0, + "y": 230.0 + } + ] }, { "pin1": { @@ -3213,7 +3372,16 @@ "pinName": "A" }, "name": "unnamedWire#105", - "path": [] + "path": [ + { + "x": 480.0, + "y": 205.0 + }, + { + "x": 480.0, + "y": 225.0 + } + ] }, { "pin1": { @@ -3237,7 +3405,16 @@ "pinName": "Y" }, "name": "unnamedWire#107", - "path": [] + "path": [ + { + "x": 510.0, + "y": 240.0 + }, + { + "x": 510.0, + "y": 230.0 + } + ] }, { "pin1": { @@ -3249,7 +3426,24 @@ "pinName": "Y" }, "name": "unnamedWire#108", - "path": [] + "path": [ + { + "x": 510.0, + "y": 250.0 + }, + { + "x": 510.0, + "y": 270.0 + }, + { + "x": 565.0, + "y": 270.0 + }, + { + "x": 565.0, + "y": 290.0 + } + ] }, { "pin1": { @@ -3261,7 +3455,12 @@ "pinName": "A" }, "name": "unnamedWire#109", - "path": [] + "path": [ + { + "x": 325.0, + "y": 315.0 + } + ] }, { "pin1": { @@ -3275,8 +3474,8 @@ "name": "unnamedWire#110", "path": [ { - "x": 360.0, - "y": 235.0 + "x": 355.0, + "y": 325.0 } ] }, @@ -3314,7 +3513,16 @@ "pinName": "" }, "name": "unnamedWire#113", - "path": [] + "path": [ + { + "x": 415.0, + "y": 310.0 + }, + { + "x": 415.0, + "y": 305.0 + } + ] }, { "pin1": { @@ -3326,7 +3534,16 @@ "pinName": "B" }, "name": "unnamedWire#114", - "path": [] + "path": [ + { + "x": 415.0, + "y": 315.0 + }, + { + "x": 415.0, + "y": 320.0 + } + ] }, { "pin1": { @@ -3350,7 +3567,12 @@ "pinName": "A" }, "name": "unnamedWire#116", - "path": [] + "path": [ + { + "x": 540.0, + "y": 240.0 + } + ] }, { "pin1": { @@ -3359,20 +3581,29 @@ }, "pin2": { "compName": "NandGate#24", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#117", - "path": [] + "path": [ + { + "x": 570.0, + "y": 315.0 + }, + { + "x": 570.0, + "y": 255.0 + } + ] }, { "pin1": { - "compName": "NandGate#24", - "pinName": "B" - }, - "pin2": { "compName": "NandGate#23", "pinName": "Y" }, + "pin2": { + "compName": "NandGate#24", + "pinName": "A" + }, "name": "unnamedWire#118", "path": [] }, @@ -3463,7 +3694,12 @@ "pinName": "B" }, "name": "unnamedWire#125", - "path": [] + "path": [ + { + "x": 540.0, + "y": 250.0 + } + ] }, { "pin1": { @@ -3525,7 +3761,7 @@ }, "pin2": { "compName": "NandGate#25", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#130", "path": [] @@ -3537,10 +3773,19 @@ }, "pin2": { "compName": "NandGate#21", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#131", - "path": [] + "path": [ + { + "x": 535.0, + "y": 300.0 + }, + { + "x": 535.0, + "y": 295.0 + } + ] }, { "pin1": { @@ -3549,10 +3794,19 @@ }, "pin2": { "compName": "NandGate#25", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#132", - "path": [] + "path": [ + { + "x": 410.0, + "y": 495.0 + }, + { + "x": 410.0, + "y": 500.0 + } + ] }, { "pin1": { @@ -3561,25 +3815,33 @@ }, "pin2": { "compName": "NandGate#27", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#133", "path": [] }, { "pin1": { - "compName": "NandGate#27", - "pinName": "B" - }, - "pin2": { "compName": "WireCrossPoint#13", "pinName": "" }, + "pin2": { + "compName": "NandGate#27", + "pinName": "A" + }, "name": "unnamedWire#134", "path": [ { - "x": 310.0, - "y": 510.0 + "x": 305.0, + "y": 490.0 + }, + { + "x": 440.0, + "y": 490.0 + }, + { + "x": 440.0, + "y": 495.0 } ] }, @@ -3593,7 +3855,16 @@ "pinName": "A" }, "name": "unnamedWire#135", - "path": [] + "path": [ + { + "x": 470.0, + "y": 500.0 + }, + { + "x": 470.0, + "y": 520.0 + } + ] }, { "pin1": { @@ -3621,7 +3892,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#40", + "compName": "WireCrossPoint#91", "pinName": "" }, "pin2": { @@ -3638,25 +3909,33 @@ }, "pin2": { "compName": "NandGate#30", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#139", "path": [] }, { "pin1": { - "compName": "NandGate#30", - "pinName": "B" - }, - "pin2": { "compName": "WireCrossPoint#29", "pinName": "" }, + "pin2": { + "compName": "NandGate#30", + "pinName": "A" + }, "name": "unnamedWire#140", "path": [ { - "x": 270.0, - "y": 525.0 + "x": 265.0, + "y": 485.0 + }, + { + "x": 500.0, + "y": 485.0 + }, + { + "x": 500.0, + "y": 515.0 } ] }, @@ -3670,7 +3949,16 @@ "pinName": "A" }, "name": "unnamedWire#141", - "path": [] + "path": [ + { + "x": 530.0, + "y": 520.0 + }, + { + "x": 530.0, + "y": 545.0 + } + ] }, { "pin1": { @@ -3694,7 +3982,16 @@ "pinName": "B" }, "name": "unnamedWire#143", - "path": [] + "path": [ + { + "x": 530.0, + "y": 570.0 + }, + { + "x": 530.0, + "y": 555.0 + } + ] }, { "pin1": { @@ -3706,7 +4003,16 @@ "pinName": "B" }, "name": "unnamedWire#144", - "path": [] + "path": [ + { + "x": 500.0, + "y": 580.0 + }, + { + "x": 500.0, + "y": 575.0 + } + ] }, { "pin1": { @@ -3727,14 +4033,14 @@ }, "pin2": { "compName": "NandGate#33", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#146", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#41", + "compName": "WireCrossPoint#92", "pinName": "" }, "pin2": { @@ -3742,7 +4048,16 @@ "pinName": "B" }, "name": "unnamedWire#147", - "path": [] + "path": [ + { + "x": 440.0, + "y": 570.0 + }, + { + "x": 440.0, + "y": 565.0 + } + ] }, { "pin1": { @@ -3763,7 +4078,7 @@ }, "pin2": { "compName": "NandGate#35", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#149", "path": [] @@ -3782,7 +4097,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#36", + "compName": "WireCrossPoint#90", "pinName": "" }, "pin2": { @@ -3812,7 +4127,7 @@ "y": 115.0 }, { - "x": 375.0, + "x": 370.0, "y": 115.0 } ] @@ -3839,7 +4154,12 @@ "pinName": "B" }, "name": "unnamedWire#154", - "path": [] + "path": [ + { + "x": 450.0, + "y": 210.0 + } + ] }, { "pin1": { @@ -3848,13 +4168,21 @@ }, "pin2": { "compName": "NandGate#35", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#155", "path": [ { - "x": 375.0, - "y": 545.0 + "x": 370.0, + "y": 565.0 + }, + { + "x": 410.0, + "y": 565.0 + }, + { + "x": 410.0, + "y": 560.0 } ] }, @@ -3872,43 +4200,51 @@ }, { "pin1": { - "compName": "WireCrossPoint#46", - "pinName": "" + "compName": "and#10", + "pinName": "B" }, "pin2": { - "compName": "and#10", - "pinName": "A" + "compName": "WireCrossPoint#46", + "pinName": "" }, "name": "unnamedWire#157", "path": [ { - "x": 165.0, - "y": 90.0 + "x": 385.0, + "y": 60.0 }, { - "x": 350.0, + "x": 385.0, "y": 90.0 }, { - "x": 350.0, - "y": 50.0 + "x": 165.0, + "y": 90.0 } ] }, { "pin1": { - "compName": "NandGate#33", - "pinName": "A" + "compName": "WireCrossPoint#81", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#82", - "pinName": "" + "compName": "NandGate#33", + "pinName": "B" }, "name": "unnamedWire#158", "path": [ { - "x": 385.0, - "y": 535.0 + "x": 380.0, + "y": 575.0 + }, + { + "x": 470.0, + "y": 575.0 + }, + { + "x": 470.0, + "y": 570.0 } ] }, @@ -3965,7 +4301,7 @@ "name": "unnamedWire#162", "path": [ { - "x": 265.0, + "x": 260.0, "y": 725.0 } ] @@ -3982,11 +4318,11 @@ "name": "unnamedWire#163", "path": [ { - "x": 315.0, + "x": 310.0, "y": 465.0 }, { - "x": 315.0, + "x": 310.0, "y": 55.0 }, { @@ -4075,7 +4411,12 @@ "pinName": "" }, "name": "unnamedWire#169", - "path": [] + "path": [ + { + "x": 450.0, + "y": 195.0 + } + ] }, { "pin1": { @@ -4083,7 +4424,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#48", + "compName": "WireCrossPoint#89", "pinName": "" }, "name": "unnamedWire#170", @@ -4101,7 +4442,7 @@ "name": "unnamedWire#171", "path": [ { - "x": 305.0, + "x": 300.0, "y": 45.0 }, { @@ -4134,8 +4475,8 @@ "name": "unnamedWire#173", "path": [ { - "x": 280.0, - "y": 675.0 + "x": 275.0, + "y": 665.0 } ] }, @@ -4145,16 +4486,11 @@ "pinName": "" }, "pin2": { - "compName": "NandGate#41", - "pinName": "B" + "compName": "WireCrossPoint#91", + "pinName": "" }, "name": "unnamedWire#174", - "path": [ - { - "x": 285.0, - "y": 685.0 - } - ] + "path": [] }, { "pin1": { @@ -4163,7 +4499,7 @@ }, "pin2": { "compName": "NandGate#42", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#175", "path": [] @@ -4175,10 +4511,19 @@ }, "pin2": { "compName": "NandGate#42", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#176", - "path": [] + "path": [ + { + "x": 440.0, + "y": 685.0 + }, + { + "x": 440.0, + "y": 680.0 + } + ] }, { "pin1": { @@ -4192,12 +4537,12 @@ "name": "unnamedWire#177", "path": [ { - "x": 735.0, + "x": 470.0, "y": 675.0 }, { - "x": 735.0, - "y": 665.0 + "x": 470.0, + "y": 660.0 } ] }, @@ -4213,11 +4558,11 @@ "name": "unnamedWire#178", "path": [ { - "x": 735.0, - "y": 655.0 + "x": 470.0, + "y": 650.0 }, { - "x": 735.0, + "x": 470.0, "y": 645.0 } ] @@ -4234,7 +4579,7 @@ "name": "unnamedWire#179", "path": [ { - "x": 295.0, + "x": 290.0, "y": 655.0 } ] @@ -4245,16 +4590,11 @@ "pinName": "" }, "pin2": { - "compName": "and#14", - "pinName": "A" + "compName": "WireCrossPoint#90", + "pinName": "" }, - "name": "unnamedWire#180", - "path": [ - { - "x": 305.0, - "y": 645.0 - } - ] + "name": "unnamedWire#180", + "path": [] }, { "pin1": { @@ -4266,16 +4606,7 @@ "pinName": "B" }, "name": "unnamedWire#181", - "path": [ - { - "x": 765.0, - "y": 660.0 - }, - { - "x": 765.0, - "y": 655.0 - } - ] + "path": [] }, { "pin1": { @@ -4313,8 +4644,8 @@ "name": "unnamedWire#184", "path": [ { - "x": 290.0, - "y": 590.0 + "x": 285.0, + "y": 600.0 } ] }, @@ -4325,7 +4656,7 @@ }, "pin2": { "compName": "NandGate#46", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#185", "path": [] @@ -4337,10 +4668,19 @@ }, "pin2": { "compName": "NandGate#46", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#186", - "path": [] + "path": [ + { + "x": 410.0, + "y": 590.0 + }, + { + "x": 410.0, + "y": 595.0 + } + ] }, { "pin1": { @@ -4378,22 +4718,31 @@ }, "pin2": { "compName": "NandGate#48", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#189", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#93", "pinName": "" }, "pin2": { "compName": "NandGate#48", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#190", - "path": [] + "path": [ + { + "x": 440.0, + "y": 585.0 + }, + { + "x": 440.0, + "y": 590.0 + } + ] }, { "pin1": { @@ -4405,7 +4754,16 @@ "pinName": "A" }, "name": "unnamedWire#191", - "path": [] + "path": [ + { + "x": 470.0, + "y": 595.0 + }, + { + "x": 470.0, + "y": 615.0 + } + ] }, { "pin1": { @@ -4417,7 +4775,16 @@ "pinName": "A" }, "name": "unnamedWire#192", - "path": [] + "path": [ + { + "x": 500.0, + "y": 620.0 + }, + { + "x": 500.0, + "y": 625.0 + } + ] }, { "pin1": { @@ -4431,11 +4798,11 @@ "name": "unnamedWire#193", "path": [ { - "x": 765.0, - "y": 635.0 + "x": 530.0, + "y": 630.0 }, { - "x": 765.0, + "x": 530.0, "y": 645.0 } ] @@ -4604,8 +4971,8 @@ "name": "unnamedWire#205", "path": [ { - "x": 320.0, - "y": 740.0 + "x": 315.0, + "y": 745.0 } ] }, @@ -4621,11 +4988,11 @@ "name": "unnamedWire#206", "path": [ { - "x": 670.0, + "x": 415.0, "y": 740.0 }, { - "x": 670.0, + "x": 415.0, "y": 745.0 } ] @@ -4642,8 +5009,16 @@ "name": "unnamedWire#207", "path": [ { - "x": 355.0, - "y": 730.0 + "x": 350.0, + "y": 720.0 + }, + { + "x": 415.0, + "y": 720.0 + }, + { + "x": 415.0, + "y": 735.0 } ] }, @@ -4659,11 +5034,11 @@ "name": "unnamedWire#208", "path": [ { - "x": 700.0, + "x": 445.0, "y": 740.0 }, { - "x": 700.0, + "x": 445.0, "y": 755.0 } ] @@ -4692,7 +5067,7 @@ "name": "unnamedWire#210", "path": [ { - "x": 635.0, + "x": 380.0, "y": 770.0 } ] @@ -4709,11 +5084,11 @@ "name": "unnamedWire#211", "path": [ { - "x": 665.0, + "x": 410.0, "y": 765.0 }, { - "x": 665.0, + "x": 410.0, "y": 770.0 } ] @@ -4730,7 +5105,7 @@ "name": "unnamedWire#212", "path": [ { - "x": 665.0, + "x": 410.0, "y": 760.0 } ] @@ -4759,11 +5134,11 @@ "name": "unnamedWire#214", "path": [ { - "x": 765.0, + "x": 505.0, "y": 720.0 }, { - "x": 765.0, + "x": 505.0, "y": 745.0 } ] @@ -4798,7 +5173,7 @@ "pinName": "A" }, "pin2": { - "compName": "WireCrossPoint#81", + "compName": "WireCrossPoint#82", "pinName": "" }, "name": "unnamedWire#217", @@ -4891,7 +5266,16 @@ "pinName": "A" }, "name": "unnamedWire#224", - "path": [] + "path": [ + { + "x": 410.0, + "y": 410.0 + }, + { + "x": 410.0, + "y": 415.0 + } + ] }, { "pin1": { @@ -4915,7 +5299,16 @@ "pinName": "A" }, "name": "unnamedWire#226", - "path": [] + "path": [ + { + "x": 440.0, + "y": 420.0 + }, + { + "x": 440.0, + "y": 425.0 + } + ] }, { "pin1": { @@ -4963,7 +5356,16 @@ "pinName": "A" }, "name": "unnamedWire#230", - "path": [] + "path": [ + { + "x": 470.0, + "y": 430.0 + }, + { + "x": 470.0, + "y": 450.0 + } + ] }, { "pin1": { @@ -4972,10 +5374,19 @@ }, "pin2": { "compName": "and#1", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#231", - "path": [] + "path": [ + { + "x": 500.0, + "y": 455.0 + }, + { + "x": 500.0, + "y": 460.0 + } + ] }, { "pin1": { @@ -4996,10 +5407,19 @@ }, "pin2": { "compName": "and#1", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#233", - "path": [] + "path": [ + { + "x": 500.0, + "y": 395.0 + }, + { + "x": 500.0, + "y": 450.0 + } + ] }, { "pin1": { @@ -5015,26 +5435,26 @@ }, { "pin1": { - "compName": "NandGate#66", - "pinName": "B" - }, - "pin2": { "compName": "WireCrossPoint#66", "pinName": "" }, + "pin2": { + "compName": "NandGate#66", + "pinName": "A" + }, "name": "unnamedWire#235", "path": [ { - "x": 325.0, - "y": 475.0 + "x": 105.0, + "y": 65.0 }, { - "x": 325.0, + "x": 320.0, "y": 65.0 }, { - "x": 105.0, - "y": 65.0 + "x": 320.0, + "y": 455.0 } ] }, @@ -5045,7 +5465,7 @@ }, "pin2": { "compName": "NandGate#66", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#236", "path": [] @@ -5099,11 +5519,11 @@ "path": [ { "x": 225.0, - "y": 805.0 + "y": 785.0 }, { "x": 120.0, - "y": 805.0 + "y": 785.0 } ] }, @@ -5146,7 +5566,16 @@ "pinName": "" }, "name": "unnamedWire#243", - "path": [] + "path": [ + { + "x": 410.0, + "y": 360.0 + }, + { + "x": 410.0, + "y": 365.0 + } + ] }, { "pin1": { @@ -5180,7 +5609,7 @@ "y": 60.0 }, { - "x": 320.0, + "x": 315.0, "y": 60.0 } ] @@ -5233,8 +5662,8 @@ "name": "unnamedWire#249", "path": [ { - "x": 355.0, - "y": 70.0 + "x": 350.0, + "y": 60.0 } ] }, @@ -5290,7 +5719,7 @@ "y": 110.0 }, { - "x": 370.0, + "x": 365.0, "y": 110.0 } ] @@ -5375,7 +5804,7 @@ "y": 80.0 }, { - "x": 340.0, + "x": 335.0, "y": 80.0 } ] @@ -5424,7 +5853,7 @@ "y": 85.0 }, { - "x": 345.0, + "x": 340.0, "y": 85.0 } ] @@ -5441,7 +5870,7 @@ "name": "unnamedWire#263", "path": [ { - "x": 345.0, + "x": 340.0, "y": 760.0 } ] @@ -5475,7 +5904,7 @@ "name": "unnamedWire#265", "path": [ { - "x": 365.0, + "x": 360.0, "y": 105.0 }, { @@ -5529,7 +5958,7 @@ "name": "unnamedWire#268", "path": [ { - "x": 635.0, + "x": 380.0, "y": 735.0 } ] @@ -5552,7 +5981,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#80", + "compName": "WireCrossPoint#92", "pinName": "" }, "name": "unnamedWire#270", @@ -5582,16 +6011,8 @@ "name": "unnamedWire#272", "path": [ { - "x": 260.0, + "x": 380.0, "y": 140.0 - }, - { - "x": 260.0, - "y": 125.0 - }, - { - "x": 385.0, - "y": 125.0 } ] }, @@ -5609,26 +6030,18 @@ }, { "pin1": { - "compName": "WireCrossPoint#84", - "pinName": "" - }, - "pin2": { "compName": "and#3", "pinName": "B" }, + "pin2": { + "compName": "WireCrossPoint#94", + "pinName": "" + }, "name": "unnamedWire#274", "path": [ { - "x": 300.0, - "y": 800.0 - }, - { - "x": 240.0, - "y": 800.0 - }, - { - "x": 240.0, - "y": 835.0 + "x": 80.0, + "y": 815.0 } ] }, @@ -5667,6 +6080,100 @@ }, "name": "unnamedWire#277", "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#88", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#17", + "pinName": "" + }, + "name": "unnamedWire#278", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#89", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#48", + "pinName": "" + }, + "name": "unnamedWire#279", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#90", + "pinName": "" + }, + "pin2": { + "compName": "and#14", + "pinName": "A" + }, + "name": "unnamedWire#280", + "path": [ + { + "x": 300.0, + "y": 645.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#91", + "pinName": "" + }, + "pin2": { + "compName": "NandGate#41", + "pinName": "B" + }, + "name": "unnamedWire#281", + "path": [ + { + "x": 280.0, + "y": 675.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#92", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#80", + "pinName": "" + }, + "name": "unnamedWire#282", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#93", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#26", + "pinName": "" + }, + "name": "unnamedWire#283", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#94", + "pinName": "" + }, + "pin2": { + "compName": "and#5", + "pinName": "A" + }, + "name": "unnamedWire#284", + "path": [] } ], "version": "0.1.1"