ad36ab1067
frappy_psi.thermofisher improvements
...
- merge Loop with Sensor
- make convergence work
Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-06-05 09:50:35 +02:00
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
9a6421a54f
up to date with develop/mlz
...
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
2023-05-31 14:27:36 +02:00
726665ebd8
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-31 08:43:19 +02:00
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
c4d5d2e284
fix equipment_id in seadesc
...
Change-Id: Iecf5d3ae815373c0535ee9e1c230b2f48554f5b5
2023-05-30 15:12:36 +02:00
75f156beef
improve HasRamp
...
Change-Id: I0ddabb8b2681712637a18c392da5424d30a05b4b
2023-05-26 16:07:07 +02:00
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
bef190b77d
software ramp mixin
...
+ fix frappy.lib.merge_status
Change-Id: I550eaeaab460a0d9ac1b027d59d4223dac4c0663
2023-05-25 17:53:36 +02:00
e4dbb90065
lakshore must not import from frappy_psi.mixins
...
Change-Id: I988bef545f98d5c42d56af3fe4d5aae6dbf19809
2023-05-25 17:52:27 +02:00
l_samenv
db94def694
newest version of okasanas drivers
2023-05-17 16:56:49 +02:00
1407514458
phytron
...
better handling of restart status
Change-Id: I28f97b49d39ed7c6b781f0d8edb218e63e1b1fc9
2023-05-16 09:39:20 +02:00
050a2dc8dc
phytron next version
...
with adaption of HasStates
Change-Id: I167ac8031bc5f7120c30031e7cfcb7587b42b61d
2023-05-15 11:12:52 +02:00
6697462f15
phytron: next fix
...
Change-Id: I72debb43b02f07cf9ff79286293105f052314a35
2023-05-15 09:03:58 +02:00
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
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
c46947afd4
update phytron driver
...
offset as storage only (after current draft specs)
Change-Id: I1a005f149a8bd562124e2d40e49416957f66e851
2023-05-10 14:32:26 +02:00
8039351395
mercury, ips, sea, triton, convergence
...
after gerrit
Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
2023-05-09 14:57:34 +02:00
a9fe8577c3
improve mercury driver
...
less fancy but more readable commands
Change-Id: Ifcc6a03199167179d984235c9b1bc7e14c60b51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31008
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2023-05-05 13:30:29 +02:00
3314241631
[WIP] phytron improvements
...
- Limits
- offset
- power cycle behaviour
Change-Id: Id2f717c362cd7e1e37f180c8130b0e086e724389
2023-05-05 13:16:41 +02:00
3fcd72b189
merge manually with mlz repo
...
as of 2023-05-04
Change-Id: I5926617c454844927799e20a489db20d538db100
2023-05-04 16:34:09 +02:00
bbe70fb3cb
add missing files from secop_psi
...
- all of them have to be checked!
Change-Id: I89d55ca683d0b2710222f14c2c3cd42f8fbf3a1f
2023-05-03 11:24:47 +02:00
1961f91567
add switching_sensor
2023-05-02 16:39:34 +02:00
5784aa0f5d
improve mercury temperature loop
...
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match
Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2023-05-02 15:54:14 +02:00
da15df076a
fetched mlz version
...
- before some chamges in the gerrit pipline
Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
2023-05-02 15:25:11 +02:00
