Commit Graph

1700 Commits

Author SHA1 Message Date
Douglas Clowes
d4432012d2 A bit of printf, character escaping, line wrapping, duplicate suppression, format fixing and stuff like that ...
r3757 | dcl | 2012-10-04 13:49:02 +1000 (Thu, 04 Oct 2012) | 1 line
2012-11-15 17:39:47 +11:00
Douglas Clowes
90719997ab logg excess and unsolicited characters
r3756 | dcl | 2012-10-02 17:12:06 +1000 (Tue, 02 Oct 2012) | 1 line
2012-11-15 17:39:42 +11:00
Douglas Clowes
defe43eed4 add hex logging capability
r3755 | dcl | 2012-10-02 17:11:07 +1000 (Tue, 02 Oct 2012) | 1 line
2012-11-15 17:39:37 +11:00
Ferdi Franceschini
e1ad82ca76 Set time of flight channel width.
r3754 | ffr | 2012-09-26 12:03:01 +1000 (Wed, 26 Sep 2012) | 2 lines
2012-11-15 17:39:33 +11:00
Ferdi Franceschini
2ab1abb95c Oat table was defined twice. Removed the wrong definition.
r3753 | ffr | 2012-09-26 12:00:45 +1000 (Wed, 26 Sep 2012) | 2 lines
2012-11-15 17:39:28 +11:00
Ferdi Franceschini
49da4dea29 util/utlity.tcl
Hack to make the set_motor_attributes function work with motor objects
implements as tclmot type drivers.

r3752 | ffr | 2012-09-26 10:06:48 +1000 (Wed, 26 Sep 2012) | 4 lines
2012-11-15 17:39:23 +11:00
Ferdi Franceschini
b1de99869e motor_configuration.tcl
Set attributes on vwi motor which are required to save it in the data
file.

r3751 | ffr | 2012-09-26 10:06:23 +1000 (Wed, 26 Sep 2012) | 4 lines
2012-11-15 17:39:18 +11:00
Ferdi Franceschini
a0eee42022 hmm_configuration.tcl
Added time of flight channel width (tofw) and elastic peak index (elpk)

r3750 | ffr | 2012-09-26 10:05:40 +1000 (Wed, 26 Sep 2012) | 3 lines
2012-11-15 17:39:13 +11:00
Ferdi Franceschini
99c3c397d3 sct_fermichopper.tcl
Refactored to enable creation master and slave chopper objects and added
a mkChoppers command.

r3749 | ffr | 2012-09-26 10:02:12 +1000 (Wed, 26 Sep 2012) | 4 lines
2012-11-15 17:39:08 +11:00
Ferdi Franceschini
b887636684 fermimot.tcl
Create tclmot motors for the master chopper speed (mchs), slave chopper
speed (schs) and slave chopper phase (schp). Currently mchs and schs
just read rotation speed.
TODO: Read phase and set speed and phase.

r3748 | ffr | 2012-09-26 09:55:08 +1000 (Wed, 26 Sep 2012) | 6 lines
2012-11-15 17:39:03 +11:00
Ferdi Franceschini
0b9580f334 pelican_configuration.tcl
Enabled the sct_fermichopper scrip context controller and object.
Added fermimot.tcl configuration for the chopper speed and phase motor
objects.

r3747 | ffr | 2012-09-26 09:54:28 +1000 (Wed, 26 Sep 2012) | 5 lines
2012-11-15 17:38:59 +11:00
Ferdi Franceschini
350055ea57 common_instrument_dictionary.tcl and instdict_specification.tcl
Provide fermi_chopper group for the chopper speed and phase motor
objects.

r3746 | ffr | 2012-09-26 09:46:38 +1000 (Wed, 26 Sep 2012) | 4 lines
2012-11-15 17:38:54 +11:00
Jing Chen
9afb90b311 add hdb structure
r3745 | jgn | 2012-09-24 14:02:21 +1000 (Mon, 24 Sep 2012) | 1 line
2012-11-15 17:38:49 +11:00
Jing Chen
58b74c6f45 add hdb structure
r3744 | jgn | 2012-09-24 10:05:39 +1000 (Mon, 24 Sep 2012) | 1 line
2012-11-15 17:38:44 +11:00
Jing Chen
5ceb583d26 update the driver
r3743 | jgn | 2012-09-24 09:56:27 +1000 (Mon, 24 Sep 2012) | 1 line
2012-11-15 17:38:39 +11:00
Jing Chen
5d5c6bed54 new SICS driver for Green Magnet
r3742 | jgn | 2012-09-20 16:16:00 +1000 (Thu, 20 Sep 2012) | 1 line
2012-11-15 17:38:35 +11:00
Douglas Clowes
82b8590f30 Move deployment information to file DEPLOYMENT.TXT
r3741 | dcl | 2012-09-19 13:53:02 +1000 (Wed, 19 Sep 2012) | 1 line
2012-11-15 17:38:30 +11:00
Douglas Clowes
eddabe79c4 merge back changes from instrument
r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line
2012-11-15 17:38:25 +11:00
Douglas Clowes
a59f088761 Add instrument/name and rename program_branch and program_revision
r3739 | dcl | 2012-09-19 12:18:20 +1000 (Wed, 19 Sep 2012) | 1 line
2012-11-15 17:38:20 +11:00
Douglas Clowes
6a49b17dde augment and refactor SICS_* defines
r3738 | dcl | 2012-09-19 11:11:13 +1000 (Wed, 19 Sep 2012) | 1 line
2012-11-15 17:38:16 +11:00
Douglas Clowes
9244cb839c extract all unique revisions
r3737 | dcl | 2012-09-18 12:13:53 +1000 (Tue, 18 Sep 2012) | 1 line
2012-11-15 17:38:11 +11:00
Douglas Clowes
f90ede5c75 Find the highest revision in the tree
r3736 | dcl | 2012-09-18 09:55:01 +1000 (Tue, 18 Sep 2012) | 1 line
2012-11-15 17:38:06 +11:00
Douglas Clowes
68edac83fc Add SICS_Site, SICS_Version and SICS_Revision
r3735 | dcl | 2012-09-17 17:09:48 +1000 (Mon, 17 Sep 2012) | 1 line
2012-11-15 17:38:01 +11:00
Douglas Clowes
6b482b29ec Implement the command "sics_revision" to get the SVN revision into the SICServer executable
r3734 | dcl | 2012-09-14 17:18:11 +1000 (Fri, 14 Sep 2012) | 1 line
2012-11-15 17:37:57 +11:00
Douglas Clowes
62d894b9e7 First Working Version against "SCPI" protocol Mercury
r3733 | dcl | 2012-09-11 11:40:48 +1000 (Tue, 11 Sep 2012) | 1 line
2012-11-15 17:37:52 +11:00
Douglas Clowes
81605a11a1 Driver for the Oxford Mercury Temperature Controller (WIP)
r3732 | dcl | 2012-09-03 13:37:30 +1000 (Mon, 03 Sep 2012) | 1 line
2012-11-15 17:37:47 +11:00
Douglas Clowes
84842c901f Add voltage, status and "end-of-driving"
r3731 | dcl | 2012-09-03 09:03:12 +1000 (Mon, 03 Sep 2012) | 1 line
2012-11-15 17:37:42 +11:00
Douglas Clowes
475d29cfb7 Add the Green Magnet driver to the deployment
r3730 | dcl | 2012-09-03 09:00:45 +1000 (Mon, 03 Sep 2012) | 1 line
2012-11-15 17:37:37 +11:00
Douglas Clowes
d287611f03 Add virtual motors (e.g. for wavelength)
r3729 | dcl | 2012-08-30 11:16:06 +1000 (Thu, 30 Aug 2012) | 1 line
2012-11-15 17:37:33 +11:00
Jing Chen
acf91f494d r3728 | jgn | 2012-08-30 09:21:58 +1000 (Thu, 30 Aug 2012) | 1 line 2012-11-15 17:37:28 +11:00
Douglas Clowes
2ea516d84b Add virtual motors for initial energy (vei) and wavelength (vwi) and for elastic_time
r3713 | dcl | 2012-08-28 16:00:32 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:23 +11:00
Douglas Clowes
813a1c0de8 add some catch blocks
r3712 | dcl | 2012-08-28 15:12:57 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:18 +11:00
Douglas Clowes
eb3b71b532 enable the dummy motor for testing purposes
r3711 | dcl | 2012-08-28 15:08:32 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:14 +11:00
Douglas Clowes
200d539adc Simple driver for the "Green Magnet"
r3710 | dcl | 2012-08-28 15:06:20 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:09 +11:00
Jing Chen
0338f9973b make all command names lowercase
r3709 | jgn | 2012-08-28 12:38:32 +1000 (Tue, 28 Aug 2012) | 1 line
2012-11-15 17:37:04 +11:00
Jing Chen
1d8b0f0b47 r3708 | jgn | 2012-08-27 09:13:37 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:59 +11:00
Jing Chen
e4df7329f3 r3707 | jgn | 2012-08-27 09:13:29 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:54 +11:00
Jing Chen
29a9ad72a8 r3706 | jgn | 2012-08-27 09:13:20 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:50 +11:00
Jing Chen
d2b917cb99 r3705 | jgn | 2012-08-24 10:51:29 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:45 +11:00
Jing Chen
263b7e9c78 r3704 | jgn | 2012-08-24 10:42:55 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:40 +11:00
Jing Chen
06bfc7a917 r3703 | jgn | 2012-08-24 10:41:07 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:35 +11:00
Jing Chen
b2388fe47a change folder magnetic to magneticField
r3702 | jgn | 2012-08-24 10:39:12 +1000 (Fri, 24 Aug 2012) | 1 line
2012-11-15 17:36:31 +11:00
Jing Chen
f4a240c377 change command names
r3701 | jgn | 2012-08-20 15:54:34 +1000 (Mon, 20 Aug 2012) | 1 line
2012-11-15 17:36:26 +11:00
Jing Chen
e10bb049fd add scale for temp measurement
r3700 | jgn | 2012-08-15 15:42:13 +1000 (Wed, 15 Aug 2012) | 1 line
2012-11-15 17:36:21 +11:00
Ferdi Franceschini
62567cac49 Add commands to set the veto window.
r3699 | ffr | 2012-08-14 11:52:51 +1000 (Tue, 14 Aug 2012) | 2 lines
2012-11-15 17:36:16 +11:00
Jing Chen
b1d95d0a2b bug fix
r3698 | jgn | 2012-08-10 11:38:47 +1000 (Fri, 10 Aug 2012) | 1 line
2012-11-15 17:36:11 +11:00
Douglas Clowes
01fce76ffa I think that this is a typo, always returns zero.
r3697 | dcl | 2012-08-08 17:26:27 +1000 (Wed, 08 Aug 2012) | 1 line
2012-11-15 17:36:07 +11:00
Douglas Clowes
39735092d7 Update to drive the rest of the way
r3696 | dcl | 2012-08-08 13:36:40 +1000 (Wed, 08 Aug 2012) | 1 line
2012-11-15 17:36:02 +11:00
Jing Chen
aaa10b5cf1 r3695 | jgn | 2012-08-07 16:27:59 +1000 (Tue, 07 Aug 2012) | 1 line 2012-11-15 17:35:57 +11:00
Jing Chen
15fdda1deb add timeout parameter in protocol
r3694 | jgn | 2012-08-07 12:03:23 +1000 (Tue, 07 Aug 2012) | 1 line
2012-11-15 17:35:52 +11:00