1251 Commits

Author SHA1 Message Date
4fc6ef52da frappy_psi.phytron: stop motor before restart
restarting the phytron motor without prior stop leads
to funny behaviour.

- send stop before restart
- stop motor when moving but status not busy
- restart when motor drives the wrong way

+ better status text when stopping

Change-Id: I82cd59297b3c79a354a4eeb5ba03fc65bedf755f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31929
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2023-10-16 17:49:30 +02:00
fcb5052565 add hvolt_short 2023-10-16 17:49:30 +02:00
acc7580dc6 frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT
import SECoP_DEFAULT_PORT instead of defining DEF_PORT

Change-Id: I02ee420d200f90b61f8c79e1cb5ee3e0913955e9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31913
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
4f28e5555c improve error message on client when host/port is bad
for host name without port, None was used for the port
leading to a confusing error message

- do not call parse_host_port with None as defaultport argument
- improve error message when connection fails

+ fix an error in last line of parse_ipv6_host_and_port
+ fix some issues breaking PEP 8 rules

Change-Id: I437360be96449c164f0080e3c60f1685825d4780
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31911
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
ec2bc57ade fix haake_cfg 2023-10-16 17:49:19 +02:00
7142cee0db fix ma7.config.json 2023-10-16 17:49:19 +02:00
a3d7520da9 add ori7 2023-10-16 17:49:19 +02:00
dmc
9d5ed822e8 insert pressure reading into ccrpe_cfg 2023-10-16 17:49:19 +02:00
l_samenv
b6c2cf8d3a MA7: add unit=T to mf 2023-10-16 17:49:19 +02:00
a26ae0da4e sMA6 encoder mode to CHECK
after Oksana experienced that it works
2023-10-16 17:49:19 +02:00
a7cbb35455 frappy.client.interactive: bug fixes
- correct behaviour with the following untypical message sequence:
  - send change target
  - receive status idle
  - receive status busy
  - receive changed target

- add 'exception' to Logger

Change-Id: I614b2a2c2e09ef1b43544838ccb2fa43357dd50d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31632
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
e866ae7034 frappy_psi.sea: further bug fixes
- in SEA, it is not guaranteed that the is_running state is set
  before the run command returns. as a consequence, we have to
  wait in SeaDrivable.write_target for is_running being set
- syncio has always to be reconnected after asynio

Change-Id: Ia46cff11de86868ce0627faaf6f776282bd7a8f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31631
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
l_samenv
f35dae5893 ma7: sea confg: make ta/tb visible 2023-10-16 17:49:19 +02:00
2fc9eccfd5 frappy_psi.sea: avoid multiple connections
the _connect was sometimes started in parallel from
startModules and the first call to doPoll.
remove the first one, and protect the second one
with a lock

Change-Id: I079439e150efd5d005130cef475f6326f933ecbd
2023-10-16 17:49:19 +02:00
ca57f46ed2 frappy.io: make error reporting consistent
- fix mechanism to avoid multiple error messages in log files

Change-Id: I688071f9b06da1a81eb12d63adb549042171c7c8
2023-10-16 17:49:19 +02:00
1776d7b4b6 consmetic changes to ma6_sample_heat_cfg.py 2023-10-16 17:49:19 +02:00
34f46ab0b0 MA6: set om.encoder_mode to 'NO' 2023-10-16 17:49:19 +02:00
98a73d7882 add special configurations m6/ma7 sampleheat 2023-10-16 17:49:19 +02:00
e7148a30cb MA7/MA11: make ts drivable 2023-10-16 17:49:19 +02:00
da948468b4 update haake + eurotherm cfg 2023-10-16 17:49:19 +02:00
75df438d69 disable encoder for MA11 stick rotation 2023-10-16 17:49:19 +02:00
10fe42babf add FW (old power rack, via SEA) 2023-10-16 17:49:19 +02:00
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
aa7910c28c update to gerrit version
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
2023-10-16 17:49:19 +02:00
ff6a98af92 frappy_psi.thermofisher: add version through gerrit
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
2023-10-16 17:49:19 +02:00
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
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
228902a6ee fixes in ori3 and dil5 config 2023-10-16 17:49:19 +02:00
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
e36ff9bc41 add ma15 cfg 2023-10-16 17:47:29 +02:00
e02c9b1378 fix systemd bug
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
2023-10-16 17:47:29 +02:00
5a19103d0e frappy_psi.thermofisher improvements
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-10-16 17:45:45 +02:00
e201e7dce9 up to date with develop/mlz
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
2023-10-16 17:42:53 +02:00
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
a44d232dea remove unused cfg/sea/*.py
Change-Id: Ide289a30f558386d08ce4cdeb439f7438c072231
2023-06-20 11:07:23 +02:00
32b1d6412d camea filter addon
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
2023-06-20 11:03:37 +02:00
87830a1473 branch develop: recent changes from branch wip
Change-Id: I2e1173423f2aa164a8a7158921b354c2aff1ab2c
2023-06-20 10:59:18 +02:00
fcca3801a4 branch develop: cfgfiles cfg/main for branch wip
Change-Id: Iece67aedc45300b920378a83cfebf5f617c1bad3
2023-06-20 10:55:12 +02:00
00b57e3d2c GUI bugfix: use isChecked instead of checkState in BoolInput
Change-Id: I68153543d8f3424a70da5b3999e68f3e91edb2dc
2023-06-15 10:23:07 +02:00