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

27 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
Koennecke Mark
95988f331c Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop 
Conflicts:
	fourmess.c
 2016-01-29 08:53:00 +01:00
Mark Koennecke
5e597e2d10 Merge branch 'maverick' into develop 
Compile under OSX
 2016-01-26 09:48:11 +01:00
Koennecke Mark
a37aae2361 Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop 
Conflicts:
	conman.c
	drive.c
 2016-01-15 15:17:17 +01:00
Douglas Clowes
eff54a5fd9 Implement task priorities and message queues 2015-07-29 17:47:46 +10:00
Markus Zolliker
fb7741178d - remob.c: forward errors to sics correctly 
- minor, more cosmetic fixes
 2015-04-28 16:17:32 +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
Mark Könnecke
bc31c6cd1e Changes to make SICS compile on OSX Maverick with clang 2014-03-14 09:48:14 +01:00
koennecke
86e246416b - Added bridge functions to histmemsec to make it look more like histmem 
- Modifed many modules using histmem to work also with histmemsec
- Extended tasker with task names and task groups
- There is a new taskobj which allows to list tasks and to interact with them.
- Task now supports running Tcl functions as tasks
- There is a new experimental sctcomtask module which allows to define communication
  tasks against a scriptcontext. This is a new feature which should facilitate
  writing sequential scripts using asynchronous communication.
- A fix to make spss7 work when there are no switches
- ORION support for single X. TRICS measures crystals hanging down, ORION
  standing up


SKIPPED:
	psi/ease.c
	psi/faverage.c
	psi/jvlprot.c
	psi/make_gen
	psi/pardef.c
	psi/polterwrite.c
	psi/psi.c
	psi/sinq.c
	psi/spss7.c
 2012-12-20 11:32:33 +00:00
zolliker
1e23f3c7b4 - general float format for remob 2011-08-29 14:39:56 +00:00
koennecke
99d2485d22 - Connections write timeouts were incorrectly handled in asynnetc. Fixed. 
- Implemented the desired run/drive behaviour: drive waits for what it started
  run starts, and success waits for everything to finish. This required
  changes to a lot of files.
- Fixed a bug in remob which supressed required messages
 2009-04-17 12:52:01 +00:00
zolliker
50b0a5c4a7 remove eLogError and eLog in one place 2009-03-27 15:16:16 +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
a04746f766 - treat arguments of remserver command correctly (including empty strings) 2008-10-20 15:15:14 +00:00
zolliker
6b80494508 - try 3 times on a sea timeout 2008-10-20 07:49:48 +00:00
zolliker
3967dc8844 - added new scriptcontext with devser 2008-05-14 14:23:16 +00:00
zolliker
3a0b2e21be - SCStore store now also context and macro state 2008-01-18 07:27:23 +00:00
koennecke
1f862889ce - Port to SL-5 
SKIPPED:
	psi/tecs/make_crv
 2008-01-03 09:56:55 +00:00
zolliker
5053e6c216 - ignore interest command 2007-11-27 07:21:39 +00:00
zolliker
388cc4bdeb - messages from SICS should not be forwared to SEA 2007-02-23 12:44:36 +00:00
zolliker
87d81cf474 - workaround for infinite echo loop sea <-> sics 
- ".CurrentValue" removed in evcontroller.c
 2006-09-12 15:45:42 +00:00
zolliker
f88f48fca9 - inserted command statistic 
- add runscript parameter to environment object
- added Arg2Tcl0 function
 2006-06-20 13:28:17 +00:00
koennecke
38cfea4865 - Conescan working now 
- Removed old NETReadTillterm


SKIPPED:
	psi/libpsi.a
	psi/tasdriveo.c
 2006-04-11 08:03:15 +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
zolliker
afaeae0554 - remob uses now two connections (spy/user), bug fixes 2005-11-17 07:51:16 +00:00
zolliker
fce7a1d687 - moved initializer and remob to the kernel 
SKIPPED:
	psi/make_gen
 2005-09-09 14:53:33 +00:00