Commit Graph

4093 Commits

Author SHA1 Message Date
Ferdi Franceschini
40ecb8478d The env var field in the default SICS start string should be blank.
By default SICS is launched with no environment variables and sudo
doesn't allow 'None' on the ICS computers.
2013-06-16 10:54:19 +10:00
Ferdi Franceschini
9949aae2fa SICS-545 Fixed lockup/hang/freeze of Dingo cameradriver. The
cameradriver would stop sending commands after about one minute if the
safety_plc (ie SIS) driver was also running.
2013-06-16 09:42:36 +10:00
Douglas Clowes
1cf8cc81a1 Add a function to AsyncQueue to tell if we are connected 2013-06-14 14:40:03 +10:00
Ferdi Franceschini
2df9297a3f SICS-587 Setup hostport dictionary based configuration for dingo.
Also added simulated camera server and a camtest configuration file to
run test scans against a dummy motor.
2013-06-14 10:18:45 +10:00
Ferdi Franceschini
c71cbbc521 Added lyrebird and re-ordered server socket offsets.
The offsets were re-ordered to match the 3rd digit of the SIM_GALIL
baseports.
2013-06-14 10:13:15 +10:00
Ferdi Franceschini
0c49dc21f7 Add dingo, bilby and emu baseports. 2013-06-14 09:56:33 +10:00
Ferdi Franceschini
4f44b746ba Provide dummy histogram initialisation function. 2013-06-14 09:42:57 +10:00
Ferdi Franceschini
2d8d4864ef Merge branch 'dingo' into merge-replace 2013-06-11 08:30:24 +10:00
zolliker
7f298ce76c .
SKIPPED:
	psi/tecs/inp/x17627.inp
2013-06-07 06:51:21 +00:00
zolliker
c2f019ea9e - last version?
SKIPPED:
	psi/tecs/tecs.c
2013-06-07 06:51:11 +00:00
zolliker
91b0566ebf - fixed error handling
SKIPPED:
	psi/ease.c
	psi/pardef.c
2013-06-07 06:50:59 +00:00
zolliker
3817bcdfde - comment
SKIPPED:
	psi/arrobj.c
2013-06-07 06:50:41 +00:00
zolliker
ccd7bb79bd cosmetics 2013-06-07 06:47:24 +00:00
zolliker
d2c42c3913 - fixed some issues related to "config listen 1" mode
i.e. do not write some lines twice when in this mode
2013-06-07 06:47:03 +00:00
zolliker
6e1005dbc0 workaround: do not treat ?H1 as an illegal answer to H1 (for IPS)
SKIPPED:
	psi/oxinst.c
2013-06-07 06:46:06 +00:00
zolliker
e4a9733830 - added external mode (for wiggle script)
SKIPPED:
	psi/ipsdriv.c
2013-06-07 06:43:10 +00:00
zolliker
97d74d48c7 - add synced support for heater range
SKIPPED:
	psi/ighdriv.c
2013-06-07 06:42:36 +00:00
zolliker
906ceb96e8 - fixed some issues broken when the new task system was introduced 2013-06-07 06:39:50 +00:00
zolliker
db963166df SaveSICSNode fulfills at the first time all of the 3 following requirements:
1) save the value af the topmost node
2) use hupdate instead of a set command for nodes marked with __save=update
3) save kids of nodes not saved
2013-06-07 06:38:17 +00:00
zolliker
565f96b5ca - add a check for empty return value 2013-06-07 06:26:52 +00:00
zolliker
3f6a76052d - fixed some issues related to "config listen 1" mode
i.e. do not write some lines twice when in this mode
2013-06-07 06:17:07 +00:00
zolliker
9a142c18bf - fixed: pExecutor->iRun was no longer initialized since 1.52 2013-06-05 14:18:07 +00:00
Ferdi Franceschini
d872aedbec Don't create Pelican fermichopper motors when loading the configuration file.
This should be done in the local extraconfig.tcl
2013-05-31 11:13:10 +10:00
Ferdi Franceschini
357170a735 SICS-616 Removed obsolete setpos command from motor driver. 2013-05-31 09:55:10 +10:00
Douglas Clowes
7e0e068ee2 differentiate forward/reverse limit switches in 'crashed' log message 2013-05-31 09:35:52 +10:00
Douglas Clowes
ea28b7a78c add code to create, clean and ignore *.d files 2013-05-31 09:35:52 +10:00
Ferdi Franceschini
8f0ceac2ad SICS-615 You can now update the start and step fields of scan parameters.
NOTE: This also fixes the bug that was crashing SICS. The n was missing in an snprintf().
2013-05-31 09:18:35 +10:00
Ferdi Franceschini
0954c3bceb Fixed compile error, ‘struct __MoDriv’ has no m ember named ‘errMsg’ 2013-05-31 08:06:38 +10:00
Douglas Clowes
4a363d0e95 SICS-614 reallocate errMsg buffer each time it's used 2013-05-28 16:22:44 +10:00
Ferdi Franceschini
7036164640 SICS-613: Fixed voltage control for Ordela detector on Quokka. 2013-05-24 19:15:10 +10:00
zolliker
8096212c52 - introduced "stopexe run"
- fixed "task ps" to show names containing ':' correctly
2013-05-24 05:44:52 +00:00
Douglas Clowes
3c3afb92c8 the send blocks if both rmask and wmask are set so only do it if rmask is not set 2013-05-24 13:05:07 +10:00
Douglas Clowes
8e245ba4be turn read interest back on once connect completes 2013-05-24 13:04:58 +10:00
Douglas Clowes
4b510ffd05 replace the touch of site_ansto.c with the rm of site_ansto.o to force recompile (it's more git friendly) 2013-05-24 13:04:48 +10:00
koennecke
f6a2b259ea - Introduced a state filed into first generation objects
- Fixed some issues with error returns not being properly handled in devexec
- Fixed a bug in motorlist which caused limit checks to fail
- Fixed an issue with the TDCHM not properly updating the counter
  values on finish
- Readded getHipadabaPar in ChainCallback as this caused a problem in ei
- Made tasdrive ignore sgu, sgl when out of plane not allowed


SKIPPED:
	psi/eigermono.c
	psi/sinqhttp.c
	psi/tdchm.c
2013-05-23 08:54:55 +00:00
Jing Chen
17e5c61d62 Integrate Dingo Camera Server Stuffs 2013-05-22 11:10:21 +10:00
Jing Chen
951f9f40ee Integrate Dingo Camera Server Stuffs 2013-05-22 10:57:11 +10:00
Jing Chen
9b35fc13ed Integrate Dingo Camera Server Stuffs 2013-05-22 10:56:35 +10:00
Jing Chen
fb7685ff8d Integrate Dingo Camera Server Stuffs 2013-05-22 10:56:01 +10:00
Jing Chen
7a4fc22351 Integrate Dingo Camera Server Stuffs 2013-05-22 10:55:16 +10:00
Jing Chen
49c46dfcb0 Kookaburra Integration 2013-05-22 10:51:19 +10:00
Jing Chen
b5989bdb50 Kookaburra Integration 2013-05-22 10:51:07 +10:00
Jing Chen
3246278d3c integrate Dingo Camera Server stuffs 2013-05-22 10:50:09 +10:00
Jing Chen
403d7b9162 integrate Dingo Camera Server stuffs 2013-05-22 10:50:00 +10:00
Jing Chen
0dbab4045b integrate Dingo Camera Server stuffs 2013-05-22 10:49:28 +10:00
Jing Chen
1b61b67a30 integrate Dingo Camera Server stuffs 2013-05-22 10:48:44 +10:00
Jing Chen
f4d9affe7d integrate Dingo Camera Server stuffs 2013-05-22 10:47:14 +10:00
Ferdi Franceschini
a8e55caf9c Adding updates from ics1-quokka 2013-05-21 16:21:47 +10:00
Ferdi Franceschini
cd3bbe64e3 SICS-594 Check and update motor configuration for the monochromator motors. 2013-05-21 12:26:32 +10:00
Douglas Clowes
55d3c34a24 restore RemoveCallback3 as RemoveCallbackUsr to get (un)interest working again 2013-05-20 13:47:34 +10:00