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
5d3f7db
..
f764855
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Clock.java
+++ b/
era.mi/src/era/mi/logic/components/Clock.java
@@
-1,61
+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
{
private boolean toggle = false;
public class Clock implements TimelineEventHandler, Component
{
private boolean toggle = false;
- private
WireArrayInput outI
;
+ private
ReadWriteEnd out
;
private int delta;
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
*/
* @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
public void handle(TimelineEvent e)
{
addToTimeline();
}
@Override
public void handle(TimelineEvent e)
{
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()
+ public
ReadWriteEnd
getOut()
{
{
- return out
I.owner
;
+ return out;
}
}
-
+
private void addToTimeline()
{
Simulation.TIMELINE.addEvent(this, delta);
}
@Override
private void addToTimeline()
{
Simulation.TIMELINE.addEvent(this, delta);
}
@Override
- public List<
WireArray
> getAllInputs()
+ public List<
ReadEnd
> getAllInputs()
{
{
- return
Collections.unmodifiableList(Arrays.asList()
);
+ return
List.of(
);
}
@Override
}
@Override
- public List<
WireArray
> getAllOutputs()
+ public List<
ReadWriteEnd
> getAllOutputs()
{
{
- return
Collections.unmodifiableList(Arrays.asList(outI.owner)
);
+ return
List.of(out
);
}
}
}
}