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

1061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
bb14d02884 bug fix in frappy.io.BytesIO.checkHWIdent 
missing f for f string

Change-Id: Ie67384e5b7e514728041a72bd08c850abb31639e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32786
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:51:04 +01:00
Markus Zolliker
4c499cf048 remove py35 compatibility code 
as f-strings are heavily used now, compatibility to py35
can be removed

Change-Id: I1ae4912ad4cbde8419b74845217943bd061053f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32754
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:50:50 +01:00
Markus Zolliker
e403396941 fix playground after change 32249 
as modules are now stored on secnode instead of dispatcher

Change-Id: Iccda3d97269693a893c06a4e094a9c1dbcf7df0b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32746
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:50:00 +01:00
Markus Zolliker
5b42df4a5e frappy.secnode: fix strange error message 
when get_module_instance is called a second time after
it failed, the 'cls' element in opts is missing:

move opts dict copy from create_modules to get_module_instance

Change-Id: Ie046f133a8fdbbb1c39643ca16dc5447a9d2d065
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32745
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-01-29 13:49:55 +01:00
Markus Zolliker
841ef224f6 modify arguments of Dispatcher.announce_update 
- 'pname' argument is not needed
- change 'modulename' argument to 'moduleobj'
  (needed for further change)

Change-Id: Ib21f8ad06d9b2be4005ff3513088a85e29785c94
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32744
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:49:39 +01:00
Markus Zolliker
8142ba746d fix missing import in change message 
Transported values in a change must be converted first.
As this is only relevant for the exotic "scaled" and "blob"
datatypes, this was not detected yet.

- add tests
- suppress warning PytestUnhandledThreadExceptionWarning in tests
+ change import_value methods to raise no other exceptions than
  WrongTypeError and RangeError
+ simplify Command.do: as import_value already raises the
  appropriate error, no more try/except is needed

Change-Id: I299e511468dc0fcecff4c20cf8a917da38b70786
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32743
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>
 2024-01-29 13:49:30 +01:00
Alexander Zaft
5358412b7a core: better error on export of internal type 
more descriptive error when trying to export OrType, NoneOr, ValueType
and DataTypeType

Change-Id: If13815e9d2b177042b24a1bb62b1ad1d1d88b502
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32737
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:49:21 +01:00
Markus Zolliker
010f0747e1 frappy_psi.sea: workaround for bug in sea 
hdb path should not contain duble slash. replace double slash
by single slash

Change-Id: Ia2ce3be9a75d68fcc7efe3eb3dbd19a7907a73ff
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32705
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-01-29 13:49:08 +01:00
Alexander Zaft
047c52b5a5 core: better command handling 
* check argument of do
* automatically set optional struct members from function signature

Change-Id: I95684f1826c1318ea92fad2bd4c9681d85ea72f5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32501
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:48:37 +01:00
Alexander Zaft
f846c5cb31 datatypes: fix optional struct export 
Change-Id: Ia2758dfba75f36a91bf1676e8ead555cec3ead53
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32500
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:47:18 +01:00
Alexander Zaft
0e4a427bc3 mlz: handle unconfigured abslimits 
- if there are no abslimits configured, get them from the hardware.
- check if the ranges are compatible

Change-Id: If72e31a56c299cb628ed8ff66d4340a87d4bd1d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32625
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:47:09 +01:00
Alexander Zaft
2d8b609a3c core: formatting and update server docstring 
Change-Id: Ic0dd4c5239f27679c89f6b3742b9c5f8b71f33f6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32514
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 13:47:00 +01:00
Alexander Zaft
6e3865b345 core: allow multiple interfaces 
Change-Id: Ib8c0baef85a6dd69cddafe1c4973e42136d1588b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32489
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-01-29 13:46:47 +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
Markus Zolliker
158477792f add StringIO.writeline, improve StringIO.multicomm 
- StringIO.writeline sends a command and does not expect a reply
- StringIO.multicomm and BytesIO.multicomm is improved in order
  to insert individual delays in between lines and individual
  noreply flags

+ fix a bug in tutorial_t_control
+ improve readability of frappy.lib.classdoc.indent_description

Change-Id: I9dea113e19147684ec41aca5267a79816bbf202c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32267
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-01-29 13:34:45 +01:00
Markus Zolliker
fd0e762d18 doc: drop latex support, add pdf support 
latexpdf fails with error message "Too deply nested".
We want to avoid reducing the nesting level of doc strings
in frappy.lib.classdoc (less nice output) or a level of
nesting in method doc strings.

- latex removed from Jenkinsfile
- added support for rst2pdf

Change-Id: Ieb3355ef506e636e7e43a726c68327e3b1154469
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32406
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:34:39 +01:00
Alexander Zaft
a16ec6cc91 mlz/demo: move old examples to Attached 
change very early version of module attachments in GarfieldMagnet and
MagnetigField to use Attached

Change-Id: I616ad17bc72cd93d86e1b3e3609543cfe90edcd8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32250
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-01-29 13:34:29 +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
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