d55ee42612
remove more coding cookies
...
mainly from frappy_psi
Change-Id: I192811459aebe97f3076888cd31a308a51e6aa49
2024-01-29 16:00:44 +01:00
Alexander Zaft
75cfffb548
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 16:00:08 +01:00
Jenkins system
7d02b47c7a
[deb] Release v0.18.1
2024-01-29 15:59:41 +01:00
Alexander Zaft
ecfc0b2ab8
mlz: entangle fix limit check
...
Change-Id: Ib430262057026054ac71053d25dfda340b48227a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32921
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-01-29 15:58:59 +01:00
Alexander Zaft
04402e72b6
mlz: Zapf fix unit handling and small errors
...
Change-Id: Iaa5ed175582d8399cc0c69ba72c3ab8e6e51ecf6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32920
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-01-29 15:58:59 +01:00
Jenkins system
61b65220e1
[deb] Release v0.18.0
2024-01-29 15:58:59 +01:00
67030985d6
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 15:58:59 +01:00
ca2ca5d7cb
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 15:58:59 +01:00
ba3c64ddac
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 15:58:59 +01:00
06bcf94fa2
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 15:58:59 +01:00
f6f433e6b2
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 15:58:59 +01:00
2a165c5013
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 15:58:56 +01:00
Alexander Zaft
8e70b97ef7
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 15:58:48 +01:00
e1cda7d263
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 15:58:43 +01:00
Alexander Zaft
959a09957e
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 15:58:43 +01:00
f68886a4ed
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 15:57:55 +01:00
Alexander Zaft
eeea754181
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 15:57:25 +01:00
Alexander Zaft
ae7bf3ce96
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 15:57:25 +01:00
Alexander Zaft
affe3c161c
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 15:57:25 +01:00
Alexander Zaft
5b6a9de96e
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 15:57:25 +01:00
Alexander Zaft
34793f8bd0
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 15:57:25 +01:00
7333ccd7a6
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 15:57:25 +01:00
2d42eab5fa
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 15:57:25 +01:00
c88a71985a
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 15:56:38 +01:00
Alexander Zaft
ae2a731161
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 15:56:23 +01:00
Alexander Zaft
ec664d9268
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 15:56:19 +01:00
4ca7bf0a7d
logdif.py: only one commit needs to be new enough
...
+ fixe intendation
Change-Id: I4b0c393767925532e1f105e80a215839a02214af
2024-01-29 15:55:52 +01:00
715fcf4d36
added logdif.py
...
a tool the compare commits in branches
Change-Id: I503941b76bb567ea4c3d33b986406a910154fda6
2024-01-29 11:42:43 +01:00
a429852c80
adopt frappy_psi and frappy changes from wip
...
Change-Id: I4e6732e755398d88b73007fb53b758039c5d4483
2024-01-29 10:56:58 +01:00
3eb5f90ce6
remove unneeded cfg/varioxb_cfg.py
...
Change-Id: Id731b4462e6bd91de66ee271e916aec044374fce
2024-01-29 10:47:54 +01:00
f1115c937b
add cfg files from wip
...
Change-Id: I71b647c269c10eac7241970377d6f812636d082f
2024-01-29 10:45:42 +01:00
91d0f2c635
remove unneeded config files
...
Change-Id: I0a6a2d1471172ed2604265454b322a9f11f8d266
2024-01-29 10:41:25 +01:00
614a49f3e3
adopt sea amd cfg changes from wip
...
Change-Id: I83b82ece53e0cb3394551c122561a042499527d8
2024-01-29 10:33:47 +01:00
1e56f2f39e
frappy_psi/SR.py: move soft auto range from read_value to doPoll
...
Change-Id: Ia94e081eaa4c28b1f436227635d7c5beb883792b
2024-01-29 10:27:22 +01:00
82e9b599ad
sea: make sure status is error when reading main value failed
...
+ cosmetic changes using status codes
Change-Id: Ice49a6d5494d2e2cba76d138f11dffeba9aa349d
2023-12-11 08:24:11 +01:00
Oksana Shliakhtun
c4781d3d70
Autogain function for SR830 lock-in driver
...
Change-Id: If07ec9182e5153e1237b9818ce555162f54e0ae5
2023-11-20 13:20:28 +01:00
Oksana Shliakhtun
c0b928f2f6
Driver for ThermoHaake Phoenix P1 Circulator
...
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
2023-11-07 13:26:16 +01:00
Oksana Shliakhtun
73bb0cff1e
For the lockin830 get_par/set_par are implemented.
...
Change-Id: I5b6707a07d936d24528173a2edae49a148081ff9
2023-10-31 17:26:35 +01:00
6454e5f96e
frappy_psi/thermofisher: version through gerrit
...
Change-Id: I6999e84d1c5efd0625c6df89e97dad46e5a8cd59
2023-10-16 17:49:36 +02:00
3f53823c07
newset version of oksanas drivers
...
Change-Id: Ia6d8b727e48e96a14b75feeef5d3e6c002cb82a0
2023-10-16 17:49:36 +02:00
fe60a8ebd8
frappy_psi.phytron: implement limit switches
2023-10-16 17:49:36 +02:00
fb0a689786
ma6: make ts drivable
2023-10-16 17:49:36 +02:00
2ee12a62f0
fix ma15 sea config
2023-10-16 17:49:36 +02:00
de970ece3a
configs for sample heat stick
2023-10-16 17:49:36 +02:00
59810aa748
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-16 17:49:36 +02:00
d2e7ce7242
fix simulation
...
+ some fixed in sim_uniax
Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
2023-10-16 17:49:36 +02:00
72fbed289d
more cfg file fixes
...
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
2023-10-16 17:49:36 +02:00
l_samenv
60c6553ee7
cleanup cfg files
2023-10-16 17:49:36 +02:00
l_samenv
cf10590245
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-10-16 17:49:36 +02:00
l_samenv
44c59bd818
flamedil as of 2023-07-04
2023-10-16 17:49:36 +02:00
