X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FClock.java;h=1cf101b75a8006170e2304456889fc2716a30d51;hb=dba76a37f244d6b216c23f47bd020a87ea1ce328;hp=9f2ecca6eae3bc45f9e1b062d4dd5481950626cf;hpb=4c8fb641dc21efe699f457dcd48fc3cf3660740d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Clock.java b/era.mi/src/era/mi/logic/components/Clock.java
index 9f2ecca6..1cf101b7 100644
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,32 +1,61 @@
-package era.mi.logic.components;
-
-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;
-
-public class Clock implements TimelineEventHandler
-{
-	private boolean toggle = false;
-	private WireArrayInput outI;
-	
-	public Clock(WireArray out)
-	{
-		this.outI = out.createInput();
-	}
-
-	@Override
-	public void handle(TimelineEvent e)
-	{
-		Simulation.TIMELINE.addEvent(this, 50);
-		outI.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
-		toggle = !toggle;
-	}
-
-	public WireArray getOut()
-	{
-		return outI.owner;
-	}
-}
+package era.mi.logic.components;
+
+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 extends Component implements TimelineEventHandler
+{
+	private boolean toggle = false;
+	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)
+	{
+		super(timeline);
+		this.delta = delta;
+		this.out = out;
+		addToTimeline();
+	}
+
+	@Override
+	public void handle(TimelineEvent e)
+	{
+		addToTimeline();
+		out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
+		toggle = !toggle;
+	}
+
+	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 List.of(out);
+	}
+}