39 Commits

Author SHA1 Message Date
8de1fd4183 - use dig before gethostbyname to resolve host names 2018-08-09 09:10:10 +02:00
aac014618c - merged "offline" and "disconnected" stati 2018-07-03 11:14:18 +02:00
19b3c71274 - SECoP protocol for scriptcontext 2018-05-07 13:53:51 +02:00
10cb44df85 - ascon.c: bug fix
- binprot.c: enhancements
- devser.c, scriptcontext.c: introduced specifiaction of start time in poll
2017-04-07 10:10:10 +02:00
2670bafe53 SICS compiles under RHEL7 2017-01-13 15:43:39 +01:00
fdb443441a - more AsconStatus states
- enhancements in binprot
- make Logger public (logger.h)
- added lscprot (50 ms write delay for lakeshore models)
- additonal bug fixes
2016-05-13 16:32:18 +02:00
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
eff54a5fd9 Implement task priorities and message queues 2015-07-29 17:47:46 +10:00
e497e2daf3 Fixed minor typos and compilation issues 2015-04-30 09:25:36 +02:00
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
72f9e59150 Multiple bug fixes
- Arrayutil was not summing correctly
- Added interest to motorsec in order to support old status clients
- core dump because of bad free in devser
- fixed transferring of count time in multicounter
- added stack debugging to sllinux_def
- Modifications to tasdrive to wait for finish of monochromator properly
2014-05-05 13:52:00 +02: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
9a3607bd66 - make reconnectInterval changeable (0: no automatic reconnection) 2013-06-25 11:21:04 +00:00
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
6f774358e7 keep it building 2012-11-29 10:37:50 +11:00
b22906ba2d SICS-387 Started adding code to pass signals on to script context drivers. 2012-11-28 16:23:04 +11:00
caf31b36cc - added command to change timeout of a scriptcontext controller
- created syncedprot
2012-08-21 06:44:29 +00:00
aa84a9d578 - added DevHostport and DevStatus function 2012-06-19 06:31:56 +00:00
ce565b4d50 - Fixed a normalisation problem in diffscan when the first value
did not have enough counts
- Reduced polling frequency in emon
- Fixed a scriptcontext bug which would cause it to dump core in SctTransact
  on interrupts
- Fixed an issue with missing <nl> at the end of batch files
- Added a feature which does not call halt when counting stops in hmcontrol.c
  This is necessary for the BOA CCD
- Initalized doNotFree properly in hipadaba.c
- Added the travelling salesman reflection measurement algorithm
- Added another component to amorset
- Removed old SicsWait from nserver.c
- Added a means to nxscript to write 16 bit data for BOA
- Modified tasub to accept a drivabel as a motor and not only a motor.
  This became necessary to make EIGER work as A2 on EIGER is a virtual
  motor


SKIPPED:
	psi/amorcomp.h
	psi/amordrive.h
	psi/amorset.c
	psi/amorset.h
	psi/amorset.tex
	psi/amorset.w
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/pardef.c
	psi/polterwrite.c
	psi/psi.c
	psi/sinqhttpopt.c
2011-09-23 07:55:49 +00:00
2dd46f0968 - bug fix 2011-09-12 09:29:41 +00:00
3ee1865f9b - Introduced a new trace facility
- Fixed performance problems in many protocol drivers.


SKIPPED:
	psi/julprot.c
	psi/phytron.c
	psi/pmacprot.c
	psi/polterwrite.c
	psi/spss7.c
2011-06-29 07:53:54 +00:00
446b05d6a2 - Added some hipadab array math
- Added missing cnvrt files, stolen from Markus
- Debugged the new sinqhttpopt driver for SINQ HTTP HM
- Debugged the driver for the new S7 Siemens SPS
- Added handling of hexadecimal terminators to ascon.c
- Increased the write buffer size in asynnet again
- Fixed  a core dump in lld.c
- Added writing of second gen HM to nxscript.c
- Added doubletime command to SICS
- Fixed a core dump issue in sicshdbadapter.c on dimension changes
- Modified sicsobj to look for lower case keys too


SKIPPED:
	psi/cnvrt.c
	psi/cnvrt.h
	psi/el734hp.c
	psi/make_gen
	psi/sinqhttpopt.c
	psi/sinqhttpprot.c
	psi/spss7.c
	psi/swmotor.c
2011-04-08 14:18:42 +00:00
ce77a0b2f0 - bug fix 2011-03-25 14:22:58 +00:00
045029dfd3 - Currently disabled attempts at logging commands
- Added a warning for excessive data rates on monitors
- Added statistics to devser and thus to scriptcontext
- Added byte concatenation to dynstring
- Added aborting for reflection generation to fourmess.c
- Added data checksum testing to hipadaba, use for update tests
- Fixed interrupt discovery in network.c, caused invalid interrupt
  codes which in turn confused sicscron which had to be fixed too.
- Renamed ubcalc into ubcalcint in order to reclaim the ubcalc for Jurg
- Added an a3offset to tasub in order to fix what I perceive an IS problem
- Added support for the newer version of the Siemens SPS, the S7
- Added a not yet fully working sinqhttpopt driver which talks to
  http HM without libghttp


SKIPPED:
	psi/delcam.c
	psi/make_gen
	psi/psi.c
	psi/sinq.c
	psi/sinq.h
	psi/sinqhttpopt.c
	psi/slsvme.c
	psi/spss7.c
2010-12-20 10:18:01 +00:00
6c4f57ec6f - introduced <controller> actions function for listing actions
- introduced <controller> reconnect function
2010-04-13 14:17:58 +00:00
09cc25ec5b - Implemented tcl: prefix which allows to execute a command in Tcl directly
- Fixed a stack overrun bug in macro.c
- Fixed a killing bug in devser.c
- Added node writing with offset to nxscript.c
- Wrote a simulation driver for second generation HM's
- Readded devexec commands to  SICS
- Readded Hipadaba initialisation to SICS
- Fixed a bug in sinqhttprot.c which is triggered when a reconnect happens
  during a node based download of data.


SKIPPED:
	psi/sinqhttpprot.c
2010-02-02 12:38:10 +00:00
3e8938e986 - bug fixes
SKIPPED:
	psi/haakedriv.c
2010-02-01 11:29:46 +00:00
a56838b90d - simplified devser queue
- added inherited sct variables starting with @
- inserted SctIsPending / DevIsPending
- some general improvements in scriptcontext.c/sctdriveobj.c
2010-01-27 13:39:33 +00:00
85880be565 - Fixed a bug in countersec.c which prevented counting in monitor mode
- Fixes to make the second generation velocity selector driver work
- Modified obpar.c to allow parameter changes while running. This makes
  it possible to collect data at TRICS while cooling down.
2009-05-26 09:36:59 +00:00
4b82f13ab1 - fixed problems deallocation sicsobjects 2009-02-25 14:50:00 +00:00
35f2b6b810 - allow scriptcontext objects to be dynamic
- enhancements in scriptcontext (error messages stored as properties)
2009-02-19 13:30:32 +00:00
91d4af0541 - Adapted indenation to new agreed upon system
- Added support for second generation scriptcontext based counter
2009-02-13 09:00:03 +00:00
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
0fd55c2c39 - More debugging of scriptcontext, mostly working now
- Created driveable SICSobj for standalone and as an adapter
2008-07-14 07:22:41 +00:00
9e7a6cfd74 - added scriptcontext.h
- killing a node using sct should now be safe
- sctdrive adapter object might be dynamic
- default for the checkstatus script: returning the status property
- introduced <sctcon> unpoll
- changed <sctcon> queuecon to <sctcon> send
- some more improvements in sct
2008-06-13 11:22:13 +00:00
0915491925 - Scriptcontext debugged to be working
- Added a drivable adapter to scriptcontext nodes
- Added subsampling to simulated histograms (and as a general option) in
  order to support Gumtree testing.
2008-06-09 08:57:53 +00:00
dc6225ecce - 2008-05-30 10:33:19 +00:00
b5b4da2776 - unified the 2 script context commands
- minor changes in hipadaba and ascon/devser
2008-05-30 09:29:44 +00:00
3967dc8844 - added new scriptcontext with devser 2008-05-14 14:23:16 +00:00