Commit Graph

95 Commits

Author SHA1 Message Date
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
b1cda3f579 First incarnation of the logging code 2016-02-03 10:43:36 +01:00
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
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
e577d9c313 - Removed defunct capture command
- Moved some protocolls from sicspsi to kernel as discussed at ANSTO
2015-04-20 09:08:34 +02:00
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
Douglas Clowes
1da5fc9062 Create and use sicsglobal.h and add isDuringInitialization 2014-06-19 16:35:47 +10:00
Douglas Clowes
a557cf577a Implement 'sicslog' command for driver logging 2014-05-01 10:54:09 +10:00
koennecke
57b6dce6bf - Added messagepipe.c
- Added initial version of sicsget. This is a more generalised way of
  reading and writing SICS data wherever it is. The thing is extendable if
  reading something the current way is to slow. This has both a C interface
  and an interpreter interface.
2013-11-07 08:42:32 +00:00
koennecke
ad241bd99e - Added a protocol driver for the munich sputter machine
- Added a multicountsersec to teplace hmcontrol and multicounter
- Fixed a case sensitivity bug in haddcheck
- Made oscillate work with second generation motors for POLDI
- Added a time stamper to trace. Now there will be time stamps in trace files which allow
  to correlate things from the master log with the trace.
- Updated polterwrite.
- Updated testprot to work with the behave test


SKIPPED:
	psi/make_gen
	psi/polterwrite.c
	psi/psi.c
	psi/sputterprot.c
2013-11-04 12:55:15 +00:00
koennecke
1afe142812 - Removed old code
- Extended tasker to support task groups
- Added task functions for motors and counters
- Modifed devexec to use the new task functions
- Modified TAS to treat the monochromator separatly
- Coded a EIGER monochromator module to reflect even more new
  requirements
- Added EPICS counters and motors
- Modified multicounter to be better performing


SKIPPED:
	psi/eigermono.c
	psi/make_gen
	psi/makefile_linux
	psi/psi.c
	psi/sinqhttp.c
2013-04-02 15:13:35 +00: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
Douglas Clowes
7f42b8c420 move sicslist to site_ansto.c 2012-12-10 14:53:39 +11:00
Douglas Clowes
e073e3c4a8 MakeAsync... permanent and add sicslist 2012-11-29 12:24:00 +11:00
zolliker
caf31b36cc - added command to change timeout of a scriptcontext controller
- created syncedprot
2012-08-21 06:44:29 +00:00
koennecke
3e5773a446 - Added a boa recount mode in hmcontrol. Soemtimes the CCD overruns
- Added a staticoffset to motorsec.c in order to allow the use of softzero
  for physics purposes.
- When a triple axis motor fails to start, the whole shit needs to be stopped.
  This has now been implemented into tasdrive.c
- There were crashes in adding NB reflections to a reflection list. This has
  been fixed.
2012-07-11 06:34:48 +00:00
koennecke
bd50b19178 - Fixed sicsprompt bug. Sicsprompt caused a core dump
- Removed generation of incommenurate reflections for 0,0,0 in fourmess.c
- Implemented a Poch command for heartbeats
- Fixed 64 bit dimension issues in nxdict
- Fixed different calling conventions for NXReportError deep stack in nxdict
- Stopped ei motor driving when not necessary
- Added yet another monitor for POLDI
- Added a protocoll driver for the JVL motor RS-485 binary protocoll
- Fixed some reporting issues


SKIPPED:
	psi/jvlprot.c
	psi/make_gen
	psi/polterwrite.c
	psi/psi.c
	psi/spss7.c
2012-06-05 09:09:20 +00:00
zolliker
2469129270 - make definealias aliases persistent 2011-08-29 14:38:27 +00:00
koennecke
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
koennecke
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
zolliker
235f164d89 . 2011-03-25 14:27:17 +00:00
koennecke
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
koennecke
eaf96b1893 - Fixed a bug which caused the status file to be overwritten before it
could be read on initialization.
- The new SLS magnet driver for the TCP/IP concentrator now successfully
  writes data


SKIPPED:
	psi/slsecho.c
2010-04-16 09:02:17 +00:00
zolliker
5bcbacfb81 - remob must be a permanent command 2010-04-15 12:19:25 +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
koennecke
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
zolliker
969b35d1d7 - moved IFServerOption to ifile.c
- moved PWSicsUser to passwd.c
- moved back InitObjectCommands to ofac.c
2010-01-28 08:39:21 +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
be13da8a03 - SICS cleanup: removed unused code
SKIPPED:
	psi/make_gen
	psi/makefile_linux
	psi/polterwrite.c
	psi/psi.c
2010-01-19 12:55:40 +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
98009be4c3 - Added reflection generation for symmetriqally missing reflections
to fourmess
- Fixed hdbtable, reflist and tasub up to work with GTSE
- Made TRICS do fast scans again
- Added support for SANS beam center calculations
- Fixed a bug where SICS apparently did double counting but in fact
  just omitted an error message and did not
- Added the harray command
2009-08-13 07:28:44 +00:00
koennecke
3f3f0810e5 - Many fixes to the four circle codes during taking the new code into
operation.
- Fixed some missing output
- Second generation histogram memory and velocity selector objects
- Fixed a problem in diffscan
2009-05-15 13:21:20 +00:00
koennecke
3e8b11675a - Introduced a general Hipadaba table module and modified the four
circle codes to use it.
- Added to functions to histmem, getdelay and formattof,  to support new HM
- Removed obsolete mesure.*
2009-03-16 14:24:34 +00:00
koennecke
10a475f020 - Fixed conflicts in ascon.c
- Supressed superfluous message from fmess
- Expanded multicounter to deal with threshold commands nicely
- Fixed an an issue with an uninitialized dummy connection in nserver
- Many changes to simidex to make it work in a more reliable way.
- Added hdbfactory path alias targetpath
- Extended frame to deal with sinqhttp HM
2009-03-09 08:28:08 +00:00
zolliker
35f2b6b810 - allow scriptcontext objects to be dynamic
- enhancements in scriptcontext (error messages stored as properties)
2009-02-19 13:30:32 +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
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
zolliker
3967dc8844 - added new scriptcontext with devser 2008-05-14 14:23:16 +00:00
koennecke
e46334eddf - Fixed a massive memory leak in Hipadaba
- Extended the Hdb adapter to support SICSdata
- Made the simulated histogram memory driver work properly when
  data has been set.
- Implemented the hfactory command
- Removed hdbcommand which was never finsihed
2008-05-08 09:27:48 +00:00
koennecke
f512f47b02 - Refactored hdb callbacks
SKIPPED:
	psi/julcho.c
2008-03-10 11:06:07 +00:00
koennecke
d97d05cc1c - Fixed a bug with hlist -val 2008-03-05 09:50:32 +00:00
zolliker
8cf738869d - split status.c into status.c and statusfile.c
- improvements for scriptcontext.c
2008-02-13 13:07:30 +00:00
zolliker
2d7699ea39 - introduced logsetup and savehdb
- moved logger.c and logreader.c for sics/psi/ to sics/
- make comments in status file
2008-02-13 10:01:34 +00:00
zolliker
68ec926a8b - introduce script context 2008-01-18 07:55:58 +00:00
koennecke
22b0e8ec83 *** empty log message *** 2007-11-27 13:36:15 +00:00
koennecke
31a48d2155 - First implementation of Hdbqueue
- First implementation of new object model for SICS
2007-08-03 15:12:10 +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
1053f1cef1 - Fixed a couple of bugs 2007-03-22 08:52:07 +00:00
zolliker
ebbde45f33 - added 'dolater' as single shot variant of the sicscron command 2007-02-23 12:13:45 +00:00