X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FClock.java;h=a31f20c81f48019f8433be726aabed1ef89f0d7c;hb=2427bceeaf96fefbd92ea04d7ebbb52606a7b2ff;hp=9f2ecca6eae3bc45f9e1b062d4dd5481950626cf;hpb=5f74819aeebd1f133d3513bc2db9f2258a76c4ad;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..a31f20c8 100644
--- 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 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.Simulation;
+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.WireEnd;
+
+public class Clock implements TimelineEventHandler, Component
+{
+	private boolean toggle = false;
+	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.delta = delta;
+		this.out = out;
+		addToTimeline();
+	}
+
+	@Override
+	public void handle(TimelineEvent e)
+	{
+		addToTimeline();
+		out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
+		toggle = !toggle;
+	}
+
+	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 List.of(out);
+	}
+}