Closedown
This commit is contained in:
@@ -43,7 +43,7 @@ public class PowerSupply extends DeviceBase implements BitMask {
|
||||
super(name);
|
||||
this.setCache(10.0);
|
||||
this.prefix=prefix;
|
||||
|
||||
|
||||
moduleVoltageRamp = new ChannelDouble(name + " moduleVoltageRamp", prefix + ":RAMP:2");
|
||||
moduleCurrentRamp = new ChannelDouble(name + " moduleCurrentRamp", prefix + ":IRAMP:2");
|
||||
|
||||
@@ -142,10 +142,9 @@ public class PowerSupply extends DeviceBase implements BitMask {
|
||||
@Override
|
||||
protected void doUpdate() throws InterruptedException, DeviceException {
|
||||
super.doUpdate();
|
||||
try {
|
||||
|
||||
try {
|
||||
channelActualVoltage.update();
|
||||
channelActualCurrent.update();
|
||||
channelActualCurrent.update();
|
||||
setCache(new double[]{channelActualVoltage.getValue(), channelActualCurrent.getValue()});
|
||||
} catch (Exception ex) {
|
||||
throw new DeviceException(ex);
|
||||
|
||||
@@ -132,21 +132,13 @@ public class TestingList extends Panel {
|
||||
|
||||
//enumeration of possible test statuses: text and related icon
|
||||
public enum TestStatus {
|
||||
SUCCESS (0),
|
||||
FAILURE (1),
|
||||
PENDING (2),
|
||||
DISABLED (3),
|
||||
RUNNING (4);
|
||||
SUCCESS,
|
||||
FAILURE,
|
||||
PENDING,
|
||||
DISABLED,
|
||||
RUNNING;
|
||||
|
||||
private int value;
|
||||
|
||||
private TestStatus(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public int index(){
|
||||
return (int) value;
|
||||
}
|
||||
|
||||
public String IconFilename(){
|
||||
String iconFileName = "";
|
||||
|
||||
Reference in New Issue
Block a user