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

35 Commits

Author SHA1 Message Date
Koennecke Mark
66466c1c0f This is the first working version of the new logging system. Some work 
in fine tuning still needs to be done. But is reasonably OK now.
 2016-02-11 13:40:31 +01:00
Mark Koennecke
5e597e2d10 Merge branch 'maverick' into develop 
Compile under OSX
 2016-01-26 09:48:11 +01:00
Koennecke Mark
6f0e2e01df Merge branch 'develop' into moreremo 
Conflicts:
	conman.c
 2015-05-12 08:41:06 +02:00
Koennecke Mark
bb7eb497de Refactored protocol code to use defined IDs rather then raw integers 2015-05-11 09:30:44 +02:00
Koennecke Mark
5d0e05d77b Merge branch 'develop' into moreremo 2015-04-30 09:26:44 +02:00
Koennecke Mark
b60ce746d4 Merge commit 'refs/merge-requests/1' of ssh://gitorious.psi.ch/sinqdev/sics into merge-requests/1 
First merge with ANSTO which compiles

Conflicts:
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	exebuf.c
	hipadaba.c
	interface.h
	make_gen
	motor.c
	nserver.c
	nwatch.c
	ofac.c
	protocol.c
	sicshipadaba.c
 2015-04-23 17:00:33 +02:00
Koennecke Mark
b7eaa538ed - Rewrote the write part of remoteobject 
- With transactionID > 10^6, now termination messages are sent by contextdo
  and tasks
- This still has bugs
 2015-04-23 15:52:05 +02:00
Ferdi Franceschini
10d29d597c Cleaned up ANSTO code to merge with sinqdev.sics 
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h
 2015-04-23 20:49:26 +10:00
Koennecke Mark
005c35402a - Added additional cnvrt files from sicspsi 
- Removed unused sycamore protocol from the code base
 2015-04-20 09:29:07 +02:00
Koennecke Mark
2eef24bf3c First version of remoteobject. In the implementation of this, the following 
sub problems were solved:
- sicsget was not reporting geterrors on nodes properly
- rwpuffer contained dirt after wrap
- property change events were added to hipadaba
- Some tuning of SICS output
- The number of codes was wrong in outcode.c
 2015-03-17 11:41:18 +01:00
Ferdi Franceschini
b1f09c3dd3 Fixed error message typo. We don't want to miss errors when searching logs. 2014-01-15 16:31:13 +11:00
Ferdi Franceschini
1d7681e326 Reduce verbosity of log files when using JSON protocol. 2013-04-10 19:54:24 +10:00
Ferdi Franceschini
c466d85bba pSock is obsolete, see conman.h SConnection struct. 2013-04-10 18:45:51 +10:00
Douglas Clowes
53ce7dc584 Reduce noise in log files when using the JSON protocol 2012-11-29 12:47:21 +11:00
koennecke
9eca96b064 - Fixes to make SL6 work 
- New NeXus libraries
- Added new raw binary transfer mode for mass data
- Added a check script option to configurable virtual motor


SKIPPED:
	psi/dumprot.c
	psi/make_gen
	psi/psi.c
	psi/rebin.c
	psi/sanslirebin.c
 2012-03-29 08:41:05 +00:00
koennecke
b26b8fc735 - Changed strncpy to strlcpy, strncat to strlcat 
- Added strlcpy and strlcat to SICS
- Added a driver for the POLDI power supplies


SKIPPED:
	psi/A1931.c
	psi/autowin.c
	psi/bruker.c
	psi/docho.c
	psi/dornier2.c
	psi/dspcode.c
	psi/ease.c
	psi/ecb.c
	psi/ecbcounter.c
	psi/ecbdriv.c
	psi/el734dc.c
	psi/el734driv.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/el737hpdrivsps.c
	psi/el737hpv2driv.c
	psi/el755driv.c
	psi/eurodriv.c
	psi/haakedriv.c
	psi/itc4driv.c
	psi/julcho.c
	psi/linadriv.c
	psi/lmd200.c
	psi/lscsupport.c
	psi/ltc11.c
	psi/make_gen
	psi/oicom.c
	psi/oxinst.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/sanscook.c
	psi/sanslirebin.c
	psi/sanswave.c
	psi/sinqhmdriv.c
	psi/sinqhttp.c
	psi/slsecho.c
	psi/slsmagnet.c
	psi/slsvme.c
	psi/sps.c
	psi/swmotor.c
	psi/swmotor2.c
	psi/tabledrive.c
	psi/tasscan.c
	psi/tdchm.c
	psi/velodorn.c
	psi/velodornier.c
 2010-04-13 15:08:38 +00:00
koennecke
7d30c4d352 - Extended sicshdbadapter to attach a node to the target of any 
drivable. Required a new event in devexec.c
- Fixed the phytron driver to handle speed well
- Added a protocol driver for the TCP/IP bridge to the SLS magnets


SKIPPED:
	psi/make_gen
	psi/phytron.c
	psi/psi.c
	psi/slsecho.c
	psi/sps.c
 2010-03-25 10:02:47 +00:00
koennecke
40ff36d142 - Fixed a singlex death when there was no lambda. Was a problem during 
shutdown when nothing works as it should
- Made an attempt to have all error message printed on demand
- Added a tricsswap feature to sinqhttp which swaps the data right for SICS
- Edited speed for phytron driver
- First attack on adding a misalignment calculation to tasub
- Added a test protocol for scriptcontext which can be configured.


SKIPPED:
	psi/sinqhttp.c
 2010-03-09 13:12:01 +00:00
zolliker
4bf0c87daf restructured configuration (ofac.c) 
- ofac.c contains now only the command in initialisation function list
- the other functions are moved to sicsutil.c
- moved DoubleTime and the content of access.c to sicsutil.c
- moved some initialisation code from ofac.c to the corresponding modules
 2010-01-28 08:14:37 +00:00
koennecke
8cc5474334 - After a bug at TRICS I replaced all occurrences of strcpy, strcat, sprintf 
by length limited versions wherever appropriate.


SKIPPED:
	psi/el755driv.c
	psi/faverage.c
	psi/frame.c
	psi/lmd200.c
	psi/polterwrite.c
	psi/psi.c
	psi/sanswave.c
	psi/sinqhmdriv.c
	psi/termprot.c
 2009-12-04 12:58:31 +00:00
koennecke
ee49c5b56a - Fixed a core dump in the sycamore protocol 
- Added missing files aynnet.*
- Fixed the addition to root issue in scriptcontex
 2009-02-17 08:34:46 +00:00
koennecke
91d4af0541 - Adapted indenation to new agreed upon system 
- Added support for second generation scriptcontext based counter
 2009-02-13 09:00:03 +00:00
koennecke
361ee9ebea - Reworked the connection object and the IO system 
- Reworked the support for TRICS
- Added a second generation motor
 2009-02-03 08:05:39 +00:00
zolliker
17ba72418f - changed logging functionality (CompactCommandLog option) 2008-01-18 07:26:51 +00:00
zolliker
78e337b901 - bugfix (bug introduced in 1.6) 2008-01-11 15:11:02 +00:00
koennecke
08c5e037a0 - Added asynchronous IO code from ANSTO 
- Added new ACT protocol
- Extended sicshdbadapter to cover counters and status to put the status
 into Hipadaba
- Fixes to napi5.c
- Exe now supports hdbrun which allows to write output for a buffer into
 hdb node.
 2007-06-22 11:44:46 +00:00
koennecke
9737722b8c - Added hmslave.c 
- Tasub only drives required motors
- Tasub handles fixed motors more gracefully
 2007-05-30 11:57:50 +00:00
koennecke
6cf9add9ee - Installed json protocol 
SKIPPED:
	psi/libpsi.a
	psi/tecs/libtecsl.a
 2007-01-21 22:07:37 +00:00
hauser_n
51f25e651c Put space between status and msgstring 2006-05-01 00:38:58 +00:00
zolliker
da3dfd9d76 - Introducted Arg2Tcl as a replacement for some calls to Arg2Text 
- Fixed a memory leak
 2006-04-11 07:26:55 +00:00
hauser_n
08dc6c764b Added sycformat function to replace tcl code. 2006-04-05 01:09:32 +00:00
hauser_n
c99eef86aa SCWriteSycamore no longer sends messages to client when inMacro 2006-01-30 01:37:45 +00:00
koennecke
b737b4d936 - Many fixes to accomodate a nitty picky TRICS wishlist 
- Added a log facility to scan which includes a variable which is logged but
  not driven during a scan.
- Fixed normal beam operation
 2006-01-27 11:33:06 +00:00
koennecke
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
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