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

Don't remove MakeAsyncQueue and MakeAsyncProtocol commands in ofac.c, we need them for the kowari/sylvac.tcl and for the robot.

Browse Source 
Save positmotor indexed positions for Quokka

r2730 | ffr | 2008-11-03 18:20:34 +1100 (Mon, 03 Nov 2008) | 4 lines
This commit is contained in:
Ferdi Franceschini
2008-11-03 18:20:34 +11:00
committed by Douglas Clowes
parent 2734e05a73
commit c791fc65c7
6 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/manager/managerman.dvi
View File

Binary file not shown.

4
ofac.c
View File

@ -419,8 +419,8 @@
RemoveCommand(pSics,"MakeCone"); RemoveCommand(pSics,"MakeCone");
RemoveCommand(pSics,"MakeMultiCounter"); RemoveCommand(pSics,"MakeMultiCounter");
RemoveCommand(pSics,"MakeStateMon"); RemoveCommand(pSics,"MakeStateMon");
RemoveCommand(pSics,"MakeAsyncQueue"); // RemoveCommand(pSics,"MakeAsyncQueue");
RemoveCommand(pSics,"MakeAsyncProtocol"); // RemoveCommand(pSics,"MakeAsyncProtocol");
RemoveCommand(pSics,"MakeSicsObject"); RemoveCommand(pSics,"MakeSicsObject");
RemoveCommand(pSics,"MakeGenController"); RemoveCommand(pSics,"MakeGenController");
RemoveCommand(pSics,"genconfigure"); RemoveCommand(pSics,"genconfigure");

4
site_ansto/instrument/config/motors/sct_positmotor_common.tcl
View File

@ -175,8 +175,10 @@ namespace eval ::sobj::positmotor {
set parnode ${motor}_motor set parnode ${motor}_motor
MakeSICSObj $parnode SCT_MOTOR MakeSICSObj $parnode SCT_MOTOR
# Make setable position parameter and poll it. # Make setable position parameter and poll it.
VarMake $param float user
hattach /sics/${parnode} $param $param
set posindex_node /sics/${parnode}/${param} set posindex_node /sics/${parnode}/${param}
hfactory $posindex_node plain spy float # hfactory $posindex_node plain spy float
hsetprop $posindex_node read ${ns}::rd_index $param $motor hsetprop $posindex_node read ${ns}::rd_index $param $motor
hsetprop $posindex_node state_reading_index ${ns}::state_reading_index $posindex_node $param $motor hsetprop $posindex_node state_reading_index ${ns}::state_reading_index $posindex_node $param $motor
hsetprop $posindex_node write ${ns}::w_index $sct_controller $posindex_node $param $motor hsetprop $posindex_node write ${ns}::w_index $sct_controller $posindex_node $param $motor

10
site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
View File

@ -498,8 +498,8 @@ Motor mf1 $motor_driver_type [params \
asyncqueue mc3\ asyncqueue mc3\
axis A\ axis A\
units degrees\ units degrees\
hardlowerlim 0.15\ hardlowerlim 0.25\
hardupperlim 0.9\ hardupperlim 0.90\
maxSpeed 1\ maxSpeed 1\
maxAccel 1\ maxAccel 1\
maxDecel 1\ maxDecel 1\
@ -510,8 +510,8 @@ Motor mf1 $motor_driver_type [params \
bias_bits 14\ bias_bits 14\
cntsPerX 10000] cntsPerX 10000]
#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1 #setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1
mf1 home 0.15 # mf1 home 0
mf1 softlowerlim 0.15 mf1 softlowerlim 0.25
mf1 softupperlim 0.9 mf1 softupperlim 0.9
mf1 speed 0.1 mf1 speed 0.1
mf1 movecount $move_count mf1 movecount $move_count
@ -519,7 +519,7 @@ mf1 precision 0.01
mf1 part monochromator.focus mf1 part monochromator.focus
mf1 long_name horizontal mf1 long_name horizontal
mf1 creep_offset 1 mf1 creep_offset 1
mf1 Backlash_offset -0.04 mf1 Backlash_offset -0.03
# Monochromator Focusing (Ge) # Monochromator Focusing (Ge)
Motor mf2 $motor_driver_type [params \ Motor mf2 $motor_driver_type [params \

28
site_ansto/instrument/sans/quokka_configuration.tcl
View File

@ -1,5 +1,5 @@
# $Revision: 1.16 $ # $Revision: 1.17 $
# $Date: 2008-10-31 04:37:31 $ # $Date: 2008-11-03 07:20:34 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@ -61,4 +61,28 @@ server_init
hsetprop /sct_mc4 control false hsetprop /sct_mc4 control false
hfactory /instrument/parameters/changer_position link samx_motor hfactory /instrument/parameters/changer_position link samx_motor
hsetprop /instrument/parameters/changer_position data true
set param samplenum
hsetprop /instrument/parameters/changer_position/${param} savecmd ::nexus::sicsvariable::save
hsetprop /instrument/parameters/changer_position/${param} sdsinfo ::nexus::sicsvariable::sdsinfo
hsetprop /instrument/parameters/changer_position/${param} control true
hsetprop /instrument/parameters/changer_position/${param} data true
hsetprop /instrument/parameters/changer_position/${param} nxsave true
hsetprop /instrument/parameters/changer_position/${param} mutable true
hsetprop /instrument/parameters/changer_position/${param} sicsdev $param
hsetprop /instrument/parameters/changer_position/${param} nxalias $param
hsetprop /instrument/parameters/changer_position/${param} klass parameter
hfactory /instrument/parameters/autoSampleAp link apx_motor hfactory /instrument/parameters/autoSampleAp link apx_motor
hsetprop /instrument/parameters/autoSampleAp data true
set param aperture
hsetprop /instrument/parameters/autoSampleAp/${param} savecmd ::nexus::sicsvariable::save
hsetprop /instrument/parameters/autoSampleAp/${param} sdsinfo ::nexus::sicsvariable::sdsinfo
hsetprop /instrument/parameters/autoSampleAp/${param} control true
hsetprop /instrument/parameters/autoSampleAp/${param} data true
hsetprop /instrument/parameters/autoSampleAp/${param} nxsave true
hsetprop /instrument/parameters/autoSampleAp/${param} mutable true
hsetprop /instrument/parameters/autoSampleAp/${param} sicsdev $param
hsetprop /instrument/parameters/autoSampleAp/${param} nxalias $param
hsetprop /instrument/parameters/autoSampleAp/${param} klass parameter

4
site_ansto/site_ansto.c
View File

@ -79,8 +79,8 @@ static void AddCommands(SicsInterp *pInter)
AddCommand(pInter,"portnum",portNumCmd,NULL,NULL); AddCommand(pInter,"portnum",portNumCmd,NULL,NULL);
AddCommand(pInter,"abortbatch",AbortBatch,NULL,NULL); AddCommand(pInter,"abortbatch",AbortBatch,NULL,NULL);
AddCommand(pInter,"MakeHMControl_ANSTO",MakeHMControl_ANSTO,NULL,NULL); AddCommand(pInter,"MakeHMControl_ANSTO",MakeHMControl_ANSTO,NULL,NULL);
AddCommand(pInter,"MakeAsyncProtocol",AsyncProtocolFactory,NULL,NULL); // AddCommand(pInter,"MakeAsyncProtocol",AsyncProtocolFactory,NULL,NULL);
AddCommand(pInter,"MakeAsyncQueue",AsyncQueueFactory,NULL,NULL); // AddCommand(pInter,"MakeAsyncQueue",AsyncQueueFactory,NULL,NULL);
AddCommand(pInter,"MakeMultiChan",AsyncQueueFactory,NULL,NULL); AddCommand(pInter,"MakeMultiChan",AsyncQueueFactory,NULL,NULL);
AddCommand(pInter,"MakeSafetyPLC",SafetyPLCFactory,NULL,NULL); AddCommand(pInter,"MakeSafetyPLC",SafetyPLCFactory,NULL,NULL);
AddCommand(pInter,"MakeLSSMonitor",LSSFactory,NULL,NULL); AddCommand(pInter,"MakeLSSMonitor",LSSFactory,NULL,NULL);