828cccc2f3
tcpmodbus.c Check for timeout when reading. Added more error checking. Some housekeeping to make it easier to follow the code, name changes and more descriptive comments.
Ferdi Franceschini
2012-11-05 12:20:41 +11:00
e9f7c0547d
r3784 | jgn | 2012-11-02 13:46:19 +1100 (Fri, 02 Nov 2012) | 1 line
Jing Chen
2012-11-02 13:46:19 +11:00
4e2ba8c458
change unit from dW to W r3783 | jgn | 2012-11-02 13:30:02 +1100 (Fri, 02 Nov 2012) | 1 line
Jing Chen
2012-11-02 13:30:02 +11:00
e21b3eb135
r3772 | jgn | 2012-10-24 16:26:47 +1100 (Wed, 24 Oct 2012) | 1 line
Jing Chen
2012-10-24 16:26:47 +11:00
731c83786b
change magneticFieldCurernt to magneticFieldCurrent r3771 | jgn | 2012-10-24 15:12:20 +1100 (Wed, 24 Oct 2012) | 1 line
Jing Chen
2012-10-24 15:12:20 +11:00
5dcc460e78
minor tweaks to logging improvements r3759 | dcl | 2012-10-05 17:00:32 +1000 (Fri, 05 Oct 2012) | 1 line
Douglas Clowes
2012-10-05 17:00:32 +10:00
16d8498fab
Add [hostnam xxx] and [testlog] commands r3758 | dcl | 2012-10-04 14:36:30 +1000 (Thu, 04 Oct 2012) | 1 line
Douglas Clowes
2012-10-04 14:36:30 +10:00
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
Douglas Clowes
2012-10-04 13:49:02 +10:00
90719997ab
logg excess and unsolicited characters r3756 | dcl | 2012-10-02 17:12:06 +1000 (Tue, 02 Oct 2012) | 1 line
Douglas Clowes
2012-10-02 17:12:06 +10:00
defe43eed4
add hex logging capability r3755 | dcl | 2012-10-02 17:11:07 +1000 (Tue, 02 Oct 2012) | 1 line
Douglas Clowes
2012-10-02 17:11:07 +10:00
e1ad82ca76
Set time of flight channel width.
Ferdi Franceschini
2012-09-26 12:03:01 +10:00
2ab1abb95c
Oat table was defined twice. Removed the wrong definition.
Ferdi Franceschini
2012-09-26 12:00:45 +10:00
49da4dea29
util/utlity.tcl Hack to make the set_motor_attributes function work with motor objects implements as tclmot type drivers.
Ferdi Franceschini
2012-09-26 10:06:48 +10:00
b1de99869e
motor_configuration.tcl Set attributes on vwi motor which are required to save it in the data file.
Ferdi Franceschini
2012-09-26 10:06:23 +10:00
a0eee42022
hmm_configuration.tcl Added time of flight channel width (tofw) and elastic peak index (elpk)
Ferdi Franceschini
2012-09-26 10:05:40 +10:00
99c3c397d3
sct_fermichopper.tcl Refactored to enable creation master and slave chopper objects and added a mkChoppers command.
Ferdi Franceschini
2012-09-26 10:02:12 +10:00
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.
Ferdi Franceschini
2012-09-26 09:55:08 +10:00
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.
Ferdi Franceschini
2012-09-26 09:54:28 +10:00
350055ea57
common_instrument_dictionary.tcl and instdict_specification.tcl Provide fermi_chopper group for the chopper speed and phase motor objects.
Ferdi Franceschini
2012-09-26 09:46:38 +10:00
5d5c6bed54
new SICS driver for Green Magnet r3742 | jgn | 2012-09-20 16:16:00 +1000 (Thu, 20 Sep 2012) | 1 line
Jing Chen
2012-09-20 16:16:00 +10:00
82b8590f30
Move deployment information to file DEPLOYMENT.TXT r3741 | dcl | 2012-09-19 13:53:02 +1000 (Wed, 19 Sep 2012) | 1 line
Douglas Clowes
2012-09-19 13:53:02 +10:00
eddabe79c4
merge back changes from instrument r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line
Douglas Clowes
2012-09-19 13:51:37 +10:00
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
Douglas Clowes
2012-09-19 12:18:20 +10:00
6a49b17dde
augment and refactor SICS_* defines r3738 | dcl | 2012-09-19 11:11:13 +1000 (Wed, 19 Sep 2012) | 1 line
Douglas Clowes
2012-09-19 11:11:13 +10:00
9244cb839c
extract all unique revisions r3737 | dcl | 2012-09-18 12:13:53 +1000 (Tue, 18 Sep 2012) | 1 line
Douglas Clowes
2012-09-18 12:13:53 +10:00
f90ede5c75
Find the highest revision in the tree r3736 | dcl | 2012-09-18 09:55:01 +1000 (Tue, 18 Sep 2012) | 1 line
Douglas Clowes
2012-09-18 09:55:01 +10:00
68edac83fc
Add SICS_Site, SICS_Version and SICS_Revision r3735 | dcl | 2012-09-17 17:09:48 +1000 (Mon, 17 Sep 2012) | 1 line
Douglas Clowes
2012-09-17 17:09:48 +10:00
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
Douglas Clowes
2012-09-14 17:18:11 +10:00
62d894b9e7
First Working Version against "SCPI" protocol Mercury r3733 | dcl | 2012-09-11 11:40:48 +1000 (Tue, 11 Sep 2012) | 1 line
Douglas Clowes
2012-09-11 11:40:48 +10:00
81605a11a1
Driver for the Oxford Mercury Temperature Controller (WIP) r3732 | dcl | 2012-09-03 13:37:30 +1000 (Mon, 03 Sep 2012) | 1 line
Douglas Clowes
2012-09-03 13:37:30 +10:00
84842c901f
Add voltage, status and "end-of-driving" r3731 | dcl | 2012-09-03 09:03:12 +1000 (Mon, 03 Sep 2012) | 1 line
Douglas Clowes
2012-09-03 09:03:12 +10:00
475d29cfb7
Add the Green Magnet driver to the deployment r3730 | dcl | 2012-09-03 09:00:45 +1000 (Mon, 03 Sep 2012) | 1 line
Douglas Clowes
2012-09-03 09:00:45 +10:00
d287611f03
Add virtual motors (e.g. for wavelength) r3729 | dcl | 2012-08-30 11:16:06 +1000 (Thu, 30 Aug 2012) | 1 line
Douglas Clowes
2012-08-30 11:16:06 +10:00
acf91f494d
r3728 | jgn | 2012-08-30 09:21:58 +1000 (Thu, 30 Aug 2012) | 1 line
Jing Chen
2012-08-30 09:21:58 +10:00
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
Douglas Clowes
2012-08-28 16:00:32 +10:00
813a1c0de8
add some catch blocks r3712 | dcl | 2012-08-28 15:12:57 +1000 (Tue, 28 Aug 2012) | 1 line
Douglas Clowes
2012-08-28 15:12:57 +10:00
eb3b71b532
enable the dummy motor for testing purposes r3711 | dcl | 2012-08-28 15:08:32 +1000 (Tue, 28 Aug 2012) | 1 line
Douglas Clowes
2012-08-28 15:08:32 +10:00
200d539adc
Simple driver for the "Green Magnet" r3710 | dcl | 2012-08-28 15:06:20 +1000 (Tue, 28 Aug 2012) | 1 line
Douglas Clowes
2012-08-28 15:06:20 +10:00
0338f9973b
make all command names lowercase r3709 | jgn | 2012-08-28 12:38:32 +1000 (Tue, 28 Aug 2012) | 1 line
Jing Chen
2012-08-28 12:38:32 +10:00
1d8b0f0b47
r3708 | jgn | 2012-08-27 09:13:37 +1000 (Mon, 27 Aug 2012) | 1 line
Jing Chen
2012-08-27 09:13:37 +10:00
e4df7329f3
r3707 | jgn | 2012-08-27 09:13:29 +1000 (Mon, 27 Aug 2012) | 1 line
Jing Chen
2012-08-27 09:13:29 +10:00
29a9ad72a8
r3706 | jgn | 2012-08-27 09:13:20 +1000 (Mon, 27 Aug 2012) | 1 line
Jing Chen
2012-08-27 09:13:20 +10:00
d2b917cb99
r3705 | jgn | 2012-08-24 10:51:29 +1000 (Fri, 24 Aug 2012) | 1 line
Jing Chen
2012-08-24 10:51:29 +10:00
263b7e9c78
r3704 | jgn | 2012-08-24 10:42:55 +1000 (Fri, 24 Aug 2012) | 1 line
Jing Chen
2012-08-24 10:42:55 +10:00
06bfc7a917
r3703 | jgn | 2012-08-24 10:41:07 +1000 (Fri, 24 Aug 2012) | 1 line
Jing Chen
2012-08-24 10:41:07 +10:00
b2388fe47a
change folder magnetic to magneticField r3702 | jgn | 2012-08-24 10:39:12 +1000 (Fri, 24 Aug 2012) | 1 line
Jing Chen
2012-08-24 10:39:12 +10:00
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
Douglas Clowes
2012-08-08 17:26:27 +10:00
39735092d7
Update to drive the rest of the way r3696 | dcl | 2012-08-08 13:36:40 +1000 (Wed, 08 Aug 2012) | 1 line
Douglas Clowes
2012-08-08 13:36:40 +10:00
aaa10b5cf1
r3695 | jgn | 2012-08-07 16:27:59 +1000 (Tue, 07 Aug 2012) | 1 line
Jing Chen
2012-08-07 16:27:59 +10:00
15fdda1deb
add timeout parameter in protocol r3694 | jgn | 2012-08-07 12:03:23 +1000 (Tue, 07 Aug 2012) | 1 line
Jing Chen
2012-08-07 12:03:23 +10:00
1993aa2c11
r3693 | jgn | 2012-08-03 16:14:38 +1000 (Fri, 03 Aug 2012) | 1 line
Jing Chen
2012-08-03 16:14:38 +10:00
9281ebf4dd
r3692 | jgn | 2012-08-03 15:34:16 +1000 (Fri, 03 Aug 2012) | 1 line
Jing Chen
2012-08-03 15:34:16 +10:00
f3486b2a17
r3691 | jgn | 2012-08-03 15:34:06 +1000 (Fri, 03 Aug 2012) | 1 line
Jing Chen
2012-08-03 15:34:06 +10:00
f2788d66cd
Fixing hang-on bug in lfgen protocol r3690 | jgn | 2012-08-03 14:09:55 +1000 (Fri, 03 Aug 2012) | 1 line
Jing Chen
2012-08-03 14:09:55 +10:00
27a37364ab
Fixing hang-on bug in lfgen protocol r3689 | jgn | 2012-08-03 14:09:14 +1000 (Fri, 03 Aug 2012) | 1 line
Jing Chen
2012-08-03 14:09:14 +10:00
74edc8ab56
SICS-496: Set the output power limit to 40% on startup as requested.
Ferdi Franceschini
2012-08-02 09:47:33 +10:00
822b6d57a1
Add scan object to peak command, as: peak [scanObject] ["value"|"data"] r3683 | dcl | 2012-07-26 15:50:47 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 15:50:47 +10:00
a9fc20abee
make poll rates configurable by adding motorPollSlow, motorPollFast and airPollTimer parameters r3682 | dcl | 2012-07-26 15:48:38 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 15:48:38 +10:00
6f836ae4cf
bring back some changes from the instrument r3681 | dcl | 2012-07-26 15:47:15 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 15:47:15 +10:00
d6ad841174
Set auto by default on startup - as per Paolo r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 15:45:13 +10:00
8da55b8784
Taipan uses MC1-4,6 and not MC5 r3678 | dcl | 2012-07-26 12:09:34 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 12:09:34 +10:00
9a39b9912a
make timing defaults 1,1000,3 like histogram sets r3677 | dcl | 2012-07-26 10:14:02 +1000 (Thu, 26 Jul 2012) | 1 line
Douglas Clowes
2012-07-26 10:14:02 +10:00
7453eb2458
add new protocl controller for ag1010 r3674 | jgn | 2012-07-23 13:42:05 +1000 (Mon, 23 Jul 2012) | 1 line
Jing Chen
2012-07-23 13:42:05 +10:00
1da7a21805
add new protocl controller for ag1010 r3673 | jgn | 2012-07-23 13:41:34 +1000 (Mon, 23 Jul 2012) | 1 line
Jing Chen
2012-07-23 13:41:34 +10:00
31b6cd6d3f
add new protocl controller for ag1010 r3672 | jgn | 2012-07-23 13:41:13 +1000 (Mon, 23 Jul 2012) | 1 line
Jing Chen
2012-07-23 13:41:13 +10:00
96d8af4de2
add new protocl controller for ag1010 r3671 | jgn | 2012-07-23 13:41:03 +1000 (Mon, 23 Jul 2012) | 1 line
Jing Chen
2012-07-23 13:41:03 +10:00
28e090f1a2
add new protocl controller for ag1010 r3670 | jgn | 2012-07-23 13:40:48 +1000 (Mon, 23 Jul 2012) | 1 line
Jing Chen
2012-07-23 13:40:48 +10:00
4309b28c2c
Fix the Gaussian smoothing calculation r3657 | dcl | 2012-07-19 14:59:00 +1000 (Thu, 19 Jul 2012) | 1 line
Douglas Clowes
2012-07-19 14:59:00 +10:00
7727408b80
Add some initialisaton for each new scan, so we don't reuse old data r3656 | dcl | 2012-07-19 14:58:21 +1000 (Thu, 19 Jul 2012) | 1 line
Douglas Clowes
2012-07-19 14:58:21 +10:00
5118d7b23e
Add TCP address:port to displayed parameters for use in simulation r3655 | dcl | 2012-07-19 14:57:03 +1000 (Thu, 19 Jul 2012) | 1 line
Douglas Clowes
2012-07-19 14:57:03 +10:00
45f27b98cc
Minor improvement in timing and jitter of simulation r3654 | dcl | 2012-07-19 14:55:45 +1000 (Thu, 19 Jul 2012) | 1 line
Douglas Clowes
2012-07-19 14:55:45 +10:00
Jing Chen