7d535abd73
Fixed a core dump in monitor mode in countersec.c
2015-05-04 08:04:54 +02:00
aef2a36b60
Now, I fiddling with the message writitng code, I get all remote object
...
messages but in the wrong order. They are sent in the right order, though.
Have to chnage the code to use one connection asynchronously for everything only.
2015-05-04 08:02:37 +02:00
5d0e05d77b
Merge branch 'develop' into moreremo
2015-04-30 09:26:44 +02:00
b770b8c004
stptok playing up
2015-04-30 09:26:22 +02:00
e497e2daf3
Fixed minor typos and compilation issues
2015-04-30 09:25:36 +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
e8df6158ea
- Fixed a bug relating to the control variable in countserse.c It was used
...
to control the counter and internally to maintain count progress. This has
now been fixed.
- Due to improper state handling multi counter failed when called both from
the count task and the sttus testing. This is now resolved.
2015-04-27 14:46:39 +02:00
Ferdi Franceschini
64b212c4a0
Resolved a conflict that was missed during 'git merge' conflict resolution.
2015-04-24 13:36:59 +10: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
cdb9a8fba2
Merge branch 'master' of gitorious.psi.ch:sinqdev/sics into maverick
2015-04-23 16:00:02 +02:00
b7eaa538ed
- Rewrote the write part of remoteobject
...
- With transactionID > 10^6, now termination messages are sent by contextdo
and tasks
- This still has bugs
2015-04-23 15:52:05 +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
b8fbe22fc0
Merge branch 'master' into moreremo
2015-04-22 09:15:03 +02:00
04906f672a
Enhanced simindex to capture all data for fourcircle.tcl Another change
...
to remove capture
2015-04-20 11:21:41 +02:00
005c35402a
- Added additional cnvrt files from sicspsi
...
- Removed unused sycamore protocol from the code base
2015-04-20 09:29:07 +02: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
c2f08097da
Nxdict attribute writing failed at "0,1,0" style strings, FIXED
2015-04-17 11:44:50 +02:00
Douglas Clowes
c650788a2c
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2015-04-17 14:05:39 +10:00
Douglas Clowes
49a8bdc96c
Merge branch 'Quokka' into RELEASE-3_1
2015-04-17 14:05:23 +10:00
Douglas Clowes
c09781fed7
Change gumtree_time_estimate from float to text
2015-04-17 14:04:17 +10:00
Douglas Clowes
4bb05ed67e
Merge branch 'RELEASE-3_1' into RELEASE-3_2
...
Conflicts:
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
2015-04-17 13:54:48 +10:00
Douglas Clowes
21c96297f3
Merge branch 'Wombat' into RELEASE-3_1
2015-04-17 13:17:45 +10:00
Douglas Clowes
f2568b681d
Pullback from Wombat 2015-04-17
2015-04-17 13:12:42 +10:00
Douglas Clowes
2925bdedc5
Merge branch 'Platypus' into RELEASE-3_1
2015-04-17 12:52:59 +10:00
Douglas Clowes
843a9f46be
Pullback changes from Platypus
2015-04-17 12:52:17 +10:00
Douglas Clowes
1a93e494d9
Add a test setup for Pelican
2015-04-17 12:38:19 +10:00
Douglas Clowes
94663632e4
Merge branch 'Quokka' into RELEASE-3_1
...
Conflicts:
sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
sics/site_ansto/instrument/util/gen_sct.py
2015-04-17 12:27:57 +10:00
Douglas Clowes
1f9dd8da95
Pullback from Quokka 2015-04-17
2015-04-17 12:15:01 +10:00
Douglas Clowes
49a43f4d9b
Merge branch 'Taipan_R31' into RELEASE-3_1
2015-04-17 11:50:03 +10:00
Douglas Clowes
d07a0418b6
Add Taipan euler_config
2015-04-17 11:49:10 +10:00
Douglas Clowes
349171e8ec
Minor changes from Taipan motor_config
2015-04-17 11:45:05 +10:00
Douglas Clowes
65b8f93cea
Merge tag 'Taipan_2014-09-19' into Taipan_R31
...
Deployed to Taipan
Conflicts:
sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
sics/site_ansto/instrument/tas/taipan_configuration.tcl
2015-04-17 11:36:01 +10:00
Douglas Clowes
c6b9a3ab97
Merge branch 'Dingo' into RELEASE-3_1
...
Conflicts:
sics/site_ansto/instrument/dingo/util/sics_config.ini
2015-04-17 10:57:32 +10:00
Douglas Clowes
fea223beff
Add motor soma to dingo configuration
2015-04-17 10:48:20 +10:00
0d0c90cee7
Another try ad getting write to work
2015-03-19 16:12:35 +01:00
Douglas Clowes
7891c9195f
Remove more files to match with PSI cleanup
2015-03-19 13:41:42 +11:00
Douglas Clowes
3661e1fc77
Remove .{h,c} files to match with PSI cleanup
2015-03-19 11:55:23 +11:00
Douglas Clowes
42500aca38
Remove TCL files to match with PSI cleanup
2015-03-19 11:55:23 +11:00
Ferdi Franceschini
a43b106c25
Add instrument specific initialisation for commands on emu.
2015-03-18 11:27:11 +11:00
Ferdi Franceschini
418faae4e8
PLC status is currently unavailable on emu.
2015-03-18 11:13:07 +11:00
Ferdi Franceschini
613dbe0a91
Fix histogram memory configuration.
2015-03-18 11:12:38 +11:00
Ferdi Franceschini
8c4c5aa5ec
Add new options to hmm simulated object.
2015-03-18 11:04:23 +11:00
f82197623e
Merge branch 'master' into maverick
...
- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
makefile_macosx
2015-03-17 14:01:40 +01:00
0097a2f3cb
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
2015-03-17 11:45:06 +01: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
Ferdi Franceschini
9d98cb15ea
Created emu specific histmem configuration.
2015-03-17 14:53:14 +11:00
Douglas Clowes
9ee2252138
Merge branch 'RELEASE-3_1' into RELEASE-3_2
...
Conflicts:
sics/site_ansto/instrument/dingo/dingo_configuration.tcl
sics/site_ansto/instrument/hipd/wombat_configuration.tcl
sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
sics/site_ansto/instrument/sans/quokka_configuration.tcl
2015-03-13 15:44:32 +11:00
Douglas Clowes
6ef97197ee
Handle nested GROUP and VAR constructs in gen_sct.py
2015-03-13 15:31:56 +11:00
Douglas Clowes
125ebc9f6d
Make getlog commands less flakey
...
getlog {kill,none}
getlog what
getlog list
getlog err,wrn[,...]
2015-03-13 15:31:56 +11:00
