ef76d668bf
return on error to prevent crash
...
r1969 | dcl | 2007-05-21 14:16:44 +1000 (Mon, 21 May 2007) | 2 lines
2012-11-15 13:17:38 +11:00
1320d14426
multichan becomes AsyncQueue and AsyncProtocol
...
r1968 | dcl | 2007-05-21 14:15:33 +1000 (Mon, 21 May 2007) | 2 lines
2012-11-15 13:17:35 +11:00
76d4c83793
Oscillating collimator code added
...
r1967 | dbx | 2007-05-16 17:05:58 +1000 (Wed, 16 May 2007) | 2 lines
2012-11-15 13:17:32 +11:00
20e00a8504
Beam attenuator commissioned
...
r1966 | dbx | 2007-05-16 17:04:01 +1000 (Wed, 16 May 2007) | 2 lines
2012-11-15 13:17:28 +11:00
f374e445bf
multichan becomes AsyncQueue and AsyncProtocol
...
r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:25 +11:00
1ea715020a
Remove old multichanfactory
...
r1964 | dcl | 2007-05-15 13:14:25 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:21 +11:00
27d849ea23
multichan becomes AsyncQueue and AsyncProtocol
...
r1963 | dcl | 2007-05-15 12:47:58 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:18 +11: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.
...
r1962 | dcl | 2007-05-15 12:35:24 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:14 +11:00
1eb1698d79
make the arguments case insensitive i.e. allow test or TEST
...
r1961 | dcl | 2007-05-15 12:31:22 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:11 +11:00
a181e68d36
multichan becomes AsyncQueue and AsyncProtocol
...
r1960 | dcl | 2007-05-14 08:26:24 +1000 (Mon, 14 May 2007) | 2 lines
2012-11-15 13:17:08 +11:00
bc3224a9c4
changes to mtth
...
r1959 | dcl | 2007-05-11 17:34:24 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:17:04 +11:00
c41f37b657
Better cleanup of CVS and build files and directories, improve tar and ssh commands
...
r1958 | dcl | 2007-05-11 17:29:57 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:17:01 +11:00
a18500cbf0
multichan becomes AsyncQueue and AsyncProtocol
...
r1957 | dcl | 2007-05-11 17:28:31 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:16:58 +11:00
6d9120f796
Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
...
r1956 | ffr | 2007-05-10 16:12:25 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:54 +11:00
7a2f0c238a
Make sure default drive speed is non-zero, otherwise we're no going anywhere.
...
r1955 | ffr | 2007-05-10 16:10:35 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:51 +11:00
691ea5dbf0
Reverted support for text value parameters.
...
This has been made obsolete by the pActionRoutine.
r1954 | ffr | 2007-05-10 16:09:04 +1000 (Thu, 10 May 2007) | 3 lines
2012-11-15 13:16:47 +11:00
5b683ecbe0
Fixed botched merge.
...
The merge effectively created duplicate setmode procs.
r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
2012-11-15 13:16:44 +11:00
a151a2a163
Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.
...
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:40 +11:00
ebba5a8052
Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.
...
r1951 | ffr | 2007-05-10 13:21:51 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:37 +11:00
717f9beea7
Tidied up indents etc, to make it easy to compare diffs against the echidna config.
...
r1950 | ffr | 2007-05-10 13:18:06 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:34 +11: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.
r1949 | ffr | 2007-05-10 13:15:21 +1000 (Thu, 10 May 2007) | 4 lines
2012-11-15 13:16:30 +11:00
cb7d9fc8ae
no message
...
r1947 | dbx | 2007-05-09 12:27:37 +1000 (Wed, 09 May 2007) | 2 lines
2012-11-15 13:16:27 +11: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
r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +11:00
86b99280d4
Merged the simulation mode setup from the trunk with the modified setmode command from the branch.
...
r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
2012-11-15 13:16:20 +11: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.
r1944 | ffr | 2007-05-08 14:58:51 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:16 +11:00
e6c78ef4d6
Resolved conflict in favour of release 1.3
...
r1943 | ffr | 2007-05-07 16:27:07 +1000 (Mon, 07 May 2007) | 2 lines
2012-11-15 13:16:13 +11:00
4ce126650e
Refactored kowari configuration layout.
...
r1942 | ffr | 2007-05-07 16:10:55 +1000 (Mon, 07 May 2007) | 2 lines
2012-11-15 13:16:10 +11:00
a33918149c
Bringing kowari layout and config inline with the current requirements of
...
the deployment script.
r1941 | ffr | 2007-05-07 15:54:09 +1000 (Mon, 07 May 2007) | 3 lines
2012-11-15 13:16:06 +11:00
6fc1a8feca
Bringing kowari layout and config inline with the current requirements of
...
the deployment script.
r1940 | ffr | 2007-05-07 15:30:02 +1000 (Mon, 07 May 2007) | 3 lines
2012-11-15 13:16:03 +11: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.
...
r1939 | dcl | 2007-05-04 14:01:19 +1000 (Fri, 04 May 2007) | 2 lines
2012-11-15 13:15:59 +11:00
bbdc2f820d
minor, trivial and cosmetic changes not related to state machine implementation
...
r1938 | dcl | 2007-05-04 13:47:21 +1000 (Fri, 04 May 2007) | 2 lines
2012-11-15 13:15:56 +11:00
911c0d8450
no message
...
r1937 | dbx | 2007-05-03 16:53:56 +1000 (Thu, 03 May 2007) | 2 lines
2012-11-15 13:15:53 +11: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.
...
r1918 | dcl | 2007-04-24 17:18:57 +1000 (Tue, 24 Apr 2007) | 2 lines
2012-11-15 13:15:49 +11:00
c01188bc8b
Fixed order of histogram memory data axes.
...
r1903 | ffr | 2007-04-23 10:34:44 +1000 (Mon, 23 Apr 2007) | 2 lines
2012-11-15 13:15:46 +11:00
83744c2e15
Added "master" motor name lists for configurable virtualmotors.
...
r1901 | ffr | 2007-04-20 12:47:27 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:43 +11:00
65a1fc1a1d
Added safety plc configuration files.
...
r1900 | ffr | 2007-04-20 12:46:11 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:39 +11:00
56cdbec451
remove trailing spaces on numerous lines
...
r1898 | dcl | 2007-04-20 11:56:22 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:36 +11:00
ade5216ea9
Merged Release 1.2
...
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:32 +11:00
d0957b18d5
Move things around, fix typo
...
r1896 | dcl | 2007-04-20 09:11:03 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:29 +11:00
093bf92438
cosmetic changes
...
r1895 | dcl | 2007-04-20 09:08:32 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:25 +11:00
8b27116358
backlash preseek made internal
...
r1891 | dcl | 2007-04-19 15:56:56 +1000 (Thu, 19 Apr 2007) | 2 lines
2012-11-15 13:15:22 +11:00
34da43b4ee
Update slit gearing ratio to computed 6 * 7:3 stages
...
r1885 | dcl | 2007-04-19 10:08:59 +1000 (Thu, 19 Apr 2007) | 2 lines
2012-11-15 13:15:19 +11:00
4b33abe79c
change comment and reposition stepsPerX in list command
...
r1871 | dcl | 2007-04-18 09:59:04 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:15 +11:00
a77d9feb59
Add MakeStateMon
...
r1870 | dcl | 2007-04-18 09:38:07 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:12 +11: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.
...
r1869 | dcl | 2007-04-18 09:35:32 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:09 +11:00
98a2081f99
Update safety PLC multichan to remove RS232 controller
...
r1868 | dcl | 2007-04-18 09:32:58 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:05 +11:00
c8558d0a5b
Reverted hipadaba paths to original settings.
...
r1861 | ffr | 2007-04-16 16:16:57 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:15:02 +11:00
784b391415
Added part and type info to motors and modified hpaths to work with new hipadaba config code.
...
r1858 | ffr | 2007-04-16 14:46:49 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:59 +11:00
487f370d5e
Added extended hmake "xhmake" to make it easier to create long paths.
...
r1857 | ffr | 2007-04-16 14:44:25 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:55 +11:00
40e1042cda
reverse comparison operators
...
r1856 | dcl | 2007-04-16 10:46:55 +1000 (Mon, 16 Apr 2007) | 2 lines
2012-11-15 13:14:52 +11:00
Douglas Clowes