projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge logic of origin into logic
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
gates
/
OrGate.java
diff --git
a/era.mi/src/era/mi/logic/components/gates/OrGate.java
b/era.mi/src/era/mi/logic/components/gates/OrGate.java
index
723fc72
..
ba8262a
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/gates/OrGate.java
+++ b/
era.mi/src/era/mi/logic/components/gates/OrGate.java
@@
-1,10
+1,12
@@
package era.mi.logic.components.gates;
import era.mi.logic.Util;
package era.mi.logic.components.gates;
import era.mi.logic.Util;
-import era.mi.logic.wires.Wire
Array
;
+import era.mi.logic.wires.Wire
.WireEnd
;
-public class OrGate extends MultiInputGate {
- public OrGate(int processTime, WireArray out, WireArray... in) {
+public class OrGate extends MultiInputGate
+{
+ public OrGate(int processTime, WireEnd out, WireEnd... in)
+ {
super(processTime, Util::or, out, in);
}
}
super(processTime, Util::or, out, in);
}
}