linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,710 Commits 1 Branch 0 Tags
000e799800b3a4034d6ab90859ba89f5d6819b70
Commit Graph

68 Commits

Author SHA1 Message Date
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
Douglas Clowes
95974df5e4 Pick up some obvious changes from Wombat 2014-06-24 17:32:34 +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
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +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
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
Ferdi Franceschini
99955b01da SICS-698 Make Bruker magnet driver setpoint driveable. 2013-12-20 09:08:51 +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
d4b782aae7 Remove hard coded magnet name from sensor path. 2013-10-15 03:23:10 +11:00
Ferdi Franceschini
5acb398b42 Provide add_oxmag command to instantiate an oxford magnet driver. 2013-08-15 07:59:02 +10:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +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
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
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
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
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
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
Jing Chen
5b4b52c627 add progress reminder at changing temperature and field 
r3399 | jgn | 2012-02-27 12:13:47 +1100 (Mon, 27 Feb 2012) | 1 line
 2012-11-15 17:24:52 +11:00