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