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

1031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
eiger
19f965bced Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-03 17:51:43 +02:00
eiger
3e4ea2515e add ma15 cfg 2023-07-03 17:51:28 +02:00
camea
714c820115 fixes in ori3 and dil5 config 2023-07-03 17:49:06 +02:00
Markus Zolliker
a8e1d0e1e8 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-06-29 11:28:04 +02:00
l_samenv
d7a1604bd5 frappy_psi.sea: auto connect 
on both .ssynio and /syncio try to reconnect after failure
 2023-06-26 14:45:53 +02:00
Markus Zolliker
b92095974b camea filter addon 
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
 2023-06-20 11:05:15 +02:00
Alexander Zaft
8dc9c57e9d entangle: fix tango guards for pytango 9.3 
Change-Id: I666969f9c798971d5cd8a0c2f6564067ac3cde72
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31327
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-06-20 09:00:42 +02:00
Alexander Zaft
7c95f1f8ee config: fix merge_modules 
Change-Id: I31d05afe300443e08fb08f9e6645401f52cfae39
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31323
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-06-20 08:05:55 +02:00
Markus Zolliker
3786d2f209 frappy_psi.triton: fix HeaterOutput.limit 
+ fix handling of control_active

Change-Id: Ic11933f6c1c4d9df07aa9d06ae4dca40b755e4ed
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31377
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-06-20 08:03:37 +02:00
Markus Zolliker
138b84e84c add a hook for reads to be done initially 
inital reads from HW should be done in the thread started by
startModule, not in startModule itself.

- add a hook method 'initialReads' for this
+ add doc for init methods
+ fix some errors in doc

Change-Id: I914e3b7ee05050eea1ee8aff3461030adf08a461
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31374
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-06-20 08:03:37 +02:00
Markus Zolliker
997e8e26e9 frappy_psi.mercury: proper handling of control_active 
Change-Id: I31e846fa6fdf6d642184e3736a66ffd53033bccf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31376
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-06-20 08:03:37 +02:00
Markus Zolliker
644d005dad frappy.mixins.HasOutputModule 
add 'set_control_active' method for overriding by subclasses

Change-Id: Ib344319862a4a0bf29efef16a63db09d1f314a82
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31375
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-06-20 08:03:37 +02:00
Markus Zolliker
36dfe968e8 frappy_psi.phytron: rename reset_error to clear_errors 
use the command 'clear_errors' to return from an error state

+ make sure target is valid after clear_errors

Change-Id: I3c180500a05836d52bbb9a8ecbdb397adea03d0d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31337
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-06-20 08:03:37 +02:00
Markus Zolliker
0932228596 frappy_psi.mercury/triton: add control_off command 
frappy_psi.triton.TemperatureLoop has not output module to
deactivate control -> add control_off also to loops in
frappy_psi.mercury

Change-Id: I4dc4333134da34a8d3ae0f3c037a1e5b108c95a1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31341
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-06-20 08:03:37 +02:00
Alexander Zaft
dff0c819de io: followup fix for retry-first-ident 
followup fix: no error was raised ever for the first identification
message.

Change-Id: I80f0f431add6dfd7b37d750b9fc661174aa8f217
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31318
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-06-20 08:02:13 +02:00
Alexander Zaft
fd917724d8 io: add option to retry first ident request 
Change-Id: I524c15387eaf2461e3dfe690250a55f058467b0b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31291
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-06-20 08:02:02 +02:00
Markus Zolliker
bf43858031 GUI bugfix: use isChecked instead of checkState in BoolInput 
Change-Id: I4896df13c117c6eeaaaaba80ca3da4b1982c3d9b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31346
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-06-16 11:09:27 +02:00
Markus Zolliker
f354b19cf0 frappy_psi.sea: fix extra_module_set 
Change-Id: If5669fdd60c8505a47414f17cfcd8534cdc2abee
 2023-06-06 16:50:48 +02:00
Markus Zolliker
f304ac019e fix cfg files (extra_modules/single_module) 
Change-Id: I1821e1e0dc960d48a3e343c53195808798b7f969
 2023-06-06 16:49:54 +02:00
zebra
9a9a22588f Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-06-06 16:46:31 +02:00
zebra
3e26dd49d0 jtccr: fix cfg for extra_modules / single_module 2023-06-06 16:45:31 +02:00
Markus Zolliker
5a456a82b0 fix enum when SEA type is text 
Change-Id: I873045a2dac8771b844431ccda70ce1b8ff1aee5
 2023-06-05 13:56:00 +02:00
Markus Zolliker
f6868da3b9 fix systemd bug 
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
 2023-06-05 13:56:00 +02:00
zebra
ee31f8fb45 fix merge_status in HasConvergence 2023-06-05 13:03:38 +02:00
zebra
a6a3f80e30 remove sign=-1 from cfg files 2023-06-05 13:02:40 +02:00
Markus Zolliker
ad36ab1067 frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

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

Change-Id: I6f10875f7ef5d2109c13d7448ede114b8e30d86e
 2023-06-05 09:47:08 +02:00
Markus Zolliker
c04337c3a4 frappy.client: missing exception method in dummy logger 
Change-Id: Ie3a574c3060f2ac6833ff44e8074a19db6ea2f0b
 2023-06-05 09:45:04 +02:00
Markus Zolliker
57d5298c92 remove secop-server.spec 
Change-Id: I8097a2918bc4e786bd270aeb436efebe9a3bd88f
 2023-05-31 14:32:04 +02:00
Markus Zolliker
9a6421a54f up to date with develop/mlz 
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
 2023-05-31 14:27:36 +02:00
Markus Zolliker
c5d429346d update 2023-05-30 from gitmlz 
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
 2023-05-31 14:16:12 +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
l_samenv
db94def694 newest version of okasanas drivers 2023-05-17 16:56:49 +02:00
Markus Zolliker
1407514458 phytron 
better handling of restart status

Change-Id: I28f97b49d39ed7c6b781f0d8edb218e63e1b1fc9
 2023-05-16 09:39:20 +02:00
Markus Zolliker
050a2dc8dc phytron next version 
with adaption of HasStates

Change-Id: I167ac8031bc5f7120c30031e7cfcb7587b42b61d
 2023-05-15 11:12:52 +02:00
Markus Zolliker
df4a37085a frappy-cli: fix init(*...) 
Change-Id: Iba8106a779ac399e6d72d247ea93e6c1e8cdbf94
 2023-05-15 11:12:31 +02:00
Markus Zolliker
6697462f15 phytron: next fix 
Change-Id: I72debb43b02f07cf9ff79286293105f052314a35
 2023-05-15 09:03:58 +02:00
Markus Zolliker
84d0d44f38 phytron with HasStates 
test version

Change-Id: Ifbaa35421a64faad32c87bbcf758c236f900cd0b
 2023-05-15 08:33:14 +02:00
l_samenv
fa9525fd4c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-05-11 10:42:38 +02:00
l_samenv
087036922a move more code from bin/frappy-cli to frappy/client/interactive.py 2023-05-11 10:42:10 +02:00
l_samenv
1ce43a567b fixes in sea cfg files 
- json_file must be a string, not a list
- rel_path is no longer to be converted to a list
 2023-05-10 16:36:32 +02:00
Markus Zolliker
c46947afd4 update phytron driver 
offset as storage only (after current draft specs)

Change-Id: I1a005f149a8bd562124e2d40e49416957f66e851
 2023-05-10 14:32:26 +02:00