Commit Graph

  • a78bc86bca adc reader standalone for blackfin as well Dhanya Maliakal 2017-08-24 18:41:30 +02:00
  • 5e11e0a7db added adc reader standalone Dhanya Maliakal 2017-08-24 18:39:35 +02:00
  • 319d883880 modified user example in manual/manual-api and regenerated documentation Dhanya Maliakal 2017-08-24 16:47:27 +02:00
  • 2d52058a55 Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class Dhanya Maliakal 2017-08-24 16:06:00 +02:00
  • e5c84fd11c external gui unused variables Dhanya Maliakal 2017-08-24 16:03:31 +02:00
  • 598d163173 new gotthard server in bin Dhanya Maliakal 2017-08-24 16:02:51 +02:00
  • 6f09a5abff Merge branch 'developer' into 3.0 Dhanya Maliakal 2017-08-24 14:09:36 +02:00
  • fbb04f5ebe Merge branch 'externalgui' into developer Dhanya Maliakal 2017-08-23 19:06:59 +02:00
  • 0bea688a83 changes for external gui Dhanya Maliakal 2017-08-23 19:06:40 +02:00
  • 19d973f5d6 Merge branch '3.0' into externalgui Dhanya Maliakal 2017-08-23 18:26:46 +02:00
  • 92d5143f81 Merge branch '3.0' into developer Dhanya Maliakal 2017-08-23 18:26:36 +02:00
  • 6332025bbc frames caught in 9m was only looking at 1st receiver, now made to average Dhanya Maliakal 2017-08-23 18:26:25 +02:00
  • bdccddfe97 in between Dhanya Maliakal 2017-08-23 18:24:48 +02:00
  • a236a7a9aa Merge branch '3.0' into externalgui Dhanya Maliakal 2017-08-23 18:01:58 +02:00
  • 72c4cbe871 Merge branch '3.0' into developer Dhanya Maliakal 2017-08-23 18:01:48 +02:00
  • 7ffd9b87b8 bug fix:removed 0x prefix for dr Dhanya Maliakal 2017-08-23 18:01:34 +02:00
  • a657bac1b1 removed a print Dhanya Maliakal 2017-08-23 18:01:02 +02:00
  • f4e2b819d2 changes for external gui Dhanya Maliakal 2017-08-23 16:31:32 +02:00
  • 634fbc748e compile libraries with -fPIC flag Xiaoqiang Wang 2017-08-23 16:13:36 +02:00
  • 8fde83499e Merge branch '3.0' into developer Gemma Tinti 2017-08-23 12:10:29 +02:00
  • 5e90386fda manual Gemma Tinti 2017-08-23 12:09:42 +02:00
  • 2116070f02 Merge branch '3.0' into externalgui Dhanya Maliakal 2017-08-23 10:11:57 +02:00
  • 02c193118b Merge branch '3.0' into developer Dhanya Maliakal 2017-08-23 09:41:27 +02:00
  • 33894509e6 Merge branch '3.0' into developer Dhanya Maliakal 2017-08-23 09:41:26 +02:00
  • b208acf4a0 moved doxy.config to here Dhanya Maliakal 2017-08-23 09:41:10 +02:00
  • 02f4b5f546 manual-main fixed, detaildoc not, but for developers and in next release Dhanya Maliakal 2017-08-23 09:40:53 +02:00
  • b2513cad23 Merge branch '3.0' into developer Dhanya Maliakal 2017-08-22 19:43:49 +02:00
  • 4f28df03ab trials Dhanya Maliakal 2017-08-22 19:43:26 +02:00
  • a7dab9a257 updating user documentation. another update required Dhanya Maliakal 2017-08-22 19:42:52 +02:00
  • ca756dbeee Merge branch '3.0' into developer Dhanya Maliakal 2017-08-22 19:40:47 +02:00
  • 760ca98ee4 updating user documentation. another update required Dhanya Maliakal 2017-08-22 19:40:20 +02:00
  • 960dc5c62f removing the print Dhanya Maliakal 2017-08-21 10:40:15 +02:00
  • 03d9e1d182 check should be before and after the push or pull Dhanya Maliakal 2017-08-21 09:24:26 +02:00
  • 25886044ab Merge branch '3.0' into developer Dhanya Maliakal 2017-08-21 09:21:41 +02:00
  • 4dd7cafe32 Merge branch '3.0' into developer Dhanya Maliakal 2017-08-21 09:21:41 +02:00
  • f78a7b201b updated master file to reflect all files(not just eiger) Dhanya Maliakal 2017-08-18 18:35:55 +02:00
  • 4e374eb2cd updaterev Dhanya Maliakal 2017-08-18 18:35:30 +02:00
  • 5b80ef6d04 changes to release Dhanya Maliakal 2017-08-18 18:35:04 +02:00
  • cc5862533e changes for the statistic moved to listener Dhanya Maliakal 2017-08-18 17:57:31 +02:00
  • d58dd1d035 reset fifo statistic at measurement startup Dhanya Maliakal 2017-08-18 17:24:56 +02:00
  • 3b497eca36 reset fifo statistic at measurement startup Dhanya Maliakal 2017-08-18 17:23:52 +02:00
  • f4a11533be removed prints Dhanya Maliakal 2017-08-18 17:02:09 +02:00
  • fe24c8fb86 changed check Dhanya Maliakal 2017-08-18 17:00:28 +02:00
  • 608f292e4f moved statistics to listener Dhanya Maliakal 2017-08-18 16:50:19 +02:00
  • 9868ca3eca Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-18 16:13:51 +02:00
  • de3c62fea4 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-18 16:13:51 +02:00
  • 4b6144c489 updated server binaries Dhanya Maliakal 2017-08-18 16:13:33 +02:00
  • 4838d6c037 updated server binaries Dhanya Maliakal 2017-08-18 16:13:09 +02:00
  • ec4be4f2c0 bugfix: framesl was not conected, exptime default time is 10 us Dhanya Maliakal 2017-08-18 16:11:49 +02:00
  • e93f53f459 changes for min fifo level Dhanya Maliakal 2017-08-18 15:59:18 +02:00
  • efad86335f made fifo bound volatile Dhanya Maliakal 2017-08-18 15:29:15 +02:00
  • 70c2165df4 check of fifo level before trying to push in successfully Dhanya Maliakal 2017-08-18 15:21:30 +02:00
  • c1ea73d21c some changes for release txt Dhanya Maliakal 2017-08-18 14:03:11 +02:00
  • 181616fb67 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:24:30 +02:00
  • ed8e41a02c Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:24:30 +02:00
  • 37f881017a updating command line docu. Dhanya Maliakal 2017-08-17 17:24:20 +02:00
  • cda7814c21 timing put for delay and period Dhanya Maliakal 2017-08-17 17:23:13 +02:00
  • c87cb5d051 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:16:59 +02:00
  • 70a55428bc removed 2 files in doxygen always generated Dhanya Maliakal 2017-08-17 17:16:41 +02:00
  • 8c0b4ac216 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:13:40 +02:00
  • 60292ca0f8 added to .gitignore Dhanya Maliakal 2017-08-17 17:13:30 +02:00
  • fecac2c4d2 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:10:52 +02:00
  • 9167d113dc command line doc. done Dhanya Maliakal 2017-08-17 17:10:32 +02:00
  • 04ebc85fcc command line doc. done Dhanya Maliakal 2017-08-17 17:09:59 +02:00
  • de5986e5dd Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:09:05 +02:00
  • 7cfc6a9fd9 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:09:04 +02:00
  • e0c29190a2 command line doc. done Dhanya Maliakal 2017-08-17 17:08:55 +02:00
  • ff7b6c5abe Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc Anna Bergamaschi 2017-08-17 17:04:57 +02:00
  • 269227b093 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:04:30 +02:00
  • 355c0a8c11 command line docu. more coming up Dhanya Maliakal 2017-08-17 17:04:29 +02:00
  • be95de0963 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc Anna Bergamaschi 2017-08-17 17:04:27 +02:00
  • 0dd6567ce4 changed some sections in the documentation Anna Bergamaschi 2017-08-17 17:04:07 +02:00
  • 638a69ad23 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 17:02:43 +02:00
  • 7115ac19b6 command line docu. more coming up Dhanya Maliakal 2017-08-17 17:02:42 +02:00
  • b20f994ac4 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 16:59:08 +02:00
  • 4adf3e9385 command line docu. more coming up Dhanya Maliakal 2017-08-17 16:59:07 +02:00
  • ae13fbce72 changed some sections in the documentation Anna Bergamaschi 2017-08-17 16:57:06 +02:00
  • 68840b4544 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 16:50:18 +02:00
  • e2af1de83f Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc Dhanya Maliakal 2017-08-17 16:49:54 +02:00
  • 7156d2e7b3 updated client docu. more coming up Dhanya Maliakal 2017-08-17 16:49:48 +02:00
  • e2d451a400 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 16:46:49 +02:00
  • 3189bd5359 command line docu. more coming up Dhanya Maliakal 2017-08-17 16:46:48 +02:00
  • c3fce9822f Merge branch '3.0-rc' into developer Gemma Tinti 2017-08-17 16:40:35 +02:00
  • ca02a8fd72 manual Gemma Tinti 2017-08-17 16:39:48 +02:00
  • 3c3a5062bd Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 16:25:05 +02:00
  • edfa8493d8 command line docu. more coming up Dhanya Maliakal 2017-08-17 16:25:04 +02:00
  • 52223e61d4 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 16:25:02 +02:00
  • 827ce17fac command line docu. more coming up Dhanya Maliakal 2017-08-17 16:25:01 +02:00
  • 96700d42b4 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 14:34:24 +02:00
  • 56e61de863 command line docu. more coming up Dhanya Maliakal 2017-08-17 14:34:09 +02:00
  • 2932a954ab Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 14:32:46 +02:00
  • de7bb0b979 command line docu. more coming up Dhanya Maliakal 2017-08-17 14:32:45 +02:00
  • 6ef4aa9715 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 14:32:44 +02:00
  • e333eb15cd command line docu. more coming up Dhanya Maliakal 2017-08-17 14:32:43 +02:00
  • 80c8ff9f20 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 14:17:16 +02:00
  • 3da71c9274 command line docu. more coming up Dhanya Maliakal 2017-08-17 14:17:10 +02:00
  • 3a887eb604 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 14:17:05 +02:00
  • c6549694a8 command line docu. more coming up Dhanya Maliakal 2017-08-17 14:16:54 +02:00
  • b9cd0054a9 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 13:56:09 +02:00
  • cf5137723d command line docu update. more coming Dhanya Maliakal 2017-08-17 13:56:00 +02:00