Merge branch 'RELEASE-3_1' into RELEASE-3_2
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
@@ -6,3 +6,4 @@ config
|
||||
util
|
||||
hostport_config.tcl
|
||||
hostport_config_test.tcl
|
||||
sics_simulation.tcl
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
23
site_ansto/instrument/pelican/sics_simulation.tcl
Normal file
23
site_ansto/instrument/pelican/sics_simulation.tcl
Normal file
@@ -0,0 +1,23 @@
|
||||
# Simulation flags, possible values = true or false
|
||||
# true: The simulated driver will be used.
|
||||
# false: The real driver will be used.
|
||||
# icsval column = settings when running on the Instrument Control Server (ie SICS_SIMULATION not defined)
|
||||
# fakedev column = settings for test platforms (ie SICS_SIMULATION=fakedev)
|
||||
foreach {simflag icsval fakedev} {
|
||||
opal_simulation false true
|
||||
detector_simulation false true
|
||||
hmm_simulation false true
|
||||
environment_simulation false false
|
||||
counter_simulation false true
|
||||
motor_simulation false false
|
||||
chopper_simulation false true
|
||||
velsel_simulation false true
|
||||
plc_simulation true true
|
||||
rfgen_simulation false true
|
||||
goniometer_simulation false true
|
||||
magnetic_simulation false true
|
||||
} {
|
||||
dict set SIMFLAG_VAL $simflag ICSVAL $icsval
|
||||
dict set SIMFLAG_VAL $simflag FAKEDEV $fakedev
|
||||
VarMake $simflag Text internal
|
||||
}
|
||||
@@ -8,7 +8,7 @@ enabled = False
|
||||
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage
|
||||
enabled = False
|
||||
[Default]
|
||||
cascade = sample_stage:normal_sample_stage
|
||||
cascade = sample_stage:normal_sample_stage,T1:ls340_pelican
|
||||
enabled = True
|
||||
[OC1]
|
||||
cascade = T1:OC1_ls340,sample_stage:normal_sample_stage
|
||||
@@ -43,9 +43,9 @@ name = curr2
|
||||
optype = multimeter
|
||||
[T1]
|
||||
datype = T
|
||||
enabled = False
|
||||
enabled = True
|
||||
id = 1
|
||||
implementation = none
|
||||
implementation = ls340_pelican
|
||||
name = tc1
|
||||
optype = temperature
|
||||
[T2]
|
||||
@@ -83,6 +83,11 @@ id = 2
|
||||
implementation = none
|
||||
name = volts2
|
||||
optype = multimeter
|
||||
[ls218]
|
||||
enabled = Always
|
||||
implementation = ls218-01
|
||||
name = ls218
|
||||
optype = lakeshore_218
|
||||
[sample_stage]
|
||||
enabled = Always
|
||||
implementation = normal_sample_stage
|
||||
@@ -120,6 +125,13 @@ imptype = function_generator
|
||||
ip = 10.157.205.16
|
||||
port = 5025
|
||||
|
||||
[ls218-01]
|
||||
desc = "Lakeshore 218 Temperature Monitor"
|
||||
driver = "lakeshore_218"
|
||||
imptype = lakeshore_218
|
||||
ip = ca2-pelican
|
||||
port = 4002
|
||||
|
||||
[ls336_01]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
|
||||
Reference in New Issue
Block a user