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

34 Commits

Author SHA1 Message Date
Mark Koennecke
2593b44633 Merge branch 'maverick' into develop 
Everything up to dat
 2016-01-26 11:34:17 +01:00
Mark Koennecke
1149227685 Merge branch 'master' into maverick 2016-01-26 10:56:19 +01:00
Mark Koennecke
5e597e2d10 Merge branch 'maverick' into develop 
Compile under OSX
 2016-01-26 09:48:11 +01:00
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
Mark Koennecke
bff0473ed6 Added forgotten files to commit for compiling on Maverick 2014-03-14 09:50:31 +01:00
Douglas Clowes
9a1be5a80b merge and replace with PSI+site_ansto 2012-11-26 11:33:14 +11:00
Mark Koennecke
4baffb9b7a PSI sics-cvs-psi-2008-10-02 2012-11-15 12:39:52 +11:00
Mark Koennecke
6e926b813f PSI sics-cvs-psi-2006 2012-11-15 12:39:51 +11:00
Mark Koennecke
ae77364de2 PSI sics-cvs-psi-complete-tree-post-site-support 2012-11-15 12:39:49 +11:00
Mark Koennecke
6373f6b0fb PSI sics-cvs-psi_pre-ansto-moved (artificially renamed) 2012-11-15 12:39:49 +11:00
Mark Koennecke
3ffd0d8af4 PSI sics-cvs-psi_pre-ansto 2012-11-15 12:39:48 +11: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
zolliker
58cf612fa9 - introduced header file dependency check 
SKIPPED:
	psi/hardsup/make_gen
	psi/hardsup/makefile_linux
 2009-11-10 10:39:29 +00:00
koennecke
af3461c774 Compiles and runs under Mac OS X 
VS: ----------------------------------------------------------------------


SKIPPED:
	psi/arrobj.c
	psi/pardef.c
	psi/polterwrite.c
	psi/tecs/tecs_cli.c
 2008-07-23 12:15:06 +00:00
zolliker
33a6a35662 . 
SKIPPED:
	psi/makefile_linux
	psi/scontroller.c
	psi/serial.c
	psi/tecs/make_crv
 2007-02-23 15:47:05 +00:00
koennecke
faec15b5f6 - Some fixes to the hipadaba code. 
SKIPPED:
	psi/libpsi.a
	psi/hardsup/libhlib.a
	psi/tecs/libtecsl.a
 2007-02-02 05:48:07 +00:00
koennecke
d61fbe0869 - Fixed a compile issue with serial.c 
SKIPPED:
	psi/libpsi.a
	psi/scontroller.c
	psi/serial.c
	psi/hardsup/libhlib.a
	psi/tecs/libtecsl.a
 2007-01-29 22:50:19 +00:00
koennecke
6cf9add9ee - Installed json protocol 
SKIPPED:
	psi/libpsi.a
	psi/tecs/libtecsl.a
 2007-01-21 22:07:37 +00:00
zolliker
2b63ad06b2 *** empty log message *** 
SKIPPED:
	psi/makefile
	psi/hardsup/makefile
	psi/tecs/pg_plus/makefile
	psi/utils/makefile
 2005-03-18 06:45:14 +00:00
zolliker
6eeac106eb - cleaned up makefiles 
SKIPPED:
	psi/tecs/pg_plus/make_gen
	psi/tecs/pg_plus/makefile
	psi/tecs/pg_plus/makefile_linux
	psi/tecs/pg_plus/makefile_macosx
 2005-03-08 11:12:03 +00:00
zolliker
23479e32c5 *** empty log message *** 
SKIPPED:
	psi/hardsup/makefile
	psi/tecs/makefile
	psi/tecs/pg_plus/makefile
	psi/utils/makefile
 2005-03-04 09:43:36 +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
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
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
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
f7abbe6aa5 - New drivers for EL737 and EL734 high performance 
- Changes to makefiles


SKIPPED:
	psi/dornier2.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/makefile_alpha
	psi/psi.c
	psi/velodorn.c
	psi/velodorn.h
	psi/velodorn.w
	psi/hardsup/el737_utility.c
	psi/hardsup/makefile_alpha
	psi/tecs/makefile_alpha
 2003-07-08 13:26:53 +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
f3853c20f0 - Fixed bug with ECB not stopping when no beam 
- Fixed synchronisation issues
- Fixed hsitogram memory writing from nxscript
- Started module for writing SICS interfaces in Tcl
- Fixed a bug in scan, which allowed to corrupt files
- Fixed memory problems in napi5
 2003-05-23 15:06:47 +00:00
cvs
f42a780057 Different makefiles for different machines M.Z. 2003-03-18 09:43:43 +00:00
cvs
2d16479717 - Added back calculation from motor positions to Q/E variables into 
TAS code.
- Fixed communication problems in SerPortServer, mainly with terminator
  detection.
- Added SPS switched motors for TOPSI
- Debugged Power-PC histogram memory software for TRICS
 2001-05-18 14:12:32 +00:00
cvs
fc6c4acd79 D.Maden. 11-Sep-2000. 
Makefiles modified to generate a Linux SICServer.
   Other files modified to get rid of irritating compiler warning messages.
 2000-09-11 09:17:43 +00:00
cvs
0a3e457c96 - Fixed irregularly occuring core dump bug. 2000-07-26 08:00:29 +00:00
cvs
d782d43951 - added backwards calculation of hkl from four circle angles. This 
required inclusion of a matrix package.
- modified  counter error handling to send a Stop when the _BAD_BUSY
  error is received.
- added an environment interface to the general controller stuff in choco.*
  Also added setting a parameter directly at the controller object.
- Added a driver for the ETH High Temperature Furnace to be used at
  SANS.
 2000-07-12 12:01:19 +00:00