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=3fe36116e5a1e6ab79d8e7ba1be9f0c0d53ea4a0;hpb=74aebd92f41d03f4a44c9a455ef8c05465136412;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 3fe36116..01795e01 100644
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,54 +1,61 @@
 package era.mi.logic.components;
 
-import java.util.Arrays;
-import java.util.Collections;
 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.WireArrayInput;
+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 WireArrayInput 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, 50);
+		this.out = out;
+		addToTimeline();
 	}
 
 	@Override
-	public void handle(TimelineEvent e) {
+	public void handle(TimelineEvent e)
+	{
 		addToTimeline();
-		outI.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
+		out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
 		toggle = !toggle;
 	}
 
-	public WireArray getOut() {
-		return outI.owner;
+	public ReadWriteEnd getOut()
+	{
+		return out;
 	}
 
-	private void addToTimeline() {
-		Simulation.TIMELINE.addEvent(this, delta);
+	private void addToTimeline()
+	{
+		timeline.addEvent(this, delta);
 	}
 
 	@Override
-	public List<WireArray> getAllInputs() {
-		return Collections.unmodifiableList(Arrays.asList());
+	public List<ReadEnd> getAllInputs()
+	{
+		return List.of();
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs() {
-		return Collections.unmodifiableList(Arrays.asList(outI.owner));
+	public List<ReadWriteEnd> getAllOutputs()
+	{
+		return List.of(out);
 	}
 }