Commit Graph

156 Commits

Author SHA1 Message Date
Douglas Clowes
0b2f3d520b Regen SCT drivers 2014-11-06 13:36:47 +11:00
Douglas Clowes
ce324826dd Update protocol_args to new format and terminator for ls340 2014-11-06 13:00:07 +11:00
Douglas Clowes
d41e77cc79 Regenerate the affected drivers 2014-10-22 16:03:22 +11:00
Douglas Clowes
3ad3bf3524 Regen SCT drivers 2014-10-03 09:58:11 +10:00
Douglas Clowes
29650b420c Regen sct drivers after refactoring 2014-10-03 09:58:11 +10:00
Douglas Clowes
e4b88fd2ad Regen SCT drivers 2014-10-03 09:58:10 +10:00
Douglas Clowes
ba72e77d4c Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl
2014-09-26 17:04:19 +10:00
Douglas Clowes
98b5a89225 There is no mkdriver_args 2014-09-26 15:30:25 +10:00
Ferdi Franceschini
cf386ec3ef SICS-781 lakeshore 370 driver does not save data. 2014-09-19 12:16:31 +10:00
Douglas Clowes
0cb3f4f91c Regenerated drivers 2014-09-11 13:29:52 +10:00
Douglas Clowes
a9a20b4855 Regenerate the ls218, nhq200 and sr630 drivers 2014-09-10 14:27:11 +10:00
Douglas Clowes
c6d2245941 Move ls218, nhq200, sr630 from environment to detector 2014-09-10 14:26:16 +10:00
Douglas Clowes
0867f5a315 Update "Decimal" processing for 4100/6100 2014-09-10 14:22:50 +10:00
Douglas Clowes
b127f49b33 Pullback change from Quokka 2014-09-09 2014-09-09 16:56:29 +10:00
Douglas Clowes
e6925423e3 Regenerate the SR630 driver with 600 second polls 2014-09-08 13:45:40 +10:00
Douglas Clowes
fb9671531c West 6100 driver 2014-09-05 16:12:37 +10:00
Douglas Clowes
55a0055bd3 West 6100 driver 2014-09-05 16:09:36 +10:00
Douglas Clowes
24c8792467 SR630 reduce to 8 channels and 600 second polls, change driver name 2014-09-04 09:26:03 +10:00
Douglas Clowes
8af9116667 Update the Stanford SR630 SCT file for ten channels 2014-09-03 13:01:35 +10:00
Douglas Clowes
6070706571 Stanford Research Systems Model SR630 Thermocouple Monitor 2014-09-02 12:01:47 +10:00
Douglas Clowes
3650e68f9a Regenerate template drivers 2014-08-19 12:04:53 +10:00
Douglas Clowes
44f6b65aef Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
2014-08-19 11:46:24 +10:00
Douglas Clowes
a93819572a Regenerate template drivers 2014-08-19 11:43:45 +10:00
Douglas Clowes
6f5892f07d Change SCT wrappers to use ip_address and tcp_port 2014-08-19 11:27:43 +10:00
Douglas Clowes
507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2014-08-06 13:53:18 +10:00
Ferdi Franceschini
639e4dc3c8 Generated sct tcl drivers from sct templates. 2014-08-06 11:20:46 +10:00
Douglas Clowes
a761136b48 Regenerate modified drivers 2014-08-05 12:23:33 +10:00
Douglas Clowes
17315b15c7 Remove hand-coded config for generated in Oxford ITC-500 2014-08-04 15:46:16 +10:00
Douglas Clowes
39519d8c1c Don't register poll/write when simulating in LS-3xx drivers 2014-08-04 15:45:59 +10:00
Douglas Clowes
5112af83fd SICS-697 Decorate LS-370 with permlink 2014-08-04 15:42:08 +10:00
Douglas Clowes
05dc1958ff SICS-696 Explicity include the namespace on mk_sct_ calls 2014-07-31 11:36:22 +10:00
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
dda4a0f8f6 Fix erroneous filenames that match other files 2014-07-23 16:20:34 +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
Douglas Clowes
ab3d7c5adf Remove explicit test debug_threshold from SCT files and regenerate 2014-07-21 10:58:01 +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