Commit Graph

365 Commits

Author SHA1 Message Date
24107e993b Fixed a bug with a off by one severity number in sicslogquery.c
Added a number of python utilities for querying the mongoDB
2016-04-28 10:41:36 +02:00
78f6b92960 Added a -h option to sicslog querying
Fixed the mongodb path in sicslogmain to point to the production server
2016-04-14 14:57:55 +02:00
1fb85ef6b5 Fixed core dumps when closing unintialized mongo or sqlite log instances
Fixed a Host header bug in sinqhttpopt
2016-04-08 11:24:02 +02:00
1087dd6c8d Added a sqlite and mongo database driver for the new logging
system.
2016-03-01 09:51:25 +01:00
972e191795 Switched to new SICS logging system 2016-02-17 16:44:53 +01:00
3ec4658208 A number of smaller adpations 2016-02-08 09:23:42 +01:00
4d5468458b Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sicspsi
Conflicts:
	binprot.c
	pardef.c
2015-07-07 12:36:11 +02:00
0294b7ad95 Added the small support driver for the picoscope
Added a deploysics script
The Tcl data and time functions were moved to the SICS kernel
2015-07-07 12:33:02 +02:00
900e2771fc - bug fix (illegal value should be printed) 2015-06-05 09:36:17 +02:00
8bef7c156f - fixed logging of array objects
- added checksum to binprot
2015-04-30 12:51:02 +02:00
c3744cea5f Moved additional cnvrt.* files to SICS kernel 2015-04-20 09:26:56 +02:00
7c93631c68 Moved some protocolls to main sics directory as discussed at ANSTO 2015-04-20 09:06:56 +02:00
2c78f6b448 Merge branch 'zwickrollrefactor' 2015-03-17 12:03:05 +01:00
889749c90b Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sicspsi 2015-03-17 11:46:38 +01:00
eb09725a1c The new zwickroll driver with separation of out-of-band messages appears to
be working
2015-02-04 14:19:42 +01:00
a793526a8e Fixed a memory leak when writing through the epicsadapter 2015-02-04 14:18:57 +01:00
1cf0e3351a - Fixed a sign problem in amorset.c regarding aom and cox
- Fixed a bad encoding of float values when writing to the SPS
2014-12-04 11:35:26 +01:00
ac5aee6062 Fixed a number pf memory leaks in the EPICS write code 2014-11-18 09:21:47 +01:00
c24049766c Fixed a bug where sinqhttpopt would lock up on 0 length messages when in keep-alive 2014-11-07 14:00:12 +01:00
4e148ffcaf Added EPICS status code translation to epicsadapter 2014-11-03 11:29:35 +01:00
c6715af717 - remove all stuff related to tecs 2014-10-30 11:25:30 +01:00
ac04939284 - do not swallow bytes in buffer before sending an empty line (binprot.c)
- state after EaseStop changed to offline instead of notconnected
2014-10-29 16:03:48 +01:00
dadb71245a First working version of the epics SICS adapter 2014-10-27 12:14:56 +01:00
b2a63d59f0 Reading DPICS works 2014-10-24 10:42:23 +02:00
68d3a16700 Fixed a documentation typo in termprot 2014-10-16 09:41:25 +02:00
32e55f2176 Added a motor driver which ignores air cushion errors for TRICS (falsely triggered) 2014-10-13 13:38:51 +02:00
07cd8a0215 Catching out of range preset monitor in EL737 2014-08-28 09:51:16 +02:00
boa
41689d97b4 Removed status setting from tasscan.c 2014-08-15 13:39:20 +02:00
ce371d6837 - Changes to the old TAS initialisation system to have ss and sa to be processed
properly. Requires a script scatfix to exist
2014-07-15 16:47:32 +02:00
7d986b1a9f - Fixed a bug in poldifold which caused a crash whne the HM data was not initialized
- The astrium chopper controller requires floats with a . and retuns them with a , .
  Accomodated for this quirk
2014-05-22 10:45:48 +02:00
bf3ad3915b Some fixed to astriumnet
- Recognize the </hash> closing tag
- Convert , to . and vice versa
2014-05-09 16:48:59 +02:00
414bf2a148 Fixes to eigermono to make it wait for finish correctly 2014-05-05 13:55:24 +02:00
71f48c8220 Added an assertion which will trigger when number size wrong 2014-04-23 14:15:46 +02:00
fb2164ca2d Made astriumnet and poldifold work
Astriumnet had problems:
- The hash code stuff is number size dependent
- wrPos was not properly reset, thus leading to no new request being
  written.
Poldifold was tested and taken into operation
2014-04-22 15:45:40 +02:00
ea78720a8c Merged with poldichopper branch 2014-04-15 11:55:54 +02:00
cca0efbfbd Merge branch 'poldichopper' 2014-04-15 11:52:38 +02:00
25d549c7e0 Readded poldi chopper stuff
A new astriumnet protocol driver
A poldifold which solves the quadrant issue with the new chopper
2014-04-15 11:49:54 +02:00
75e2795293 Merge remote branch 'origin/poldichopper' 2014-04-15 11:46:07 +02:00
e36ced5718 Improved error reporting in eigermono 2014-04-07 14:06:48 +02:00
71c03ee3d1 Made SICS PSI part compile on OSX Maverick with clang 2014-03-14 09:51:48 +01:00
fc0ff43db2 Made SICS compile again after the move to git 2014-02-24 08:40:42 +01:00
koennecke
4fdb6612cc - Modified collective drive operations to run motors in individual tasks
- Added a processnode methos to scriptcontext. processnode waits for the
  scriptchain of a node to finish.
- Fixed a bug in sicsget
- Made histmemsec dim and rank manager privilege. To allow chnage at runtime.
  Is required for SANS
- Fixed some issues with multicountersec, mostly relating to passing things through
  in a sensible way.
- Updated motorsec.c to work with a client based driver
2014-02-18 13:25:33 +00:00
koennecke
d00f143255 - 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
2013-12-19 10:24:54 +00:00
koennecke
b1b9accc2e - Added missing file epicscounter.c 2013-11-04 15:03:03 +00:00
koennecke
b526c0541a - 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
2013-11-04 12:55:16 +00:00
zolliker
f0872ae16b - inserted comments 2013-10-16 12:46:44 +00:00
koennecke
ec8a3a7bc4 - Fixed documentation typos
- In support of HMsec, allow the count command in countsec to run without a
  preset parameter. If this is missing the old, stored preset is used.
- Removed a check which causes initialisation of the HM from a batch file fail
  for POLDI
- fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE
- Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions.
- Fixed motorsec to remove itself properly from a parent when linked. Please note
  that there is still the limitation that a second generation motor can only be linked
  once in a Hipadaba tree
- Extended subsampling a HM for second generation HM
- Added a hscriptnotify. This calls a script on the update of a node
- POLDI has been rebuilt, chnages to data file writing
- For testing, sinqhttopt now understands a special command, byteswapoff,
  which switches off byte swapping. Required when the HM ius run on an Intel box.
2013-09-16 09:27:51 +00:00
koennecke
5c3e3a4422 - 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.
2013-08-14 09:50:31 +00:00
zolliker
dba57e55b7 - make V5A visible in IGH driver 2013-06-25 11:15:05 +00:00
zolliker
fa0b1dc2ce . 2013-06-07 06:51:21 +00:00