linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,068 Commits 1 Branch 0 Tags
f82d6a83b08125d1acf522d97cfc63fe1b36e19b
Commit Graph

4068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
a375c6ce20 SICS-821: You can now use the "whenall" keyword to forbid a move based on the positions of a set of motors. 2014-11-07 09:44:35 +11:00
Ferdi Franceschini
4dbaa0f73d SICS-723 Provide a detector/reset_trip node to notify GumTree and allow reset. 2014-11-07 09:44:34 +11:00
Ferdi Franceschini
22d81d4195 Add ls370 to Wombat sics_config.ini 2014-11-07 09:44:34 +11:00
Douglas Clowes
4b9ed0bf7f Merge changes from RELEASE-3_1 in gen_sct.py 
Now the only difference is sct defauly of before/after
 2014-11-07 09:41:43 +11:00
Douglas Clowes
b28af1d086 Update the gitignore file for .sw? and .orig files 2014-11-07 09:35:16 +11:00
Douglas Clowes
9909c1412e Regenerate all the SCT drivers with new generator 2014-11-07 09:14:09 +11:00
Douglas Clowes
6c6292bbb2 Change nodenames to lowercase and add a 'stash' function in he3_polanal 2014-11-07 09:10:17 +11:00
Douglas Clowes
67b6c5c7ee regen sct_he3_polanal.tcl 2014-11-06 18:17:25 +11:00
Douglas Clowes
3602f56352 Rework the he3_polanal.sct driver 2014-11-06 18:17:02 +11:00
Douglas Clowes
c488733bcd Set default sct=before, add ${name} to mkDriver call 2014-11-06 18:16:02 +11:00
Douglas Clowes
6bed30d5d4 Reduce spurious differences in generated code 2014-11-06 16:37:46 +11:00
Douglas Clowes
f1595151cd Changes to protocol_args to add defaults 2014-11-06 16:27:15 +11:00
Douglas Clowes
ad29e66160 Import of changes in 3.2 2014-11-06 16:18:43 +11:00
Douglas Clowes
00574586ea Import of changes in 3.2 2014-11-06 16:14:51 +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
58ca10883f Refactor the output filename handling and sct position in the name 
add --sct options for before (sct_*.tcl) or after (*_sct.tcl) the driver name
 2014-11-06 15:40:40 +11:00
Douglas Clowes
90d4fc6870 Update the gitignore file for .sw? and .orig files 2014-11-06 14:43:53 +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
47c92518a9 Make protocol_args like {add,make}_args and add nosctcontroller in read_config 2014-11-06 12:54:21 +11:00
Douglas Clowes
aa9942b2b6 calling makesctcontroller and mkDriver from read_config 2014-11-06 12:53:06 +11:00
Douglas Clowes
cd64a3de3d Allow sendterminator and replyterminator in .ini file 2014-11-06 12:52:37 +11:00
Douglas Clowes
899daa8d83 Add defaults to .ini args and refactor add_driver 2014-11-06 12:51:53 +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
f59daef96b Clean up argument handling in gen_sct for add_args and make_args 2014-11-03 16:30:33 +11:00
Douglas Clowes
4620c7b079 Regenerate SCT drivers 2014-11-03 14:26:25 +11:00
Douglas Clowes
9adb5cb907 Handle missing read_command 2014-11-03 14:25:42 +11:00
Douglas Clowes
300e29fe00 Merge branch 'Pelican' into RELEASE-3_1 2014-11-03 12:37:34 +11:00
Douglas Clowes
16ad9ed8e2 Pull back address change on Pelican 2014-11-03 12:34:56 +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
71475199d9 Formatting, typo, and speedup from RELEASE-3_2 compareSICS.py 2014-11-03 11:46:51 +11:00
Douglas Clowes
79e4be4ca6 Speed up compare by not use difflib if we dont need to (and fix type found by syntastic) 2014-10-31 12:28:17 +11:00
Markus Zolliker
f7aad141d1 - removed all stuff related to tecs 
- allow short make command by means of SICS_MAKE_VERSION env.variable
 2014-10-30 11:24:05 +01:00
Douglas Clowes
af4aa2c876 SICS-815 remove exttra space from BATCHSTART message 2014-10-30 17:02:43 +11:00
Douglas Clowes
0060adf114 Make make sct faster - alternate ways of doing it 2014-10-30 16:46:03 +11:00
Douglas Clowes
a57852954e Fix some problems handling multiple filenames 2014-10-30 13:41:02 +11:00
Markus Zolliker
a0ea2d5745 bug fix in syncedprot.c (treat stackoverflow correctly) 2014-10-29 15:59:12 +01: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