Commit Graph

Select branches

Hide Pull Requests

andrea

develop

dilsc

dilsc_feb2023

flame

flowsas

hot_lakeshore

mirror

paul

sinqtmp

tmp

trinamic

trinamic_persistent

ultrasound

uniax

uniax_may2021

wip

work

v0.20.1-7

Mono Color

• da37175cbb frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT Markus Zolliker 2023-08-07 15:35:45 +02:00
• 2020928289 improve error message on client when host/port is bad Markus Zolliker 2023-08-07 13:18:28 +02:00
• 9df6794678 fix haake_cfg sans 2023-08-07 16:10:55 +02:00
• 41f3b7526e fix ma7.config.json sans 2023-08-07 16:10:30 +02:00
• e405783716 Removed status Oksana Shliakhtun 2023-07-12 15:19:16 +02:00
• dc59906c8a Added tc for the Ametek 7265 Oksana Shliakhtun 2023-07-12 15:13:35 +02:00
• 161fb7b2ca Changed configuration file for Ametek lockin 7270 Oksana Shliakhtun 2023-07-12 15:11:19 +02:00
• f80624b48d MA7: add unit=T to mf l_samenv 2023-07-11 15:34:18 +02:00
• 9e2e6074c8 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2023-07-11 13:27:57 +02:00
• 5a13888498 sMA6 encoder mode to CHECK zebra 2023-07-11 11:27:20 +02:00
• 5a8a6b88ff frappy.client.interactive: bug fixes Markus Zolliker 2023-07-10 18:36:02 +02:00
• b84b7964e3 frappy_psi.sea: further bug fixes Markus Zolliker 2023-07-10 17:48:59 +02:00
• 6c5dddc449 ma7: sea confg: make ta/tb visible l_samenv 2023-07-10 10:55:43 +02:00
• 78fa49ef74 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip focus 2023-07-07 15:46:05 +02:00
• d92b154292 frappy_psi.sea: avoid multiple connections Markus Zolliker 2023-07-07 15:37:38 +02:00
• 073fe1a08b frappy.io: make error reporting consistent Markus Zolliker 2023-07-07 15:35:54 +02:00
• f80c793cd9 consmetic changes to ma6_sample_heat_cfg.py zebra 2023-07-06 14:49:06 +02:00
• 519e9e2ed7 MA6: set om.encoder_mode to 'NO' zebra 2023-07-06 14:48:09 +02:00
• 14036160f7 add special configurations m6/ma7 sampleheat sans 2023-07-06 13:06:06 +02:00
• 131dc60807 MA7/MA11: make ts drivable sans 2023-07-06 12:55:04 +02:00
• 49722a858f update haake + eurotherm cfg sans 2023-07-06 11:08:32 +02:00
• c61b674382 disable encoder for MA11 stick rotation sans 2023-07-06 11:06:56 +02:00
• 091543be56 add FW (old power rack, via SEA) focus 2023-07-06 11:53:52 +02:00
• d2885bdd72 revert commits done before MZ holidays Markus Zolliker 2023-07-06 08:03:15 +02:00
• 975593dd6b update to gerrit version Markus Zolliker 2023-07-05 17:26:33 +02:00
• 4fe28363d3 server: add option to dynamically create devices Alexander Zaft 2023-06-28 08:55:41 +02:00
• 28b19dbf57 frappy_psi.thermofisher: add version through gerrit Markus Zolliker 2023-07-05 17:14:07 +02:00
• 05189d094a add StructParam Markus Zolliker 2023-06-20 15:12:54 +02:00
• 47da14eef9 pylint: disable use-dict-literal Markus Zolliker 2023-06-29 11:37:41 +02:00
• 7904f243cb server: add option to dynamically create devices Alexander Zaft 2023-06-28 08:55:41 +02:00
• a2fed8df03 pylint: disable use-dict-literal Markus Zolliker 2023-06-29 11:37:41 +02:00
• 19f965bced Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip eiger 2023-07-03 17:51:43 +02:00
• 3e4ea2515e add ma15 cfg eiger 2023-07-03 17:51:28 +02:00
• 714c820115 fixes in ori3 and dil5 config camea 2023-07-03 17:49:06 +02:00
• a8e1d0e1e8 frappy_psi.sea: try to reconnect on failure Markus Zolliker 2023-06-29 11:27:28 +02:00
• 04940b1a0b write_range, write_tc, string_to_value method Oksana Shliakhtun 2023-06-28 13:03:21 +02:00
• 6f6f07b0f9 The write method is changed Oksana Shliakhtun 2023-06-27 09:55:34 +02:00
• d7a1604bd5 frappy_psi.sea: auto connect l_samenv 2023-06-26 14:45:53 +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
• 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
• bf43858031 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
• 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
• 33fb90af05 fixed autorange, vmode, amp, irange, freq Oksana Shliakhtun 2023-06-01 17:03:02 +02:00
• da122ad961 edited lockin (SR) Oksana Shliakhtun 2023-05-31 17:25:00 +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
• 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
• 1de5455ef6 add haakeuro l_samenv 2023-05-25 09:56:25 +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