Commit Graph

281 Commits

Author SHA1 Message Date
Douglas Clowes
964d218a20 Start of sct generator description file for Julabo LH45 2014-02-03 11:05:03 +11:00
Ferdi Franceschini
68a746d46a SICS-710: Make the watlow_rm driveable block until a drive has finished.
Also clear the geterror property to make sure that the driver recovers from Modbus error messages.
2014-01-15 16:31:13 +11:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
37879b9144 The ID and TYPE were the wrong way around when calling add_oxford_mercury. 2013-12-20 09:08:58 +11:00
Ferdi Franceschini
216e2b3529 SICS-697 Make named links in data group for LS336 and Oxford Mercury.
SICS-705 Fixed log file name bug in Mercury controller.
2013-12-20 09:08:57 +11:00
Ferdi Franceschini
2cf513c4bb FIX: Create driver interface for each syringe pump on Platypus 2013-12-20 09:08:55 +11:00
Ferdi Franceschini
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
7b814089ff SICS-705 Fix mercury log file creation bug. 2013-12-20 09:08:52 +11:00
Ferdi Franceschini
99955b01da SICS-698 Make Bruker magnet driver setpoint driveable. 2013-12-20 09:08:51 +11:00
Ferdi Franceschini
093479f808 SICS-697 Make named links to data group using new typed naming system. 2013-12-20 09:08:49 +11:00
Douglas Clowes
0266abbd94 Change the temperature factor from 10.0 to 20.0
This refelcts the firmware update to the RVA ROM removing the factor
of 2.0 for the temperature reading and setting
2013-12-16 13:36:35 +11:00
Ferdi Franceschini
95369d3454 Make naming scheme for west4100 temperature controller consistent with other drivers. 2013-10-28 15:33:44 +11:00
Ferdi Franceschini
4812644b66 Modify west4100 configuration to load the driver if it has been
selected in a sics_config.ini file.
2013-10-28 15:33:43 +11:00
Ferdi Franceschini
5914db28c3 Save the magnetic field value setpoint last set by SICS for the Oxford 12T magnet.
TODO:We should save the setpoint from the Labview program.
2013-10-18 18:11:35 +11:00
Ferdi Franceschini
ad3aa5cd3b Use sics_config.ini to configure LS370, oxford ITC, oxford Mercury, and oxford labview drivers. 2013-10-15 03:25:22 +11:00
Ferdi Franceschini
d4b782aae7 Remove hard coded magnet name from sensor path. 2013-10-15 03:23:10 +11:00
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