linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl
This commit is contained in:
Douglas Clowes
2014-09-26 17:04:19 +10:00
parent fb5addfe64 5bedffc9c3
commit ba72e77d4c
75 changed files with 5146 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
site_ansto/instrument/pelican/config/chopper/fermimot.tcl
View File

@@ -423,13 +423,16 @@ namespace eval ::chopper {
set catch_status [ catch {
if [hgetpropval $hpath/$node abort] {
hsetprop $hpath/$node abort 0
clientput "ERROR: User requested stop. Aborting operation"
set errStr "ERROR: User requested stop. Aborting operation"
clientput $errStr
hsetprop $hpath/$node errmsg $errStr
return $SCode(HWFault)
}
set devErr [hval $hpath/$node/control/device_error]
if {$devErr != ""} {
clientput "ERROR: Drive request failed. Aborting operation"
clientput $devErr
set errStr "ERROR: Drive request failed. Aborting operation: device_error = $devErr"
clientput $errStr
hsetprop $hpath/$node errmsg $errStr
return $SCode(HWFault)
}
if [hpropexists $hpath geterror] {
@@ -458,6 +461,8 @@ namespace eval ::chopper {
return $SCode(HWBusy)
} elseif {[expr $readtime - $timecheck] > $timeout} {
return $SCode(HWIdle)
} else {
return $SCode(HWBusy)
}
} else {
if {$timecheck != -1} {
@@ -498,6 +503,9 @@ namespace eval ::chopper {
proc imot_PhRun {hpath node addr name target} {
global SCode
if {[hval $hpath/$node/control/device_error] != ""} {
hset $hpath/$node/control/device_error ""
}
hset $hpath/$node/control/set_ref_delay $target
hsetprop $hpath/$node/control timecheck -1
set readtime [hgetpropval $hpath read_time]

8
site_ansto/instrument/pelican/config/hmm/sct_hv.tcl
View File

@@ -418,7 +418,7 @@ publish set_data_record user
MakeAsyncProtocol std
MakeAsyncQueue hvport std 10.157.205.10 4001
MakeAsyncQueue hvport std 137.157.202.215 55011
# Main process call to create the driver
::scobj::hv::mkHV {
name "hv"
@@ -427,9 +427,3 @@ MakeAsyncQueue hvport std 10.157.205.10 4001
tuning 1
interval 5
}

8
site_ansto/instrument/pelican/config/plc/plc.tcl
View File

@@ -1,7 +1,11 @@
#FIXME Does pelican have a PLC interface?
plc_simulation true
set sim_mode [SplitReply [plc_simulation]]
if {$sim_mode == "false"} {
# MakeAsyncQueue plc_chan SafetyPLC 137.157.204.79 31001
# MakeSafetyPLC plc plc_chan 0
MakeAsyncQueue plc_chan SafetyPLC IP? PORT?
MakeSafetyPLC plc plc_chan 0
}
source $cfPath(plc)/plc_common_1.tcl