linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,332 Commits 18 Branches 1 Tag
Commit Graph

1332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sans
da948468b4 update haake + eurotherm cfg 2023-10-16 17:49:19 +02:00
sans
75df438d69 disable encoder for MA11 stick rotation 2023-10-16 17:49:19 +02:00
focus
10fe42babf add FW (old power rack, via SEA) 2023-10-16 17:49:19 +02:00
Markus Zolliker
8124ed3294 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-10-16 17:49:19 +02:00
Markus Zolliker
aa7910c28c update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-10-16 17:49:19 +02:00
Markus Zolliker
ff6a98af92 frappy_psi.thermofisher: add version through gerrit 
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
 2023-10-16 17:49:19 +02:00
Markus Zolliker
0647b34bb8 add StructParam 
adds a generic solution for creating parameters with struct datatype
with their members linked to individual parameters.

main use case: ctrlpars

read_*/write_* methods are either created for the main (structed)
parameter based on the corresponding methods of the individual
parameters or the methods for the individual parameters are created
based on the methods of the main parameter

+ disable pylint use-dict-literal

Change-Id: I7f1d9fb3d3b2226b548c2999bbfebe2ba5ac285e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31405
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:19 +02:00
Alexander Zaft
271bb27699 server: add option to dynamically create devices 
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__

TODO:
  factor out dispatcher (regards to playground)
  discuss factoring out of module creation code from server AND
  dispatcher

Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-10-16 17:49:19 +02:00
Markus Zolliker
2cbe3f19b4 pylint: disable use-dict-literal 
sometimes it is nicer to use dict(...) instead of {}
an objections against removing this check from pylint?

Change-Id: Ib08d3016b7ec3512111021a82685253cdcd42916
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31505
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:19 +02:00
camea
228902a6ee fixes in ori3 and dil5 config 2023-10-16 17:49:19 +02:00
Markus Zolliker
bee591c861 frappy_psi.sea: try to reconnect on failure 
both .asynio and .syncio connection should be tried to reopen.
(fix from mlz gerrit)

Change-Id: I0da5bd9927865a1c55afb93a7a5b76c44fc8750e
 2023-10-16 17:49:19 +02:00
l_samenv
8e7e70c50e frappy_psi.sea: auto connect 
on both .ssynio and /syncio try to reconnect after failure
 2023-10-16 17:49:19 +02:00
eiger
e36ff9bc41 add ma15 cfg 2023-10-16 17:47:29 +02:00
Markus Zolliker
e02c9b1378 fix systemd bug 
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
 2023-10-16 17:47:29 +02:00
Markus Zolliker
5a19103d0e frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-10-16 17:45:45 +02:00
Markus Zolliker
e201e7dce9 up to date with develop/mlz 
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
 2023-10-16 17:42:53 +02:00
Markus Zolliker
532e4a7ab5 update 2023-05-30 from gitmlz 
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
 2023-10-16 17:39:43 +02:00
Oksana Shliakhtun
c9ccaa484a SR830: moved dicts out of class 
Change-Id: If056b1bf4e81c3b609ded087dff2b40c7119903f
 2023-10-16 13:43:57 +02:00
Oksana Shliakhtun
a5dfc82b95 Changed write_range, write_tc methods 
Change-Id: I335f97bd54deaccf0552b27deb3a7dfe73074e4c
 2023-10-09 14:28:16 +02:00
Oksana Shliakhtun
e22da0db67 Changed driver for lock-in 65 
Change-Id: Ic452f2309e54dd583a1ff796e82a12469357830d
 2023-09-28 09:15:25 +02:00
Oksana Shliakhtun
e89bc07759 New driver for lock-in amplifier SR830 
Change-Id: I45c5a06460f4b84cade0eae53188b058510c4473
 2023-09-28 09:14:22 +02:00
Oksana Shliakhtun
e405783716 Removed status 
Change-Id: I276fe69a4ca46f536be022d9604377378e41f26c
 2023-07-12 15:19:16 +02:00
Oksana Shliakhtun
dc59906c8a Added tc for the Ametek 7265 
Change-Id: Ifd8e55b2da14cb41391f72787cd726951192ec95
 2023-07-12 15:13:35 +02:00
Oksana Shliakhtun
161fb7b2ca Changed configuration file for Ametek lockin 7270 
Change-Id: I7a1f3382df1dcc168cf2997c92ea7696f17a779d
 2023-07-12 15:11:19 +02:00
Oksana Shliakhtun
04940b1a0b write_range, write_tc, string_to_value method 
Change-Id: I6f81db72e852d2670e0a774a621c8382680bb93a
 2023-06-28 13:03:21 +02:00
Oksana Shliakhtun
6f6f07b0f9 The write method is changed 
Change-Id: I5ffeecfeb43804d1f443e500808d9ff83c507d18
 2023-06-27 09:56:28 +02:00
Markus Zolliker
a44d232dea remove unused cfg/sea/*.py 
Change-Id: Ide289a30f558386d08ce4cdeb439f7438c072231
 2023-06-20 11:07:23 +02:00
Markus Zolliker
32b1d6412d camea filter addon 
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
 2023-06-20 11:03:37 +02:00
Markus Zolliker
87830a1473 branch develop: recent changes from branch wip 
Change-Id: I2e1173423f2aa164a8a7158921b354c2aff1ab2c
 2023-06-20 10:59:18 +02:00
Markus Zolliker
fcca3801a4 branch develop: cfgfiles cfg/main for branch wip 
Change-Id: Iece67aedc45300b920378a83cfebf5f617c1bad3
 2023-06-20 10:55:12 +02:00
Markus Zolliker
00b57e3d2c GUI bugfix: use isChecked instead of checkState in BoolInput 
Change-Id: I68153543d8f3424a70da5b3999e68f3e91edb2dc
 2023-06-15 10:23:07 +02:00
Markus Zolliker
720d010c47 frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-06-05 09:52:18 +02:00
Markus Zolliker
9e52665b88 frappy_psi.convergence: improvments 
- merge_status
- empty string instead of 'approaching'
- dif <= tol

Change-Id: I6f10875f7ef5d2109c13d7448ede114b8e30d86e
 2023-06-05 09:52:18 +02:00
Markus Zolliker
a529cb9ab1 frappy.client: missing exception method in dummy logger 
Change-Id: Ie3a574c3060f2ac6833ff44e8074a19db6ea2f0b
 2023-06-05 09:52:18 +02:00
Oksana Shliakhtun
33fb90af05 fixed autorange, vmode, amp, irange, freq 
Change-Id: Idae23ad1b5716375484acf0410843141e2e45d24
 2023-06-01 17:03:02 +02:00
Oksana Shliakhtun
da122ad961 edited lockin (SR) 
Change-Id: I66d95144d61c62a2396933c2f9a7ce6e05917fe4
 2023-05-31 17:25:59 +02:00
Markus Zolliker
11d1ad546f up to date with mlz 
Change-Id: I205ccc9847771ebe5622a45792a4dbe8d8e02b82
 2023-05-31 14:29:25 +02:00
Markus Zolliker
37d28c9f35 update 2023-05-30 from gitmlz 
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
 2023-05-31 14:17:21 +02:00
Markus Zolliker
dc0cc590ed Merge branch 'wip' into develop 
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
 2023-05-31 14:06:05 +02:00
Oksana Shliakhtun
0771cb6899 working on lockin (SR) 
Change-Id: Ia8dc71bf1029feaa66614ade0f8e9e99358f142e
 2023-05-31 13:39:09 +02:00
Oksana Shliakhtun
564620e9e3 Test for lockin driver 
Change-Id: I9db745088efdef182154b71e019a0f6f83644278
 2023-05-31 13:39:09 +02:00
camea
726665ebd8 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-31 08:43:19 +02:00
camea
004533655f frappy_psi.magfield: bug in progress check 
must check for self.current (not self.value)

+ fix in mercury: __ramping must be initialized
 2023-05-31 08:42:17 +02:00
Markus Zolliker
c4d5d2e284 fix equipment_id in seadesc 
Change-Id: Iecf5d3ae815373c0535ee9e1c230b2f48554f5b5
 2023-05-30 15:12:36 +02:00
Markus Zolliker
75f156beef improve HasRamp 
Change-Id: I0ddabb8b2681712637a18c392da5424d30a05b4b
 2023-05-26 16:07:07 +02:00
Markus Zolliker
459a80b4d2 add Drivable with alias value and target 
together wih mixins HasConvergence and HasRamp

Change-Id: Ia36a8b44220e93cfeee98400f4276bfd7e40d82f
 2023-05-25 17:54:28 +02:00
Markus Zolliker
bef190b77d software ramp mixin 
+ fix frappy.lib.merge_status

Change-Id: I550eaeaab460a0d9ac1b027d59d4223dac4c0663
 2023-05-25 17:53:36 +02:00
Markus Zolliker
e4dbb90065 lakshore must not import from frappy_psi.mixins 
Change-Id: I988bef545f98d5c42d56af3fe4d5aae6dbf19809
 2023-05-25 17:52:27 +02:00
Markus Zolliker
0cbaffd4b6 log.exception instead of log.error in callbacks 
+ inhibit timestamps in future

Change-Id: Idef463558bf24e891573179474ffbebd4e81468f
 2023-05-25 16:16:30 +02:00
l_samenv
1de5455ef6 add haakeuro 2023-05-25 09:56:25 +02:00