Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ) Use new ls340 and ls336 controllers. script_context_util.tcl Modified hinitprops so that it can take sub-paths nxscripts_common_1.tcl Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file. sct_julabo_lh45.tcl Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files. Also only set the setpoint if the Julabo is in remote mode. sct_positmotor_common.tcl Report 99999 if a posit motor table is out of range. quokka guide_configuration.tcl Updated aperture size for p1, p1lp, p1lens in the guide configuration table. r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
This commit is contained in:
committed by
Douglas Clowes
parent
d94cf7b011
commit
bbc133dab9
@@ -18,6 +18,9 @@ namespace eval ::scobj::lh45 {
|
||||
}
|
||||
|
||||
proc setPoint {tc_root nextState cmd} {
|
||||
if {[hval $tc_root/remote_ctrl] == "False"} {
|
||||
return idle
|
||||
}
|
||||
set par [sct target]
|
||||
|
||||
if {[hval $tc_root/apply_tolerance]} {
|
||||
@@ -236,10 +239,21 @@ namespace eval ::scobj::lh45 {
|
||||
|
||||
hfactory $scobj_hpath/sensor plain spy none
|
||||
hfactory $scobj_hpath/sensor/value plain internal float
|
||||
hsetprop $scobj_hpath/sensor/value read ${ns}::getValue rdValue "in_pv_00"
|
||||
hsetprop $scobj_hpath/sensor/value read ${ns}::getValue rdValue "in_pv_02"
|
||||
hsetprop $scobj_hpath/sensor/value rdValue ${ns}::rdValue
|
||||
hsetprop $scobj_hpath/sensor/value oldval UNKNOWN
|
||||
hsetprop $scobj_hpath/sensor/value units "C"
|
||||
hfactory $scobj_hpath/sensor/start_temperature plain user float
|
||||
hfactory $scobj_hpath/sensor/end_temperature plain user float
|
||||
proc ${ns}::OnFirstSave {} [subst -nocommands {
|
||||
hset $scobj_hpath/sensor/start_temperature [hval $scobj_hpath/sensor/value]
|
||||
hset $scobj_hpath/sensor/end_temperature [hval $scobj_hpath/sensor/value]
|
||||
}]
|
||||
proc ${ns}::OnLastSave {} [subst -nocommands {
|
||||
hset $scobj_hpath/sensor/end_temperature [hval $scobj_hpath/sensor/value]
|
||||
}]
|
||||
::nexus::OnFirstSave ${ns}::OnFirstSave
|
||||
::nexus::OnLastSave ${ns}::OnLastSave
|
||||
|
||||
hfactory $scobj_hpath/heating_power_percent plain internal float
|
||||
hsetprop $scobj_hpath/heating_power_percent read ${ns}::getValue rdValue "in_pv_01"
|
||||
@@ -328,7 +342,7 @@ namespace eval ::scobj::lh45 {
|
||||
hsetprop $scobj_hpath/sensor/value sdsinfo ::nexus::scobj::sdsinfo
|
||||
|
||||
hsetprop $scobj_hpath privilege spy
|
||||
::scobj::hinitprops $tempobj setpoint
|
||||
::scobj::hinitprops $tempobj setpoint sensor/start_temperature sensor/end_temperature
|
||||
if {[SplitReply [environment_simulation]]=="false"} {
|
||||
ansto_makesctdrive ${tempobj}_driveable $scobj_hpath/setpoint $scobj_hpath/sensor/value $sct_controller
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user