projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed ManualSwitch concerning U and added Bit methods
[Mograsim.git]
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
components
/
ManualSwitch.java
diff --git
a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/ManualSwitch.java
b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/ManualSwitch.java
index
e3ae372
..
9ec98ed
100644
(file)
--- a/
net.mograsim.logic.core/src/net/mograsim/logic/core/components/ManualSwitch.java
+++ b/
net.mograsim.logic.core/src/net/mograsim/logic/core/components/ManualSwitch.java
@@
-21,7
+21,6
@@
public class ManualSwitch extends Component implements LogicObservable
{
private Collection<LogicObserver> observers;
private ReadWriteEnd output;
{
private Collection<LogicObserver> observers;
private ReadWriteEnd output;
- private boolean isOn;
public ManualSwitch(Timeline timeline, ReadWriteEnd output)
{
public ManualSwitch(Timeline timeline, ReadWriteEnd output)
{
@@
-44,26
+43,32
@@
public class ManualSwitch extends Component implements LogicObservable
public void toggle()
{
public void toggle()
{
- setState(!isOn);
+ setState(!isOn
()
);
}
public void setState(boolean isOn)
{
}
public void setState(boolean isOn)
{
- if (this.isOn == isOn)
+ setToValueOf(isOn ? Bit.ONE : Bit.ZERO);
+ }
+
+ public void setToValueOf(Bit bit)
+ {
+ if (!bit.isBinary())
+ throw new IllegalArgumentException("Cannot set ManualSwitch to the value of Bit " + bit);
+ if (bit == output.getInputValue())
return;
return;
- this.isOn = isOn;
- output.feedSignals(getValue());
+ output.feedSignals(bit);
notifyObservers();
}
public boolean isOn()
{
notifyObservers();
}
public boolean isOn()
{
- return
isOn
;
+ return
output.getInputValue() == Bit.ONE
;
}
public Bit getValue()
{
}
public Bit getValue()
{
- return
isOn ? Bit.ONE : Bit.ZERO
;
+ return
output.getInputValue()
;
}
@Override
}
@Override