linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
736 Commits 1 Branch 0 Tags
98e8fb742f0ecc98fd70161a11068b9583ff45fc
Commit Graph

736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Bartlett
98e8fb742f no message 
r1993 | dbx | 2007-05-31 16:33:10 +1000 (Thu, 31 May 2007) | 2 lines
 2012-11-15 13:19:00 +11:00
Douglas Clowes
8e52e84ac2 hmake for type array used wrong argument for array length 
r1992 | dcl | 2007-05-30 11:02:02 +1000 (Wed, 30 May 2007) | 2 lines
 2012-11-15 13:18:57 +11:00
Douglas Clowes
55eb873873 replaced by AsyncQueue 
r1991 | dcl | 2007-05-25 16:46:58 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:53 +11:00
Douglas Clowes
c691f95a8f Spelling 
r1990 | dcl | 2007-05-25 16:42:18 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:50 +11:00
Douglas Clowes
1b4bafbeb4 fix some spelling and sync with changes to interface.h for RemoveCallback3 
r1989 | dcl | 2007-05-25 16:36:47 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:46 +11:00
Douglas Clowes
9438dc0973 Add some logging, comments, report unhandled events in the state machine. 
Limit the state and trace commands to motors with finite state machines.

r1988 | dcl | 2007-05-25 16:19:37 +1000 (Fri, 25 May 2007) | 3 lines
 2012-11-15 13:18:43 +11:00
Douglas Clowes
6ed6e5e6cb Make motor uninterest work by using RemoveCallback3 and a custom function to check that the pCon is the correct one. 
Remove any prior interest for this motor and pCon before installing the new one. Limits the interest callback message count to one.

r1987 | dcl | 2007-05-25 16:17:44 +1000 (Fri, 25 May 2007) | 3 lines
 2012-11-15 13:18:40 +11:00
Douglas Clowes
efe6f72b43 Add RemoveCallback3 to match callback function and supply user function to determine if this callback should be deleted. Allows checking inside the userdata structure instead of just the address - needed for motor uninterest. 
r1986 | dcl | 2007-05-25 16:15:15 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:36 +11:00
Douglas Clowes
2d36c99ac8 fix some spelling 
r1985 | dcl | 2007-05-25 16:12:57 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:33 +11:00
Douglas Clowes
f70233d55d implement some TODOs, add malloc checks and logging 
r1984 | dcl | 2007-05-25 16:12:10 +1000 (Fri, 25 May 2007) | 2 lines
 2012-11-15 13:18:29 +11:00
Ferdi Franceschini
64918f0a45 Two-theta angles can be negative. 
r1983 | ffr | 2007-05-24 15:31:08 +1000 (Thu, 24 May 2007) | 2 lines
 2012-11-15 13:18:26 +11:00
Ferdi Franceschini
ae647f85fa TaskSignal sets the calling task status to WAITING to prevent recursion through TaskYield. 
r1982 | ffr | 2007-05-24 15:29:48 +1000 (Thu, 24 May 2007) | 2 lines
 2012-11-15 13:18:22 +11:00
Douglas Clowes
06264a4b4b fix slack code that was probably never used anyway 
r1981 | dcl | 2007-05-24 15:04:33 +1000 (Thu, 24 May 2007) | 2 lines
 2012-11-15 13:18:19 +11:00
Douglas Clowes
785fe7bb96 Memory cleanup 
r1980 | dcl | 2007-05-24 14:49:02 +1000 (Thu, 24 May 2007) | 2 lines
 2012-11-15 13:18:16 +11:00
Douglas Clowes
8678bcb102 Add -d option for debugging - to suppress daemonisation for profiler and debugger 
r1979 | dcl | 2007-05-23 08:55:21 +1000 (Wed, 23 May 2007) | 2 lines
 2012-11-15 13:18:12 +11:00
Douglas Clowes
09a64afee3 fix memory leak 
r1978 | dcl | 2007-05-23 08:53:41 +1000 (Wed, 23 May 2007) | 2 lines
 2012-11-15 13:18:09 +11:00
Douglas Clowes
db1a7d3b4d fix a couple of memory leaks 
r1977 | dcl | 2007-05-23 08:52:31 +1000 (Wed, 23 May 2007) | 2 lines
 2012-11-15 13:18:06 +11:00
Douglas Clowes
0646439d1c trivial bug/typo 
r1976 | dcl | 2007-05-23 08:51:45 +1000 (Wed, 23 May 2007) | 2 lines
 2012-11-15 13:18:02 +11:00
Douglas Clowes
377ce04879 Fix warnings for printf formats 
r1975 | dcl | 2007-05-22 08:29:38 +1000 (Tue, 22 May 2007) | 2 lines
 2012-11-15 13:17:59 +11:00
Douglas Clowes
6d449014fc remove misleading comment 
r1974 | dcl | 2007-05-22 08:15:56 +1000 (Tue, 22 May 2007) | 2 lines
 2012-11-15 13:17:55 +11:00
Douglas Clowes
163b03b557 Configurable terminators for normal protocols 
r1973 | dcl | 2007-05-21 17:57:33 +1000 (Mon, 21 May 2007) | 2 lines
 2012-11-15 13:17:52 +11:00
Douglas Clowes
4e5ea6a61c use separate function for delayed start now that CommandTimeout has been changed to include retries and other stuff. 
r1972 | dcl | 2007-05-21 17:51:50 +1000 (Mon, 21 May 2007) | 2 lines
 2012-11-15 13:17:49 +11:00
Douglas Clowes
65b36cf992 Silly typos "==" should be "=" 
r1971 | dcl | 2007-05-21 17:50:27 +1000 (Mon, 21 May 2007) | 2 lines
 2012-11-15 13:17:45 +11:00
Douglas Clowes
dbcdf0e38c do not use port if it was not supplied 
r1970 | dcl | 2007-05-21 14:17:27 +1000 (Mon, 21 May 2007) | 2 lines
 2012-11-15 13:17:42 +11:00
Douglas Clowes
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
Douglas Clowes
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
Dan Bartlett
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
Dan Bartlett
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Douglas Clowes
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Dan Bartlett
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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