use in.getBits() in FpgaDock

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDock.java b/src/edu/berkeley/fleet/fpga/FpgaDock.java
index dadda29..57ef338 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaDock.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDock.java
@@ -75,9 +75,9 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
 
             new Event(new Object[] { in, busy.isFull(), out },
                       new Action[] { in, busy.doDrain() });
-            new Event(new Object[] { in, busy.isEmpty(), out, torpedo, fpga.PACKET_TOKEN.verilogVal("in") },
+            new Event(new Object[] { in, busy.isEmpty(), out, torpedo, in.getBits(fpga.PACKET_TOKEN) },
                       new Action[] { in,                      torpedo });
-            new Event(new Object[] { in, busy.isEmpty(), out,      "!"+fpga.PACKET_TOKEN.verilogVal("in") },
+            new Event(new Object[] { in, busy.isEmpty(), out,          in.getBits(fpga.PACKET_TOKEN).invertBits() },
                       new Action[] {     busy.doFill(),  out });
 
             out.latchDriver = in.getBits(fpga.PACKET_DATA);