projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WireEnd functionality split into ReadEnd and ReadWriteEnd
[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
d95cbc7
..
f764855
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Clock.java
+++ b/
era.mi/src/era/mi/logic/components/Clock.java
@@
-2,42
+2,43
@@
package era.mi.logic.components;
import java.util.List;
import java.util.List;
-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.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.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
{
private boolean toggle = false;
public class Clock implements TimelineEventHandler, Component
{
private boolean toggle = false;
- private
WireArrayEnd outI
;
+ private
ReadWriteEnd out
;
private int delta;
/**
*
private int delta;
/**
*
- * @param out {@link Wire
Array
} 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
*/
* @param delta ticks between rising and falling edge
*/
- public Clock(
WireArray
out, int delta)
+ public Clock(
ReadWriteEnd
out, int delta)
{
this.delta = delta;
{
this.delta = delta;
- this.out
I = out.createInput()
;
-
Simulation.TIMELINE.addEvent(this, delta
);
+ this.out
= out
;
+
addToTimeline(
);
}
@Override
public void handle(TimelineEvent e)
{
addToTimeline();
}
@Override
public void handle(TimelineEvent e)
{
addToTimeline();
- out
I
.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
+ out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
toggle = !toggle;
}
toggle = !toggle;
}
- public
WireArray
getOut()
+ public
ReadWriteEnd
getOut()
{
{
- return out
I.owner
;
+ return out;
}
private void addToTimeline()
}
private void addToTimeline()
@@
-46,14
+47,14
@@
public class Clock implements TimelineEventHandler, Component
}
@Override
}
@Override
- public List<
WireArray
> getAllInputs()
+ public List<
ReadEnd
> getAllInputs()
{
return List.of();
}
@Override
{
return List.of();
}
@Override
- public List<
WireArray
> getAllOutputs()
+ public List<
ReadWriteEnd
> getAllOutputs()
{
{
- return List.of(out
I.owner
);
+ return List.of(out);
}
}
}
}