From 63b01516457d2cac32750158fc8893c6f38fc8ff Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sat, 10 Oct 2020 21:21:18 +0200 Subject: [PATCH] Renamed mux1_4 to mux1_4_sb --- .../logic/model/am2900/components/Am2900.json | 60 +++---- .../am2900/components/am2901/Am2901.json | 30 ++-- .../am2900/components/am2904/Am2904.json | 60 +++---- .../am2900/components/am2904/Am2904MSR.json | 150 +++++++++--------- .../am2900/components/am2904/Am2904muSR.json | 60 +++---- .../logic/model/am2900/components/dff4.json | 30 ++-- .../{mux1_4.json => mux1_4_sb.json} | 2 +- .../am2900/standardComponentIDMapping.json | 2 +- 8 files changed, 197 insertions(+), 197 deletions(-) rename plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{mux1_4.json => mux1_4_sb.json} (99%) diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index cf75c6bd..4e171ed7 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -1272,16 +1272,16 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 635.0, "y": 145.0 } }, { - "id": "mux1_4", - "name": "mux1_4#1", + "id": "mux1_4_sb", + "name": "mux1_4_sb#1", "pos": { "x": 635.0, "y": 240.0 @@ -2456,7 +2456,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "name": "unnamedWire#63", @@ -2464,7 +2464,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "pin2": { @@ -2480,7 +2480,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#65", @@ -2492,7 +2492,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#66", @@ -2504,7 +2504,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_1" }, "name": "unnamedWire#67", @@ -2512,7 +2512,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_2" }, "pin2": { @@ -2528,7 +2528,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_3" }, "name": "unnamedWire#69", @@ -2540,7 +2540,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_4" }, "name": "unnamedWire#70", @@ -2590,7 +2590,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { @@ -2606,7 +2606,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "name": "unnamedWire#74", @@ -2614,7 +2614,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "pin2": { @@ -2630,7 +2630,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "name": "unnamedWire#76", @@ -2638,7 +2638,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y1" }, "pin2": { @@ -2654,7 +2654,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y2" }, "name": "unnamedWire#78", @@ -2662,7 +2662,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y3" }, "pin2": { @@ -2678,7 +2678,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y4" }, "name": "unnamedWire#80", @@ -5849,7 +5849,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#293", @@ -5857,7 +5857,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "pin2": { @@ -5873,7 +5873,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#295", @@ -5881,7 +5881,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "pin2": { @@ -5897,7 +5897,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_1" }, "name": "unnamedWire#297", @@ -5905,7 +5905,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_2" }, "pin2": { @@ -5921,7 +5921,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_3" }, "name": "unnamedWire#299", @@ -5929,7 +5929,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_4" }, "pin2": { @@ -6015,7 +6015,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "pin2": { @@ -6056,7 +6056,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "S0" }, "pin2": { diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 16e3f842..9d21e807 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -730,8 +730,8 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 500.0, "y": 350.0 @@ -873,7 +873,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "name": "unnamedWire#8", @@ -1609,7 +1609,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#50", @@ -1621,7 +1621,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#51", @@ -1633,7 +1633,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#52", @@ -1641,7 +1641,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "pin2": { @@ -2273,7 +2273,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#95", @@ -2285,7 +2285,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "name": "unnamedWire#96", @@ -2297,7 +2297,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#97", @@ -2309,7 +2309,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "name": "unnamedWire#98", @@ -2836,7 +2836,7 @@ "pinName": "YF" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#134", @@ -2877,7 +2877,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "pin2": { @@ -2989,7 +2989,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "name": "unnamedWire#142", @@ -3093,7 +3093,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "pin2": { diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index 8807f867..7df1a292 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -1139,16 +1139,16 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 480.0, "y": 85.0 } }, { - "id": "mux1_4", - "name": "mux1_4#1", + "id": "mux1_4_sb", + "name": "mux1_4_sb#1", "pos": { "x": 440.0, "y": 135.0 @@ -2617,11 +2617,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#85", @@ -2629,11 +2629,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y2" }, "name": "unnamedWire#86", @@ -2641,11 +2641,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#87", @@ -2653,11 +2653,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y4" }, "name": "unnamedWire#88", @@ -2669,7 +2669,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "name": "unnamedWire#89", @@ -2677,7 +2677,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "pin2": { @@ -2693,7 +2693,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "name": "unnamedWire#91", @@ -2701,7 +2701,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { @@ -2762,7 +2762,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "S0" }, "name": "unnamedWire#95", @@ -2791,7 +2791,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#96", @@ -2803,7 +2803,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "name": "unnamedWire#97", @@ -2815,7 +2815,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#98", @@ -2823,7 +2823,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "pin2": { @@ -2839,7 +2839,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#100", @@ -2863,7 +2863,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_1" }, "name": "unnamedWire#102", @@ -2871,7 +2871,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_2" }, "pin2": { @@ -2887,7 +2887,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_3" }, "name": "unnamedWire#104", @@ -2895,7 +2895,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_4" }, "pin2": { @@ -2928,7 +2928,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_4" }, "name": "unnamedWire#107", @@ -2936,7 +2936,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_3" }, "pin2": { @@ -2952,7 +2952,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_2" }, "name": "unnamedWire#109", @@ -2960,7 +2960,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_1" }, "pin2": { diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 9ffa28cc..3ebf575a 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -361,40 +361,40 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 45.0, "y": 80.0 } }, { - "id": "mux1_4", - "name": "mux1_4#1", + "id": "mux1_4_sb", + "name": "mux1_4_sb#1", "pos": { "x": 85.0, "y": 220.0 } }, { - "id": "mux1_4", - "name": "mux1_4#2", + "id": "mux1_4_sb", + "name": "mux1_4_sb#2", "pos": { "x": 90.0, "y": 30.0 } }, { - "id": "mux1_4", - "name": "mux1_4#3", + "id": "mux1_4_sb", + "name": "mux1_4_sb#3", "pos": { "x": 130.0, "y": 170.0 } }, { - "id": "mux1_4", - "name": "mux1_4#4", + "id": "mux1_4_sb", + "name": "mux1_4_sb#4", "pos": { "x": 175.0, "y": 120.0 @@ -621,7 +621,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "pin2": { @@ -646,7 +646,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#13", @@ -667,7 +667,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#14", @@ -688,7 +688,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#15", @@ -709,7 +709,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#16", @@ -717,7 +717,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "pin2": { @@ -733,7 +733,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#18", @@ -741,7 +741,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "pin2": { @@ -899,7 +899,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_1" }, "name": "unnamedWire#30", @@ -907,7 +907,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_2" }, "pin2": { @@ -923,7 +923,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_3" }, "name": "unnamedWire#32", @@ -931,7 +931,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_4" }, "pin2": { @@ -1047,7 +1047,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_4" }, "pin2": { @@ -1068,7 +1068,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_2" }, "name": "unnamedWire#40", @@ -1081,7 +1081,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_3" }, "pin2": { @@ -1118,7 +1118,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "S0" }, "name": "unnamedWire#43", @@ -1126,11 +1126,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I1_1" }, "name": "unnamedWire#44", @@ -1155,11 +1155,11 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I1_2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "name": "unnamedWire#46", @@ -1167,11 +1167,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I1_3" }, "name": "unnamedWire#47", @@ -1179,11 +1179,11 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I1_4" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "name": "unnamedWire#48", @@ -1195,7 +1195,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I0_4" }, "name": "unnamedWire#49", @@ -1227,7 +1227,7 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I0_3" }, "pin2": { @@ -1243,7 +1243,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I0_2" }, "name": "unnamedWire#53", @@ -1251,7 +1251,7 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "I0_1" }, "pin2": { @@ -1296,7 +1296,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_1" }, "name": "unnamedWire#57", @@ -1320,7 +1320,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I0_1" }, "name": "unnamedWire#59", @@ -1333,7 +1333,7 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I0_2" }, "pin2": { @@ -1345,7 +1345,7 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I0_3" }, "pin2": { @@ -1366,7 +1366,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I0_4" }, "name": "unnamedWire#62", @@ -1383,11 +1383,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I1_1" }, "name": "unnamedWire#63", @@ -1395,11 +1395,11 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I1_2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y2" }, "name": "unnamedWire#64", @@ -1407,11 +1407,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I1_3" }, "name": "unnamedWire#65", @@ -1419,11 +1419,11 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "I1_4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y4" }, "name": "unnamedWire#66", @@ -1452,7 +1452,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "S0" }, "name": "unnamedWire#68", @@ -1464,7 +1464,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "S0" }, "name": "unnamedWire#69", @@ -1481,7 +1481,7 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "Y4" }, "pin2": { @@ -1506,7 +1506,7 @@ "pinName": "D2" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "Y3" }, "name": "unnamedWire#71", @@ -1556,7 +1556,7 @@ "pinName": "D4" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "Y1" }, "name": "unnamedWire#73", @@ -1573,11 +1573,11 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I1_4" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "Y4" }, "name": "unnamedWire#74", @@ -1585,11 +1585,11 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I1_3" }, "name": "unnamedWire#75", @@ -1597,11 +1597,11 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I1_2" }, "pin2": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "Y2" }, "name": "unnamedWire#76", @@ -1609,11 +1609,11 @@ }, { "pin1": { - "compName": "mux1_4#3", + "compName": "mux1_4_sb#3", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I1_1" }, "name": "unnamedWire#77", @@ -1621,11 +1621,11 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I0_4" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "Y4" }, "name": "unnamedWire#78", @@ -1642,11 +1642,11 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "Y3" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I0_3" }, "name": "unnamedWire#79", @@ -1663,11 +1663,11 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I0_2" }, "pin2": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "Y2" }, "name": "unnamedWire#80", @@ -1684,11 +1684,11 @@ }, { "pin1": { - "compName": "mux1_4#2", + "compName": "mux1_4_sb#2", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "I0_1" }, "name": "unnamedWire#81", @@ -1709,7 +1709,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "S0" }, "name": "unnamedWire#82", @@ -1801,7 +1801,7 @@ }, { "pin1": { - "compName": "mux1_4#4", + "compName": "mux1_4_sb#4", "pinName": "Y2" }, "pin2": { @@ -1901,7 +1901,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#92", diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 3a5ec338..94fe508a 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -243,16 +243,16 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 25.0, "y": 125.0 } }, { - "id": "mux1_4", - "name": "mux1_4#1", + "id": "mux1_4_sb", + "name": "mux1_4_sb#1", "pos": { "x": 65.0, "y": 75.0 @@ -367,7 +367,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#7", @@ -384,7 +384,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "pin2": { @@ -409,7 +409,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#9", @@ -426,7 +426,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "pin2": { @@ -463,7 +463,7 @@ "pinName": "O0" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#12", @@ -484,7 +484,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#13", @@ -505,7 +505,7 @@ "pinName": "O2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#14", @@ -551,11 +551,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -563,11 +563,11 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "name": "unnamedWire#18", @@ -575,11 +575,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_2" }, "name": "unnamedWire#19", @@ -587,11 +587,11 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I1_1" }, "name": "unnamedWire#20", @@ -599,7 +599,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_1" }, "pin2": { @@ -620,7 +620,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_2" }, "name": "unnamedWire#22", @@ -628,7 +628,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_3" }, "pin2": { @@ -668,7 +668,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "I0_4" }, "name": "unnamedWire#26", @@ -680,7 +680,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#27", @@ -697,7 +697,7 @@ "pinName": "O1" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "S0" }, "name": "unnamedWire#28", @@ -805,7 +805,7 @@ }, { "pin1": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y2" }, "pin2": { @@ -972,7 +972,7 @@ "pinName": "D4" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y1" }, "name": "unnamedWire#41", @@ -1005,7 +1005,7 @@ "pinName": "D2" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y3" }, "name": "unnamedWire#43", @@ -1017,7 +1017,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#1", + "compName": "mux1_4_sb#1", "pinName": "Y4" }, "name": "unnamedWire#44", @@ -1084,7 +1084,7 @@ "pinName": "O3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "name": "unnamedWire#48", diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json index c245c9bf..c11feda5 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json @@ -192,8 +192,8 @@ } }, { - "id": "mux1_4", - "name": "mux1_4#0", + "id": "mux1_4_sb", + "name": "mux1_4_sb#0", "pos": { "x": 55.0, "y": 60.0 @@ -220,7 +220,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y1" }, "pin2": { @@ -241,7 +241,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y2" }, "pin2": { @@ -338,7 +338,7 @@ "pinName": "WE" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "S0" }, "name": "unnamedWire#9", @@ -359,7 +359,7 @@ "pinName": "D1" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_1" }, "name": "unnamedWire#10", @@ -380,7 +380,7 @@ "pinName": "D2" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_2" }, "name": "unnamedWire#11", @@ -401,7 +401,7 @@ "pinName": "D3" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_3" }, "name": "unnamedWire#12", @@ -470,7 +470,7 @@ "pinName": "D4" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -535,7 +535,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y3" }, "pin2": { @@ -556,7 +556,7 @@ }, { "pin1": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "Y4" }, "pin2": { @@ -581,7 +581,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_1" }, "name": "unnamedWire#24", @@ -606,7 +606,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_2" }, "name": "unnamedWire#25", @@ -631,7 +631,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_3" }, "name": "unnamedWire#26", @@ -656,7 +656,7 @@ "pinName": "" }, "pin2": { - "compName": "mux1_4#0", + "compName": "mux1_4_sb#0", "pinName": "I0_4" }, "name": "unnamedWire#27", diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4_sb.json similarity index 99% rename from plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json rename to plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4_sb.json index cc9df387..3a049820 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4_sb.json @@ -491,7 +491,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "mux1_4", + "centerText": "mux1_4_sb", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json index c680e3cb..89f792df 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json @@ -49,7 +49,7 @@ "inc12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/inc12.json", "inc16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/inc16.json", "mux1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1.json", - "mux1_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_4.json", + "mux1_4_sb": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_4_sb.json", "mux1_12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_12.json", "mux1_16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_16.json", "mux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2.json", -- 2.17.1