linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • dc2f0f29c8 - added hvali command (does not throw an error when geterror is defined) Markus Zolliker 2015-06-23 10:50:23 +02:00
  • 08e1e58c42 Added gregories patch to fitcenter. Koennecke Mark 2015-06-16 11:02:36 +02:00
  • 766c8bbb73 Interrupt handling in motorsec.c did not work, fixed Koennecke Mark 2015-06-16 11:01:51 +02:00
  • 410c142ecd Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop Markus Zolliker 2015-06-11 16:26:57 +02:00
  • b02a574199 - added checksum algorithm binprot.c - minor fix in ascon.c Markus Zolliker 2015-06-11 16:22:42 +02:00
  • cb0f4c0b99 - added checksum algorithm binprot.c - minor fix in ascon.c Markus Zolliker 2015-06-11 16:13:01 +02:00
  • 6c40d4c06c Merge branch 'moreremo' of ssh://gitorious.psi.ch/sinqdev/sics into develop Koennecke Mark 2015-06-05 08:35:21 +02:00
  • 5428016125 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop Koennecke Mark 2015-06-05 08:35:01 +02:00
  • 5ad786b3b4 Small adaptions to output for TRICS ccl files Koennecke Mark 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 Koennecke Mark 2015-06-05 08:28:03 +02:00
  • c60e9920c5 First working verion of remote object Koennecke Mark 2015-05-20 08:55:49 +02:00
  • 6f0e2e01df Merge branch 'develop' into moreremo Koennecke Mark 2015-05-12 08:41:06 +02:00
  • 9517a6d14e Switched remoteobject to use a single connection with ACT Koennecke Mark 2015-05-12 08:36:38 +02:00
  • e73743a97c Another protocol ID which escaped Koennecke Mark 2015-05-11 14:47:19 +02:00
  • 4865902a97 Merge branch 'develop' into moreremo Koennecke Mark 2015-05-11 11:44:06 +02:00
  • bb7eb497de Refactored protocol code to use defined IDs rather then raw integers Koennecke Mark 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 Koennecke Mark 2015-05-08 13:43:49 +02:00
  • f82d6a83b0 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop Koennecke Mark 2015-05-04 08:07:07 +02:00
  • 7d535abd73 Fixed a core dump in monitor mode in countersec.c Koennecke Mark 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. Koennecke Mark 2015-05-04 08:02:37 +02:00
  • 5d0e05d77b Merge branch 'develop' into moreremo Koennecke Mark 2015-04-30 09:26:44 +02:00
  • b770b8c004 stptok playing up Koennecke Mark 2015-04-30 09:26:22 +02:00
  • e497e2daf3 Fixed minor typos and compilation issues Koennecke Mark 2015-04-30 09:25:36 +02:00
  • 55750450a5 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop Markus Zolliker 2015-04-28 16:24:39 +02:00
  • fb7741178d - remob.c: forward errors to sics correctly - minor, more cosmetic fixes Markus Zolliker 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. Koennecke Mark 2015-04-27 14:46:39 +02:00
  • 64b212c4a0 Resolved a conflict that was missed during 'git merge' conflict resolution. Ferdi Franceschini 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 Koennecke Mark 2015-04-23 17:00:33 +02:00
  • cdb9a8fba2 Merge branch 'master' of gitorious.psi.ch:sinqdev/sics into maverick Mark Koennecke 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 Koennecke Mark 2015-04-23 15:52:05 +02:00
  • 10d29d597c Cleaned up ANSTO code to merge with sinqdev.sics Ferdi Franceschini 2015-04-23 20:49:26 +10:00
  • b8fbe22fc0 Merge branch 'master' into moreremo Koennecke Mark 2015-04-22 09:15:03 +02:00
  • 04906f672a Enhanced simindex to capture all data for fourcircle.tcl Another change to remove capture Koennecke Mark 2015-04-20 11:21:41 +02:00
  • 005c35402a - Added additional cnvrt files from sicspsi - Removed unused sycamore protocol from the code base Koennecke Mark 2015-04-20 09:29:07 +02:00
  • e577d9c313 - Removed defunct capture command - Moved some protocolls from sicspsi to kernel as discussed at ANSTO Koennecke Mark 2015-04-20 09:08:34 +02:00
  • c2f08097da Nxdict attribute writing failed at "0,1,0" style strings, FIXED Koennecke Mark 2015-04-17 11:44:50 +02:00
  • c650788a2c Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2015-04-17 14:05:39 +10:00
  • 49a8bdc96c Merge branch 'Quokka' into RELEASE-3_1 Douglas Clowes 2015-04-17 14:05:23 +10:00
  • c09781fed7 Change gumtree_time_estimate from float to text Douglas Clowes 2015-04-17 14:04:17 +10:00
  • 4bb05ed67e Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2015-04-17 13:54:48 +10:00
  • 21c96297f3 Merge branch 'Wombat' into RELEASE-3_1 Douglas Clowes 2015-04-17 13:17:45 +10:00
  • f2568b681d Pullback from Wombat 2015-04-17 Douglas Clowes 2015-04-17 13:12:42 +10:00
  • 2925bdedc5 Merge branch 'Platypus' into RELEASE-3_1 Douglas Clowes 2015-04-17 12:52:59 +10:00
  • 843a9f46be Pullback changes from Platypus Douglas Clowes 2015-04-17 12:52:17 +10:00
  • 1a93e494d9 Add a test setup for Pelican Douglas Clowes 2015-04-17 12:38:19 +10:00
  • 94663632e4 Merge branch 'Quokka' into RELEASE-3_1 Douglas Clowes 2015-04-17 12:27:57 +10:00
  • 1f9dd8da95 Pullback from Quokka 2015-04-17 Douglas Clowes 2015-04-17 12:15:01 +10:00
  • 49a43f4d9b Merge branch 'Taipan_R31' into RELEASE-3_1 Douglas Clowes 2015-04-17 11:50:03 +10:00
  • d07a0418b6 Add Taipan euler_config Douglas Clowes 2015-04-17 11:49:10 +10:00
  • 349171e8ec Minor changes from Taipan motor_config Douglas Clowes 2015-04-17 11:45:05 +10:00
  • 65b8f93cea Merge tag 'Taipan_2014-09-19' into Taipan_R31 Douglas Clowes 2015-04-17 11:36:01 +10:00
  • c6b9a3ab97 Merge branch 'Dingo' into RELEASE-3_1 Douglas Clowes 2015-04-17 10:57:32 +10:00
  • fea223beff Add motor soma to dingo configuration Douglas Clowes 2015-04-17 10:48:20 +10:00
  • 0d0c90cee7 Another try ad getting write to work Koennecke Mark 2015-03-19 16:12:35 +01:00
  • 7891c9195f Remove more files to match with PSI cleanup Douglas Clowes 2015-03-19 13:41:42 +11:00
  • 3661e1fc77 Remove .{h,c} files to match with PSI cleanup Douglas Clowes 2015-03-19 11:42:50 +11:00
  • 42500aca38 Remove TCL files to match with PSI cleanup Douglas Clowes 2015-03-19 11:30:51 +11:00
  • a43b106c25 Add instrument specific initialisation for commands on emu. Ferdi Franceschini 2015-03-18 11:27:11 +11:00
  • 418faae4e8 PLC status is currently unavailable on emu. Ferdi Franceschini 2015-03-18 11:13:07 +11:00
  • 613dbe0a91 Fix histogram memory configuration. Ferdi Franceschini 2015-03-18 11:12:38 +11:00
  • 8c4c5aa5ec Add new options to hmm simulated object. Ferdi Franceschini 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 Mark Koennecke 2015-03-17 14:01:40 +01:00
  • 0097a2f3cb Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics Koennecke Mark 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 Koennecke Mark 2015-03-17 11:41:18 +01:00
  • 9d98cb15ea Created emu specific histmem configuration. Ferdi Franceschini 2015-03-17 14:53:14 +11:00
  • 9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2015-03-13 15:44:32 +11:00
  • 6ef97197ee Handle nested GROUP and VAR constructs in gen_sct.py Douglas Clowes 2015-03-13 15:30:16 +11:00
  • 125ebc9f6d Make getlog commands less flakey Douglas Clowes 2015-03-13 15:23:32 +11:00
  • b9954651d5 Make getlog commands less flakey Douglas Clowes 2015-03-13 15:16:31 +11:00
  • 25d73eb17a Bring config INI files up to date with new drivers and fix some errors. Ferdi Franceschini 2015-03-13 13:09:15 +11:00
  • 88c1f007fa Fix up whitespace. Ferdi Franceschini 2015-03-13 11:57:56 +11:00
  • e7e2e87b83 Copy changes from ics1-wombat Ferdi Franceschini 2015-03-13 11:54:50 +11:00
  • d751146090 Rename mtth to chom for chopper rotation and set nexus groups. Ferdi Franceschini 2015-03-12 10:46:13 +11:00
  • fa92f61433 The mchi fwd limit switch is in the wrong place so we need to compensate. Ferdi Franceschini 2015-03-12 10:24:54 +11:00
  • 6d87ae05cb Add some configuration files which might be useful later. Ferdi Franceschini 2015-03-12 10:21:15 +11:00
  • e89200999f Inlcude derived parameters when generating motor configuration. Ferdi Franceschini 2015-03-11 14:35:47 +11:00
  • 3e11532bd0 my encoder limits swapped in Elec Eng spreadsheet. Ferdi Franceschini 2015-03-11 14:21:30 +11:00
  • 760d5f3067 Corrections made to Emu_motion_control... spreadsheet during testing. Also renamed axes and added reference positions from spreadsheet. Ferdi Franceschini 2015-03-11 13:42:30 +11:00
  • a76f5d9143 First implementation of an Emu. TODO: Review motor names. Ferdi Franceschini 2015-03-10 14:13:11 +11:00
  • f72e20b120 SICS-128: Added HB1 and HB2 fields to the reactor status. Ferdi Franceschini 2015-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 Franceschini 2015-03-06 11:52:41 +11:00
  • 386db5d424 Rename and move the Rheometer drivers for Kookaburra Douglas Clowes 2015-03-05 14:11:24 +11:00
  • 6f8e7b5429 Pull over sct_antonparr_MCR500.tcl from RELEASE-3_1 Douglas Clowes 2015-03-05 13:56:44 +11:00
  • f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2015-03-05 13:53:47 +11:00
  • b75e0b5efb Make sure that the Lt0 command returns an error if the master_chopper_id isn't set. Ferdi Franceschini 2015-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 Franceschini 2015-02-26 10:49:39 +11:00
  • 243dddc9a3 Fix calculation of ap_limit in collimator anticollision code. Ferdi Franceschini 2015-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 Franceschini 2015-02-25 09:44:06 +11:00
  • 445a8c2fce Fix eulerian spelling. Ferdi Franceschini 2015-01-19 16:13:08 +11:00
  • a974be9c86 SICS-844 Add eulerian cradle configuration to Taipan Ferdi Franceschini 2015-01-19 16:08:07 +11:00
  • 06c51416dd Merge branch 'Dingo' into temp Douglas Clowes 2015-02-19 16:04:50 +11:00
  • 27c3a48d91 Pullback from Dingo 2015-02-19 Douglas Clowes 2015-02-19 15:59:22 +11:00
  • 92539b80aa Merge branch 'Kookaburra' into temp Douglas Clowes 2015-02-19 15:54:22 +11:00
  • 0cff1f7c3c Pullback from Kookaburra 2015-02-19 Douglas Clowes 2015-02-19 15:51:41 +11:00
  • 8b4ab411fd Merge branch 'Wombat' into temp Douglas Clowes 2015-02-19 15:26:13 +11:00
  • 4e383b2af2 Merge branch 'Echidna' into temp Douglas Clowes 2015-02-19 14:57:43 +11:00
  • 4756be739a Merge branch 'Platypus' into temp Douglas Clowes 2015-02-19 14:55:19 +11:00
  • 1bb7f90237 Merge branch 'Pelican' into temp Douglas Clowes 2015-02-19 14:53:33 +11:00
  • 106d61a883 Merge branch 'Taipan_R31' into temp Douglas Clowes 2015-02-19 14:50:39 +11:00
  • 14be249401 Pullback from Wombat 2015-02-19 Douglas Clowes 2015-02-19 11:51:51 +11:00