Commit Graph

1218 Commits

Author SHA1 Message Date
Ferdi Franceschini
eea4d4d9eb L2mm depends on sample position (ported from RELEASE-2_0P1)
r2634 | ffr | 2008-06-18 10:56:27 +1000 (Wed, 18 Jun 2008) | 2 lines
2012-11-15 13:39:38 +11:00
Ferdi Franceschini
ee1ffd4468 Fix segfault triggered by addition of version info to low side server document element
r2631 | ffr | 2008-06-17 12:27:29 +1000 (Tue, 17 Jun 2008) | 2 lines
2012-11-15 13:39:34 +11:00
Douglas Clowes
e59b073066 Align nhq200.c and orhvps.c to be more alike (and more diffable)
r2629 | dcl | 2008-06-12 17:23:40 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:30 +11:00
Douglas Clowes
1795e07504 Add a beam monitor counter to Koala
r2628 | dcl | 2008-06-12 17:21:40 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:26 +11:00
Douglas Clowes
4a88bf6fc1 cut out some older code
r2627 | dcl | 2008-06-12 17:20:58 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:22 +11:00
Ferdi Franceschini
6c6156174f Manually merged the following changes from RELEASE-2_0P1
commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines
2012-11-15 13:39:18 +11:00
Ferdi Franceschini
177d5f3ed6 Provide a parameters and parameters/derived_parameters section as a one stop shop for all your instrument parameter needs.
r2625 | ffr | 2008-06-12 12:42:17 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:14 +11:00
Ferdi Franceschini
3a40ea5693 Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:10 +11:00
Ferdi Franceschini
528d125efe Fixes SICS-144
target value was wrong when checking scan variable.

r2623 | ffr | 2008-06-11 16:26:36 +1000 (Wed, 11 Jun 2008) | 3 lines
2012-11-15 13:39:06 +11:00
Ferdi Franceschini
3d3ecdd83e Merged configuration from release 2.0P1
Added appropriate defaults for frame source for each instrument.

r2619 | ffr | 2008-06-10 14:40:30 +1000 (Tue, 10 Jun 2008) | 3 lines
2012-11-15 13:39:02 +11:00
Douglas Clowes
d495c3b43a Accept uA instead of mA in response to '#' as found on 6kV suplies
r2613 | dcl | 2008-06-06 14:18:25 +1000 (Fri, 06 Jun 2008) | 2 lines
2012-11-15 13:38:58 +11:00
Douglas Clowes
17e0c0b5bc get msd into gumtree
r2612 | dcl | 2008-06-05 16:24:32 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:54 +11:00
Douglas Clowes
c61c709b11 add msd klass unitsa and long_name
r2611 | dcl | 2008-06-05 15:32:42 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:50 +11:00
Douglas Clowes
03853605c9 Redo stth and sz
r2610 | dcl | 2008-06-04 17:00:46 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:46 +11:00
Douglas Clowes
419a746c77 Update sample stage limits and speeds
r2607 | dcl | 2008-06-04 16:08:08 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:41 +11:00
Douglas Clowes
62de717b11 adjust limits and add Mono-Samp Distance (msd) simulated motor
r2606 | dcl | 2008-06-04 15:21:36 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:37 +11:00
Douglas Clowes
588a44305a Change sz to temporary replacement
r2605 | dcl | 2008-06-02 14:41:14 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:33 +11:00
Douglas Clowes
6af0b58582 Change cntsPerX
r2604 | dcl | 2008-06-02 11:59:50 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:30 +11:00
Douglas Clowes
e462982897 Change slit gaps to floating point to avoid integer truncation in expressions
r2603 | dcl | 2008-05-30 17:39:29 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:26 +11:00
Douglas Clowes
bc7e224820 Changed to reflect different value on loaner tilt stage
r2602 | dcl | 2008-05-30 17:38:22 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:21 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:17 +11:00
Ferdi Franceschini
4a937e1608 extraconfig.tcl should not be kept on CVS or deployed to ics boxes.
We should put commissioning configurations in a config/commissioning directory

r2600 | ffr | 2008-05-30 10:14:56 +1000 (Fri, 30 May 2008) | 3 lines
2012-11-15 13:38:11 +11:00
Douglas Clowes
55a5f2c538 add "-x" option for "executable only" to deply patched SICServer
r2599 | dcl | 2008-05-29 14:57:42 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:38:07 +11:00
Douglas Clowes
4b81f0836b temporary addition of separate sample Z motors
r2598 | dcl | 2008-05-29 14:56:27 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:38:03 +11:00
Douglas Clowes
be033cddcd stth and monochromator focussing
r2597 | dcl | 2008-05-29 14:55:49 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:59 +11:00
Douglas Clowes
0f4b77cce0 take out extraconfig
r2596 | dcl | 2008-05-29 14:55:08 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:55 +11:00
Douglas Clowes
a0ddc569b2 Make like an echidna
r2595 | dcl | 2008-05-29 14:54:42 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:51 +11:00
Douglas Clowes
a9746d1190 Monochromator focussing
r2594 | dcl | 2008-05-29 14:54:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:48 +11:00
Douglas Clowes
a16d3d38d4 fix typo
r2593 | dcl | 2008-05-29 14:53:32 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:44 +11:00
Douglas Clowes
a0684a033e cleanups and add encoder bias code
r2592 | dcl | 2008-05-29 14:52:41 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:40 +11:00
Douglas Clowes
9f479bc136 register the new nhq driver
r2591 | dcl | 2008-05-29 14:51:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:36 +11:00
Douglas Clowes
28e39b963a update in line with nhq driver
r2590 | dcl | 2008-05-29 14:50:35 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:32 +11:00
Douglas Clowes
a87c8149db complete rewrite
r2589 | dcl | 2008-05-29 14:50:16 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:28 +11:00
Douglas Clowes
cf5d570a52 update nhq driver and add koala instrument
r2588 | dcl | 2008-05-29 14:49:59 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:24 +11:00
Douglas Clowes
34f7139ebc add timer value to event trace
r2587 | dcl | 2008-05-29 14:49:26 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:20 +11:00
Douglas Clowes
e20d3f0f63 remove old nhq driver
r2586 | dcl | 2008-05-29 14:48:48 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:16 +11:00
Douglas Clowes
c12595c6a4 Access to current timer from callback and to time value
r2585 | dcl | 2008-05-29 14:47:52 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:12 +11:00
Douglas Clowes
63cd8f3ea3 Add compiler option for C99 std
r2524 | dcl | 2008-05-12 11:09:19 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:09 +11:00
Douglas Clowes
1087dcf7ce Implement SC (stop code)
r2523 | dcl | 2008-05-12 11:08:15 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:05 +11:00
Douglas Clowes
fba2b55fb9 Adjust sx,sy homes
r2522 | dcl | 2008-05-12 11:06:54 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:01 +11:00
Douglas Clowes
e235fd85cc Adjust limits to reflect reality
r2521 | dcl | 2008-05-12 11:06:18 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:36:57 +11:00
Douglas Clowes
445a332370 Set Motor status to HWBusy in State_Unknown
Discard outstanding message response on entering State_Unknown (timing window)
Don't break if it times out while waiting
Defer various faults until motor has stopped
Rename absenc to absencoder in list command (if has encoder)
Modify absenc to report integer encoder value
Allow manager to set various sensitive values in motor debug mode
Make motor "reset" command wait until motor reinitialised (timing window)

r2520 | dcl | 2008-05-12 11:05:35 +1000 (Mon, 12 May 2008) | 9 lines
2012-11-15 13:36:53 +11:00
Douglas Clowes
2a469d6b89 Dan's changes for small sample Z stage (temporary)
r2510 | dcl | 2008-05-08 16:50:32 +1000 (Thu, 08 May 2008) | 2 lines
2012-11-15 13:36:49 +11:00
Douglas Clowes
3076fccac3 change speeds add focussing motors
r2509 | dcl | 2008-05-08 16:50:04 +1000 (Thu, 08 May 2008) | 2 lines
2012-11-15 13:36:45 +11:00
Douglas Clowes
b5d157c67a incorporate Dan's change to resolver code
r2508 | dcl | 2008-05-08 16:48:32 +1000 (Thu, 08 May 2008) | 2 lines
2012-11-15 13:36:41 +11:00
Douglas Clowes
f7d9d06484 implement motor "trace_switches" command
r2507 | dcl | 2008-05-08 16:47:34 +1000 (Thu, 08 May 2008) | 2 lines
2012-11-15 13:36:37 +11:00
Douglas Clowes
c7794c4092 Speed up the idle slow poll timer to make it more responsive to changes in position while idle.
r2506 | dcl | 2008-05-07 10:19:26 +1000 (Wed, 07 May 2008) | 2 lines
2012-11-15 13:36:33 +11:00
Douglas Clowes
a143b9905e Change state transition on limit switch event to ensure that motor is stopped before turning it off.
r2505 | dcl | 2008-05-07 10:14:28 +1000 (Wed, 07 May 2008) | 2 lines
2012-11-15 13:36:29 +11:00
Douglas Clowes
0e4be397d5 Rework to make more like updated Echidna and Wombat programs
r2495 | dcl | 2008-04-30 11:57:55 +1000 (Wed, 30 Apr 2008) | 2 lines
2012-11-15 13:36:25 +11:00
Douglas Clowes
fe682b39ac Change over to Quokka SIS PLC address
r2494 | dcl | 2008-04-30 11:57:08 +1000 (Wed, 30 Apr 2008) | 2 lines
2012-11-15 13:36:21 +11:00