Commit Graph

156 Commits

Author SHA1 Message Date
Ferdi Franceschini
d7acb7c16c Load drivers which have been enabled in the SICS config ini files.
Lakeshore 336 drivers with known IP addresses have been added to the ini files with unique IDs.
All entries in the ini files now have unique IDs
The wombat ini now has radio buttons to select sample stage motor configurations.
2014-05-05 12:25:00 +10:00
Douglas Clowes
a52835379d Changes to sct files 2014-05-01 10:54:09 +10:00
Douglas Clowes
7e6b5a3a9f Fix the Pfeiffer/mercury driver 2014-05-01 10:54:09 +10:00
Ferdi Franceschini
85dc69ed70 Load Oxford 12T magnet driver if it is enabled in the sics_config.ini file. 2014-04-29 15:29:04 +10:00
Douglas Clowes
ad50eaca6a Regenerate all of the generated driver code 2014-04-17 13:45:35 +10:00
Douglas Clowes
43035bfb37 Split out the flow/humidity sensor/setpoint as four separate nodes 2014-04-16 10:08:08 +10:00
Douglas Clowes
8f3b6aaabe Add sct and tcl driver files for mercury and pfeiffer duo 2014-04-14 14:25:11 +10:00
Douglas Clowes
87bf23eb6e tweak spacing and code, generate new drivers 2014-04-14 14:25:11 +10:00
Douglas Clowes
d08f5b6541 Update generated driver code 2014-04-14 10:34:43 +10:00
Douglas Clowes
ff43028b1a Add missing braces 2014-04-14 10:20:45 +10:00
Douglas Clowes
8964750835 Implement "settle_time" in generated drivers 2014-03-24 10:21:28 +11:00
Douglas Clowes
ef4d4d0235 Regenerate with nxalias and sdsinfo 2014-03-24 10:21:12 +11:00
Douglas Clowes
957ca1db19 Separate out the PID related code into pid_function blocks 2014-03-24 10:21:01 +11:00
Douglas Clowes
9f8eabd3ec Implicit setting type to part/drivable if not set explicitly 2014-03-18 15:02:39 +11:00
Douglas Clowes
2db71ba537 Wrap generated driver code in 'catch' and handle_exception blocks 2014-03-18 14:57:43 +11:00
Douglas Clowes
ad06ef1711 Remove 'create_node' from driver generator and '*.sct' files
It wasn't in working condition nor was it being used in any drivers
2014-03-18 09:29:30 +11:00
Douglas Clowes
012de6d735 More Gumtree-friendly driver changes 2014-03-04 16:38:08 +11:00
Douglas Clowes
8be48b16a5 refactor and regenerate hiden driver - make more Gumtree friendly 2014-03-04 15:18:06 +11:00
Douglas Clowes
cec264a252 Generate sct_hiden_xcs.tcl with new PID parameters and range check 2014-03-04 11:07:41 +11:00
Douglas Clowes
bcefc2db60 Hiden XCS Vapor system generated driver 2014-02-28 16:38:12 +11:00
Douglas Clowes
1fd74bef01 Improved PI control of Hiden XCS 2014-02-28 13:35:26 +11:00
Douglas Clowes
05d25257b3 Add total flow and PID-ish control 2014-02-28 11:16:36 +11:00
Douglas Clowes
3abc6c9e60 Move pathname and basename utility functions to extra_utility
This makes them generally available to SICS (and it's early)
2014-02-27 12:28:21 +11:00
Douglas Clowes
99b5b92565 Add base/span properties and a gas factor calculation 2014-02-07 11:52:54 +11:00
Douglas Clowes
f14b2c0a82 Script Context driver generator files for Hiden XCS and Isotech Power Supply 2014-02-03 11:05:04 +11:00
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