0e2605b570
First commit towards replacing pCon-> with someFunc(pCon)
...
This is accompanied with the removal of dead code in conman.c and else
2016-10-31 08:33:36 +01:00
1b2022a5e9
There has been a continuous problem that the counter:CheckStatus function
...
called from the status task messed up count processing. This has now been
resolved in this way:
- A new function ReadStatus and a lastStatus filed have been added
to the countable interface.
- CountTaskFunc updates the lastStatus field.
- ReadStatus just returns that field.
- ReadStatus is now being called by the status task.
2016-03-15 11:24:50 +01:00
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
f85c983651
Merge branch 'multicounter' into develop
2016-01-15 15:19:50 +01:00
eff54a5fd9
Implement task priorities and message queues
2015-07-29 17:47:46 +10:00
a3605ea96b
MultiCounterSec revised now passes self test
2015-06-30 15:03:06 +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
9e898d1476
Fixed addauxref for the triple axis code
...
Added a writing state to status
2014-08-15 13:36:36 +02:00
f5e797dd6a
- Cleaned all old dtatus setting code
2014-07-18 14:02:57 +02:00
4fb94efe9a
This is the first version of the newly refactored status code handling.
...
Status codes are now determined by a special task which inspects SICS for what
is going on. Before this was a global variable which caused conflicts when
multiple instances in the code tried to set it.
2014-06-27 11:05:27 +02:00
b26b8fc735
- Changed strncpy to strlcpy, strncat to strlcat
...
- Added strlcpy and strlcat to SICS
- Added a driver for the POLDI power supplies
SKIPPED:
psi/A1931.c
psi/autowin.c
psi/bruker.c
psi/docho.c
psi/dornier2.c
psi/dspcode.c
psi/ease.c
psi/ecb.c
psi/ecbcounter.c
psi/ecbdriv.c
psi/el734dc.c
psi/el734driv.c
psi/el734hp.c
psi/el737driv.c
psi/el737hpdriv.c
psi/el737hpdrivsps.c
psi/el737hpv2driv.c
psi/el755driv.c
psi/eurodriv.c
psi/haakedriv.c
psi/itc4driv.c
psi/julcho.c
psi/linadriv.c
psi/lmd200.c
psi/lscsupport.c
psi/ltc11.c
psi/make_gen
psi/oicom.c
psi/oxinst.c
psi/pimotor.c
psi/pipiezo.c
psi/polterwrite.c
psi/psi.c
psi/sanscook.c
psi/sanslirebin.c
psi/sanswave.c
psi/sinqhmdriv.c
psi/sinqhttp.c
psi/slsecho.c
psi/slsmagnet.c
psi/slsvme.c
psi/sps.c
psi/swmotor.c
psi/swmotor2.c
psi/tabledrive.c
psi/tasscan.c
psi/tdchm.c
psi/velodorn.c
psi/velodornier.c
2010-04-13 15:08:38 +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
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
45ac6c526f
- Many fixes to the new scriptcontext to make it work
2008-06-18 14:08:25 +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
8cf738869d
- split status.c into status.c and statusfile.c
...
- improvements for scriptcontext.c
2008-02-13 13:07:30 +00:00
4fa214c4c8
- make lines in statusfile which gave an error on restore
2008-01-18 07:33:47 +00:00
22b0e8ec83
*** empty log message ***
2007-11-27 13:36:15 +00:00
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
b3138f1197
- Added Sycamore protocol and command context to SICS
...
- Added sinfo to SICS
- Added driver for TCP/IP Astrium velocity selector
- Added driver for TCP/IP Astrium chopper controller
SKIPPED:
psi/amor2t.c
psi/amorstat.c
psi/dornier2.c
psi/ecb.c
psi/el734hp.c
psi/fowrite.c
psi/libpsi.a
psi/make_gen
psi/nextrics.c
psi/pardef.c
psi/pimotor.c
psi/pipiezo.c
psi/polterwrite.c
psi/psi.c
psi/scontroller.c
psi/serial.c
psi/tasinit.c
psi/tasscan.c
psi/tcpdocho.c
psi/tcpdornier.c
psi/tricssupport.c
psi/velodornier.c
2005-12-22 22:16:10 +00:00
a55d2f0f7f
- Fixed a bug in conman.c which could cause a core dump when terminating
...
a connection during an active run.
- Added an additional output mode for the connection in order to
support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.
SKIPPED:
psi/el734driv.c
psi/el734hp.c
psi/el737driv.c
psi/el737hpdriv.c
psi/nextrics.c
psi/nxamor.c
psi/psi.c
psi/slsmagnet.c
psi/swmotor2.c
psi/tasscan.c
psi/tasutil.c
2004-07-21 12:03:06 +00:00
90b5e37552
- Fixed missalignment in TAS scan messages
...
- Fixed a counting/driving race in devexec
- Fixed some problems with sanscheck
SKIPPED:
psi/tasscan.c
psi/utils/check/amorcheck
psi/utils/check/dmccheck
psi/utils/check/focuscheck
psi/utils/check/hrptcheck
psi/utils/check/sanscheck
psi/utils/check/sicssyntaxlib.tcl
psi/utils/check/topsicheck
psi/utils/check/tricscheck
2003-11-25 10:29:21 +00:00
98cfb3ddda
- Implemented defpos for multiple motors
...
- Implemented automatic backup on parameter change
- Implemented silent restore
- Cleaned a couple of unused flags from connection object
2003-02-19 08:29:46 +00:00
3ba5f28b65
- First working version of the TRICS collision protection module
2002-08-14 14:24:00 +00:00
bde19bb973
- Fixes to HM code for AMOR TOF
...
- A couple of TAS fixes
- o2t was fixed to work with any drivable
- FOCUS was mended to include beam monitor in data file
2002-07-19 15:09:21 +00:00
db6c355f44
- Enhanced and debugged histogram memory for AMOR
...
* added PROJECT both in HM and driver code
* added single detector support.
- Removed several bugs in the AMOR data bit.
- Updated documentation
2001-08-17 14:33:05 +00:00
0604761252
minor modifications to avoid warnings
2001-08-08 11:05:49 +00:00
8f84d45dd6
- Added a multiple histogram memory control module. This required a
...
tiny change in the countable interface which in turn required updating
of header file includes in a lot of files.
- Some small fixes to TRICS writing as well.
2001-06-08 15:18:35 +00:00
fc6c4acd79
D.Maden. 11-Sep-2000.
...
Makefiles modified to generate a Linux SICServer.
Other files modified to get rid of irritating compiler warning messages.
2000-09-11 09:17:43 +00:00
d9cac91b81
coerrected typo
2000-05-16 12:06:58 +00:00
fdc6b051c9
Initial revision
2000-02-07 10:38:55 +00:00