Timeline now passed via constructor

[Mograsim.git] / era.mi / src / era / mi / logic / components / Clock.java

diff --git a/era.mi/src/era/mi/logic/components/Clock.java b/era.mi/src/era/mi/logic/components/Clock.java
index 3efde15..01795e0 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,31 +1,61 @@
 package era.mi.logic.components;
 
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
-import era.mi.logic.WireArray;
+import java.util.List;
+
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.timeline.TimelineEvent;
 import era.mi.logic.timeline.TimelineEventHandler;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 
-public class Clock implements TimelineEventHandler
+public class Clock extends Component implements TimelineEventHandler
 {
        private boolean toggle = false;
-       private WireArray w;
-       
-       public Clock(WireArray w)
+       private ReadWriteEnd out;
+       private int delta;
+
+       /**
+        * 
+        * @param out   {@link Wire} the clock's impulses are fed into
+        * @param delta ticks between rising and falling edge
+        */
+       public Clock(Timeline timeline, ReadWriteEnd out, int delta)
        {
-               this.w = w;
+               super(timeline);
+               this.delta = delta;
+               this.out = out;
+               addToTimeline();
        }
 
        @Override
        public void handle(TimelineEvent e)
        {
-               Simulation.TIMELINE.addEvent(this, 50);
-               w.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
+               addToTimeline();
+               out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
                toggle = !toggle;
        }
 
-       public WireArray getW()
+       public ReadWriteEnd getOut()
+       {
+               return out;
+       }
+
+       private void addToTimeline()
+       {
+               timeline.addEvent(this, delta);
+       }
+
+       @Override
+       public List<ReadEnd> getAllInputs()
+       {
+               return List.of();
+       }
+
+       @Override
+       public List<ReadWriteEnd> getAllOutputs()
        {
-               return w;
+               return List.of(out);
        }
 }