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

Commit Graph

  • 19c0bcdf14 psi: improve sea interface Markus Zolliker 2023-09-13 18:16:51 +02:00
  • cb2c10655c improve shutdown time Markus Zolliker 2023-09-13 17:22:58 +02:00
  • 0d2c677de3 fix missing .poll attribute in simulation Markus Zolliker 2023-09-13 14:32:57 +02:00
  • c7c6d60a99 further fixes after change 31470 Markus Zolliker 2023-09-12 08:18:17 +02:00
  • 6c49abea74 fix frappy/playground.py after change 31470 Markus Zolliker 2023-08-16 17:13:59 +02:00
  • dee8f8929e Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip focus 2023-09-08 10:46:13 +02:00
  • 2e143963df stickmotor addon: add backlash -1 focus 2023-09-08 10:45:18 +02:00
  • 4bc82c2896 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip sans 2023-09-06 08:39:22 +02:00
  • 833a68db51 ma10: improve sea cfg sans 2023-09-06 08:38:49 +02:00
  • b9f046a665 hvolt_short stick: make hcp writable sans 2023-09-06 08:38:06 +02:00
  • 9d9b5b2694 frappy_psi.phytron: further improvements Markus Zolliker 2023-08-23 13:05:18 +02:00
  • 255adbf8d9 frappy_psi.phytron: further improvements Markus Zolliker 2023-08-23 13:05:18 +02:00
  • 20b6d3e953 frappy_psi.phytron: further improvements Markus Zolliker 2023-08-23 13:05:18 +02:00
  • d946efa629 frappy_mlz seop: add count to ampl and phase cmds Alexander Zaft 2023-08-23 08:51:09 +02:00
  • 3b95277152 fix frappy/playground.py after change 31470 Markus Zolliker 2023-08-16 17:13:59 +02:00
  • bc0133f55a add zapf to requirements-dev Alexander Zaft 2023-07-20 15:27:18 +02:00
  • 09e59b93d8 Revert "add zapf to requirements-dev.txt" Alexander Zaft 2023-07-20 15:21:30 +02:00
  • 2474dc5e72 interactive client: improve keyboard interrupt Markus Zolliker 2023-08-09 14:19:39 +02:00
  • 9dab41441f frappy_mlz: Add Zapf PLC Alexander Zaft 2023-06-28 09:02:05 +02:00
  • 4af46a0ea2 add zapf to requirements-dev.txt Alexander Zaft 2023-07-20 07:36:54 +02:00
  • b844b83352 core: do not call register_module on error Alexander Zaft 2023-07-19 15:35:02 +02:00
  • 3b63e32395 frappy_mlz: fix one-off error in barcode reader Alexander Zaft 2023-07-21 10:12:17 +02:00
  • 5168e0133d dispatcher: change logging calls to debug Alexander Zaft 2023-07-18 10:35:57 +02:00
  • 9ea6082ed8 frappy_mlz: Zebra fixes after basic test Alexander Zaft 2023-07-12 16:10:10 +02:00
  • f205cf76aa mlz: Add Zebra Barcode Reader Alexander Zaft 2023-05-05 16:01:06 +02:00
  • db9ce02028 Revert "revert commits done before MZ holidays" Markus Zolliker 2023-08-18 16:27:55 +02:00
  • c4a39306e4 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip dmc 2023-08-17 14:10:29 +02:00
  • 024de0bd32 insert pressure reading into ccrpe_cfg dmc 2023-08-17 14:07:44 +02:00
  • 2e74172869 interactive client: improve keyboard interrupt Markus Zolliker 2023-08-09 14:19:39 +02:00
  • d2d63c47e1 frappy_psi.phytron: stop motor before restart Markus Zolliker 2023-08-09 15:03:12 +02:00
  • 501b781144 frappy_psi.phytron: stop motor before restart Markus Zolliker 2023-08-09 15:03:12 +02:00
  • 565e8e6fd3 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip focus 2023-08-10 14:35:03 +02:00
  • 89bc7f6dfe add ori7 focus 2023-08-10 14:34:51 +02:00
  • c69fe1571a add hvolt_short sans 2023-08-09 17:39:19 +02:00
  • c40033a816 update old cfg files Markus Zolliker 2023-08-09 17:36:02 +02:00
  • 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
  • 2272aecf0f frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT Markus Zolliker 2023-08-07 15:35:45 +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
  • 3569876bfc improve error message on client when host/port is bad Markus Zolliker 2023-08-07 13:18:28 +02:00
  • 4d3d78ad3c frappy_mlz: fix one-off error in barcode reader Alexander Zaft 2023-07-21 10:12:17 +02:00
  • 5b95a0ccca add zapf to requirements-dev Alexander Zaft 2023-07-20 15:27:18 +02:00
  • 8232b106a7 Revert "add zapf to requirements-dev.txt" Alexander Zaft 2023-07-20 15:21:30 +02:00
  • bc652f00bc frappy_mlz: Add Zapf PLC Alexander Zaft 2023-06-28 09:02:05 +02:00
  • e67a46cd01 add zapf to requirements-dev.txt Alexander Zaft 2023-07-20 07:36:54 +02:00
  • a974f85a41 core: do not call register_module on error Alexander Zaft 2023-07-19 15:35:02 +02:00
  • 819e2c5381 dispatcher: change logging calls to debug Alexander Zaft 2023-07-18 10:35:57 +02:00
  • c6796a1199 frappy_mlz: Zebra fixes after basic test Alexander Zaft 2023-07-12 16:10:10 +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
  • 2a769bbb40 mlz: Add Zebra Barcode Reader Alexander Zaft 2023-05-05 16:01:06 +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
  • 7ee65f47ee frappy.client.interactive: bug fixes Markus Zolliker 2023-07-10 18:36:02 +02:00
  • 285df89d4d 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
  • 78e8b9127f frappy_psi.sea: avoid multiple connections Markus Zolliker 2023-07-07 15:37:38 +02:00
  • 8647814220 frappy.io: make error reporting consistent Markus Zolliker 2023-07-07 15:35:54 +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
  • 9935546efd add frappy_psi.thermofisher to the doc Markus Zolliker 2023-07-05 17:34:41 +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
  • 830b5b3be0 add frappy_psi.thermofisher Markus Zolliker 2023-06-23 15:53:41 +02:00
  • fd2d05d7b5 add StructParam Markus Zolliker 2023-06-20 15:12:54 +02:00
  • 01348e0c7c server: add option to dynamically create devices Alexander Zaft 2023-06-28 08:55:41 +02:00
  • fdf82c3989 pylint: disable use-dict-literal Markus Zolliker 2023-06-29 11:37:41 +02:00
  • a8e1d0e1e8 frappy_psi.sea: try to reconnect on failure Markus Zolliker 2023-06-29 11:27:28 +02:00
  • 9ece4f797b frappy_psi.sea: try to reconnect on failure Markus Zolliker 2023-06-26 16:18:47 +02:00
  • 04940b1a0b write_range, write_tc, string_to_value method Oksana Shliakhtun 2023-06-28 13:03:21 +02:00
  • b47e5d270c fix frappy.lib.merge_status Markus Zolliker 2023-06-20 08:41:11 +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
  • 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