diff --git a/site_ansto/instrument/dingo/config/plc/plc.tcl b/site_ansto/instrument/dingo/config/plc/plc.tcl index 1386c276..531c7902 100644 --- a/site_ansto/instrument/dingo/config/plc/plc.tcl +++ b/site_ansto/instrument/dingo/config/plc/plc.tcl @@ -5,8 +5,6 @@ if {$sim_mode == "false"} { MakeSafetyPLC plc plc_chan 0 } -makesctcontroller sct_shutter std 137.157.204.213:30000 - # Configuration Note: # # A default setting has been set in safetyplc.c code. following configuration @@ -51,14 +49,38 @@ proc focuslight {args} { sct_shutter transact $cmd } -proc tertiary_shutter {args} { - set cmd "set tertiary shutter=$args\r\n" - sct_shutter transact $cmd +proc tertiary {sw} { + set sw [string tolower $sw] + switch $sw { + "open" { + wait 1 + plc_chan send set output=0 + wait 1 + plc_chan send set output=3 + wait 1 + plc_chan send set output=1 + wait 1 + plc_chan send set output=3 + } + "close" { + wait 1 + plc_chan send set output=0 + wait 1 + plc_chan send set output=3 + wait 1 + plc_chan send set output=2 + wait 1 + plc_chan send set output=3 + } + default { + clientput ERROR: [info level 0] command should be open or close not $sw + } + } } publish shutter user publish focuslight user -publish tertiary_shutter user +publish tertiary user source $cfPath(plc)/plc_common_1.tcl diff --git a/site_ansto/instrument/dingo/dingo_configuration.tcl b/site_ansto/instrument/dingo/dingo_configuration.tcl index 7e044f44..144390ee 100644 --- a/site_ansto/instrument/dingo/dingo_configuration.tcl +++ b/site_ansto/instrument/dingo/dingo_configuration.tcl @@ -24,11 +24,30 @@ fileeval $cfPath(motors)/motor_configuration.tcl fileeval $cfPath(plc)/plc.tcl #fileeval $cfPath(counter)/counter.tcl #fileeval $cfPath(hmm)/hmm_configuration.tcl +fileeval $cfPath(environment)/sct_agilent_33220A.tcl +fileeval $cfPath(environment)/sct_isotech_ps.tcl +fileeval $cfPath(environment)/sct_keithley_2700.tcl +fileeval $cfPath(environment)/sct_keithley_m2700.tcl +fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl +fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl +fileeval $cfPath(environment)/temperature/sct_ls336.tcl +fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl +fileeval $cfPath(environment)/temperature/sct_ls340.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl +fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl +fileeval $cfPath(environment)/sct_protek_common.tcl +fileeval $cfPath(environment)/sct_protekmm.tcl +fileeval $cfPath(environment)/temperature/west400.tcl +fileeval $cfPath(environment)/temperature/sct_west4100.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl fileeval $cfPath(commands)/commands.tcl -#fileeval $cfPath(commands)/pulser.tcl -#fileeval $cfPath(commands)/hvcommands.tcl +fileeval $cfPath(commands)/pulser.tcl +fileeval $cfPath(commands)/hvcommands.tcl fileeval $cfPath(anticollider)/anticollider.tcl source gumxml.tcl diff --git a/site_ansto/instrument/dingo/sics_simulation.tcl b/site_ansto/instrument/dingo/sics_simulation.tcl index d1fad2a9..400867c3 100644 --- a/site_ansto/instrument/dingo/sics_simulation.tcl +++ b/site_ansto/instrument/dingo/sics_simulation.tcl @@ -12,7 +12,7 @@ foreach {simflag icsval fakedev} { motor_simulation false false chopper_simulation false true velsel_simulation false true - plc_simulation true true + plc_simulation false true rfgen_simulation false true goniometer_simulation false true magnetic_simulation false true