From f2f4a40efe0cfddab192b9a1c5d30fe2cb3b1448 Mon Sep 17 00:00:00 2001 From: timmmooney <mooney@aps.anl.gov> Date: Fri, 25 Mar 2005 18:41:13 +0000 Subject: [PATCH] Added softMotor_settings, scanParms settings for soft motors, and fixed icb-device names to agree with canberra_1.cmd --- iocBoot/iocvxWorks/auto_settings.req | 31 +++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/iocBoot/iocvxWorks/auto_settings.req b/iocBoot/iocvxWorks/auto_settings.req index eae7407..16cdfda 100644 --- a/iocBoot/iocvxWorks/auto_settings.req +++ b/iocBoot/iocvxWorks/auto_settings.req @@ -20,6 +20,17 @@ file motor_settings.req P=$(P),M=m14 file motor_settings.req P=$(P),M=m15 file motor_settings.req P=$(P),M=m16 +file softMotor_settings.req P=$(P),SM=SM1 +file softMotor_settings.req P=$(P),SM=SM2 +file softMotor_settings.req P=$(P),SM=SM3 +file softMotor_settings.req P=$(P),SM=SM4 +file softMotor_settings.req P=$(P),SM=SM5 +file softMotor_settings.req P=$(P),SM=SM6 +file softMotor_settings.req P=$(P),SM=SM7 +file softMotor_settings.req P=$(P),SM=SM8 +file softMotor_settings.req P=$(P),SM=SM9 +file softMotor_settings.req P=$(P),SM=SM10 + file scanParms_settings.req P=$(P),M=m1 file scanParms_settings.req P=$(P),M=m2 file scanParms_settings.req P=$(P),M=m3 @@ -37,6 +48,17 @@ file scanParms_settings.req P=$(P),M=m14 file scanParms_settings.req P=$(P),M=m15 file scanParms_settings.req P=$(P),M=m16 +file scanParms_settings.req P=$(P),M=SM1 +file scanParms_settings.req P=$(P),M=SM2 +file scanParms_settings.req P=$(P),M=SM3 +file scanParms_settings.req P=$(P),M=SM4 +file scanParms_settings.req P=$(P),M=SM5 +file scanParms_settings.req P=$(P),M=SM6 +file scanParms_settings.req P=$(P),M=SM7 +file scanParms_settings.req P=$(P),M=SM8 +file scanParms_settings.req P=$(P),M=SM9 +file scanParms_settings.req P=$(P),M=SM10 + file table_settings.req P=$(P),T=table1,Q=Table1 file scaler_8ch_settings.req P=$(P),S=scaler1 @@ -107,12 +129,11 @@ file interp_settings.req P=$(P) # MCA #file mca_settings.req P=$(P),M=mca1 -#file icb_adc_settings.req P=$(P),ADC=icbAdc1 +#file icb_adc_settings.req P=$(P),ADC=adc1 #file icb_amp_settings.req P=$(P),AMP=amp1 -#file icb_hvps_settings.req P=$(P),HVPS=icbHvps1 -#file icb_tca_settings.req P=$(P),TCA=icbTca1 -#file icbDsp_settings.req P=$(P),DSP=icbDsp1 -#file simple_mca_settings.req P=$(P),M=mca1 +#file icb_hvps_settings.req P=$(P),HVPS=hvps1 +#file icb_tca_settings.req P=$(P),TCA=tca1 +#file icbDsp_settings.req P=$(P),DSP=dsp1 # PVs loaded by vxStats.substitutions $(P):R_CA -- GitLab