a37aae2361
Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop
...
Conflicts:
conman.c
drive.c
2016-01-15 15:17:17 +01:00
cdce9cc2c9
Merge branch 'master' into develop
2015-08-05 11:11:24 +02:00
64d44c2824
Assorted bug fixes
...
- If SctProcessNode ran into a timeout, its action data wa sdeleted. If data came
later, this caused SICS to crash. This is now fixed
- sget leaked connections under certain circumstances
- Cosmetic fix to hipadaba.c
- yet another chnage to the TRICS file format in fourmess.c, now it prints magnetic field
instead of the proton count
2015-07-30 13:57:55 +02:00
Douglas Clowes
eff54a5fd9
Implement task priorities and message queues
2015-07-29 17:47:46 +10:00
Douglas Clowes
0db57b9bae
Reference count async queue transactions
...
so we can put them of task message queues
2015-07-29 17:47:15 +10:00
Douglas Clowes
7ccbf7e0bd
Change LLDstringDelete to LLDdeleteString
2015-07-29 17:46:34 +10:00
950cddc8e5
Moved Tcl clock and date function into the main SICS kernel directory
2015-07-07 12:31:21 +02:00
ef8b2a2eed
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-07-06 09:14:58 +02:00
7f8d532748
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
2015-07-06 09:11:25 +02:00
Douglas Clowes
e0d400cdbb
Fix argv index in MakeDrive for mv command name
2015-07-03 09:12:30 +10:00
Douglas Clowes
8a4192dc41
Fix the TaskDescription format for the start time
2015-07-03 09:11:17 +10:00
a3d76cafd9
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-23 10:54:46 +02:00
dc2f0f29c8
- added hvali command (does not throw an error when geterror is defined)
2015-06-23 10:51:19 +02:00
08e1e58c42
Added gregories patch to fitcenter.
...
Implements a valerr on the peak command
2015-06-16 11:02:36 +02:00
766c8bbb73
Interrupt handling in motorsec.c did not work, fixed
2015-06-16 11:01:51 +02:00
410c142ecd
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-11 16:26:57 +02:00
b02a574199
- added checksum algorithm binprot.c
...
- minor fix in ascon.c
2015-06-11 16:22:42 +02:00
cb0f4c0b99
- added checksum algorithm binprot.c
...
- minor fix in ascon.c
2015-06-11 16:13:01 +02:00
6c40d4c06c
Merge branch 'moreremo' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-05 08:35:21 +02:00
5428016125
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-05 08:35:01 +02:00
5ad786b3b4
Small adaptions to output for TRICS ccl files
2015-06-05 08:29:49 +02:00
69d44bc495
Fixed bad -9999.9 after error message when geterror was set on a root level
...
SICSOBJ node
2015-06-05 08:28:03 +02:00
c60e9920c5
First working verion of remote object
...
Fixed two bugs along the way:
- asynnet: ANETReadPtr now sets length to 0 if ther eis no data
- motorsec: if the motor does not start the status is set to error
2015-05-20 08:55:49 +02:00
6f0e2e01df
Merge branch 'develop' into moreremo
...
Conflicts:
conman.c
2015-05-12 08:41:06 +02:00
9517a6d14e
Switched remoteobject to use a single connection with ACT
2015-05-12 08:36:38 +02:00
e73743a97c
Another protocol ID which escaped
2015-05-11 14:47:19 +02:00
4865902a97
Merge branch 'develop' into moreremo
2015-05-11 11:44:06 +02:00
bb7eb497de
Refactored protocol code to use defined IDs rather then raw integers
2015-05-11 09:30:44 +02:00
0bcd3b06f6
Fixed a critical bug which prevented gumtree SE from working. No ACt was sent
...
after removing the sycamore protocol
2015-05-08 13:43:49 +02:00
f82d6a83b0
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-05-04 08:07:07 +02:00
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
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
