projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIBitDisplay and GUIManualSwitch now support logicWidth != 1
[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
b5b230a
..
e5cdf1b
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
@@
-8,6
+8,7
@@
import net.mograsim.logic.core.LogicObservable;
import net.mograsim.logic.core.LogicObserver;
\r
import net.mograsim.logic.core.timeline.Timeline;
\r
import net.mograsim.logic.core.types.Bit;
\r
import net.mograsim.logic.core.LogicObserver;
\r
import net.mograsim.logic.core.timeline.Timeline;
\r
import net.mograsim.logic.core.types.Bit;
\r
+import net.mograsim.logic.core.types.BitVector;
\r
import net.mograsim.logic.core.wires.Wire.ReadEnd;
\r
import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
\r
\r
import net.mograsim.logic.core.wires.Wire.ReadEnd;
\r
import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
\r
\r
@@
-21,49
+22,55
@@
public class ManualSwitch extends Component implements LogicObservable
{
\r
private Collection<LogicObserver> observers;
\r
private ReadWriteEnd output;
\r
{
\r
private Collection<LogicObserver> observers;
\r
private ReadWriteEnd output;
\r
- private boolean isOn;
\r
\r
public ManualSwitch(Timeline timeline, ReadWriteEnd output)
\r
{
\r
super(timeline);
\r
observers = new ArrayList<>();
\r
\r
public ManualSwitch(Timeline timeline, ReadWriteEnd output)
\r
{
\r
super(timeline);
\r
observers = new ArrayList<>();
\r
- if (output.length() != 1)
\r
- throw new IllegalArgumentException("Switch output can be only a single wire");
\r
this.output = output;
\r
}
\r
\r
this.output = output;
\r
}
\r
\r
- public void switchOn()
\r
+ public void switch
Full
On()
\r
{
\r
{
\r
- setState(
true
);
\r
+ setState(
BitVector.of(Bit.ONE, output.length())
);
\r
}
\r
\r
}
\r
\r
- public void switchOff()
\r
+ public void switch
Full
Off()
\r
{
\r
{
\r
- setState(
false
);
\r
+ setState(
BitVector.of(Bit.ZERO, output.length())
);
\r
}
\r
\r
public void toggle()
\r
{
\r
}
\r
\r
public void toggle()
\r
{
\r
- setState(!isOn);
\r
+ if (isFullOn())
\r
+ switchFullOff();
\r
+ else
\r
+ switchFullOn();
\r
}
\r
\r
}
\r
\r
- public void setState(
boolean isOn
)
\r
+ public void setState(
Bit bit
)
\r
{
\r
{
\r
- if (this.isOn == isOn)
\r
+ setState(BitVector.of(bit));
\r
+ }
\r
+
\r
+ public void setState(BitVector bits)
\r
+ {
\r
+ if (bits.length() != output.length())
\r
+ throw new IllegalArgumentException("Incorrect bit vector length");
\r
+ if (bits.equals(output.getInputValues()))
\r
return;
\r
return;
\r
- this.isOn = isOn;
\r
- output.feedSignals(getValue());
\r
+ output.feedSignals(bits);
\r
notifyObservers();
\r
}
\r
\r
notifyObservers();
\r
}
\r
\r
- public boolean isOn()
\r
+ public boolean is
Full
On()
\r
{
\r
{
\r
- return
isOn
;
\r
+ return
BitVector.of(Bit.ONE, output.length()).equals(output.getInputValues())
;
\r
}
\r
\r
}
\r
\r
- public Bit
getValue
()
\r
+ public Bit
Vector getValues
()
\r
{
\r
{
\r
- return
isOn ? Bit.ONE : Bit.ZERO
;
\r
+ return
output.getInputValues()
;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r