Commit Graph

123 Commits

Author SHA1 Message Date
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
9c90153f37 Perform the rename 2014-07-23 17:14:18 +10:00
Douglas Clowes
dedcc49284 Fix erroneous filenames that match other files 2014-07-23 16:20:22 +10:00
Douglas Clowes
e3b583150e SICS-696 Explicity include the namespace on mk_sct_ calls 2014-07-23 14:32:26 +10:00
Ferdi Franceschini
22c701b816 Fix LS340 tc driveable by setting the right value for the model number. 2014-07-17 08:55:19 +10:00
Douglas Clowes
fd7d369ea2 Julabo sct driver to use @@NOREPLY@@ 2014-07-15 18:52:09 +10:00
Ferdi Franceschini
c1b5b558f0 Make all sct drivers. 2014-07-15 10:56:27 +10:00
Ferdi Franceschini
ac136f3426 Cleanup legacy Julabo driver. 2014-07-15 08:59:20 +10:00
Ferdi Franceschini
58a64da712 Wrapper code for legacy drivers. 2014-07-15 08:59:18 +10:00
Ferdi Franceschini
67b8576f35 Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates. 2014-07-15 08:59:17 +10:00
Douglas Clowes
f916462be6 Updated julabo SCT template 2014-07-11 18:30:55 +10:00
Ferdi Franceschini
6aa229ee75 Driver changes made on ics1-wombat-test. 2014-07-11 08:49:40 +10:00
Douglas Clowes
47d5604e1e Make the Julabo work for asyncqueue adapters 2014-07-07 13:58:08 +10:00
Ferdi Franceschini
5ee2634d30 Modified some more old drivers to use config_dict as in gen_sct.py
TODO
environment/sct_keithley_2700.tcl
environment/sct_protek_common.tcl
2014-07-01 20:12:42 +10:00
Ferdi Franceschini
4f397350cb Modified some older drivers to use the tcl dict code from gen_sct.py
TODO
    sct_keithley_2700.tcl
    magneticField/sct_oxford_labview.tcl
    magneticField/sct_bruker_BEC1.tcl
    temperature/sct_watlow_st4.tcl
    temperature/sct_oxford_mercury.tcl
    temperature/sct_mercury_pres.tcl
    temperature/sct_julabo_lh45.tcl
    temperature/sct_lakeshore_340.tcl
    temperature/sct_julabo_lh45_gen.tcl
    temperature/sct_watlow_rm.tcl
    temperature/sct_eurotherm_2000.tcl
    temperature/sct_lakeshore_336.tcl
    temperature/sct_watlow_pm.tcl
    temperature/sct_oxford_itc.tcl
    temperature/sct_lakeshore_370.tcl
    temperature/west400.tcl
2014-06-30 13:47:48 +10:00
Douglas Clowes
7960cb73a0 Change puts to clientput to avoid error on stdout undefined 2014-06-30 13:44:14 +10:00
Douglas Clowes
202004766a Check for existence of config dict fields before using them in generated drivers 2014-06-30 12:49:22 +10:00
Ferdi Franceschini
e971cd8b64 New sicsconfig.ini file configuration editor.
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
2014-06-30 09:08:19 +10:00
Douglas Clowes
27f1f1dfa0 Merge from Echidna 2014-06-26 16:26:36 +10:00
Douglas Clowes
8bf1764dd9 SICS-754 Use "clientput" instead of "puts stdout" in non-generated drivers 2014-06-26 14:08:20 +10:00
Douglas Clowes
fe3489b61f SICS-754 Use "clientput" instead of "puts stdout" in generated drivers 2014-06-26 13:48:44 +10:00
Douglas Clowes
2676ab9282 Rework the LS-218 driver to make it flexible. 2014-06-25 13:37:32 +10:00
Douglas Clowes
c5f7a7375e Merge from Wombat west400.tcl 2014-06-25 13:22:35 +10:00
Douglas Clowes
95974df5e4 Pick up some obvious changes from Wombat 2014-06-24 17:32:34 +10:00
Douglas Clowes
ffef4e208f SCT driver for Lakeshore 218S Temperature Monitor 2014-06-23 17:40:10 +10:00
Douglas Clowes
fa3154bdcd Update non-templated drivers to log to ../log/ instead of /tmp/ 2014-06-16 10:42:17 +10:00
Douglas Clowes
1010003d6c Regenerate templated drivers to get changes to logging and simulation tests 2014-06-16 10:37:10 +10:00
Douglas Clowes
3ae5310af9 Massage the mercury pressure card driver 2014-06-11 10:50:07 +10:00
Douglas Clowes
e2fae66199 Update the mercury pressure loop for the pressure card 2014-06-10 17:17:28 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Douglas Clowes
cf8a08ea7e Generated modular mercury drivers 2014-05-16 15:42:11 +10:00
Douglas Clowes
81ed966092 Regen sct drivers with async and logging changes 2014-05-16 15:39:58 +10:00
Ferdi Franceschini
d1bfcf3b6a Remove unnecessary {*} TCL operator. 2014-05-16 13:56:50 +10:00
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
Douglas Clowes
ad50eaca6a Regenerate all of the generated driver code 2014-04-17 13:45:35 +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
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
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
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
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
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