diff --git a/plugins/TestingList.java b/plugins/TestingList.java index a648a41..ad6903a 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -430,8 +430,8 @@ public class TestingList extends Panel { //launch the test try{ args.put("DEVICE", sDeviceName); - //args.put("ret", ""); - //args.put("status", false); + args.put("ret", ""); + args.put("status", false); run(sTestName, args); } catch (Exception ex) { SwingUtils.showMessage(this, "", ex.toString()); diff --git a/script/power-supply.py b/script/power-supply.py index 64803e4..aa06117 100644 --- a/script/power-supply.py +++ b/script/power-supply.py @@ -9,7 +9,7 @@ #by default, failed ret = 'Test failed' -success = False +status = False scan = ManualScan(['time'], ['SetVA', 'ActualVA', 'ActualIA'] , [0.0], [20.0], [10]) scan.start() @@ -66,7 +66,7 @@ for setpoint1 in frange(0.0, 20.0, 10.0, True): scan.append ([detector1], [detector1], [readback1, detector2, detector3]) sleep( 0.1 ) # Settling time ret = 'test completed' - success = True + status = True #reset output to 0V SetVA.put(0.0, timeout=None)