Merge logic of origin into logic

[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 9f2ecca..d638617 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,32 +1,59 @@
 package era.mi.logic.components;
 
+import java.util.List;
+
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
 import era.mi.logic.timeline.TimelineEvent;
 import era.mi.logic.timeline.TimelineEventHandler;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
 
-public class Clock implements TimelineEventHandler
+public class Clock implements TimelineEventHandler, Component
 {
        private boolean toggle = false;
-       private WireArrayInput outI;
-       
-       public Clock(WireArray out)
+       private WireEnd 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(WireEnd out, int delta)
        {
-               this.outI = out.createInput();
+               this.delta = delta;
+               this.out = out;
+               addToTimeline();
        }
 
        @Override
        public void handle(TimelineEvent e)
        {
-               Simulation.TIMELINE.addEvent(this, 50);
-               outI.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
+               addToTimeline();
+               out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
                toggle = !toggle;
        }
 
-       public WireArray getOut()
+       public WireEnd getOut()
+       {
+               return out;
+       }
+
+       private void addToTimeline()
+       {
+               Simulation.TIMELINE.addEvent(this, delta);
+       }
+
+       @Override
+       public List<WireEnd> getAllInputs()
+       {
+               return List.of();
+       }
+
+       @Override
+       public List<WireEnd> getAllOutputs()
        {
-               return outI.owner;
+               return List.of(out);
        }
 }