linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,791 Commits 1 Branch 0 Tags
2ee490b5ceac4b87deb03d4f1b0e2392738766b9
Commit Graph

547 Commits

Author SHA1 Message Date
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
a9932f8ae8 Slight change to the way we do PID in SCT files 2014-11-06 16:09:44 +11:00
Douglas Clowes
741d12d57a Driver generated in RELEASE-3_2 with --sct=before 2014-11-06 15:42:00 +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
2076c0a5fc New generated SCT drivers for knauer, sr630 and epson robot wrapper 2014-11-06 13:40:06 +11:00
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
8a61f65701 Developing the Eurotherm 3200 SCT driver 2014-11-06 12:35:21 +11:00
Douglas Clowes
0010cef179 Call the add instead of make function for the Eurotherm 2000 wrapper 2014-11-06 12:34:45 +11:00
Douglas Clowes
1f6d28637d Trim the He-3 response before splitting to remove empty list elements 
Damn you, TCL ...
 2014-11-06 11:13:32 +11:00
Douglas Clowes
4620c7b079 Regenerate SCT drivers 2014-11-03 14:26:25 +11:00
Douglas Clowes
300e29fe00 Merge branch 'Pelican' into RELEASE-3_1 2014-11-03 12:37:34 +11:00
Douglas Clowes
9daf62c299 Fix for the Lakeshore LS-340 RELAY command on Pelican 
It's not the same as on the LS-336
 2014-11-03 11:53:20 +11:00
Douglas Clowes
13d3772078 Regen 3He SCT driver 2014-10-27 17:51:14 +11:00
Douglas Clowes
155d24588a Extend 3He poll to 900 seconds and add refresh command 2014-10-27 17:50:55 +11:00
Douglas Clowes
81a425e293 Revert "Anticollider changes from Platypus" 
This reverts commit f47c6fec812eece9f68c7bee2bcc314bcadf32ca.
 2014-10-27 15:01:23 +11:00
Douglas Clowes
3bcd3fa0fb Regen SC driver for west 4100/6100 2014-10-27 14:41:46 +11:00
Douglas Clowes
09cedac66d Make West 4100 driveable and add permlinks 2014-10-27 14:40:40 +11:00
Douglas Clowes
fa2eb775ac Regen 3He SC driver 2014-10-27 14:35:37 +11:00
Douglas Clowes
62481b76c5 Add fields to 3He driver 2014-10-27 14:35:16 +11:00
Douglas Clowes
d41e77cc79 Regenerate the affected drivers 2014-10-22 16:03:22 +11:00
Douglas Clowes
b02ea420d8 Merge Platypus changes into RELEASE-3_1 2014-10-22 12:15:04 +11:00
Douglas Clowes
9350f4023b Anticollider changes from Platypus 2014-10-22 12:11:01 +11:00
Douglas Clowes
2723ed9279 Changes add_bruker_BEC1 to add_bruker_bec1 2014-10-22 12:09:49 +11:00
Douglas Clowes
07116a4ef4 Change driveable nodes from text to int to satisfy new checks 2014-10-22 12:09:13 +11:00
Douglas Clowes
2ed8269a0f Changes to 3He driver 2014-10-22 11:56:28 +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
Ferdi Franceschini
2afcb043c3 Generate TCL code for syringe and mvp wrappers. 2014-10-17 16:42:51 +11:00
Ferdi Franceschini
73181a43d9 Wrapper templates to load syringe pump and mvp valve via sics_config.ini. 2014-10-17 16:42:50 +11:00
Douglas Clowes
0cd3e85607 Add a driver for the 3He Polariser/Analyser (rudimentary) 2014-10-16 15:52:30 +11:00
Ferdi Franceschini
d8f5030a8d SICS-795 Bring GIT up to date with changes made on ics1-wombat. 2014-10-08 20:29:23 +11:00
Ferdi Franceschini
9720f1d0f0 SICS-788 Guard against integer division. 2014-10-08 19:59:22 +11:00
Ferdi Franceschini
3a475196a0 SICS-788: Some divisions in Tcl macros will be truncated if the values are integers. 
An integer division was caused here by the fix to SICS-785
 2014-10-08 19:56:59 +11:00
Ferdi Franceschini
3b35308bf2 SICS-786 SICS locked up while counting on Taipan 
An in-situ hack that was done on Wombat was accidentally committed.
 2014-10-08 19:44:29 +11:00
Douglas Clowes
b0e4c3a85b Better checks and state machine for Knauer pump 2014-10-07 15:03:52 +11:00
Douglas Clowes
91b7c0b6eb Reasonably working Knauer pump driver 2014-10-07 15:03:48 +11:00
Douglas Clowes
5ba5af5db8 Reworking the Knauer 2014-10-07 15:03:43 +11:00
Douglas Clowes
a51ce71999 Major revision of the Knauer pump driver 2014-10-07 15:03:28 +11:00
Douglas Clowes
591c602da2 Regen SCT drivers 2014-10-03 10:17:46 +10: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
c6abb1fabd Slight change to the way we do PID in SCT files 2014-09-30 17:24:58 +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
Douglas Clowes
cf77588861 Add some more checking and fix drive end bug 2014-09-22 13:48:49 +10:00