Commit Graph

20 Commits

Author SHA1 Message Date
Jing Chen
a311f331cd add Dlition Sample temperautre contorl
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
2012-11-15 17:35:19 +11:00
Jing Chen
5b4b52c627 add progress reminder at changing temperature and field
r3399 | jgn | 2012-02-27 12:13:47 +1100 (Mon, 27 Feb 2012) | 1 line
2012-11-15 17:24:52 +11:00
Ferdi Franceschini
3b4247c8d2 Moved the pre_count and post_count procs to quokka's environment.tcl because
their definition is specific to quokka.  They have also been modified to
include the lakeshore readings.

r3364 | ffr | 2012-02-12 18:55:07 +1100 (Sun, 12 Feb 2012) | 4 lines
2012-11-15 17:24:34 +11:00
Jing Chen
acd1b9e036 add sct_oxford_labview.tcl
r3324 | jgn | 2012-01-03 12:00:22 +1100 (Tue, 03 Jan 2012) | 1 line
2012-11-15 17:21:34 +11:00
Ferdi Franceschini
12b524cfbb sct_bruker_BEC1.tcl
Arndt's latest updates, this is sct_bruker_BEC1_20100625.tcl
r3135 | ffr | 2011-05-19 08:38:09 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:48 +11:00
Ferdi Franceschini
7371a561d9 Make sure spin flipper code in rfamp.c is initialised
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:46 +11:00
Douglas Clowes
82801c301c Adjust limits on Oxford Magnet to +/- 10T
r3019 | dcl | 2010-08-10 16:22:09 +1000 (Tue, 10 Aug 2010) | 1 line
2012-11-15 17:06:00 +11:00
Douglas Clowes
eabb3de24d add the LakeShore 460 Gaussmeter driver
r3018 | dcl | 2010-08-06 15:12:24 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:56 +11:00
Ferdi Franceschini
6c6ba7de86 sct_oxford_ips.tcl
Set the "setpoint" type to drivable for GumTree and clear the "geterror" property when we get a new reading.

r2981 | ffr | 2010-07-19 17:38:02 +1000 (Mon, 19 Jul 2010) | 3 lines
2012-11-15 17:05:31 +11:00
Ferdi Franceschini
77932a4d15 Set the setpoint in the setpoint node.
r2972 | ffr | 2010-07-02 12:12:31 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:54 +11:00
Ferdi Franceschini
d94cf7b011 sct_oxford_ips.tcl
Fixed properties so the controller gets linked into /sample

INSTCFCOMMON.TXT quokka_configuration.tcl
Added ips120 controller to quokka

r2968 | ffr | 2010-07-01 21:03:54 +1000 (Thu, 01 Jul 2010) | 6 lines
2012-11-15 17:04:35 +11:00
Douglas Clowes
eebe078118 implement HALT and improve recovery
r2967 | dcl | 2010-07-01 12:39:42 +1000 (Thu, 01 Jul 2010) | 2 lines
2012-11-15 17:04:30 +11:00
Douglas Clowes
4afb1a765c Oxford Intelligent Power Supply IPS120-10
r2964 | dcl | 2010-06-25 15:16:28 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:17 +11:00
Ferdi Franceschini
e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
2012-11-15 17:00:43 +11:00
Arndt Meiers
d8cd96b69b version 20091209_3. Not tested. Takes the exception handling inside catch blocks one step further. Has additional args argument for optional message in case of a real error and uses the new catch method throughout all subroutines.
r2840 | axm | 2009-12-09 18:43:23 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:58:05 +11:00
Arndt Meiers
ab7774aa4c version 20091209_2. Not tested. Merges the changes from 20091201 and 20091209_1(ffr).
r2839 | axm | 2009-12-09 18:41:43 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:58:01 +11:00
Arndt Meiers
8b6c89ebc1 version 20091209_1 (ffr). Not tested. Introduces new handling of exceptions in some key subroutines - added by ffr based on the version 20091016, not 20091201.
r2838 | axm | 2009-12-09 18:40:39 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:57 +11:00
Arndt Meiers
814fa32408 version 20091201, not tested. Fixed drivestatus return values (insights from Lakeshore 336 driver) and removed obsolete line terminator code.
r2837 | axm | 2009-12-09 18:38:58 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:52 +11:00
Arndt Meiers
f4e26c7e08 Version 20091016, This is the version that has been running on Platypus from mid October to at least mid December 2009. Although users have been happy, we discovered some bits of code that may cause problems under certain circumstances such as the drivestatus return values and the handling of exceptions. We are waiting with the roll-out of the latest version until we will be able to test it and together with the migration to the new power supply controller. Only tested with serial communication because of the TCP/IP port bug in the old controller.
r2836 | axm | 2009-12-09 18:37:03 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:48 +11:00
Ferdi Franceschini
c73c4c85c8 Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:39 +11:00