49 Commits

Author SHA1 Message Date
61341b52f4 various improvements
- use dig for resolving host names
- ascon.c: fix terminator parsing
- property callback: change property before callback
- logger.c:default for logger period must be the old value instead of 1
- add frappy type history writing
- increase max. logreader line length
- HIPNONE returns "null" with json protocol
- encode strings properly in formatNameValue
- fix memory leak in json2tcl
- scriptcontext: do not show debug messages when script starts with underscore or when the "send" property is empty
- scriptcontext: remove args for action timestamp
- scriptcontext: "que" function will replace an already queued action, e.g. for 'halt
- introduced updatestatus script
2021-09-16 12:26:18 +02:00
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
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
5e597e2d10 Merge branch 'maverick' into develop
Compile under OSX
2016-01-26 09:48:11 +01:00
cb0f4c0b99 - added checksum algorithm binprot.c
- minor fix in ascon.c
2015-06-11 16:13:01 +02:00
55750450a5 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop 2015-04-28 16:24:39 +02:00
fb7741178d - remob.c: forward errors to sics correctly
- minor, more cosmetic fixes
2015-04-28 16:17:32 +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
bc31c6cd1e Changes to make SICS compile on OSX Maverick with clang 2014-03-14 09:48:14 +01:00
a43e3838e3 test commit 2014-02-25 08:25:07 +01: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
131f06367f - modified error message when offline 2013-10-16 12:46:21 +00:00
5a06bb9b90 - Removed napi from SICS
- Added error fields to hwardware objects: motor, counter, histmem
- Optimised sinqhttpopt
- Added haddcheck which adds checks to hipadaba nodes. The current implementation
  only checks for selctions agaisnt the values property. Expand when more checks are
  required.


SKIPPED:
	psi/polterwrite.c
	psi/sinqhttpopt.c
	psi/tasinit.c
2013-08-14 09:50:22 +00:00
9a3607bd66 - make reconnectInterval changeable (0: no automatic reconnection) 2013-06-25 11:21:04 +00:00
e91fdd1808 progressive patching 2012-11-28 11:03:51 +11:00
caf31b36cc - added command to change timeout of a scriptcontext controller
- created syncedprot
2012-08-21 06:44:29 +00:00
36d1204da0 - added AsconHostport function
- added composite terminator in standard protocol
2012-06-19 06:31:06 +00:00
f24ed4e5b6 - use strncmp instead of strstr 2011-04-29 14:07:28 +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
2efb59c7f0 - AsconStdProtocol: arguments may be given as name=value 2011-03-25 14:21:39 +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
d7ea085549 - inititalize private link 2010-09-02 11:38:30 +00:00
6c4f57ec6f - introduced <controller> actions function for listing actions
- introduced <controller> reconnect function
2010-04-13 14:17:58 +00:00
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
3e8938e986 - bug fixes
SKIPPED:
	psi/haakedriv.c
2010-02-01 11:29:46 +00:00
3f75ed617b - moved DoubleTime to nserver.c
- skip ascii nuls in standard handler
2010-01-27 13:33:46 +00:00
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
b8a0936b99 - implemented multi-line response in AsconStdHandler 2009-11-10 07:47:32 +00:00
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
de4ca7a5e9 - bug fix 2009-03-03 15:06:59 +00:00
2e060ccf73 - design improvements in scriptcontext (sct send) and ascon (AsconBaseHandler)
- bug fixes
2009-03-03 14:07:43 +00:00
2fd07071d9 - reworked states (removed substate)
- leave handler after every character read
2009-02-25 14:44:26 +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
373063fab6 - changed select calls to newly indroduced uselect
SKIPPED:
	psi/sinqhttpprot.c
2008-10-16 13:53: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
7c2504bdc2 - bug in protocol arg handling 2008-06-17 09:27:00 +00:00
0305826724 - simplified errormsg interface 2008-06-13 11:15:14 +00:00
31e4a58870 - Made init function in ascon handle errors
- Minor fixes to scriptcontext.c
2008-06-11 13:37: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
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
217de95b29 - minor fixes and improvements 2008-02-13 09:59:23 +00:00
45707dfe20 - Fixed a compilation issue in ascon.c/AsconTask 2008-02-12 08:47:45 +00:00
68ec926a8b - introduce script context 2008-01-18 07:55:58 +00:00