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

Commit Graph

  • c4f9f2ef4b rename action to dil_action l_samenv 2022-12-19 16:12:06 +01:00
  • 0820d537c3 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-12-19 16:09:40 +01:00
  • 1a6aa893e4 move persistent_field parameter from magnet.py to ips_magnet.py camea 2022-12-19 16:03:44 +01:00
  • b10c722ff6 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-12-19 15:13:20 +01:00
  • b7a1f17e5e fix new statemachine with ips magfield camea 2022-12-19 15:12:00 +01:00
  • db3b190c26 Improve jenkinsfile Bjoern Pedersen 2022-12-19 14:24:24 +01:00
  • c522c41654 GUI: add logging infra, switch to argparse Alexander Zaft 2022-12-07 17:42:08 +01:00
  • 929e41ffff Merge "Fix identification response" Enrico Faulhaber 2022-12-06 18:00:10 +01:00
  • 8d99a8c536 Fix identification response Alexander Zaft 2022-12-06 07:49:39 +01:00
  • a14c282993 redesign of the state machine Markus Zolliker 2022-12-06 09:59:56 +01:00
  • a0d14c30be attocube: more robust moving l_samenv 2022-12-02 10:37:45 +01:00
  • e668b6a439 attocube: add offset and change to HasTargetLimits l_samenv 2022-12-02 09:12:51 +01:00
  • 3483c3374d allow pollinterval = 0 l_samenv 2022-12-02 09:10:07 +01:00
  • d71a512454 new features HasTargetLimits and HasSimpleOffset l_samenv 2022-12-02 09:07:20 +01:00
  • b1608c4d7f Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-12-02 09:00:12 +01:00
  • e4c1f35e4a add attocube l_samenv 2022-12-02 08:54:26 +01:00
  • 3ab7eb99ab add flamemag / flamedil config l_samenv 2022-11-30 14:14:47 +01:00
  • ef9d89993c new specs of HasOffset and target_limits l_samenv 2022-11-30 14:14:06 +01:00
  • 9887ba0721 improve Attached l_samenv 2022-11-30 14:11:05 +01:00
  • d09634a55d Fix error Message for too large arrays Alexander Zaft 2022-11-28 09:28:17 +01:00
  • 397ca350f8 add FLAMP furnace zebra 2022-11-24 07:56:09 +01:00
  • 99220400f1 add FS furnace zebra 2022-11-24 07:55:36 +01:00
  • 4e8636a620 heliox: make temperatures seperate modules dmc 2022-11-24 07:50:24 +01:00
  • f14bd553a8 disable closed loop on MA10 rotator dmc 2022-11-24 07:49:36 +01:00
  • 2845a82236 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-11-23 22:41:49 +01:00
  • 4f5cc3059e add FT furnace camea 2022-11-23 22:41:23 +01:00
  • 9636dc9cea state on dilsc as of 2022-10-03 Markus Zolliker 2022-11-21 14:51:02 +01:00
  • d845fedc03 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-11-21 14:38:40 +01:00
  • 1b2e364f70 magfield adapted to new state machine l_samenv 2022-11-21 14:37:53 +01:00
  • 4405b2b02c new state machine, HasStates mixin l_samenv 2022-11-21 14:08:17 +01:00
  • 49b9bfa11d improvements for triton l_samenv 2022-11-15 16:57:52 +01:00
  • df428f4c0c check readback and try up to 3 times when it does not match l_samenv 2022-11-15 16:57:00 +01:00
  • b17030afa2 Merge "interactive client: fix detection of overriding modules" Markus Zolliker 2022-11-10 17:01:34 +01:00
  • 37c9efb27b interactive client: fix detection of overriding modules Markus Zolliker 2022-11-07 15:14:48 +01:00
  • 4167ce7b00 fix sorce package name Enrico Faulhaber 2022-11-10 15:00:27 +01:00
  • 2b7b2267d2 [deb] Release v0.15.0 Jenkins system 2022-11-10 14:46:02 +01:00
  • 8071c21819 Merge "Fix typo in .description" Enrico Faulhaber 2022-11-10 14:43:32 +01:00
  • e16ef3ae87 Merge "rename debian files" Enrico Faulhaber 2022-11-10 14:42:54 +01:00
  • 51147d8e09 Fix doc warnings/errors Björn Pedersen 2022-11-10 09:32:09 +01:00
  • 6909eb8541 rename debian files Alexander Zaft 2022-11-08 08:15:48 +01:00
  • 5d6b208671 CI build: upgrade base image Björn Pedersen 2022-11-10 08:35:42 +01:00
  • b3eebb6c6a rename debian package files Alexander Zaft 2022-11-08 08:12:36 +01:00
  • 7f166a5b8c Rename from secop to frappy Alexander Zaft 2022-11-08 08:09:41 +01:00
  • c1eb764b09 fixed pylint warnings Alexander Zaft 2022-11-08 07:53:34 +01:00
  • a9d798fabc Fix typo in .description Christian Felder 2022-11-08 17:43:05 +01:00
  • a928c95efd Merge "Add requirements-gui.txt and add PyQT5" Alexander Zaft 2022-11-03 15:50:19 +01:00
  • 7df4584150 Merge "Remove iohandler left-overs from docs" Enrico Faulhaber 2022-11-03 15:00:54 +01:00
  • b7cebe2cd8 Add requirements-gui.txt and add PyQT5 Alexander Zaft 2022-11-03 14:41:25 +01:00
  • b8b2dafaf8 Makefile: fix release target Georg Brandl 2022-11-03 13:56:11 +01:00
  • f66411dded Remove iohandler left-overs from docs Björn Pedersen 2022-11-03 13:38:56 +01:00
  • ce4bbec766 [deb] Release v0.14.3 Jenkins system 2022-11-03 13:51:52 +01:00
  • 355810a887 MLZ/entangle: fix AnalogOutput.read_status() Enrico Faulhaber 2022-11-03 11:17:10 +01:00
  • aa98604f88 Upgrade for ci Bjoern Pedersen 2022-11-02 19:06:37 +02:00
  • b0051ca3f0 secop_mlz/amagnet: formatting fixup Georg Brandl 2022-10-28 16:20:29 +02:00
  • 92edbb27ea change repo to secop/frappy Enrico Faulhaber 2022-10-21 12:40:33 +02:00
  • 20fc48ddf0 [deb] Release v0.14.2 Jenkins system 2022-10-20 15:38:45 +02:00
  • 340c031f46 systemd generator: adapt to changed config API Georg Brandl 2022-10-20 14:48:46 +02:00
  • 3ac8b4e255 [deb] Release v0.14.1 Jenkins system 2022-10-20 14:04:07 +02:00
  • 6ffc73a1e1 Makefile: fix Jenkins host Georg Brandl 2022-10-20 14:03:59 +02:00
  • 4ef0b0c01d mlz: avoid error on import due to consistency check Georg Brandl 2022-10-19 17:04:35 +02:00
  • 1fc805a5a2 gui: clarify needed input for "add sec node" dialog Georg Brandl 2022-10-19 17:02:55 +02:00
  • 05edf98dfe secop_psi.entangle.AnalogInput: fix main value Markus Zolliker 2022-09-22 10:25:50 +02:00
  • e09c365ea5 [deb] Release v0.14.0 Jenkins system 2022-10-19 11:31:51 +02:00
  • 0c93ca8c75 add comment "do not use mb11stick" camea 2022-10-18 16:41:04 +02:00
  • 971c1dcfee Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-10-04 15:13:23 +02:00
  • 498dbd4179 sea.py: fix status datatype camea 2022-10-04 15:11:57 +02:00
  • 00b0a54f12 ramp unit must be $/min l_samenv 2022-09-22 17:12:54 +02:00
  • 48076edd99 improve magfield and ips_mercury l_samenv 2022-09-22 17:12:30 +02:00
  • 64cb297a06 HasIO: automatic creation of io from uri fails Markus Zolliker 2022-09-22 07:55:31 +02:00
  • eaefa1ce87 apply main unit also in structured types Markus Zolliker 2022-09-14 14:50:39 +02:00
  • 71aaf7187a improvements on interactive client Markus Zolliker 2022-09-22 07:47:43 +02:00
  • 0a28192c15 improve general config Markus Zolliker 2022-09-22 08:29:53 +02:00
  • 1b9cac04b1 fix bug when restarting statemachine Markus Zolliker 2022-09-22 08:33:54 +02:00
  • 2b1986ad8f fix bug in persistent.py Markus Zolliker 2022-09-22 09:29:58 +02:00
  • 270152d503 improve HasConvergence mixin Markus Zolliker 2022-09-22 10:01:08 +02:00
  • 1922578dfa fix undefined status in softcal Markus Zolliker 2022-09-22 10:06:44 +02:00
  • 485e81bfb0 [deb] Release v0.13.1 Jenkins system 2022-08-02 15:31:52 +02:00
  • 0df50bb0f9 secop_mlz: minor rework entangle client Enrico Faulhaber 2022-08-02 11:54:53 +02:00
  • de5f17695c make startup faster in case of errors Markus Zolliker 2022-06-02 10:03:38 +02:00
  • e4aa2149f7 phytron: fix warning on repeated comm. error Markus Zolliker 2022-09-21 11:35:42 +02:00
  • 9f656546df fix undefined status in softcal Markus Zolliker 2022-09-20 12:06:46 +02:00
  • 5affb9f31b fix bug in persistent.py Markus Zolliker 2022-09-20 11:26:33 +02:00
  • 5e3bf96df1 rework of uniax Markus Zolliker 2022-09-20 11:07:44 +02:00
  • 07995e2235 fix bug when restarting statemachine Markus Zolliker 2022-09-20 10:31:43 +02:00
  • 54f091d0fe disable encoder for ma6 stick motor zebra 2022-09-19 11:38:33 +02:00
  • 14a71427fa jtccr: fix rel_paths zebra 2022-09-19 11:37:56 +02:00
  • 486be9604e [WIP] uniax: removed do_ prefix Markus Zolliker 2022-09-16 14:57:58 +02:00
  • a8f1495bc8 [WIP] uniax after changing to StateMachine Markus Zolliker 2022-09-16 14:53:42 +02:00
  • 3ab9821860 improve formatting of values Markus Zolliker 2022-09-16 08:06:24 +02:00
  • 0b9e227669 state after discussion with users Markus Zolliker 2022-09-16 08:14:14 +02:00
  • befba09acc fix main value unit Markus Zolliker 2022-09-14 14:54:48 +02:00
  • 554f265eb8 fix main value unit Markus Zolliker 2022-09-14 14:53:59 +02:00
  • 4287ec6477 apply main unit also in structured types Markus Zolliker 2022-09-14 14:50:39 +02:00
  • aad1c33742 improvements on interactive client Markus Zolliker 2022-09-14 13:59:51 +02:00
  • b0315e133b rework switch timing Markus Zolliker 2022-09-14 13:58:12 +02:00
  • c3f55435da add reading of slave currents and voltages l_samenv 2022-09-14 10:59:55 +02:00
  • 12cb0cdade Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip camea 2022-09-12 15:16:57 +02:00
  • 7ed7dd7493 add combined mb11 / mb11 stick camea 2022-09-12 15:16:26 +02:00
  • 031b30a4aa heater slots H2 and H3 are exchanged! camea 2022-09-12 15:15:24 +02:00
  • 3597adf869 fix code for current framwork version Markus Zolliker 2022-09-08 14:57:06 +02:00