Commit Graph

Select branches

Hide Pull Requests

andrea

develop

dilsc

dilsc_feb2023

flame

flowsas

hot_lakeshore

mirror

paul

sinqtmp

tmp

tnmr

trinamic

trinamic_persistent

ultrasound

uniax

uniax_may2021

wip

work

v0.20.1-7

Mono Color

• d7a1604bd5 frappy_psi.sea: auto connect l_samenv 2023-06-26 14:45:53 +02:00
• cffe301c26 add test cases for server and config Alexander Zaft 2023-06-12 09:14:11 +02:00
• 83d11da5ae server: Add signal handling Alexander Zaft 2023-06-14 09:57:29 +02:00
• 4c911d58b7 frappy_psi.convergence: bug fixes and improvements Markus Zolliker 2023-06-20 09:03:20 +02:00
• d079bd15e7 Add shutdownModule function Alexander Zaft 2023-06-14 09:35:09 +02:00
• 0c45755170 [deb] Release v0.17.13 Jenkins system 2023-06-20 14:38:00 +02:00
• b91905fc04 server: fix systemd variable scope Alexander Zaft 2023-06-20 14:29:45 +02:00
• a44d232dea remove unused cfg/sea/*.py Markus Zolliker 2023-06-20 11:07:23 +02:00
• b92095974b camea filter addon Markus Zolliker 2023-06-20 11:03:37 +02:00
• 32b1d6412d camea filter addon Markus Zolliker 2023-06-20 11:03:37 +02:00
• 87830a1473 branch develop: recent changes from branch wip Markus Zolliker 2023-06-20 10:57:27 +02:00
• fcca3801a4 branch develop: cfgfiles cfg/main for branch wip Markus Zolliker 2023-06-20 10:55:12 +02:00
• 5727ecbc7f frappy_psi.sea: bug fixes Markus Zolliker 2023-06-20 09:09:51 +02:00
• 27b8deeb2e frappy_psi.magfield: bug fix Markus Zolliker 2023-06-20 09:31:38 +02:00
• 8dc9c57e9d entangle: fix tango guards for pytango 9.3 Alexander Zaft 2023-06-12 16:16:06 +02:00
• 7c95f1f8ee config: fix merge_modules Alexander Zaft 2023-06-12 14:00:56 +02:00
• 3786d2f209 frappy_psi.triton: fix HeaterOutput.limit Markus Zolliker 2023-06-19 10:57:34 +02:00
• 138b84e84c add a hook for reads to be done initially Markus Zolliker 2023-06-19 08:59:31 +02:00
• 997e8e26e9 frappy_psi.mercury: proper handling of control_active Markus Zolliker 2023-06-19 10:55:40 +02:00
• 644d005dad frappy.mixins.HasOutputModule Markus Zolliker 2023-06-19 10:33:24 +02:00
• 36dfe968e8 frappy_psi.phytron: rename reset_error to clear_errors Markus Zolliker 2023-06-14 11:01:48 +02:00
• 0932228596 frappy_psi.mercury/triton: add control_off command Markus Zolliker 2023-06-14 11:28:59 +02:00
• dff0c819de io: followup fix for retry-first-ident Alexander Zaft 2023-06-12 08:09:24 +02:00
• fd917724d8 io: add option to retry first ident request Alexander Zaft 2023-06-06 10:30:19 +02:00
• 98c8600117 frappy_psi.triton: fix HeaterOutput.limit Markus Zolliker 2023-06-19 10:57:34 +02:00
• f7129f6a00 add a hook for reads to be done initially Markus Zolliker 2023-06-19 08:59:31 +02:00
• 2feff36077 frappy_psi.mercury: proper handling of control_active Markus Zolliker 2023-06-19 10:55:40 +02:00
• 04b6ad09ba frappy.mixins.HasOutputModule Markus Zolliker 2023-06-19 10:33:24 +02:00
• 06175da887 frappy_psi.phytron: rename reset_error to clear_errors Markus Zolliker 2023-06-14 11:01:48 +02:00
• 9306596cb2 frappy_psi.mercury/triton: add control_off command Markus Zolliker 2023-06-14 11:28:59 +02:00
• bf43858031 GUI bugfix: use isChecked instead of checkState in BoolInput Markus Zolliker 2023-06-15 10:31:00 +02:00
• 666ebf5719 GUI bugfix: use isChecked instead of checkState in BoolInput Markus Zolliker 2023-06-15 10:31:00 +02:00
• 00b57e3d2c GUI bugfix: use isChecked instead of checkState in BoolInput Markus Zolliker 2023-06-15 10:23:07 +02:00
• 3783210b81 add egg-info to gitignore Alexander Zaft 2023-06-14 09:39:20 +02:00
• 18f2fa05c9 [deb] Release v0.17.12 Jenkins system 2023-06-13 06:51:28 +02:00
• b0e23466cc entangle: fix tango guards for pytango 9.3 Alexander Zaft 2023-06-12 16:16:06 +02:00
• 6802e8f9d3 io: followup fix for retry-first-ident Alexander Zaft 2023-06-12 08:09:24 +02:00
• ff9f7239cf config: fix merge_modules Alexander Zaft 2023-06-12 14:00:56 +02:00
• 15ca3c984d io: add option to retry first ident request Alexander Zaft 2023-06-06 10:30:19 +02:00
• f354b19cf0 frappy_psi.sea: fix extra_module_set Markus Zolliker 2023-06-06 16:50:48 +02:00
• f304ac019e fix cfg files (extra_modules/single_module) Markus Zolliker 2023-06-06 16:49:54 +02:00
• 9a9a22588f Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip zebra 2023-06-06 16:46:31 +02:00
• 3e26dd49d0 jtccr: fix cfg for extra_modules / single_module zebra 2023-06-06 16:45:31 +02:00
• 5a456a82b0 fix enum when SEA type is text Markus Zolliker 2023-06-05 13:55:34 +02:00
• f6868da3b9 fix systemd bug Markus Zolliker 2023-06-05 13:55:17 +02:00
• ee31f8fb45 fix merge_status in HasConvergence zebra 2023-06-05 13:03:38 +02:00
• a6a3f80e30 remove sign=-1 from cfg files zebra 2023-06-05 13:02:40 +02:00
• 720d010c47 frappy_psi.thermofisher improvements Markus Zolliker 2023-06-05 09:49:03 +02:00
• 9e52665b88 frappy_psi.convergence: improvments Markus Zolliker 2023-06-05 09:47:08 +02:00
• a529cb9ab1 frappy.client: missing exception method in dummy logger Markus Zolliker 2023-06-05 09:45:04 +02:00
• ad36ab1067 frappy_psi.thermofisher improvements Markus Zolliker 2023-06-05 09:49:03 +02:00
• f2d795cfba frappy_psi.convergence: improvments Markus Zolliker 2023-06-05 09:47:08 +02:00
• c04337c3a4 frappy.client: missing exception method in dummy logger Markus Zolliker 2023-06-05 09:45:04 +02:00
• 68d74347c6 silently catches error in systemd.daemon.notify Markus Zolliker 2023-06-02 14:03:11 +02:00
• a11b8cf2d1 seop: fix fitparam command Alexander Zaft 2023-06-02 09:44:24 +02:00
• 33fb90af05 fixed autorange, vmode, amp, irange, freq Oksana Shliakhtun 2023-06-01 17:03:02 +02:00
• 4a80b4e45d Typo in influences description Alexander Zaft 2023-06-01 15:55:04 +02:00
• d3c9666593 Add SEOP He3-polarization device Alexander Zaft 2023-05-24 10:18:47 +02:00
• da122ad961 edited lockin (SR) Oksana Shliakhtun 2023-05-31 17:25:00 +02:00
• fa4349784c frappy.client: dummy logger is missing 'exception' method Markus Zolliker 2023-05-31 16:17:36 +02:00
• 57d5298c92 remove secop-server.spec Markus Zolliker 2023-05-31 14:30:37 +02:00
• 11d1ad546f up to date with mlz Markus Zolliker 2023-05-31 14:29:25 +02:00
• 9a6421a54f up to date with develop/mlz Markus Zolliker 2023-05-31 14:27:36 +02:00
• 37d28c9f35 update 2023-05-30 from gitmlz Markus Zolliker 2023-05-31 14:16:12 +02:00
• c5d429346d update 2023-05-30 from gitmlz Markus Zolliker 2023-05-31 14:16:12 +02:00
• dc0cc590ed Merge branch 'wip' into develop Markus Zolliker 2023-05-31 14:06:05 +02:00
• 0771cb6899 working on lockin (SR) Oksana Shliakhtun 2023-05-31 13:38:44 +02:00
• 564620e9e3 Test for lockin driver Oksana Shliakhtun 2023-05-30 18:23:33 +02:00
• 815e91ae26 Add influences property to parameters/commands Alexander Zaft 2023-05-31 08:52:23 +02:00
• 726665ebd8 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2023-05-31 08:43:19 +02:00
• 004533655f frappy_psi.magfield: bug in progress check camea 2023-05-31 08:42:17 +02:00
• c4d5d2e284 fix equipment_id in seadesc Markus Zolliker 2023-05-30 15:12:36 +02:00
• 75f156beef improve HasRamp Markus Zolliker 2023-05-26 16:07:07 +02:00
• 459a80b4d2 add Drivable with alias value and target Markus Zolliker 2023-05-25 17:54:28 +02:00
• bef190b77d software ramp mixin Markus Zolliker 2023-05-25 16:14:06 +02:00
• e4dbb90065 lakshore must not import from frappy_psi.mixins Markus Zolliker 2023-05-25 17:52:27 +02:00
• 0cbaffd4b6 log.exception instead of log.error in callbacks Markus Zolliker 2023-05-25 16:16:30 +02:00
• 3b92688b84 Warn about duplicate module definitions in a file Alexander Zaft 2023-05-25 10:57:44 +02:00
• 1de5455ef6 add haakeuro l_samenv 2023-05-25 09:56:25 +02:00
• 37337ac959 [deb] Release v0.17.11 Jenkins system 2023-05-25 09:38:25 +02:00
• af0f9b39b5 Fix rstrip misuse in frappy-generator Alexander Zaft 2023-05-25 09:28:04 +02:00
• a643093934 client: timestamps must never lie in the future Markus Zolliker 2023-05-22 07:32:16 +02:00
• d8c0a1c507 phytron motor driver Markus Zolliker 2023-05-10 14:22:36 +02:00
• bda0afe042 client.interactive: fix error when interface_classes empty Markus Zolliker 2023-05-10 17:31:22 +02:00
• 4b307fe92a add unit=s to pollinterval Markus Zolliker 2023-05-10 14:31:11 +02:00
• 04d7d0249a move more code from bin/frappy-cli to frappy/client/interactive.py Markus Zolliker 2023-05-11 10:36:51 +02:00
• 386e5d241e debian: add new executable Georg Brandl 2023-05-23 07:25:15 +02:00
• e1b30bf37e merge with wip branch l_samenv 2023-05-17 17:00:06 +02:00
• db94def694 newest version of okasanas drivers l_samenv 2023-05-17 16:56:49 +02:00
• 439c9d34c1 add test cfg for lockin Oksana Shliakhtun 2023-05-17 16:04:09 +02:00
• ac90999bdd add Thermofisher to doc Oksana Shliakhtun 2023-05-17 16:03:55 +02:00
• 85dd905cfd add SR lockin Oksana Shliakhtun 2023-05-17 16:03:18 +02:00
• 04b9bed7c9 thermofisher updates Oksana Shliakhtun 2023-05-17 16:02:41 +02:00
• 1407514458 phytron Markus Zolliker 2023-05-16 09:39:20 +02:00
• 050a2dc8dc phytron next version Markus Zolliker 2023-05-15 11:12:52 +02:00
• df4a37085a frappy-cli: fix init(*...) Markus Zolliker 2023-05-15 11:12:31 +02:00
• 6697462f15 phytron: next fix Markus Zolliker 2023-05-15 09:03:58 +02:00
• 84d0d44f38 phytron with HasStates Markus Zolliker 2023-05-15 08:33:14 +02:00
• fa9525fd4c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2023-05-11 10:42:38 +02:00
• 087036922a move more code from bin/frappy-cli to frappy/client/interactive.py l_samenv 2023-05-11 10:42:10 +02:00