Ferdi Franceschini
16e744be12
Moved MakeDrive to instrument specific configuration.
...
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
2013-04-09 14:15:55 +10:00
Ferdi Franceschini
191e3719b7
Use ns instead of micro-seconds for veto-windows.
2013-03-14 15:29:31 +11:00
Ferdi Franceschini
1079f6e702
Always return 0 from the AsconReading state to make sure we exit the AsconTask().
...
Since the PSI update the AsconTask() function will loop forever unless you return 0.
2013-03-13 19:06:57 +11:00
Ferdi Franceschini
94f21f832e
SICS-561: Wait for the hmm COUNTEND event in blocking mode.
...
Also allow veto when scanning.
2013-03-04 18:03:55 +11:00
Ferdi Franceschini
ed95f3aaaf
SICS-555: ANSTO hmcontrol now releases locks on the counters after pausing.
2013-03-04 18:02:31 +11:00
Ferdi Franceschini
86379e8038
Added functions to create the camera driver and init the camera protocol
...
to site_ansto.c
2013-02-28 12:57:41 +11:00
Ferdi Franceschini
abbe619a10
Merge remote-tracking branch 'origin/merge-replace' into dingo
2013-02-26 01:35:58 +11:00
Ferdi Franceschini
ad27488d3d
Initial implementation of Dingo Camera driver.
...
Takes a single shot or a multishot.
If the user changes the camera configuration in SICS the new config will
be uploaded when the next take shot/multishot command is sent.
This driver allows the scan object in SICS to drive the scan variable to
the next target while the camera is processing and saving data after
acquiring an image.
TODO
Implement "set file,..." command.
2013-02-26 01:20:02 +11:00
Ferdi Franceschini
87559bf411
Upload camera configuration if it has changed before sending
...
a "take shot" or "take multi on" command. Incorporate Vijay's changes
to the "set camera," parameters.
2013-02-26 01:02:25 +11:00
Douglas Clowes
a00ca3872f
Addpython motor simulation for taipan
2013-02-21 14:26:26 +11:00
Ferdi Franceschini
743c52d905
Remove duplicate camera code
2013-02-21 14:00:57 +11:00
Ferdi Franceschini
e7a478489e
Copied in-situ modifications from ics1-quokka.
2013-02-20 18:19:44 +11:00
Ferdi Franceschini
ed9a2aff16
Moved camera to hardsup and started adding parameters.
2013-02-18 11:21:04 +11:00
Douglas Clowes
b5b4d7a747
Add some comments to deploySICS.sh
2013-02-15 13:27:55 +11:00
Douglas Clowes
0e52709cdc
Report SICS version information on "SICServer -v"
2013-02-15 13:27:03 +11:00
Douglas Clowes
639e7af80c
Add indicator of local changes relative to commit checksum
2013-02-15 13:25:34 +11:00
Douglas Clowes
d3a7249649
Add FileEvalGlob command for multipath config files
2013-02-15 13:23:51 +11:00
Douglas Clowes
ba128520da
Add motor runtime to motor stopped log message
2013-02-15 09:49:39 +11:00
Douglas Clowes
48bb76ac58
At ANSTO we use JSON so do not bypass the formatting
2013-02-15 09:47:06 +11:00
Douglas Clowes
fcac36591e
Adjust site_ansto/Makefile to define SITE_ANSTO for common SICS files
2013-02-15 09:45:57 +11:00
Ferdi Franceschini
49a2cbff50
Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into merge-replace
2013-02-14 11:36:43 +11:00
Ferdi Franceschini
9e30a158fb
server_config.tcl
...
Remove call to obsolete ::utility::set_sctobj_attributes because it
returns an error and aborts the server_set_sobj_attributes proc.
This bug meant that script context objects weren't being linked into the
hdb tree.
util/utility.tcl
Removed obselete ::utility::set_sctobj_attributes proc because
sctcontrollers are no longer being added to the root of the hdb tree.
2013-02-14 11:32:36 +11:00
Ferdi Franceschini
5ae5a826a4
Deleted
2013-02-11 19:24:24 +11:00
Ferdi Franceschini
f2befda1a2
Dingo camera driver
2013-02-11 19:14:03 +11:00
Douglas Clowes
eb1d042440
set driver_status to HWIdle on HALT in motor Idle state
2013-02-06 10:27:00 +11:00
Douglas Clowes
4fa515c351
Add hdbnode to diffscan
2012-12-18 14:03:58 +11:00
Douglas Clowes
907f0e2ba6
add sicsvar output to diffscan
2012-12-14 08:48:05 +11:00
Douglas Clowes
43346d6ea5
add hostnam and portnum commands
2012-12-13 14:07:38 +11:00
Douglas Clowes
dfb9db5e5c
add das servers to test host list
2012-12-13 14:07:08 +11:00
Douglas Clowes
c8bf2a71ed
Remove InstallHdb from barebones
2012-12-13 14:06:32 +11:00
Douglas Clowes
4c82c0b1cb
scan/diffscan enhancements to do with timestamps
2012-12-13 13:54:47 +11:00
Douglas Clowes
3a81b3a5c8
add HAVE_UNISTD_H for SL6
2012-12-13 13:53:35 +11:00
Douglas Clowes
da33f7ed21
make portnum command work on UDP ports too
2012-12-13 13:52:52 +11:00
Douglas Clowes
6ca55df3d6
fix UDP code to work with a higher socket fd
2012-12-13 13:51:14 +11:00
Douglas Clowes
da1213c059
TCL 8.5 and cleanup
2012-12-10 14:55:51 +11:00
Douglas Clowes
c2150780fa
move sicslist to site_ansto.c and add TCL 8.5 clock
2012-12-10 14:54:44 +11:00
Douglas Clowes
7f42b8c420
move sicslist to site_ansto.c
2012-12-10 14:53:39 +11:00
Douglas Clowes
2af296a3d2
use saved argv0 - not sure if needed
2012-12-10 14:53:13 +11:00
Douglas Clowes
9534ba4b31
refactor, improve usage and save the argv0
2012-12-10 14:51:29 +11:00
Douglas Clowes
d2bcea11b2
source the psi version of TCL 8.4 clock
2012-12-05 15:47:44 +11:00
Douglas Clowes
ceb7c72806
undo spurious change
2012-11-30 10:39:12 +11:00
Douglas Clowes
ca69d44b3d
TaskSignal sets the calling task status to WAITING to prevent recursion through TaskYield.
2012-11-30 10:35:26 +11:00
Douglas Clowes
1fe4e40e8b
merge
2012-11-30 10:32:37 +11:00
Douglas Clowes
36697bf25a
various changes
2012-11-30 10:31:59 +11:00
Douglas Clowes
3501c0085a
underscore in environment_controller
2012-11-30 10:27:25 +11:00
Douglas Clowes
e929862b2d
need to look at eCounting
2012-11-30 09:24:30 +11:00
Douglas Clowes
cacc490e59
work in progress
2012-11-30 09:24:22 +11:00
Douglas Clowes
441550b546
variuos changes
2012-11-30 08:26:54 +11:00
Douglas Clowes
17e5379745
Disabled sending hdb command start and stop messages because they break gumtree
2012-11-29 14:28:41 +11:00
Douglas Clowes
a41941ff9b
Make privilege property consistent with the GumTree hipadaba schema.
2012-11-29 14:27:49 +11:00
