Douglas Clowes
c3bb4a9591
Merge branch 'RELEASE-3_1' into RELEASE-3_2
...
Conflicts:
sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2015-01-07 13:09:27 +11:00
Douglas Clowes
76d7191754
SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent
2015-01-07 10:20:40 +11:00
Douglas Clowes
5f2223510f
Regenerate SCT drivers
2014-12-02 10:09:17 +11:00
Ferdi Franceschini
e64b7bf409
Instructed bruker_BEC1 wrapper to not make a script context controller.
2014-12-01 14:32:54 +11:00
Douglas Clowes
30c23b1e0a
Merge branch 'RELEASE-3_1'
...
Conflicts:
sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
sics/site_ansto/instrument/config/environment/isotech_ps.sct
sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
sics/site_ansto/instrument/util/gen_sct.py
2014-11-13 13:52:46 +11:00
Douglas Clowes
86d4732b06
Regenerate SCT drivers
2014-11-13 13:43:51 +11:00
Douglas Clowes
5fefe5f009
Regenerate SCT drivers
2014-11-13 12:41:22 +11:00
Douglas Clowes
674fae9115
Regenerate SCT drivers
2014-11-13 12:40:18 +11:00
Douglas Clowes
38dff05881
Regenerate SCT drivers
2014-11-13 12:38:03 +11:00
Douglas Clowes
3450b4cbf9
Regenerate SCT drivers
2014-11-13 12:35:46 +11:00
Douglas Clowes
9909c1412e
Regenerate all the SCT drivers with new generator
2014-11-07 09:14:09 +11:00
Douglas Clowes
42db9431f2
Add newer generated drivers from merge
2014-11-06 14:43:18 +11:00
Douglas Clowes
3ce5ae0977
Merge branch 'RELEASE-3_1'
...
Conflicts:
sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/pelican/pelican_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
2014-11-06 14:13:20 +11:00
Douglas Clowes
0b2f3d520b
Regen SCT drivers
2014-11-06 13:36:47 +11:00
Douglas Clowes
4620c7b079
Regenerate SCT drivers
2014-11-03 14:26:25 +11:00
Douglas Clowes
d41e77cc79
Regenerate the affected drivers
2014-10-22 16:03:22 +11:00
Douglas Clowes
2723ed9279
Changes add_bruker_BEC1 to add_bruker_bec1
2014-10-22 12:09:49 +11:00
Ferdi Franceschini
ea8ed30eb8
Revert obsolete read_config code for bruker_BEC1 driver.
2014-10-17 16:42:53 +11:00
Ferdi Franceschini
998e49d8b2
Generate new wrapper TCL code for Bruker magnet.
2014-10-17 16:42:52 +11:00
Ferdi Franceschini
f1397cc1f9
Wrapper template which configures bruker via sics_config.ini
2014-10-17 16:42:51 +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
0cb3f4f91c
Regenerated drivers
2014-09-11 13:29:52 +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
10b7e8029f
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2014-08-18 13:34:56 +10:00
Douglas Clowes
288be8f1c2
Generate the green magnet wrapper TCL code
2014-08-18 12:48:01 +10:00
Douglas Clowes
273c26cc22
Add a wrapper for the green magnet
2014-08-18 12:46:48 +10:00
Ferdi Franceschini
13003126a6
Use configured magnet name in OxfordSet commands.
...
Also T3 is really pressure.
2014-08-08 11:52:04 +10:00
Ferdi Franceschini
944902c9d4
Added sct wrapper to load legacy sct_oxford_labview.tcl driver.
2014-08-08 11:51:49 +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
Ferdi Franceschini
6b8d9d88fa
The default interval of five seconds seems to be working for everyone so let it be.
2014-08-06 10:08:11 +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
e3b583150e
SICS-696 Explicity include the namespace on mk_sct_ calls
2014-07-23 14:32:26 +10:00
Ferdi Franceschini
0e53fe3757
Save 5T magnet sensor reading and setpoint.
2014-07-16 11:27:13 +10:00
Ferdi Franceschini
c03bbdc38e
Add permlink to 5T magnet driver and load the driver in the quokka config.
2014-07-16 10:11:07 +10:00
Douglas Clowes
db24e03106
Add sct driver for New Zealand magnet
2014-07-15 18:48:38 +10:00
Ferdi Franceschini
6aa229ee75
Driver changes made on ics1-wombat-test.
2014-07-11 08:49:40 +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
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
