Commit Graph

115 Commits

Author SHA1 Message Date
Ferdi Franceschini
7bacc4dc7f Use sics_config.ini to generate 12T magnet setup on Taipan. 2013-09-18 16:16:06 +10:00
Douglas Clowes
f5dd71f4fb Get sct_lakeshore_370.tcl saving data to nexus files 2013-08-21 15:26:02 +10:00
Ferdi Franceschini
564b7c9bd5 Use the selected sensor (external or bath) to report temperature from a Julabo 2013-08-15 08:03:34 +10:00
Ferdi Franceschini
5acb398b42 Provide add_oxmag command to instantiate an oxford magnet driver. 2013-08-15 07:59:02 +10:00
Douglas Clowes
40c0bf7d9e Remove LS370 logging to stdout 2013-07-15 13:01:35 +10:00
Douglas Clowes
d73cf4278d Add Kiethley serial port configuration from Echidna 2013-07-05 14:27:35 +10:00
Douglas Clowes
73536234fe Add a new sct driver for the Watlow RM, based on the Watlow PM driver 2013-07-04 15:39:24 +10:00
Douglas Clowes
7d35ca4cf9 Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores 2013-06-27 16:36:06 +10:00
Douglas Clowes
3dce7feb8e Andrew Kerrigan's sct driver for the Pfeiffer pressure gauge and Oxford Mercury 2013-06-21 13:39:13 +10:00
Douglas Clowes
95d8a565e3 Andrew Kerrigan's script context driver for the Pfeiffer 261 pressure gauge 2013-06-21 13:37:31 +10:00
Douglas Clowes
5970a05aaa Make the ls370 sct controller name consistent with ls336 and ls340 2013-06-19 12:35:46 +10:00
Jing Chen
17d72343e7 Removed old error message 2013-05-17 07:34:29 +10:00
Ferdi Franceschini
b98ff24528 Added configuration file changes from ics1-pelican 2013-04-20 17:53:17 +10:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Douglas Clowes
fa18677fca add cybaman default port
r3789 | dcl | 2012-11-13 12:43:34 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:41:34 +11:00
Jing Chen
731c83786b change magneticFieldCurernt to magneticFieldCurrent
r3771 | jgn | 2012-10-24 15:12:20 +1100 (Wed, 24 Oct 2012) | 1 line
2012-11-15 17:40:55 +11:00
Jing Chen
39a3e0ab19 add HDB nodes
r3770 | jgn | 2012-10-18 14:54:11 +1100 (Thu, 18 Oct 2012) | 1 line
2012-11-15 17:40:51 +11:00
Jing Chen
12c6a9c0a8 r3769 | jgn | 2012-10-18 14:50:30 +1100 (Thu, 18 Oct 2012) | 1 line 2012-11-15 17:40:46 +11:00
Jing Chen
bc5ca10804 comment our main driver call
r3768 | jgn | 2012-10-18 14:15:12 +1100 (Thu, 18 Oct 2012) | 1 line
2012-11-15 17:40:41 +11:00
Jing Chen
3a1bd2192c comment out the driver line
r3767 | jgn | 2012-10-15 14:11:04 +1100 (Mon, 15 Oct 2012) | 1 line
2012-11-15 17:40:36 +11:00
Jing Chen
935a45cbf5 update formats of displayed strings
r3766 | jgn | 2012-10-15 12:01:50 +1100 (Mon, 15 Oct 2012) | 1 line
2012-11-15 17:40:31 +11:00
Jing Chen
18a3a0b028 r3762 | jgn | 2012-10-09 13:42:17 +1100 (Tue, 09 Oct 2012) | 1 line 2012-11-15 17:40:11 +11:00
Jing Chen
a545823330 add He3 SICS controller
r3760 | jgn | 2012-10-08 13:29:25 +1100 (Mon, 08 Oct 2012) | 1 line
2012-11-15 17:40:01 +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
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
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
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
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
Douglas Clowes
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
2012-11-15 17:34:46 +11:00
Ferdi Franceschini
a6fd5af72c Made the isobus address configurable for the Oxford Mercury ITC.
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"

r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
2012-11-15 17:33:03 +11:00
Ferdi Franceschini
d99d9cc7ee SICS-435: Save setpoint in data file.
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
2012-11-15 17:31:11 +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
Douglas Clowes
b64217e6de Map range to +/-180 and limit step motion for A-axis
r3362 | dcl | 2012-01-30 14:21:31 +1100 (Mon, 30 Jan 2012) | 1 line
2012-11-15 17:24:25 +11:00
Ferdi Franceschini
f498b3ce6a sct_julabo_lh45.tcl
Add bath temperature to feedback.   Allow switching between reading the
bath or external sensor for the sensor value. Check the data type of
replies from the Julabo because it can return values like "___.__" if
you're reading the wrong sensor.

sct_lakeshore_340.tcl, sct_lakeshore_336.tcl
Use the tolerance set on the control/tolerance node so the user can
change it while running.

r3348 | ffr | 2012-01-20 15:25:46 +1100 (Fri, 20 Jan 2012) | 10 lines
2012-11-15 17:23:22 +11:00
Douglas Clowes
b7bb5f7e9b Lakeshore 370 AC "Resistance Bridge" Temperature Controller
r3343 | dcl | 2012-01-16 17:39:14 +1100 (Mon, 16 Jan 2012) | 1 line
2012-11-15 17:23:00 +11:00
Ferdi Franceschini
1026dbb808 Change driveable motor names to GA GB GC
r3339 | ffr | 2012-01-13 13:59:20 +1100 (Fri, 13 Jan 2012) | 2 lines
2012-11-15 17:22:42 +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
Douglas Clowes
2954216d2d A driver for the Cybaman goniometer
r3317 | dcl | 2011-12-12 16:17:39 +1100 (Mon, 12 Dec 2011) | 1 line
2012-11-15 17:21:03 +11:00
Douglas Clowes
a172bed449 Add ";*IDN?" in SetValue and setPoint functions (after commands that don't elicit a response) to force a response that avoids the timeout and reconnect sequence that gives problems on the LS336
r3259 | dcl | 2011-10-18 16:13:01 +1100 (Tue, 18 Oct 2011) | 1 line
2012-11-15 17:16:47 +11:00
Douglas Clowes
c765c33f6d Make instance data properties of a params node instead of namespace global variables
This is to allow multiple instance of the same device type without clashing of persistent data
r3248 | dcl | 2011-08-22 11:30:20 +1000 (Mon, 22 Aug 2011) | 3 lines
2012-11-15 17:16:07 +11:00
Ferdi Franceschini
5e50f2cb43 Removed the dependency on some global variables so that you can drive
two lakeshore controllers.  Most of the remaining globals are harmless
or unused but they should be removed.

r3237 | ffr | 2011-08-12 08:41:56 +1000 (Fri, 12 Aug 2011) | 4 lines
2012-11-15 17:15:59 +11:00
Ferdi Franceschini
169aa5ed2f Display/Value and setpoint should be numeric to save arrays of readings.
We can't save arrays of text.

r3235 | ffr | 2011-07-25 17:06:35 +1000 (Mon, 25 Jul 2011) | 3 lines
2012-11-15 17:15:50 +11:00
Douglas Clowes
d33a957d01 differentiate rdValue and rdData and add experimental treewalk
r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
2012-11-15 17:15:37 +11:00
Douglas Clowes
cffc765197 Add ;*IDN? after writes to get a response
r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
2012-11-15 17:15:32 +11:00
Douglas Clowes
a76803c242 Keithley 2700 DMM
r3230 | dcl | 2011-07-05 16:23:52 +1000 (Tue, 05 Jul 2011) | 1 line
2012-11-15 17:15:28 +11:00
Douglas Clowes
5b94e43689 log catch messages
r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
2012-11-15 17:15:06 +11:00