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

1293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
cb3e98f86d added logdif.py 
a tool the compare commits in branches

Change-Id: I503941b76bb567ea4c3d33b986406a910154fda6
 2024-01-29 12:58:45 +01:00
Markus Zolliker
a8bafde64e add test cfg for lockin 7270 
Change-Id: Ic6d66b625feb44e8130266901f1296adcb11f532
 2024-01-29 10:58:21 +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
9e000528d2 add vacuum furnace cfg file 2024-01-11 16:33:06 +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
camea
0fa2e8332d do not complain when no output module is configured 2023-12-04 15:46:50 +01:00
camea
afb49199a1 fixes in mb11/dil5 cfg files 
- add flowpars
- increase om range to -360
- add sea config
 2023-12-04 15:45:00 +01:00
Markus Zolliker
416fe6ddc0 frappy.client: fix the case then timestamp is missing 
the previous version failed when timestamp was missing

Change-Id: I77e1fb81b19fb4ee2749d731bafacbac46132f8e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32404
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-11-30 09:17:11 +01:00
Markus Zolliker
e3cb5d2e60 frappy.io: change default to retry_first_idn=True 
Looked at this code again, and wondered why the default is not True.
It is far more probable that the programmer just forgets to set
this property to True than it would harm to do so.

Change-Id: I439aedbdfc9c2b12737e3ce1694e90550ddf0e78
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32270
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>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-11-30 09:16:57 +01:00
l_samenv
998367a727 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-11-23 15:57:17 +01:00
l_samenv
ab918a33ae cc: replace bool by enum in cc.hav and cc.nav 2023-11-23 15:56:23 +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
67032ff59b ma6: set backlash 2023-10-27 15:11:19 +02:00
zebra
03c356590b frappy_psi.phytron: implement limit switches 2023-10-02 16:58:09 +02:00
zebra
06bec41ed3 ma6: make ts drivable 2023-10-02 16:56:23 +02:00
zebra
4cd6929d4b fix ma15 sea config 2023-10-02 16:55:42 +02:00
zebra
a89f7a3c44 configs for sample heat stick 2023-10-02 16:54:52 +02:00
Markus Zolliker
a4330081b7 proxy: fix command wrapper 
bugfix: return only value of execCommand result, not qualifiers
Change-Id: Iff14779050daa9886e9f7d0396317c5a41695cd1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32235
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-02 13:49:08 +02:00
tasp
3b997d7d86 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-22 13:29:23 +02:00
tasp
612295d360 add ill2 2023-09-22 13:29:04 +02:00
tasp
9e39a43193 fix fs config 2023-09-22 13:27:54 +02:00
tasp
6adfafaa27 more consistent ori1 stick json file 2023-09-22 13:27:10 +02:00
Markus Zolliker
f6c4090b96 fix simulation 
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
 2023-09-19 16:05:52 +02:00
Markus Zolliker
ecef2b8974 more cfg file fixes 
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
 2023-09-19 15:04:02 +02:00
l_samenv
96a7e2109b cleanup cfg files 2023-09-19 14:43:48 +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
27600e3ddf fix bad cfg files 
Change-Id: Iacba12a2679777dd4ea2892751d82a63221b1361
 2023-09-19 14:07:20 +02:00
l_samenv
6b4244f071 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-09-19 11:01:06 +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
tasp
c39aef10aa Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-14 11:10:12 +02:00