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

• 09772eb746 stickmotor addon: add backlash -1 focus 2023-09-08 10:45:18 +02:00
• c249b1648d frappy_psi.phytron: further improvements Markus Zolliker 2023-08-23 13:05:18 +02:00
• 480913dabe add zapf to requirements-dev Alexander Zaft 2023-07-20 15:27:18 +02:00
• c2a080360d Revert "add zapf to requirements-dev.txt" Alexander Zaft 2023-07-20 15:21:30 +02:00
• 923da8ca15 interactive client: improve keyboard interrupt Markus Zolliker 2023-08-09 14:19:39 +02:00
• 7a2e764262 frappy_mlz: Add Zapf PLC Alexander Zaft 2023-06-28 09:02:05 +02:00
• d726fd9fa0 add zapf to requirements-dev.txt Alexander Zaft 2023-07-20 07:36:54 +02:00
• 267acf644c core: do not call register_module on error Alexander Zaft 2023-07-19 15:35:02 +02:00
• 0bc8accaaa frappy_mlz: fix one-off error in barcode reader Alexander Zaft 2023-07-21 10:12:17 +02:00
• 0351ebd98d dispatcher: change logging calls to debug Alexander Zaft 2023-07-18 10:35:57 +02:00
• 3a235f6380 frappy_mlz: Zebra fixes after basic test Alexander Zaft 2023-07-12 16:10:10 +02:00
• 500c5f8c5d mlz: Add Zebra Barcode Reader Alexander Zaft 2023-05-05 16:01:06 +02:00
• 6b8e6498fa Revert "revert commits done before MZ holidays" Markus Zolliker 2023-08-18 16:27:55 +02:00
• 4fc6ef52da frappy_psi.phytron: stop motor before restart Markus Zolliker 2023-08-09 15:03:12 +02:00
• fcb5052565 add hvolt_short sans 2023-08-09 17:39:19 +02:00
• acc7580dc6 frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT Markus Zolliker 2023-08-07 15:35:45 +02:00
• 4f28e5555c improve error message on client when host/port is bad Markus Zolliker 2023-08-07 13:18:28 +02:00
• ec2bc57ade fix haake_cfg sans 2023-08-07 16:10:55 +02:00
• 7142cee0db fix ma7.config.json sans 2023-08-07 16:10:30 +02:00
• a3d7520da9 add ori7 focus 2023-08-10 14:34:51 +02:00
• 9d5ed822e8 insert pressure reading into ccrpe_cfg dmc 2023-08-17 14:07:44 +02:00
• b6c2cf8d3a MA7: add unit=T to mf l_samenv 2023-07-11 15:34:18 +02:00
• a26ae0da4e sMA6 encoder mode to CHECK zebra 2023-07-11 11:27:20 +02:00
• a7cbb35455 frappy.client.interactive: bug fixes Markus Zolliker 2023-07-10 18:36:02 +02:00
• e866ae7034 frappy_psi.sea: further bug fixes Markus Zolliker 2023-07-10 17:48:59 +02:00
• f35dae5893 ma7: sea confg: make ta/tb visible l_samenv 2023-07-10 10:55:43 +02:00
• 2fc9eccfd5 frappy_psi.sea: avoid multiple connections Markus Zolliker 2023-07-07 15:37:38 +02:00
• ca57f46ed2 frappy.io: make error reporting consistent Markus Zolliker 2023-07-07 15:35:54 +02:00
• 1776d7b4b6 consmetic changes to ma6_sample_heat_cfg.py zebra 2023-07-06 14:49:06 +02:00
• 34f46ab0b0 MA6: set om.encoder_mode to 'NO' zebra 2023-07-06 14:48:09 +02:00
• 98a73d7882 add special configurations m6/ma7 sampleheat sans 2023-07-06 13:06:06 +02:00
• e7148a30cb MA7/MA11: make ts drivable sans 2023-07-06 12:55:04 +02:00
• da948468b4 update haake + eurotherm cfg sans 2023-07-06 11:08:32 +02:00
• 75df438d69 disable encoder for MA11 stick rotation sans 2023-07-06 11:06:56 +02:00
• 10fe42babf add FW (old power rack, via SEA) focus 2023-07-06 11:53:52 +02:00
• 8124ed3294 revert commits done before MZ holidays Markus Zolliker 2023-07-06 08:03:15 +02:00
• aa7910c28c update to gerrit version Markus Zolliker 2023-07-05 17:26:33 +02:00
• ff6a98af92 frappy_psi.thermofisher: add version through gerrit Markus Zolliker 2023-07-05 17:14:07 +02:00
• 0647b34bb8 add StructParam Markus Zolliker 2023-06-20 15:12:54 +02:00
• 271bb27699 server: add option to dynamically create devices Alexander Zaft 2023-06-28 08:55:41 +02:00
• 2cbe3f19b4 pylint: disable use-dict-literal Markus Zolliker 2023-06-29 11:37:41 +02:00
• 228902a6ee fixes in ori3 and dil5 config camea 2023-07-03 17:49:06 +02:00
• bee591c861 frappy_psi.sea: try to reconnect on failure Markus Zolliker 2023-06-29 11:27:28 +02:00
• 8e7e70c50e frappy_psi.sea: auto connect l_samenv 2023-06-26 14:45:53 +02:00
• e36ff9bc41 add ma15 cfg eiger 2023-07-03 17:51:28 +02:00
• e02c9b1378 fix systemd bug Markus Zolliker 2023-06-05 13:55:17 +02:00
• 5a19103d0e frappy_psi.thermofisher improvements Markus Zolliker 2023-06-05 09:49:03 +02:00
• e201e7dce9 up to date with develop/mlz Markus Zolliker 2023-05-31 14:27:36 +02:00
• 532e4a7ab5 update 2023-05-30 from gitmlz Markus Zolliker 2023-05-31 14:16:12 +02:00
• c9ccaa484a SR830: moved dicts out of class Oksana Shliakhtun 2023-10-16 13:42:49 +02:00
• 69bb896ebb mlz/demo: move old examples to Attached Alexander Zaft 2023-10-04 12:43:07 +02:00
• 757e96e7c0 core: move module handling out of dispatcher Alexander Zaft 2023-10-04 09:27:15 +02:00
• a5dfc82b95 Changed write_range, write_tc methods Oksana Shliakhtun 2023-10-09 14:28:16 +02:00
• 8d26ab4fe2 frappy.io: change default to retry_first_idn=True Markus Zolliker 2023-10-06 11:04:17 +02:00
• a3651f71f2 psi: fix Done import in sea Alexander Zaft 2023-10-05 11:13:32 +02:00
• 48c9853b37 all: remove coding cookies Alexander Zaft 2023-10-04 13:15:13 +02:00
• c68529d42d server: handle signals during startup Alexander Zaft 2023-10-04 10:28:13 +02:00
• 03c356590b frappy_psi.phytron: implement limit switches zebra 2023-10-02 16:58:09 +02:00
• 06bec41ed3 ma6: make ts drivable zebra 2023-10-02 16:56:23 +02:00
• 4cd6929d4b fix ma15 sea config zebra 2023-10-02 16:55:42 +02:00
• a89f7a3c44 configs for sample heat stick zebra 2023-10-02 16:54:52 +02:00
• a4330081b7 proxy: fix command wrapper Markus Zolliker 2023-10-02 13:26:58 +02:00
• 4b5e02c957 proxy: fix command wrapper Markus Zolliker 2023-10-02 13:26:58 +02:00
• e22da0db67 Changed driver for lock-in 65 Oksana Shliakhtun 2023-09-28 09:15:25 +02:00
• e89bc07759 New driver for lock-in amplifier SR830 Oksana Shliakhtun 2023-09-28 09:14:22 +02:00
• 7d85d85963 core: factor out accessibles from init Alexander Zaft 2023-09-25 16:29:10 +02:00
• d7ab35a461 core: split module code Alexander Zaft 2023-07-14 15:53:38 +02:00
• 3b997d7d86 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip tasp 2023-09-22 13:29:23 +02:00
• 612295d360 add ill2 tasp 2023-09-22 13:28:23 +02:00
• 9e39a43193 fix fs config tasp 2023-09-22 13:27:54 +02:00
• 6adfafaa27 more consistent ori1 stick json file tasp 2023-09-22 13:27:10 +02:00
• dd67c48c9e bug in Attached (fix after change 31470) Markus Zolliker 2023-09-21 11:13:57 +02:00
• f6c4090b96 fix simulation Markus Zolliker 2023-09-19 16:05:52 +02:00
• ecef2b8974 more cfg file fixes Markus Zolliker 2023-09-19 15:03:48 +02:00
• 96a7e2109b cleanup cfg files l_samenv 2023-09-19 14:43:48 +02:00
• 2f3c68a5c5 improvements for flame l_samenv 2023-07-11 13:24:41 +02:00
• e9a195d61e flamedil as of 2023-07-04 l_samenv 2023-07-04 17:02:48 +02:00
• 6ac3938b78 flamedil as of 2023-07-03 l_samenv 2023-07-03 17:11:07 +02:00
• b4cfdcfc1a flame sample combined T l_samenv 2023-06-29 15:07:53 +02:00
• d32fb647a6 frappy_psi.ls372: add TemperatureSensor and TemperatureLoop l_samenv 2023-06-29 15:06:45 +02:00
• abf7859fd6 frappy_psi.cryoltd: fixes after frappy upgrade l_samenv 2023-06-29 15:05:18 +02:00
• 55ea2b8cc4 frappy_psi.triton: try to fix channel selection before condense action l_samenv 2023-06-29 15:00:58 +02:00
• 27600e3ddf fix bad cfg files Markus Zolliker 2023-09-19 14:07:20 +02:00
• 6b4244f071 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2023-09-19 11:01:06 +02:00
• 1d81fc6fcd frappy_psi.sea: small fixes Markus Zolliker 2023-09-19 10:54:14 +02:00
• dfce0bdfbc phytron.py: improve status Markus Zolliker 2023-09-13 18:11:13 +02:00
• 4f86fc5c3c frappy_psi.sea: small fixes Markus Zolliker 2023-09-19 10:54:14 +02:00
• 4db1421b52 phytron.py: improve status Markus Zolliker 2023-09-13 18:11:13 +02:00
• 81279d3b61 introduce FrozenParam Markus Zolliker 2023-08-17 17:44:47 +02:00
• c39aef10aa Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip tasp 2023-09-14 11:10:12 +02:00
• 45dd87060b improve client shutdown time Markus Zolliker 2023-09-13 17:22:58 +02:00
• 8019b359c4 change FloatRange arguments minval/maxval to min/max Markus Zolliker 2023-08-18 09:29:32 +02:00
• 4c5109e5a3 fix frappy_demo.lakeshore Markus Zolliker 2023-08-18 10:07:20 +02:00
• bf4b3e5683 psi: improve sea interface Markus Zolliker 2023-09-13 18:16:51 +02:00
• af34fef1e1 fix missing .poll attribute in simulation Markus Zolliker 2023-09-13 14:32:57 +02:00
• 5e1c22ba28 further fixes after change 31470 Markus Zolliker 2023-09-12 08:18:17 +02:00
• 0bc4a63aa7 add parmod.Par Markus Zolliker 2023-09-14 09:05:00 +02:00
• ebb076a485 improve client shutdown time Markus Zolliker 2023-09-13 17:22:58 +02:00
• 98f9b2b8ad change FloatRange arguments minval/maxval to min/max Markus Zolliker 2023-08-18 09:29:32 +02:00
• e416a657fd fix frappy_demo.lakeshore Markus Zolliker 2023-08-18 10:07:20 +02:00