13 Commits

Author SHA1 Message Date
f82197623e Merge branch 'master' into maverick
- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx
2015-03-17 14:01:40 +01:00
dc85708451 - Added a AsconReadDoneReconnect to ascon. This handles the case better when
a server hangs up diretcly after a message.
- Some output was suppressed while tracing, fixed
- Make ready to compile both with Ubuntu 32 and 64 or /usr/local
  based ON in general. Just in psi/makefile_linux the top include has
  to be adapted
- Removed epics drivers from SICS. Still in source to be reenabled when
  needed
- Added FindMotor
- Added sput, sappend and slab to nxscript using the new sicsget module
- Fix to sget to fix the "mot softzero" problem


SKIPPED:
	psi/make_gen
	psi/psi.c
	psi/sinqhttpopt.c
	psi/spss7.c
2013-12-19 10:24:54 +00:00
c3b3ab1f06 - Make linux makefiles work
SKIPPED:
	psi/make_gen
	psi/makefile_linux
	psi/termprot.c
	psi/hardsup/makefile_linux
	psi/tecs/pg_plus/makefile_linux
	psi/utils/makefile_linux
2009-12-23 14:08:22 +00:00
60c2b58c95 - Fixed a couple of Hipadaba Issues
- Added properties to Hipadaba Nodes
- Made Morpheus Hipadaba aware and implemented scans
  for Morpheus and Hipadaba


SKIPPED:
	psi/tecs/make_crv
2007-01-18 04:58:50 +00:00
1aef9afabb polished code to suppress warnings
SKIPPED:
	psi/makefile_linux
2006-03-23 12:39:11 +00:00
45fd50265f - Added SicsList
- Removed group and description attributes from ObjectDescriptor


SKIPPED:
	psi/dornier2.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/psi.c
	psi/serial.c
	psi/sinqhttp.c
	psi/sinqhttp.h
	psi/tcpdornier.c
	psi/velodornier.c
2006-01-16 08:32:07 +00:00
b3138f1197 - Added Sycamore protocol and command context to SICS
- Added sinfo to SICS
- Added driver for TCP/IP Astrium velocity selector
- Added driver for TCP/IP Astrium chopper controller


SKIPPED:
	psi/amor2t.c
	psi/amorstat.c
	psi/dornier2.c
	psi/ecb.c
	psi/el734hp.c
	psi/fowrite.c
	psi/libpsi.a
	psi/make_gen
	psi/nextrics.c
	psi/pardef.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/scontroller.c
	psi/serial.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tcpdocho.c
	psi/tcpdornier.c
	psi/tricssupport.c
	psi/velodornier.c
2005-12-22 22:16:10 +00:00
f603985860 - cleaned up makefiles
- polished code to avoid warnings


SKIPPED:
	psi/amorscan.c
	psi/amorstat.c
	psi/buffer.c
	psi/dornier2.c
	psi/ecb.c
	psi/ecbdriv.c
	psi/el737hpdriv.c
	psi/el737hpv2driv.c
	psi/eve.c
	psi/faverage.c
	psi/fowrite.c
	psi/ipsdriv.c
	psi/logger.c
	psi/make_gen
	psi/makefile
	psi/makefile_alpha
	psi/makefile_linux
	psi/oicom.c
	psi/psi.c
	psi/remob.c
	psi/ruli.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tasutil.c
	psi/tricssupport.c
	psi/hardsup/itc4util.c
	psi/hardsup/make_gen
	psi/hardsup/makefile
	psi/hardsup/makefile_alpha
	psi/hardsup/makefile_linux
	psi/hardsup/makeprint.c
	psi/hardsup/serialsinq.c
	psi/tecs/coc_client.c
	psi/tecs/coc_logfile.c
	psi/tecs/coc_server.c
	psi/tecs/coc_server.h
	psi/tecs/didi
	psi/tecs/keep_running.c
	psi/tecs/macosx_def
	psi/tecs/make_crv.tcsh
	psi/tecs/make_gen
	psi/tecs/makefile
	psi/tecs/makefile_linux
	psi/tecs/makefile_macosx
	psi/tecs/myc_buf.c
	psi/tecs/myc_time.c
	psi/tecs/six.c
	psi/tecs/sys_select.c
	psi/tecs/tecs.c
	psi/tecs/tecs_cli.c
	psi/tecs/tecs_data.c
	psi/tecs/tecs_lsc.c
	psi/tecs/tecs_serial.c
	psi/tecs/term.c
	psi/utils/SerPortServer.c
	psi/utils/el734.c
	psi/utils/make_gen
	psi/utils/makefile
	psi/utils/makefile_alpha
	psi/utils/makefile_linux
2005-03-08 11:11:51 +00:00
cvs
137f5d2df1 improved tecs driver M.Z.
SKIPPED:
	psi/makefile
	psi/psi.c
	psi/tecsdriv.c
	psi/tecsdriv.h
	psi/hardsup/makefile
	psi/tecs/coc_client.c
	psi/tecs/coc_util.c
	psi/tecs/coc_util.h
	psi/tecs/didi
	psi/tecs/instr_hosts.c
	psi/tecs/make_gen
	psi/tecs/makefile
	psi/tecs/makefile_linux
	psi/tecs/myc_time.h
	psi/tecs/six.c
	psi/tecs/tecs.c
	psi/tecs/tecs_cli.c
	psi/tecs/tecs_client.f
	psi/tecs/tecs_data.c
	psi/tecs/tecs_plot.f
	psi/tecs/tecs_serial.c
	psi/tecs/term.c
	psi/utils/makefile
2004-03-09 15:17:56 +00:00
cvs
f109d9a8c9 - Fixed problems at ANSTO
- Some missing files


SKIPPED:
	psi/amor2t.w
2004-03-09 12:10:00 +00:00
cvs
7af6c3c3af M.Z.
SKIPPED:
	psi/cd_obj
	psi/make_gen
	psi/hardsup/cd_obj
	psi/hardsup/make_gen
	psi/hardsup/makefile_alpha
	psi/hardsup/makefile_linux
	psi/tecs/cd_obj
	psi/tecs/make_gen
	psi/tecs/makefile_alpha
	psi/tecs/makefile_linux
2003-08-27 12:40:31 +00:00
cvs
e1839599f3 objects may now be separated from sources M.Z.
SKIPPED:
	psi/make_gen
	psi/makefile
	psi/makefile_alpha
	psi/makefile_linux
	psi/hardsup/make_gen
	psi/hardsup/makefile
	psi/hardsup/makefile_alpha
	psi/hardsup/makefile_linux
	psi/tecs/make_gen
	psi/tecs/makefile
	psi/tecs/makefile_linux
2003-08-25 14:28:19 +00:00
cvs
3acf49ba53 - Created a modified swithc motor which takes into account the new motor drivers
- Added the missing linux_def file into the repository
- Fixed a bug relating to scattering sense in selector.c


SKIPPED:
	psi/make_gen
	psi/psi.c
	psi/swmotor.h
	psi/swmotor2.c
2003-08-20 14:32:52 +00:00