Commit Graph

680 Commits

Author SHA1 Message Date
Ferdi Franceschini
f873ffce89 Allow named ports or port numbers for the SICS ports
Use nexus data names.
Set SICS object attributes for new hdb and nexus support.

r2110 | ffr | 2007-08-16 14:25:37 +1000 (Thu, 16 Aug 2007) | 4 lines
2012-11-15 13:21:42 +11:00
Ferdi Franceschini
3fb134872b Added support to disable status checking when a scan is aborted.
See JIRA:SICS-65

r2109 | ffr | 2007-08-16 14:18:23 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:21:39 +11:00
Douglas Clowes
ce3e240c53 fix some typos and update measured home positions
r2108 | dcl | 2007-08-10 10:34:32 +1000 (Fri, 10 Aug 2007) | 2 lines
2012-11-15 13:21:35 +11:00
Douglas Clowes
7f0a479080 Simple two-theta virtual motor
r2107 | dcl | 2007-08-10 10:33:21 +1000 (Fri, 10 Aug 2007) | 2 lines
2012-11-15 13:21:32 +11:00
Douglas Clowes
77657615e6 MAJOR changes: remove deprecated pre state machine code, revise state transitions, add state entry events, part of the RUNx implementation, comments, ....
r2106 | dcl | 2007-08-10 10:32:40 +1000 (Fri, 10 Aug 2007) | 2 lines
2012-11-15 13:21:28 +11:00
Douglas Clowes
18ab7a86b8 Before removal of deprecated code
r2102 | dcl | 2007-08-02 08:06:01 +1000 (Thu, 02 Aug 2007) | 2 lines
2012-11-15 13:21:14 +11:00
Douglas Clowes
d0ac56e112 reduce mx and my hard and soft limits to be within limit switches
r2101 | dcl | 2007-07-26 12:22:57 +1000 (Thu, 26 Jul 2007) | 2 lines
2012-11-15 13:21:10 +11:00
Ferdi Franceschini
2494fa6ad3 Updated kowari for new hdb and nexus code.
r2100 | ffr | 2007-07-22 15:58:52 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:07 +11:00
Ferdi Franceschini
8770acc191 Merged new hdb and nexus code.
r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:03 +11:00
Dan Bartlett
4e407d0a73 Detector Y and analyser axes added
r2083 | dbx | 2007-07-20 10:37:05 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:59 +11:00
Dan Bartlett
6696692353 no message
r2082 | dbx | 2007-07-20 10:36:10 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:55 +11:00
Dan Bartlett
1d35fb41b4 IP addresses changed. reduced by 2
r2081 | dbx | 2007-07-20 10:35:09 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:52 +11:00
Douglas Clowes
85d58121a5 progressive commissioning
r2080 | dcl | 2007-07-20 10:05:00 +1000 (Fri, 20 Jul 2007) | 2 lines
2012-11-15 13:20:48 +11:00
Douglas Clowes
9bd5dee0ec Add the chopper config file
r2056 | dcl | 2007-07-12 08:49:33 +1000 (Thu, 12 Jul 2007) | 2 lines
2012-11-15 13:20:45 +11:00
Douglas Clowes
e36f220d23 Add QUOKKA/SANS to Makefile
r2055 | dcl | 2007-07-12 08:48:39 +1000 (Thu, 12 Jul 2007) | 2 lines
2012-11-15 13:20:41 +11:00
Douglas Clowes
8a7108deca Copied from Platypus Reflectometer
r2054 | dcl | 2007-07-09 16:02:35 +1000 (Mon, 09 Jul 2007) | 2 lines
2012-11-15 13:20:38 +11:00
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