Douglas Clowes
|
06c51416dd
|
Merge branch 'Dingo' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/server_config.tcl
|
2015-02-19 16:04:50 +11:00 |
|
Douglas Clowes
|
27c3a48d91
|
Pullback from Dingo 2015-02-19
|
2015-02-19 15:59:22 +11:00 |
|
Douglas Clowes
|
92539b80aa
|
Merge branch 'Kookaburra' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/kookaburra/config/anticollider/acscript.txt
|
2015-02-19 15:54:22 +11:00 |
|
Douglas Clowes
|
0cff1f7c3c
|
Pullback from Kookaburra 2015-02-19
|
2015-02-19 15:51:41 +11:00 |
|
Douglas Clowes
|
8b4ab411fd
|
Merge branch 'Wombat' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/hipd/config/commands/commands.tcl
sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/hipd/util/sics_config.ini
|
2015-02-19 15:26:13 +11:00 |
|
Douglas Clowes
|
4e383b2af2
|
Merge branch 'Echidna' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
|
2015-02-19 14:57:43 +11:00 |
|
Douglas Clowes
|
4756be739a
|
Merge branch 'Platypus' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
sics/site_ansto/instrument/config/environment/sct_omron_hldc.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
|
2015-02-19 14:55:19 +11:00 |
|
Douglas Clowes
|
1bb7f90237
|
Merge branch 'Pelican' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
|
2015-02-19 14:53:33 +11:00 |
|
Douglas Clowes
|
106d61a883
|
Merge branch 'Taipan_R31' into temp
Conflicts:
sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
sics/site_ansto/instrument/tas/util/sics_config.ini
|
2015-02-19 14:50:39 +11:00 |
|
Douglas Clowes
|
14be249401
|
Pullback from Wombat 2015-02-19
|
2015-02-19 11:51:51 +11:00 |
|
Douglas Clowes
|
31420ab850
|
Pullback from Echidna 2015-02-19
|
2015-02-19 11:43:50 +11:00 |
|
Douglas Clowes
|
da2383f5ce
|
Pullback from Platypus 2015-02-19
|
2015-02-19 11:30:48 +11:00 |
|
Douglas Clowes
|
40d2a1e2f4
|
Pullback from Pelican 2015-02-19
|
2015-02-19 11:24:44 +11:00 |
|
Douglas Clowes
|
2dcf274618
|
Tilt configuration from Taipan 2015-02-19
|
2015-02-19 10:35:21 +11:00 |
|
Douglas Clowes
|
666a70cb96
|
Dubious diffs from Taipan 2015-02-19
|
2015-02-19 10:34:31 +11:00 |
|
Douglas Clowes
|
fbdd46e258
|
Pullback from Taipan 2015-02-19
|
2015-02-19 10:34:12 +11:00 |
|
Douglas Clowes
|
a5498a2a77
|
Pull some changes from RELEASE-3_1 in gen_sct and *.sct
|
2015-02-19 09:48:38 +11:00 |
|
Douglas Clowes
|
8c4eed9bfe
|
Merged changes from Quokka as at 2015-02-18
|
2015-02-19 09:40:49 +11:00 |
|
Douglas Clowes
|
287b671569
|
Regenerate for limit changes
|
2015-02-19 09:14:23 +11:00 |
|
Douglas Clowes
|
45d4663816
|
Pullback limit adjustments from Quokka to sct template drivers
|
2015-02-19 09:04:43 +11:00 |
|
Douglas Clowes
|
bf8be461ee
|
Add in from Quokka
|
2015-02-18 14:46:54 +11:00 |
|
Douglas Clowes
|
4619a57eff
|
Pullback from Quokka 2015-02-18
|
2015-02-18 14:14:11 +11:00 |
|
Douglas Clowes
|
648c7bf1dd
|
Update Quokka configuration file
|
2015-02-18 12:36:11 +11:00 |
|
Douglas Clowes
|
f0bc6f0693
|
Backport the build command from RELEASE-3_2
|
2015-02-18 11:54:08 +11:00 |
|
Douglas Clowes
|
cad4f64dcc
|
Regenerate the 3He driver for the coils
|
2015-02-16 12:38:43 +11:00 |
|
Douglas Clowes
|
f80bec1403
|
Changes to get and set the field coil values
|
2015-02-16 12:38:02 +11:00 |
|
Douglas Clowes
|
22bb612296
|
Fake device for Oxford LabView testing
|
2015-02-16 12:36:12 +11:00 |
|
Douglas Clowes
|
a924b657e0
|
Generate the TCL from the new Oxford
|
2015-02-13 10:58:50 +11:00 |
|
Douglas Clowes
|
3486b75d47
|
Generate the TCL from the new Oxford
|
2015-02-13 10:57:58 +11:00 |
|
Douglas Clowes
|
2993a04485
|
Alternative Oxford Magnet Labview interface
|
2015-02-13 10:56:50 +11:00 |
|
Douglas Clowes
|
fcb47cea5a
|
Alternative Oxford Magnet Labview interface
|
2015-02-13 10:56:42 +11:00 |
|
Ferdi Franceschini
|
59309cec60
|
SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation.
Also added some extra chopper status variables.
|
2015-02-06 14:36:39 +11:00 |
|
Ferdi Franceschini
|
e45edb3913
|
selrs now reports status of shutters when called without arguments.
|
2015-02-06 14:31:19 +11:00 |
|
Ferdi Franceschini
|
f1eb273db6
|
Allow selecting histogram memory server as source of beam monitor counts.
|
2015-02-06 08:48:11 +11:00 |
|
Ferdi Franceschini
|
ae06a182c6
|
Add Oxford magnet configuration to Bilby.
|
2015-02-06 08:48:09 +11:00 |
|
Ferdi Franceschini
|
4c3b3f71e5
|
Fix reference to chopper sim_mode variable.
|
2015-02-06 08:48:08 +11:00 |
|
Ferdi Franceschini
|
79fb7292bc
|
Fix some duplicate definitions.
|
2015-02-06 08:48:07 +11:00 |
|
Ferdi Franceschini
|
2a739e2f09
|
Remove some configuration code that was copied from Quokka.
|
2015-02-06 08:48:06 +11:00 |
|
Ferdi Franceschini
|
fae83b3d9e
|
Only set the posit_count parameter on motors that need to drive to discrete positions.
|
2015-02-06 08:48:05 +11:00 |
|
Ferdi Franceschini
|
e8601615e6
|
Add an OUT position to apertures. Copy bug fixes and improvements from ics1-bilby.
Also provide a motor object to read the second encoder on the velocity selector
translation stage for diagnostic purposes.
|
2015-02-06 08:48:03 +11:00 |
|
Ferdi Franceschini
|
ec1d83f77d
|
Text nodes can't be mutable.
|
2015-02-06 08:48:02 +11:00 |
|
Ferdi Franceschini
|
6b1a192af6
|
Fix updating parameters when a value changes.
|
2015-02-06 08:48:01 +11:00 |
|
Ferdi Franceschini
|
56d63ebc30
|
SICS-842: Added 'enable' and 'disable' device control commands.
|
2015-02-06 08:48:00 +11:00 |
|
Ferdi Franceschini
|
06f1f2f62a
|
SICS-841: import new selrs command.
|
2015-02-06 08:47:59 +11:00 |
|
Ferdi Franceschini
|
0c6168a526
|
SICS-840: Added selrs to select roughing slits and guarantee that a slit is always selected.
Also disabled driving slits via hset on GumTree.
|
2015-02-06 08:47:58 +11:00 |
|
Ferdi Franceschini
|
9c3a0931ce
|
SICS-841: You can now use set_oneshot to remove a callback.
|
2015-02-06 08:47:57 +11:00 |
|
Ferdi Franceschini
|
f2590461b5
|
Make sure oneshot_state = 1 while a callback is waiting for an event.
|
2015-02-06 08:47:56 +11:00 |
|
Ferdi Franceschini
|
9d0780047c
|
SICS-843: Add Galil I/O arrays @IN and @OUT with SB and CB commands.
Added extra (non galil) IB command to set entries in @IN.
|
2015-02-06 08:47:55 +11:00 |
|
|
|
fb19bf9bf6
|
Harmonized status text codes between second generation objects and sctdriveadpater, sctdriveobj
|
2015-02-04 14:35:21 +01:00 |
|
Douglas Clowes
|
be0d932a21
|
SICS-846 Off by one error in argc check sct_asyncqueue.c
|
2015-01-23 17:13:50 +11:00 |
|
