X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FClock.java;h=01795e0111e2d7b156773e6fd48e18dd9b730902;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=d95cbc7b6aaefd43824df611a30e1f20e2459b23;hpb=c18c04011cab0040c2287608eeefc9c3cc4536c2;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 d95cbc7b..01795e01 100644
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -2,58 +2,60 @@ package era.mi.logic.components;
 
 import java.util.List;
 
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.timeline.TimelineEvent;
 import era.mi.logic.timeline.TimelineEventHandler;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
+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, Component
+public class Clock extends Component implements TimelineEventHandler
 {
 	private boolean toggle = false;
-	private WireArrayEnd outI;
+	private ReadWriteEnd out;
 	private int delta;
 
 	/**
 	 * 
-	 * @param out   {@link WireArray} the clock's impulses are fed into
+	 * @param out   {@link Wire} the clock's impulses are fed into
 	 * @param delta ticks between rising and falling edge
 	 */
-	public Clock(WireArray out, int delta)
+	public Clock(Timeline timeline, ReadWriteEnd out, int delta)
 	{
+		super(timeline);
 		this.delta = delta;
-		this.outI = out.createInput();
-		Simulation.TIMELINE.addEvent(this, delta);
+		this.out = out;
+		addToTimeline();
 	}
 
 	@Override
 	public void handle(TimelineEvent e)
 	{
 		addToTimeline();
-		outI.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
+		out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
 		toggle = !toggle;
 	}
 
-	public WireArray getOut()
+	public ReadWriteEnd getOut()
 	{
-		return outI.owner;
+		return out;
 	}
 
 	private void addToTimeline()
 	{
-		Simulation.TIMELINE.addEvent(this, delta);
+		timeline.addEvent(this, delta);
 	}
 
 	@Override
-	public List<WireArray> getAllInputs()
+	public List<ReadEnd> getAllInputs()
 	{
 		return List.of();
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs()
+	public List<ReadWriteEnd> getAllOutputs()
 	{
-		return List.of(outI.owner);
+		return List.of(out);
 	}
 }