linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,195 Commits 1 Branch 0 Tags
main
Commit Graph

23 Commits

Author SHA1 Message Date
Mark Koennecke
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
Markus Zolliker
f7aad141d1 - removed all stuff related to tecs 
- allow short make command by means of SICS_MAKE_VERSION env.variable
 2014-10-30 11:24:05 +01:00
Mark Könnecke
bc31c6cd1e Changes to make SICS compile on OSX Maverick with clang 2014-03-14 09:48:14 +01:00
koennecke
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
koennecke
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
koennecke
6cf9add9ee - Installed json protocol 
SKIPPED:
	psi/libpsi.a
	psi/tecs/libtecsl.a
 2007-01-21 22:07:37 +00:00
koennecke
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
koennecke
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
zolliker
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
8a8c392779 M.Z. 2004-11-17 11:48:22 +00:00
cvs
0f4e959e22 - New batch file management module 
- New oscillator module
- Bug fixes


SKIPPED:
	psi/buffer.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/nextrics.c
	psi/nxamor.c
	psi/pimotor.c
	psi/polterwrite.c
	psi/psi.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tricssupport.c
	psi/tricssupport.h
	psi/tecs/make_gen
	psi/utils/ecb_load_new/ecb_load.c
	psi/utils/ecb_load_new/ecb_load.h
	psi/utils/ecb_load_new/ecbdriv_els.c
	psi/utils/ecb_load_new/gpib_els.c
	psi/utils/ecb_load_new/makefile
	psi/utils/ecb_load_new/makefile_EGPIB
	psi/utils/ecb_load_new/makefile_GPIB
 2004-11-17 10:50:15 +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
350a5ad063 - Funny things with header files... 
SKIPPED:
	psi/dornier2.c
	psi/makefile_linux
 2003-12-10 15:32:42 +00:00
cvs
7a5f0193ab M.Z. 2003-12-05 14:13:45 +00:00
cvs
4aae89fcde - Fixed putpos bug in ecbdriv.c 
- Improved handling of conflicting drive commands in ecbdriv.c
- Better status codes after drive command
- Better error handling in anticollider


SKIPPED:
	psi/ecbdriv.c
	psi/makefile_linux
	psi/tecs/makefile_linux
 2003-09-04 07:15:37 +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
3ddb19d8a9 - Improvements to the chooper driver for the SANS2 chopper 
- Fixes to the new counter and motor drivers
- Updated Linux makefiles to linux_def


SKIPPED:
	psi/dornier2.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/makefile_linux
	psi/psi.c
	psi/hardsup/makefile_linux
	psi/tecs/makefile_linux
 2003-07-14 11:56:54 +00:00
cvs
e52bd5d937 - Updated Makefiles 
- Moved TAS code to psi
- Updated programmers documentation


SKIPPED:
	psi/make_gen
	psi/nextrics.c
	psi/t_conv.c
	psi/t_conv.f
	psi/t_rlp.c
	psi/t_rlp.f
	psi/t_update.c
	psi/t_update.f
	psi/hardsup/el734_utility.c
	psi/hardsup/makefile_alpha
 2003-06-30 11:51:35 +00:00
cvs
f7eb67ac4f - Still a problem with makefile 2003-06-20 13:43:50 +00:00
cvs
282d30b304 - Added makefiles for linux 
SKIPPED:
	psi/makefile_linux
	psi/sinqhmdriv.i
	psi/sinqhmdriv.w
	psi/swmotor.c
	psi/hardsup/makefile_linux
	psi/tecs/makefile_linux
 2003-06-20 12:26:44 +00:00
cvs
e3cd728ecb - Rearranged directory structure for forking out ANSTO 
- Refactored site specific stuff into a site module
- PSI specific stuff is now in the PSI directory.
- The old version has been tagged with pre-ansto


SKIPPED:
	psi/A1931.c
	psi/A1931.h
	psi/amor2t.c
	psi/amor2t.h
	psi/amor2t.i
	psi/amor2t.tex
	psi/amor2t.w
	psi/amorscan.c
	psi/amorscan.h
	psi/amorscan.w
	psi/amorstat.c
	psi/amorstat.h
	psi/amorstat.i
	psi/amorstat.tex
	psi/amorstat.w
	psi/bruker.c
	psi/bruker.h
	psi/bruker.w
	psi/buffer.c
	psi/buffer.h
	psi/dilludriv.c
	psi/dilludriv.h
	psi/dmc.c
	psi/dmc.h
	psi/dmc.w
	psi/docho.c
	psi/ecb.c
	psi/ecb.h
	psi/ecb.i
	psi/ecb.w
	psi/ecbdriv.c
	psi/ecbdriv.h
	psi/el734dc.c
	psi/el734driv.c
	psi/el755driv.c
	psi/el755driv.h
	psi/faverage.c
	psi/faverage.h
	psi/faverage.tex
	psi/faverage.w
	psi/fowrite.c
	psi/fowrite.h
	psi/itc4.c
	psi/itc4.h
	psi/itc4.w
	psi/itc4driv.c
	psi/ltc11.c
	psi/ltc11.h
	psi/nextrics.c
	psi/nextrics.h
	psi/nxamor.c
	psi/nxamor.h
	psi/nxamor.tex
	psi/nxamor.w
	psi/pimotor.c
	psi/pimotor.h
	psi/pimotor.tex
	psi/pimotor.w
	psi/pipiezo.c
	psi/polterwrite.c
	psi/polterwrite.h
	psi/psi.c
	psi/ruli.c
	psi/ruli.h
	psi/sanscook.c
	psi/sanswave.c
	psi/sanswave.h
	psi/sanswave.tex
	psi/sanswave.w
	psi/serial.c
	psi/serial.h
	psi/serial.w
	psi/sinqhmdriv.c
	psi/sinqhmdriv.i
	psi/sinqhmdriv.w
	psi/slsmagnet.c
	psi/sps.c
	psi/sps.h
	psi/sps.i
	psi/sps.tex
	psi/sps.w
	psi/swmotor.c
	psi/swmotor.h
	psi/swmotor.i
	psi/tas.c
	psi/tas.h
	psi/tas.tex
	psi/tas.w
	psi/tasdrive.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tasu.h
	psi/tasutil.c
	psi/tdchm.c
	psi/tdchm.h
	psi/tecsdriv.c
	psi/tecsdriv.h
	psi/velodorn.c
	psi/velodorn.h
	psi/velodorn.w
	psi/velodornier.c
	psi/hardsup/README
	psi/hardsup/StrMatch.c
	psi/hardsup/asynsrv_def.h
	psi/hardsup/asynsrv_errcodes.h
	psi/hardsup/asynsrv_mark.c
	psi/hardsup/asynsrv_utility.c
	psi/hardsup/c_interfaces.c
	psi/hardsup/dillutil.c
	psi/hardsup/dillutil.h
	psi/hardsup/el734_def.h
	psi/hardsup/el734_errcodes.h
	psi/hardsup/el734_utility.c
	psi/hardsup/el734fix.h
	psi/hardsup/el734tcl.c
	psi/hardsup/el737_def.h
	psi/hardsup/el737_errcodes.h
	psi/hardsup/el737_utility.c
	psi/hardsup/el737fix.h
	psi/hardsup/el737tcl.c
	psi/hardsup/el755_def.h
	psi/hardsup/el755_errcodes.h
	psi/hardsup/el755_errorlog.c
	psi/hardsup/el755_utility.c
	psi/hardsup/err.c
	psi/hardsup/failinet.c
	psi/hardsup/geterrno.c
	psi/hardsup/itc4util.c
	psi/hardsup/itc4util.h
	psi/hardsup/make_gen
	psi/hardsup/makefile_alpha
	psi/hardsup/makefile_linux
	psi/hardsup/makeprint.c
	psi/hardsup/rs232c_def.h
	psi/hardsup/serialsinq.c
	psi/hardsup/serialsinq.h
	psi/hardsup/sinq_defs.h
	psi/hardsup/sinq_prototypes.h
	psi/hardsup/sinqhm.c
	psi/hardsup/sinqhm.h
	psi/hardsup/sinqhm_def.h
	psi/hardsup/stredit.c
	psi/hardsup/strjoin.c
	psi/hardsup/table.c
	psi/hardsup/table.h
	psi/hardsup/velsel_def.h
	psi/hardsup/velsel_utility.c
	psi/motor/Makefile
	psi/motor/el734_test
	psi/motor/el734_test.c
	psi/motor/makeprint.c
	psi/sinqhm/FOCUS_gbl.h
	psi/sinqhm/FOCUS_srv_main.c
	psi/sinqhm/Makefile
	psi/sinqhm/SinqHM_bootParamsConfig.c
	psi/sinqhm/SinqHM_bootUtil.c
	psi/sinqhm/SinqHM_def.h
	psi/sinqhm/SinqHM_gbl.h
	psi/sinqhm/SinqHM_srv_filler.c
	psi/sinqhm/SinqHM_srv_main.c
	psi/sinqhm/SinqHM_srv_routines.c
	psi/sinqhm/SinqHM_srv_server.c
	psi/sinqhm/bld
	psi/sinqhm/bld2
	psi/sinqhm/bldmen
	psi/sinqhm/hist_mem_notes.tex
	psi/sinqhm/hist_mem_spec.tex
	psi/sinqhm/hist_mem_spec_fig1.ps
	psi/sinqhm/hist_mem_spec_fig2.ps
	psi/sinqhm/hist_mem_spec_fig3.ps
	psi/sinqhm/hist_mem_spec_fig4.ps
	psi/sinqhm/lwl_client.c
	psi/sinqhm/lwl_server.c
	psi/sinqhm/make_sinqhm.com
	psi/sinqhm/monitor.c
	psi/sinqhm/psi_logo.ps
	psi/sinqhm/sinq_logo.ps
	psi/sinqhm/sinqhm_bootutil_client.c
	psi/sinqhm/sinqhm_client.c
	psi/sinqhm/sinqhm_ctrl.c
	psi/sinqhm/usrConfig.c
	psi/sinqhm/usrConfig.c_diffs
	psi/sinqhm/usrConfig2604.c
	psi/sinqhm/vmio10_def.h
	psi/sinqhm/vmio_utility.c
	psi/tecs/coc_client.c
	psi/tecs/coc_client.h
	psi/tecs/coc_logfile.c
	psi/tecs/coc_logfile.h
	psi/tecs/coc_server.c
	psi/tecs/coc_server.h
	psi/tecs/coc_util.c
	psi/tecs/coc_util.h
	psi/tecs/fortify1.c
	psi/tecs/instr_hosts.c
	psi/tecs/instr_hosts.h
	psi/tecs/keep_running.c
	psi/tecs/make_gen
	psi/tecs/make_opt
	psi/tecs/make_opt_alpha
	psi/tecs/make_opt_llc
	psi/tecs/makefile
	psi/tecs/makefile_alpha
	psi/tecs/makefile_linux
	psi/tecs/myc_buf.c
	psi/tecs/myc_buf.h
	psi/tecs/myc_err.c
	psi/tecs/myc_err.h
	psi/tecs/myc_fortran.h
	psi/tecs/myc_mem.h
	psi/tecs/myc_str.c
	psi/tecs/myc_str.h
	psi/tecs/myc_time.c
	psi/tecs/myc_time.h
	psi/tecs/myc_tmp.c
	psi/tecs/myc_tmp.h
	psi/tecs/rstart.c
	psi/tecs/six.c
	psi/tecs/str.f
	psi/tecs/sys_cmdpar.f
	psi/tecs/sys_date.f
	psi/tecs/sys_env.c
	psi/tecs/sys_get_key.f
	psi/tecs/sys_getenv.f
	psi/tecs/sys_lun.f
	psi/tecs/sys_open.f
	psi/tecs/sys_open_alpha.f
	psi/tecs/sys_rdline.c
	psi/tecs/sys_select.c
	psi/tecs/sys_select.h
	psi/tecs/sys_unix.c
	psi/tecs/sys_wait.f
	psi/tecs/tecs.bld
	psi/tecs/tecs.c
	psi/tecs/tecs.tcl
	psi/tecs/tecs_c.c
	psi/tecs/tecs_c.h
	psi/tecs/tecs_cli.c
	psi/tecs/tecs_cli.h
	psi/tecs/tecs_client.f
	psi/tecs/tecs_data.c
	psi/tecs/tecs_data.h
	psi/tecs/tecs_dlog.inc
	psi/tecs/tecs_for.f
	psi/tecs/tecs_lsc.c
	psi/tecs/tecs_lsc.h
	psi/tecs/tecs_plot.f
	psi/tecs/tecs_serial.c
	psi/tecs/tecs_serial.h
	psi/tecs/term.c
	psi/tecs/term.h
	psi/utils/Makefile
	psi/utils/SerPortServer.c
	psi/utils/asynsrv_test.c
	psi/utils/ecb-load.c
	psi/utils/el734.c
	psi/utils/el734_test.c
	psi/utils/el737.c
	psi/utils/make.ecb
	psi/utils/check/amorcheck
	psi/utils/check/dmccheck
	psi/utils/check/focuscheck
	psi/utils/check/focusstatus.tcl
	psi/utils/check/hrptcheck
	psi/utils/check/sanscheck
	psi/utils/check/sicssyntax.tex
	psi/utils/check/sicssyntaxlib.tcl
	psi/utils/check/test.tcl
	psi/utils/check/topsicheck
	psi/utils/check/tricscheck
	psi/utils/check/tst
 2003-06-20 10:17:44 +00:00
cvs
f42a780057 Different makefiles for different machines M.Z. 2003-03-18 09:43:43 +00:00