163b03b557
Configurable terminators for normal protocols
Douglas Clowes2007-05-21 17:57:33 +10:00
4e5ea6a61c
use separate function for delayed start now that CommandTimeout has been changed to include retries and other stuff.
Douglas Clowes2007-05-21 17:51:50 +10:00
27d849ea23
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes2007-05-15 12:47:58 +10:00
c47e4ad45c
Make finite state machine the default. Make blocked motors fail the default. Add "data" to display computed data for motor. Improve blocked motor test message.
Douglas Clowes2007-05-15 12:35:24 +10:00
1eb1698d79
make the arguments case insensitive i.e. allow test or TEST
Douglas Clowes2007-05-15 12:31:22 +10:00
a181e68d36
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes2007-05-14 08:26:24 +10:00
c41f37b657
Better cleanup of CVS and build files and directories, improve tar and ssh commands
Douglas Clowes2007-05-11 17:29:57 +10:00
a18500cbf0
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes2007-05-11 17:28:31 +10:00
6d9120f796
Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
Ferdi FranceschiniandDouglas Clowes2007-05-10 16:12:25 +10:00
a151a2a163
Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.
Ferdi FranceschiniandDouglas Clowes2007-05-10 13:24:28 +10:00
ebba5a8052
Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.
Ferdi FranceschiniandDouglas Clowes2007-05-10 13:21:51 +10:00
73d144340d
Modified the ANSTO simulated motor driver so that it now accepts a list of named parameters, and supports the extra metadata parameters needed for generating hipadaba interfaces. This means that ASIM motor drivers can now be configured with the same configuration file as the DMC2280 driver. Also ensured that motors drive instantly to there target position, this streamlines testing and is useful for the script validation server.
Ferdi FranceschiniandDouglas Clowes2007-05-10 13:15:21 +10:00
55347984ec
Checked files modified by the merge with: cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath> and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD
Ferdi FranceschiniandDouglas Clowes2007-05-08 15:01:16 +10:00
86b99280d4
Merged the simulation mode setup from the trunk with the modified setmode command from the branch.
Ferdi FranceschiniandDouglas Clowes2007-05-08 14:59:26 +10:00
4594b23f13
Merged in favour of branch. Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data. These variables are set by the command which collects the data.
Ferdi FranceschiniandDouglas Clowes2007-05-08 14:58:51 +10:00
a33918149c
Bringing kowari layout and config inline with the current requirements of the deployment script.
Ferdi FranceschiniandDouglas Clowes2007-05-07 15:54:09 +10:00
6fc1a8feca
Bringing kowari layout and config inline with the current requirements of the deployment script.
Ferdi FranceschiniandDouglas Clowes2007-05-07 15:30:02 +10:00
84f883f5d7
Implement finite state machine model. Improved backlash (unidirectional motor driving). Precision motor creeping. Ensure thread zero is operating. Floating point steps and counts per unit. "send", "reset", "state" and "trace" commands.
Douglas Clowes2007-05-04 14:01:19 +10:00
bbdc2f820d
minor, trivial and cosmetic changes not related to state machine implementation
Douglas Clowes2007-05-04 13:47:21 +10:00
4e3e0e7247
Bug fix - when inserting timers into timer queue timer could go missing. Also clear next pointer on insert into tail and clear vrfy on free.
Douglas Clowes2007-04-24 17:18:57 +10:00
4693ad1686
move string parameters from "list" to "slist" because non-numerics in "list" upset hipadaba stuff. Also implement motor "setpos" command with two arguments.
Douglas Clowes2007-04-18 09:35:32 +10:00
98a2081f99
Update safety PLC multichan to remove RS232 controller
Douglas Clowes2007-04-18 09:32:58 +10:00
e2f968c923
Added part identifiers to support the new hipadaba path generation code. Added long_name fields to support nexus file writing.
Ferdi FranceschiniandDouglas Clowes2007-04-13 16:33:48 +10:00
1c65171e4e
Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver.
Ferdi FranceschiniandDouglas Clowes2007-04-13 12:52:49 +10:00
3534fcefb9
Remove trailing spaces to reduce differences with echidna
Douglas Clowes2007-04-10 10:31:41 +10:00
7363a846e1
motion is OK if motor has no absolute encoder
Douglas Clowes2007-04-10 10:17:01 +10:00
466e1bf4a9
Change stepsPerX and CountsPerX calculations to floating point
Douglas Clowes2007-04-10 09:56:18 +10:00
36dab66dc7
Change timer calculation based on feedback from PSI. Remove some duplicate code.
Douglas Clowes2007-04-10 09:53:22 +10:00
a7a480c5d1
Change stepsPerX and CountsPerX to float and revise PA calculation to avoid floting point limitation in GALIL
Douglas Clowes2007-04-10 09:50:47 +10:00
79ac59740f
MJL 4/4/07 Added upload of any dictonary entries starting with 'read_data_' as HTTP options in data read reques to histogram server, allows read data source & format to be adjusted on-the-fly.
Mark LeshaandDouglas Clowes2007-04-04 07:57:29 +10:00
2d7cf89385
Set x and y pixel offsets and run number. The run number is used as the first dimension axis for simple count and save operations.
Ferdi FranceschiniandDouglas Clowes2007-04-01 14:36:09 +10:00
4712347649
Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
Ferdi FranceschiniandDouglas Clowes2007-04-01 11:58:58 +10:00
Douglas Clowes