Commit Graph

1602 Commits

Author SHA1 Message Date
Ferdi Franceschini
afd7b3879d Generic fake Galil derived from Taipan version.
Added instrument name as a command line argument.
2013-04-18 12:40:56 +10:00
Ferdi Franceschini
47a1d0aa4e Added configuration file modifications from ics1-platypus 2013-04-18 07:00:17 +10:00
Ferdi Franceschini
278c64b377 Set scan=1ms and scans per sample=10 on the counters when SICS starts up. 2013-04-10 17:03:30 +10:00
Ferdi Franceschini
2dc1657d66 Reversed configuration tables for the autosample changers.
Because the load side was changed to the opposite side.
2013-04-09 14:38:39 +10:00
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
Douglas Clowes
a00ca3872f Addpython motor simulation for taipan 2013-02-21 14:26:26 +11:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +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
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
Douglas Clowes
eb1d042440 set driver_status to HWIdle on HALT in motor Idle state 2013-02-06 10:27:00 +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
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
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
d2bcea11b2 source the psi version of TCL 8.4 clock 2012-12-05 15:47:44 +11:00
Douglas Clowes
27e89241cf get it to build 2012-11-27 13:34:05 +11:00
Douglas Clowes
ca11a3cfe4 merge work in progress 2012-11-27 11:01:55 +11:00
Douglas Clowes
49123234d0 merge work in progress 2012-11-26 15:10:25 +11:00
Jing Chen
27b9f0aee0 r3816 | jgn | 2012-11-22 15:31:25 +1100 (Thu, 22 Nov 2012) | 1 line 2012-11-23 14:02:33 +11:00
Douglas Clowes
a09333a655 handle the git '(no branch)' case
r3815 | dcl | 2012-11-22 10:09:54 +1100 (Thu, 22 Nov 2012) | 1 line
2012-11-22 10:11:07 +11:00
Douglas Clowes
55325dd704 make extract_version work with bot svn and git
r3814 | dcl | 2012-11-22 09:22:34 +1100 (Thu, 22 Nov 2012) | 1 line
2012-11-22 09:53:01 +11:00
Jing Chen
6b8ec1e2f3 r3812 | jgn | 2012-11-16 14:19:49 +1100 (Fri, 16 Nov 2012) | 1 line 2012-11-22 09:52:30 +11:00
Jing Chen
ff6c252e39 r3811 | jgn | 2012-11-14 11:41:05 +1100 (Wed, 14 Nov 2012) | 1 line 2012-11-15 17:43:20 +11:00
Jing Chen
38b9e37678 move tclmot to site site_ansto
r3805 | jgn | 2012-11-14 11:34:06 +1100 (Wed, 14 Nov 2012) | 1 line
2012-11-15 17:42:52 +11:00
Jing Chen
5859c11d88 move tclmot to site site_ansto
r3804 | jgn | 2012-11-14 11:33:50 +1100 (Wed, 14 Nov 2012) | 1 line
2012-11-15 17:42:47 +11:00
Ferdi Franceschini
34891cb9a6 *.tc templates are no longer being used at PSI
r3803 | ffr | 2012-11-14 09:06:37 +1100 (Wed, 14 Nov 2012) | 2 lines
2012-11-15 17:42:42 +11:00
Jing Chen
5db1373881 implement tclmot
r3801 | jgn | 2012-11-13 16:40:59 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:42:32 +11:00
Jing Chen
74c4995b4b implement tclmot
r3800 | jgn | 2012-11-13 16:40:56 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:42:28 +11:00
Jing Chen
99be3b124c implement tclmot
r3792 | jgn | 2012-11-13 16:38:27 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:41:49 +11:00
Douglas Clowes
fd064f3df9 revise logging and state trace
r3790 | dcl | 2012-11-13 13:38:25 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:41:39 +11:00
Douglas Clowes
fa18677fca add cybaman default port
r3789 | dcl | 2012-11-13 12:43:34 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:41:34 +11:00
Jing Chen
e79e28b819 r3788 | jgn | 2012-11-09 14:21:44 +1100 (Fri, 09 Nov 2012) | 1 line 2012-11-15 17:41:29 +11:00
Jing Chen
d02634ff13 init
r3787 | jgn | 2012-11-09 14:12:31 +1100 (Fri, 09 Nov 2012) | 1 line
2012-11-15 17:41:24 +11:00
Jing Chen
48b811506c init
r3786 | jgn | 2012-11-09 14:12:28 +1100 (Fri, 09 Nov 2012) | 1 line
2012-11-15 17:41:20 +11:00
Ferdi Franceschini
828cccc2f3 tcpmodbus.c
Check for timeout when reading.  Added more error checking. Some
housekeeping to make it easier to follow the code, name changes and more
descriptive comments.

r3785 | ffr | 2012-11-05 12:20:41 +1100 (Mon, 05 Nov 2012) | 5 lines
2012-11-15 17:41:15 +11:00
Jing Chen
e9f7c0547d r3784 | jgn | 2012-11-02 13:46:19 +1100 (Fri, 02 Nov 2012) | 1 line 2012-11-15 17:41:10 +11:00
Jing Chen
4e2ba8c458 change unit from dW to W
r3783 | jgn | 2012-11-02 13:30:02 +1100 (Fri, 02 Nov 2012) | 1 line
2012-11-15 17:41:05 +11:00