linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,035 Commits 20 Branches 1 Tag
6e7be6b4c701e8b9accb4f9ab67a6e45402f86b5
Commit Graph

80 Commits

Author SHA1 Message Date
Markus Zolliker
6e7be6b4c7 simplify callbacks 
on Module, use one single callback list 'paramsCallback' instead of
'valueCallbacks', 'errorCallbacks'. Redesign the mechanism to
avoid most of the closures.

Change-Id: Ie7f68f6bf97ab3f3cd961faa20b0e77730e5b37d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33118
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-03-08 15:33:52 +01:00
l_samenv
2b42e3fa0a flamesample: improve comments to parmod.SwitchDriv 2024-02-23 10:13:31 +01:00
l_samenv
5b0da3ba98 fixes on 2023-11-27 
- ls372 autorange: wait one sec. more for switching
- keep only one channel, even after target is reached
- intermediate target only when T is raise, but not when lowered
 2024-02-23 10:13:05 +01:00
l_samenv
c80b4ac5fb fixes for flamesample 
- fixes in SwitchDrive
- increase range when reading is zero in autorange
- add debugging log msgs
 2024-02-23 10:10:38 +01:00
Markus Zolliker
ffaa9c83bd introduce FrozenParam 
For the case when the readback of a parameter does not reflect the
change immediately.

May also be used on Writable.target or Drivable.target with a short
BUSY period.

+ bug fix in an error message in frappy.datatypes.IntRange

Change-Id: I5e1c871629f9e3940ae80f35cb6307f404202b4a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-02-02 14:11:25 +01:00
Markus Zolliker
f9a0fdf7e4 add frappy_psi/calcurve.py and calibtest.py 
Change-Id: I5b9aae0ac3bcd76d846c08717201e6c32df4b675
 2024-01-31 17:09:17 +01:00
Markus Zolliker
4cdd3b0709 remove more coding cookies 
mainly from frappy_psi

Change-Id: I192811459aebe97f3076888cd31a308a51e6aa49
 2024-01-29 14:14:09 +01:00
Alexander Zaft
15d38d7cc1 all: remove coding cookies 
Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 14:06:06 +01:00
Markus Zolliker
0004dc7620 implement pfeiffer TPG vacuum reading 
this is an example where StringIO.communicate has to be extended

Change-Id: Iff6bb426ee7960904993574531de84793152e21d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32385
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>
 2024-01-29 13:36:18 +01:00
Alexander Zaft
777a2cb6a9 core: move module handling out of dispatcher 
Split module handling code from the dispatcher.
The new class for managing Modules is called SecNode.

* change logging to no longer need a reference to modobj
* modules get a reference to the secnode obj instead of the
  dispatcher
* intermediate usage fixes for frappy_psi/sea

Change-Id: Ifee4bb47aa7a4508bb4a47c9a5873b7e2d5faf67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32249
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-01-29 13:33:47 +01:00
Markus Zolliker
36c512d50b frappy_psi/SR.py: got changes from develop branch 
+ move soft auto range from read_value to doPoll

Change-Id: I0bf8ac15f8515e55cd9131be33615908ffc99c12
 2024-01-29 10:29:33 +01:00
Oksana Shliakhtun
17b7a01ce1 Driver for ThermoHaake Phoenix P1 Circulator 
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
 2024-01-29 10:29:33 +01:00
Markus Zolliker
be66faa591 frappy_psi/thermofisher: version through gerrit 
Change-Id: I6999e84d1c5efd0625c6df89e97dad46e5a8cd59
 2024-01-29 10:29:33 +01:00
Markus Zolliker
e27b4f72b5 newset version of oksanas drivers 
Change-Id: Ia6d8b727e48e96a14b75feeef5d3e6c002cb82a0
 2024-01-29 10:29:33 +01:00
l_samenv
bc7922f5c8 iono pi max demo (drums) 
+ fix spacing in ionopimax.py
 2024-01-25 09:40:10 +01:00
l_samenv
99a58933ec ionopimax: Add LogVoltageInput 2024-01-18 08:40:33 +01:00
LIN SE rpi1
4a2ce62dd8 added drivers for small furnace 2024-01-11 16:28:06 +01:00
Markus Zolliker
9e6699dd1e more robust calculation for heater resistivity 
and check is is in the allowed range 10 .. 100 Ohm

Change-Id: If485480c0974d953165c37f7354dc2818f68b30b
 2023-12-15 16:00:26 +01:00
Oksana Shliakhtun
416cdd5a88 Autogain function for SR830 lock-in driver 
Change-Id: If07ec9182e5153e1237b9818ce555162f54e0ae5
 2023-12-11 08:31:43 +01:00
Oksana Shliakhtun
1bd188e326 For the lockin830 get_par/set_par are implemented. 
Change-Id: I5b6707a07d936d24528173a2edae49a148081ff9
 2023-12-11 08:31:36 +01:00
Oksana Shliakhtun
f7b29ee959 SR830: moved dicts out of class 
Change-Id: If056b1bf4e81c3b609ded087dff2b40c7119903f
 2023-12-11 08:31:29 +01:00
Oksana Shliakhtun
f6a0ccb38b Changed write_range, write_tc methods 
Change-Id: I335f97bd54deaccf0552b27deb3a7dfe73074e4c
 2023-12-11 08:31:17 +01:00
Oksana Shliakhtun
b93a0cd87b New driver for lock-in amplifier SR830 
Change-Id: I45c5a06460f4b84cade0eae53188b058510c4473
 2023-12-11 08:31:11 +01:00
Markus Zolliker
be6ba73c89 workaround for bug in sea 
fix double slash in hdb path

Change-Id: I68ab79c5240abb9fcccbbe5f817f740df2bb5ea6
 2023-12-05 14:10:03 +01:00
camea
c075738584 ips_mercury: add NOT_FOUND action 2023-12-04 15:47:18 +01:00
l_samenv
397ec2efbd add pdld laser driver 
2 modules: a switch (on/off) and the power (set: target, readback:value)
 2023-11-14 09:17:11 +01:00
zebra
03c356590b frappy_psi.phytron: implement limit switches 2023-10-02 16:58:09 +02:00
Markus Zolliker
f6c4090b96 fix simulation 
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
 2023-09-19 16:05:52 +02:00
l_samenv
2f3c68a5c5 improvements for flame 
- frappy_psi.channelswitcher: use isBusy instead of checking value and target
- frappy_psi.ls372: remove underflow mechanism
- frappy_psi.parmod.SwitchDriv: switch the controlled module also when not buys
 2023-09-19 14:17:08 +02:00
l_samenv
e9a195d61e flamedil as of 2023-07-04 2023-09-19 14:17:08 +02:00
l_samenv
6ac3938b78 flamedil as of 2023-07-03 2023-09-19 14:17:08 +02:00
l_samenv
b4cfdcfc1a flame sample combined T 2023-09-19 14:16:21 +02:00
l_samenv
d32fb647a6 frappy_psi.ls372: add TemperatureSensor and TemperatureLoop 2023-09-19 14:14:12 +02:00
l_samenv
abf7859fd6 frappy_psi.cryoltd: fixes after frappy upgrade 2023-09-19 14:14:12 +02:00
l_samenv
55ea2b8cc4 frappy_psi.triton: try to fix channel selection before condense action 2023-09-19 14:14:12 +02:00
Markus Zolliker
1d81fc6fcd frappy_psi.sea: small fixes 
- changes in return value of frappy_config command in sea
- do not store sea manager

Change-Id: I5bc1d9a281ad2285b90d3649b4c702a3501d451d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32166
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-09-19 10:58:07 +02:00
Markus Zolliker
dfce0bdfbc phytron.py: improve status 
better analysis of hardware status code

Change-Id: I667b443649db43ff3e572e0a50685aabc9ba2ca2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32165
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-09-19 10:57:59 +02:00
Markus Zolliker
bf4b3e5683 psi: improve sea interface 
- get return value from teh frappy-config script in order
  to detect failures
- call config_check not more than once within 1 sec

Change-Id: Ibe42e846521206463f2761d452aea7e558a36854
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-09-14 09:09:00 +02:00
Markus Zolliker
0bc4a63aa7 add parmod.Par 
the reasonly class frappy_psi.parmod.Par represents a parameter
or a component of a tuple parameter

Change-Id: I47208c9d7a6fc377cd56b82cc6a9e8cdb433fe8e
 2023-09-14 09:05:00 +02:00
Markus Zolliker
9d9b5b2694 frappy_psi.phytron: further improvements 
unfortunaely, sometimes communication errors happen.
workaround: try several times reading the status

Change-Id: I2788c6c9b4145246cdd51c31b246abffee60f93b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32032
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-08-28 14:17:26 +02:00
Markus Zolliker
db9ce02028 Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72.
 2023-08-18 16:32:16 +02:00
Markus Zolliker
d2d63c47e1 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-08-14 14:32:01 +02:00
Markus Zolliker
b84b7964e3 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-07-11 10:59:42 +02:00
Markus Zolliker
d92b154292 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-07-07 15:40:20 +02:00
Markus Zolliker
d2885bdd72 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-07-06 08:03:15 +02:00
Markus Zolliker
28b19dbf57 frappy_psi.thermofisher: add version through gerrit 
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
 2023-07-05 17:14:07 +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
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
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