linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
763 Commits 1 Branch 0 Tags
9404d80fb90910171ce7fc84eefd6df4dbe62863
Commit Graph

664 Commits

Author SHA1 Message Date
Douglas Clowes
9404d80fb9 place holder 
r2052 | dcl | 2007-07-09 15:55:16 +1000 (Mon, 09 Jul 2007) | 2 lines
 2012-11-15 13:20:34 +11:00
Douglas Clowes
75deabc9cc moved to config/velsel 
r2051 | dcl | 2007-07-09 15:27:18 +1000 (Mon, 09 Jul 2007) | 2 lines
 2012-11-15 13:20:31 +11:00
Douglas Clowes
416fbe4879 Configuration files mostly copied from Platypus Reflectometer 
r2050 | dcl | 2007-07-09 15:25:57 +1000 (Mon, 09 Jul 2007) | 2 lines
 2012-11-15 13:20:27 +11:00
Douglas Clowes
47f31054aa Configuration directories mostly copied from Platypus Reflectometer 
r2049 | dcl | 2007-07-09 15:24:03 +1000 (Mon, 09 Jul 2007) | 2 lines
 2012-11-15 13:20:23 +11:00
Douglas Clowes
802dbe3e88 Configuration directories mostly copied from Platypus Reflectometer 
r2048 | dcl | 2007-07-09 15:08:08 +1000 (Mon, 09 Jul 2007) | 2 lines
 2012-11-15 13:20:20 +11:00
Ferdi Franceschini
7d9d72a79d Updated the mtth encoder value to match what Vladimir tells me is 90 degrees. 
mx is now positive towards dance floor.

r2046 | ffr | 2007-07-05 11:56:58 +1000 (Thu, 05 Jul 2007) | 3 lines
 2012-11-15 13:20:16 +11:00
Douglas Clowes
a63bf65270 Set mtth home encoder position at 90 degrees 
r2037 | dcl | 2007-07-05 10:32:19 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:13 +11:00
Douglas Clowes
3aa3c41114 Reverse sense of X on monochromator (left is positive) 
r2036 | dcl | 2007-07-05 10:30:46 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:09 +11:00
Douglas Clowes
5c0036fe87 Swap MX and MY and change sign 
r2033 | dcl | 2007-07-05 09:42:46 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:02 +11:00
Douglas Clowes
063fafbe83 Update the beam attenuator (bat) home, increase deceleration for slit motors to prevent overrun, adjust slit ranges individually for maximum scan range 
r2031 | dcl | 2007-06-27 11:02:36 +1000 (Wed, 27 Jun 2007) | 2 lines
 2012-11-15 13:19:59 +11:00
Douglas Clowes
4ce55c17ac Logic inversion from "if true" to "if not false" 
r2030 | dcl | 2007-06-27 10:59:52 +1000 (Wed, 27 Jun 2007) | 2 lines
 2012-11-15 13:19:55 +11:00
Douglas Clowes
d27a9cb9b6 periodically poll and update the motor position, specifically for hipadaba, to capture motion that is not commanded (e.g. homing slit motors and turning motors by hand) 
r2029 | dcl | 2007-06-27 10:58:42 +1000 (Wed, 27 Jun 2007) | 2 lines
 2012-11-15 13:19:52 +11:00
Douglas Clowes
c30c1a97f8 add sics_ports.tcl because it breaks deployment when this file is empty 
r2007 | dcl | 2007-06-13 09:57:10 +1000 (Wed, 13 Jun 2007) | 2 lines
 2012-11-15 13:19:45 +11:00
Douglas Clowes
90c48ae7c5 Move gumxml.tcl to instrument directory 
r2006 | dcl | 2007-06-13 09:53:39 +1000 (Wed, 13 Jun 2007) | 2 lines
 2012-11-15 13:19:42 +11:00
Douglas Clowes
3431ff478f Calibration of monochromator motors 
r2005 | dcl | 2007-06-13 09:51:49 +1000 (Wed, 13 Jun 2007) | 2 lines
 2012-11-15 13:19:38 +11:00
Douglas Clowes
be40877668 Modified from sics/tcl/gumxml.tcl to select only nodes with attribute control=true 
r2004 | dcl | 2007-06-08 14:03:27 +1000 (Fri, 08 Jun 2007) | 2 lines
 2012-11-15 13:19:35 +11:00
Douglas Clowes
c8d13fef1d Commissioning of monochromator stage 
r2001 | dcl | 2007-06-05 11:56:59 +1000 (Tue, 05 Jun 2007) | 2 lines
 2012-11-15 13:19:28 +11:00
Douglas Clowes
7d28dd3cd4 Initial working version 
r2000 | dcl | 2007-06-01 16:55:34 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:24 +11:00
Douglas Clowes
fa5e2711e8 Gross changes for commissioning. 
r1999 | dcl | 2007-06-01 16:54:25 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:21 +11:00
Douglas Clowes
fe63096315 Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well. 
r1998 | dcl | 2007-06-01 16:53:25 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:17 +11:00
Douglas Clowes
d75f423f43 Change Flight Tube to use REQx/RSPx instead of APDONE variables. 
r1997 | dcl | 2007-06-01 16:52:06 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:14 +11:00
Douglas Clowes
d785f48aa7 Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well. 
Move DMC_Notify and reset state machine on reconnect.

r1996 | dcl | 2007-06-01 16:50:24 +1000 (Fri, 01 Jun 2007) | 3 lines
 2012-11-15 13:19:10 +11:00
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
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
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
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
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
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
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
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