dc2f0f29c8
- added hvali command (does not throw an error when geterror is defined)
zolliker2015-06-23 10:50:23 +02:00
08e1e58c42
Added gregories patch to fitcenter.
koennecke2015-06-16 11:02:36 +02:00
766c8bbb73
Interrupt handling in motorsec.c did not work, fixed
koennecke2015-06-16 11:01:51 +02:00
410c142ecd
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
zolliker2015-06-11 16:26:57 +02:00
b02a574199
- added checksum algorithm binprot.c - minor fix in ascon.c
zolliker2015-06-11 16:22:42 +02:00
cb0f4c0b99
- added checksum algorithm binprot.c - minor fix in ascon.c
zolliker2015-06-11 16:13:01 +02:00
6c40d4c06c
Merge branch 'moreremo' of ssh://gitorious.psi.ch/sinqdev/sics into develop
koennecke2015-06-05 08:35:21 +02:00
5428016125
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
koennecke2015-06-05 08:35:01 +02:00
5ad786b3b4
Small adaptions to output for TRICS ccl files
koennecke2015-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
koennecke2015-06-05 08:28:03 +02:00
c60e9920c5
First working verion of remote object
koennecke2015-05-20 08:55:49 +02:00
6f0e2e01df
Merge branch 'develop' into moreremo
koennecke2015-05-12 08:41:06 +02:00
9517a6d14e
Switched remoteobject to use a single connection with ACT
koennecke2015-05-12 08:36:38 +02:00
e73743a97c
Another protocol ID which escaped
koennecke2015-05-11 14:47:19 +02:00
4865902a97
Merge branch 'develop' into moreremo
koennecke2015-05-11 11:44:06 +02:00
bb7eb497de
Refactored protocol code to use defined IDs rather then raw integers
koennecke2015-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
koennecke2015-05-08 13:43:49 +02:00
f82d6a83b0
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
koennecke2015-05-04 08:07:07 +02:00
7d535abd73
Fixed a core dump in monitor mode in countersec.c
koennecke2015-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.
koennecke2015-05-04 08:02:37 +02:00
5d0e05d77b
Merge branch 'develop' into moreremo
koennecke2015-04-30 09:26:44 +02:00
e497e2daf3
Fixed minor typos and compilation issues
koennecke2015-04-30 09:25:36 +02:00
55750450a5
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
zolliker2015-04-28 16:24:39 +02:00
fb7741178d
- remob.c: forward errors to sics correctly - minor, more cosmetic fixes
zolliker2015-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.
koennecke2015-04-27 14:46:39 +02:00
64b212c4a0
Resolved a conflict that was missed during 'git merge' conflict resolution.
Ferdi Franceschini2015-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
koennecke2015-04-23 17:00:33 +02:00
cdb9a8fba2
Merge branch 'master' of gitorious.psi.ch:sinqdev/sics into maverick
koennecke2015-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
koennecke2015-04-23 15:52:05 +02:00
f82197623e
Merge branch 'master' into maverick - Removed epicsmotor from motor.c - Fixed a bad define in tasscanub.h Conflicts: makefile_macosx
koennecke2015-03-17 14:01:40 +01:00
0097a2f3cb
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
koennecke2015-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
koennecke2015-03-17 11:41:18 +01:00
760d5f3067
Corrections made to Emu_motion_control... spreadsheet during testing. Also renamed axes and added reference positions from spreadsheet.
Ferdi Franceschini2015-03-11 13:42:30 +11:00
a76f5d9143
First implementation of an Emu. TODO: Review motor names.
Ferdi Franceschini2015-03-10 14:13:11 +11:00
f72e20b120
SICS-128: Added HB1 and HB2 fields to the reactor status.
Ferdi Franceschini2015-03-06 11:57:57 +11:00
64a47de78c
SICS-128: The reactor status protocol now just searches for a line containing "Power:" and returns it as the reactor status.
Ferdi Franceschini2015-03-06 11:52:41 +11:00
386db5d424
Rename and move the Rheometer drivers for Kookaburra
Douglas Clowes2015-03-05 14:11:24 +11:00
6f8e7b5429
Pull over sct_antonparr_MCR500.tcl from RELEASE-3_1
Douglas Clowes2015-03-05 13:56:44 +11:00
b75e0b5efb
Make sure that the Lt0 command returns an error if the master_chopper_id isn't set.
Ferdi Franceschini2015-02-26 10:51:18 +11:00
e0626f4b6a
Improve response of t0_chopper_id command by working around the chopsel IO Box communications problems.
Ferdi Franceschini2015-02-26 10:49:39 +11:00
243dddc9a3
Fix calculation of ap_limit in collimator anticollision code.
Ferdi Franceschini2015-02-26 10:47:56 +11:00
52ba801f28
Generated new motor configuration after updating the Bilby_motion_control_commissioning_checklist.xls The update includes corrections for samz and sapmot and configures the beam position as the origin for the slit motors. The left and down slit motors "sign" parameter has been changed so all slits drive away from the beam.
Ferdi Franceschini2015-02-25 09:44:06 +11:00
zolliker
koennecke
Ferdi Franceschini