Merged logic into master

[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 a31f20c..07419b4 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,59 +1,59 @@
-package era.mi.logic.components;\r
-\r
-import java.util.List;\r
-\r
-import era.mi.logic.Simulation;\r
-import era.mi.logic.timeline.TimelineEvent;\r
-import era.mi.logic.timeline.TimelineEventHandler;\r
-import era.mi.logic.types.Bit;\r
-import era.mi.logic.wires.Wire;\r
-import era.mi.logic.wires.Wire.WireEnd;\r
-\r
-public class Clock implements TimelineEventHandler, Component\r
-{\r
-       private boolean toggle = false;\r
-       private WireEnd out;\r
-       private int delta;\r
-\r
-       /**\r
-        * \r
-        * @param out   {@link Wire} the clock's impulses are fed into\r
-        * @param delta ticks between rising and falling edge\r
-        */\r
-       public Clock(WireEnd out, int delta)\r
-       {\r
-               this.delta = delta;\r
-               this.out = out;\r
-               addToTimeline();\r
-       }\r
-\r
-       @Override\r
-       public void handle(TimelineEvent e)\r
-       {\r
-               addToTimeline();\r
-               out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);\r
-               toggle = !toggle;\r
-       }\r
-\r
-       public WireEnd getOut()\r
-       {\r
-               return out;\r
-       }\r
-\r
-       private void addToTimeline()\r
-       {\r
-               Simulation.TIMELINE.addEvent(this, delta);\r
-       }\r
-\r
-       @Override\r
-       public List<WireEnd> getAllInputs()\r
-       {\r
-               return List.of();\r
-       }\r
-\r
-       @Override\r
-       public List<WireEnd> getAllOutputs()\r
-       {\r
-               return List.of(out);\r
-       }\r
-}\r
+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);
+       }
+}