From 19fdca7ba78cf2dd14a2637b1df3bcd260e4c70b Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Wed, 17 Jun 2015 14:15:33 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- plugins/PowerSupply.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index d342bdb..f025af1 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -11,7 +11,7 @@ #sin=ch.psi.pshell.epics.ChannelDouble TESTIOC:TESTSINUS:SinCalc 6 #arr=ch.psi.pshell.epics.ChannelDoubleArray TESTIOC:TESTWF2:MyWF 6 #pv=ch.psi.pshell.epics.ProcessVariable TESTIOC:TESTCALCOUT:Input -#$motor=ch.psi.pshell.epics.Motor MTEST-GOBBO:MOT1 +$motor=ch.psi.pshell.epics.Motor MTEST-GOBBO:MOT1 #$motor2=ch.psi.pshell.epics.Motor MTEST-GOBBO:MOT2 #table=ch.psi.pshell.dev.MotorGroupBase motor motor2 #manip=ch.psi.pshell.epics.Manipulator diff --git a/plugins/PowerSupply.java b/plugins/PowerSupply.java index 8b0f69e..1e3d05f 100644 --- a/plugins/PowerSupply.java +++ b/plugins/PowerSupply.java @@ -631,11 +631,5 @@ public class PowerSupply extends DeviceBase implements BitMask { public void setChannelCommand(ChannelCommand cmd) throws InterruptedException, DeviceException { channelCommand.write(cmd.toString().replaceAll("_", " ")); } - - - //Public children channels - - public ChannelDouble getModuleVoltageRampChannel(){ - return moduleVoltageRamp; - } + }