From 8fb54d22443ae9eb2990d652995279d901467a0a Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sat, 10 Aug 2019 20:42:19 +0200 Subject: [PATCH] Changed pin names and and a pin coordinate --- .../logic/model/am2900/components/GUInor12.java | 2 +- .../am2900/components/am2910/GUIAm2910RegCntr.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java index 61499945..5c950350 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java @@ -24,7 +24,7 @@ public class GUInor12 extends SimpleRectangularHardcodedGUIComponent super(model, name, "=0"); setSize(35, 20); addPin(new Pin(this, "D", 12, 0, 10), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "Y", 1, 30, 10), Usage.OUTPUT, Position.LEFT); + addPin(new Pin(this, "Y", 1, 35, 10), Usage.OUTPUT, Position.LEFT); } @Override diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java index 3c1ca2e9..baf456a8 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java @@ -24,8 +24,8 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent setSize(40, 40); addPin(new Pin(this, "D", 12, 20, 0), Usage.INPUT, Position.BOTTOM); addPin(new Pin(this, "_RLD", 1, 0, 5), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "RWE", 1, 0, 20), Usage.INPUT, Position.RIGHT); - addPin(new Pin(this, "RDEC", 1, 0, 30), Usage.INPUT, Position.RIGHT); + addPin(new Pin(this, "WE", 1, 0, 20), Usage.INPUT, Position.RIGHT); + addPin(new Pin(this, "DEC", 1, 0, 30), Usage.INPUT, Position.RIGHT); addPin(new Pin(this, "C", 1, 40, 20), Usage.INPUT, Position.LEFT); addPin(new Pin(this, "Y", 12, 20, 40), Usage.OUTPUT, Position.TOP); } @@ -42,8 +42,8 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent ReadEnd D = readEnds.get("D"); ReadEnd _RLD = readEnds.get("_RLD"); - ReadEnd RWE = readEnds.get("RWE"); - ReadEnd RDEC = readEnds.get("RDEC"); + ReadEnd WE = readEnds.get("WE"); + ReadEnd DEC = readEnds.get("DEC"); ReadEnd C = readEnds.get("C"); ReadWriteEnd Y = readWriteEnds.get("Y"); @@ -53,9 +53,9 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent // TODO handle U/X/Z if (oldCVal == ZERO && CVal == ONE) { - if ((RDEC.getValue() == ZERO && RWE.getValue() == ONE) || _RLD.getValue() == ZERO) + if ((DEC.getValue() == ZERO && WE.getValue() == ONE) || _RLD.getValue() == ZERO) System.arraycopy(D.getValues().getBits(), 0, QC, 0, 12); - else if (RWE.getValue() == ONE) + else if (WE.getValue() == ONE) { Bit carry = Bit.ZERO; // TODO extract to helper. This code almost also exists in GUIinc12. -- 2.17.1