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
6738a0844d
Add the Robots (Robbie and Rosie) for Echidna
2014-09-08 15:56:20 +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
8bf1764dd9
SICS-754 Use "clientput" instead of "puts stdout" in non-generated drivers
2014-06-26 14:08:20 +10:00
Douglas Clowes
92d3acb5d5
Remove superfluous trailing white space from TCL files
2014-05-16 17:23:58 +10:00
Douglas Clowes
c8d5ead3cc
revert "driving" and update ROTATE
...
r3103 | dcl | 2011-04-14 17:33:18 +1000 (Thu, 14 Apr 2011) | 1 line
2012-11-15 17:10:31 +11:00
Ferdi Franceschini
ed35192f0f
Don't add robot from the pickandplace configuration
...
The deploy script should only change ownership of the files in the newserver directory
r3075 | ffr | 2011-02-25 20:04:13 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:09:03 +11:00
Ferdi Franceschini
7371a561d9
Make sure spin flipper code in rfamp.c is initialised
...
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:46 +11:00
Douglas Clowes
d83b346ef7
Changes to ROTATE in driver to match changes in Robots
...
r3063 | dcl | 2011-02-18 11:22:21 +1100 (Fri, 18 Feb 2011) | 1 line
2012-11-15 17:08:10 +11:00
Ferdi Franceschini
a3d551c8bb
The new xxx_sics users which SICS now runs as don't have
...
permission to write the robot log files to /tmp
r3037 | ffr | 2010-12-04 11:53:11 +1100 (Sat, 04 Dec 2010) | 3 lines
2012-11-15 17:06:57 +11:00
Ferdi Franceschini
7bf2d4d9f0
Don't create robot object when loading the configuration.
...
r3031 | ffr | 2010-12-01 10:45:59 +1100 (Wed, 01 Dec 2010) | 1 line
2012-11-15 17:06:41 +11:00
Douglas Clowes
e87cc117b8
add Epson robot pick and place driver
...
r3017 | dcl | 2010-08-06 15:11:17 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:52 +11:00
