b040abcdf6
Draft for the Keythley Pulse System driver
...
Change-Id: Idd6f86acbaac178ab8031625b36ded1351de6a34
2024-08-26 16:49:07 +02:00
0def8f52e7
Comments
...
Change-Id: Ie7fe10f704aec62c19cae0bab16d43d55d911a36
2024-08-26 14:23:21 +02:00
c074d2cbba
Changed temperature range
...
Change-Id: Ib2a0bc59b191d33e65420375385d8807754193a9
2024-08-26 14:17:52 +02:00
d2c9524497
Changed temperatures
...
Change-Id: I1411e425bd911b73cfcb459de50e7eea2cd15c51
2024-08-26 14:15:48 +02:00
1c55b7dbf1
Driver with comments
...
Change-Id: Ic2d35960de6b33e4d61ad1920d2416e2d5ed1ded
2024-08-20 13:51:00 +02:00
b63dca3b4e
Added documentation
...
Change-Id: Id6e26a4c28fe080a55099cd54d0fa85c15946657
2024-08-19 17:21:40 +02:00
5f1e37a99e
.
...
Change-Id: If177029157edbd6123e9f41883dbb6c639a68852
2024-08-13 15:49:10 +02:00
8c606150f5
Status and autorange implemented for AC resistane bridge
...
Change-Id: I8c94660c3b76cc78886e9e074b4ce8114fbb7f9e
2024-06-04 16:46:52 +02:00
efc1694408
Communication with the modules for the ac resistance bridge.
...
Change-Id: I1c144bf0bfc7c8c3090aa7cf3f32f1d4d046dca7
2024-05-21 17:30:11 +02:00
cba15e0237
Communication with modules for a resistance bridge
...
Change-Id: Ia8622cd3620dff68566768411a05f9cf3618771a
2024-05-21 17:28:49 +02:00
41ed82e72e
Driver and cfg file for ac resistance bridge
...
Change-Id: I77b2294b57315fcf7d94996a2a68fcac72866710
2024-05-06 11:57:50 +02:00
95ca85fd9c
Frappy driver for a HP multimeter
...
Change-Id: I2e9dc5131ea9a7317d69c42dd49388216e77f72f
2024-04-23 17:20:55 +02:00
4f9372066a
New driver for AC Resistance Bridge (with SIM921 modules)
...
Change-Id: I2c2da421453af0f41703805092423f9b02d1f9b4
2024-04-23 17:14:36 +02:00
be779b118b
Haake driver
...
Change-Id: Ib6aec31ada835ebfb2f8a06b119e3b8189f9f51e
2024-01-31 11:10:41 +01:00
feb0566e87
Driver for HP multimeter
...
Change-Id: I45f70758331680fb7b044d28bf0dc50781d912d3
2024-01-31 11:10:40 +01:00
8b40e91578
cosmetic change in logdif.py
...
Change-Id: Ic9023d6d37067e527801cb7d092d1c8214f603f6
2024-01-29 16:02:25 +01:00
eeb666c5dd
synced most of wip to mlz
...
Change-Id: Ifc5eb0d8ccf693535ab474553759f5622b3a3c8f
2024-01-29 16:00:59 +01:00
fac29af0ad
adopt missing changes while cherry-picking from mlz
...
Change-Id: Icda4d581e8f0ebd22fc22f2661965bf98a821a34
2024-01-29 16:00:59 +01:00
d55ee42612
remove more coding cookies
...
mainly from frappy_psi
Change-Id: I192811459aebe97f3076888cd31a308a51e6aa49
2024-01-29 16:00:44 +01:00
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
7d02b47c7a
[deb] Release v0.18.1
2024-01-29 15:59:41 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
c4781d3d70
Autogain function for SR830 lock-in driver
...
Change-Id: If07ec9182e5153e1237b9818ce555162f54e0ae5
2023-11-20 13:20:28 +01:00
c0b928f2f6
Driver for ThermoHaake Phoenix P1 Circulator
...
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
2023-11-07 13:26:16 +01:00
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
60c6553ee7
cleanup cfg files
2023-10-16 17:49:36 +02:00
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
44c59bd818
flamedil as of 2023-07-04
2023-10-16 17:49:36 +02:00
c355999e85
flamedil as of 2023-07-03
2023-10-16 17:49:36 +02:00
4f0daf3424
flame sample combined T
2023-10-16 17:49:36 +02:00
be7c9eec8c
frappy_psi.ls372: add TemperatureSensor and TemperatureLoop
2023-10-16 17:49:36 +02:00
ef5f4cd2f3
frappy_psi.cryoltd: fixes after frappy upgrade
2023-10-16 17:49:36 +02:00
1da16f12c4
frappy_psi.triton: try to fix channel selection before condense action
2023-10-16 17:49:36 +02:00
2658dd8090
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-10-16 17:49:31 +02:00
fa5d5654f8
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-10-16 17:49:31 +02:00
bf8d5101b0
add ill2
2023-10-16 17:49:30 +02:00
31b5928725
fix fs config
2023-10-16 17:49:30 +02:00
110855200a
more consistent ori1 stick json file
2023-10-16 17:49:30 +02:00
21f9921269
improve client shutdown time
...
in SecopClient.disconnect joinng the reconnect thread may take
up to 10 s, because of the time.sleep(10) call in the reconnect
thread.
change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep
Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32137
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
bce88ff343
change FloatRange arguments minval/maxval to min/max
...
in the previous version FloatRange(max=100) was neither working
properly nor complaining, because the maxval=None default was
overriding the value for max.
possible fixes:
- raise an error when min/max used as argument (confusing for
the programmer, as it is a property)
- allow both versions minval/maxval and min/max (more code)
- use min/max and a pylint directive here (the only thing to
take care is not to use the min/max builtin in __init__)
this change uses the last option for the fix
Change-Id: Iff0e0c4d0d7b165003bdeffa67a93a1cd7f29eea
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31982
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
5359f0351f
fix frappy_demo.lakeshore
...
reading back the target does not work properly, because
a) the readback value might be delayed
b) there is no command to read back the target, SETP?1
is returning the working setpoint, which might be distinct
in case of a ramp
Change-Id: I0da2dbfc1a8ddbecbae6d0456ff64e008bc56336
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31983
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
ab2e001093
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-10-16 17:49:30 +02:00
ff0e77a166
fix missing .poll attribute in simulation
...
using super() in SimBase.__new__ fixes the problem
Change-Id: I18d0ba6ac476c2edb0d973090bcb09508a983d6a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32136
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
195a48f366
further fixes after change 31470
...
- get_module is to be called when io is autocreated
- register_module is missing in playground
Change-Id: I28884575b71320667107c494473b0fc5d4363a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32123
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
2110f8d83b
add parmod.Par
...
the reasonly class frappy_psi.parmod.Par represents a parameter
or a component of a tuple parameter
Change-Id: I47208c9d7a6fc377cd56b82cc6a9e8cdb433fe8e
2023-10-16 17:49:30 +02:00
4c6c7c7950
improve shutdown time
...
on shutdown, time.sleep(10) is blocking the reconnect thread.
change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep
Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
2023-10-16 17:49:30 +02:00
7d7972b73f
fix frappy/playground.py after change 31470
...
assumptions about dispatcher in playground.py are no longer
valid.
- let Dispatcher class in playground inherit from real dispatcher
+ improve log messages
Change-Id: I2a9a9d532dabadc590543660c445c021dd2f2891
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31967
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
fc40f5e0c9
ma10: improve sea cfg
2023-10-16 17:49:30 +02:00
a19b085c30
hvolt_short stick: make hcp writable
2023-10-16 17:49:30 +02:00
09772eb746
stickmotor addon: add backlash -1
2023-10-16 17:49:30 +02:00
c249b1648d
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-10-16 17:49:30 +02:00
480913dabe
add zapf to requirements-dev
...
Change-Id: I6dddd8d4c590253f1039b89edae561fa90b40811
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31725
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
c2a080360d
Revert "add zapf to requirements-dev.txt"
...
This reverts commit e67a46cd015c0a1a32d5a4f114b963dd17a7c266.
Reason for revert: required version available from pypi
Change-Id: Ib4f8b0cf62da58e84545511c7521ea93b7ff1342
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31724
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
923da8ca15
interactive client: improve keyboard interrupt
...
- when driving a module with <module>(<target>),
keyboard interrupt should send stop()
- make sure keyboard interrupt does not only stop
the current driving, but also skips other code
on the same command line
Change-Id: Ib4d2c4111dc0f23bf07385065766fb9b4a611454
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31926
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:30 +02:00
7a2e764262
frappy_mlz: Add Zapf PLC
...
adds a zapf-based PLC connection scanner.
Change-Id: Icc0ded7e7a8cc5a83d7527d9b26b37c49e9b8674
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31471
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 >
2023-10-16 17:49:30 +02:00
d726fd9fa0
add zapf to requirements-dev.txt
...
Change-Id: Ia4de696051cee1e00676e777b7dd2c0a90a0c504
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31719
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
267acf644c
core: do not call register_module on error
...
Dispatcher.get_module_instance returns None on failure.
If that is the case, the dispatcher should not try to register the
None value as a module.
Change-Id: Ie33b8debc2a829d480d56cafc1eb0ab610181d67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31713
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2023-10-16 17:49:30 +02:00
0bc8accaaa
frappy_mlz: fix one-off error in barcode reader
...
cut of one byte too much in barcode decode
Change-Id: I5f1f8475f197b13af836d685dc6da5a9ee824dc2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31728
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
0351ebd98d
dispatcher: change logging calls to debug
...
Some logging calls should not have landed as log.info in the dynamic
modules patch. This fixes that.
Change-Id: I666fc7c9b5c65ddbed1c26ea456becce7870e744
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31707
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
3a235f6380
frappy_mlz: Zebra fixes after basic test
...
Some fixes after the device was tested with socat ptys and NICOS.
Change-Id: I3e9dba2be2547d493c435d1da9844c932a2df4e6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31662
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
500c5f8c5d
mlz: Add Zebra Barcode Reader
...
Adds a Barcode reader device (for now, only for ANTARES). Not yet
tested with real hardware.
Change-Id: I25f097466be89d152f47b9d05ece8f562e4b34d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31412
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:30 +02:00
6b8e6498fa
Revert "revert commits done before MZ holidays"
...
This reverts commit d2885bdd72
.
2023-10-16 17:49:30 +02:00
4fc6ef52da
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-10-16 17:49:30 +02:00
fcb5052565
add hvolt_short
2023-10-16 17:49:30 +02:00
acc7580dc6
frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT
...
import SECoP_DEFAULT_PORT instead of defining DEF_PORT
Change-Id: I02ee420d200f90b61f8c79e1cb5ee3e0913955e9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31913
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-10-16 17:49:19 +02:00
4f28e5555c
improve error message on client when host/port is bad
...
for host name without port, None was used for the port
leading to a confusing error message
- do not call parse_host_port with None as defaultport argument
- improve error message when connection fails
+ fix an error in last line of parse_ipv6_host_and_port
+ fix some issues breaking PEP 8 rules
Change-Id: I437360be96449c164f0080e3c60f1685825d4780
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31911
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-10-16 17:49:19 +02:00
ec2bc57ade
fix haake_cfg
2023-10-16 17:49:19 +02:00
7142cee0db
fix ma7.config.json
2023-10-16 17:49:19 +02:00
a3d7520da9
add ori7
2023-10-16 17:49:19 +02:00
9d5ed822e8
insert pressure reading into ccrpe_cfg
2023-10-16 17:49:19 +02:00
b6c2cf8d3a
MA7: add unit=T to mf
2023-10-16 17:49:19 +02:00
a26ae0da4e
sMA6 encoder mode to CHECK
...
after Oksana experienced that it works
2023-10-16 17:49:19 +02:00
a7cbb35455
frappy.client.interactive: bug fixes
...
- correct behaviour with the following untypical message sequence:
- send change target
- receive status idle
- receive status busy
- receive changed target
- add 'exception' to Logger
Change-Id: I614b2a2c2e09ef1b43544838ccb2fa43357dd50d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31632
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-10-16 17:49:19 +02:00
e866ae7034
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-10-16 17:49:19 +02:00
f35dae5893
ma7: sea confg: make ta/tb visible
2023-10-16 17:49:19 +02:00
2fc9eccfd5
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-10-16 17:49:19 +02:00
ca57f46ed2
frappy.io: make error reporting consistent
...
- fix mechanism to avoid multiple error messages in log files
Change-Id: I688071f9b06da1a81eb12d63adb549042171c7c8
2023-10-16 17:49:19 +02:00
1776d7b4b6
consmetic changes to ma6_sample_heat_cfg.py
2023-10-16 17:49:19 +02:00
34f46ab0b0
MA6: set om.encoder_mode to 'NO'
2023-10-16 17:49:19 +02:00
98a73d7882
add special configurations m6/ma7 sampleheat
2023-10-16 17:49:19 +02:00
e7148a30cb
MA7/MA11: make ts drivable
2023-10-16 17:49:19 +02:00
da948468b4
update haake + eurotherm cfg
2023-10-16 17:49:19 +02:00
75df438d69
disable encoder for MA11 stick rotation
2023-10-16 17:49:19 +02:00
10fe42babf
add FW (old power rack, via SEA)
2023-10-16 17:49:19 +02:00
8124ed3294
revert commits done before MZ holidays
...
they are all not neccessary for SINQ SE operation
Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
2023-10-16 17:49:19 +02:00
aa7910c28c
update to gerrit version
...
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
2023-10-16 17:49:19 +02:00
ff6a98af92
frappy_psi.thermofisher: add version through gerrit
...
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
2023-10-16 17:49:19 +02:00
0647b34bb8
add StructParam
...
adds a generic solution for creating parameters with struct datatype
with their members linked to individual parameters.
main use case: ctrlpars
read_*/write_* methods are either created for the main (structed)
parameter based on the corresponding methods of the individual
parameters or the methods for the individual parameters are created
based on the methods of the main parameter
+ disable pylint use-dict-literal
Change-Id: I7f1d9fb3d3b2226b548c2999bbfebe2ba5ac285e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31405
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-16 17:49:19 +02:00
271bb27699
server: add option to dynamically create devices
...
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__
TODO:
factor out dispatcher (regards to playground)
discuss factoring out of module creation code from server AND
dispatcher
Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-10-16 17:49:19 +02:00
2cbe3f19b4
pylint: disable use-dict-literal
...
sometimes it is nicer to use dict(...) instead of {}
an objections against removing this check from pylint?
Change-Id: Ib08d3016b7ec3512111021a82685253cdcd42916
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31505
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-10-16 17:49:19 +02:00
228902a6ee
fixes in ori3 and dil5 config
2023-10-16 17:49:19 +02:00
bee591c861
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-10-16 17:49:19 +02:00
8e7e70c50e
frappy_psi.sea: auto connect
...
on both .ssynio and /syncio try to reconnect after failure
2023-10-16 17:49:19 +02:00
e36ff9bc41
add ma15 cfg
2023-10-16 17:47:29 +02:00
e02c9b1378
fix systemd bug
...
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
2023-10-16 17:47:29 +02:00
5a19103d0e
frappy_psi.thermofisher improvements
...
- merge Loop with Sensor
- make convergence work
Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-10-16 17:45:45 +02:00
e201e7dce9
up to date with develop/mlz
...
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
2023-10-16 17:42:53 +02:00
532e4a7ab5
update 2023-05-30 from gitmlz
...
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
2023-10-16 17:39:43 +02:00
c9ccaa484a
SR830: moved dicts out of class
...
Change-Id: If056b1bf4e81c3b609ded087dff2b40c7119903f
2023-10-16 13:43:57 +02:00
a5dfc82b95
Changed write_range, write_tc methods
...
Change-Id: I335f97bd54deaccf0552b27deb3a7dfe73074e4c
2023-10-09 14:28:16 +02:00
e22da0db67
Changed driver for lock-in 65
...
Change-Id: Ic452f2309e54dd583a1ff796e82a12469357830d
2023-09-28 09:15:25 +02:00
e89bc07759
New driver for lock-in amplifier SR830
...
Change-Id: I45c5a06460f4b84cade0eae53188b058510c4473
2023-09-28 09:14:22 +02:00
e405783716
Removed status
...
Change-Id: I276fe69a4ca46f536be022d9604377378e41f26c
2023-07-12 15:19:16 +02:00
dc59906c8a
Added tc for the Ametek 7265
...
Change-Id: Ifd8e55b2da14cb41391f72787cd726951192ec95
2023-07-12 15:13:35 +02:00
161fb7b2ca
Changed configuration file for Ametek lockin 7270
...
Change-Id: I7a1f3382df1dcc168cf2997c92ea7696f17a779d
2023-07-12 15:11:19 +02:00
04940b1a0b
write_range, write_tc, string_to_value method
...
Change-Id: I6f81db72e852d2670e0a774a621c8382680bb93a
2023-06-28 13:03:21 +02:00
6f6f07b0f9
The write method is changed
...
Change-Id: I5ffeecfeb43804d1f443e500808d9ff83c507d18
2023-06-27 09:56:28 +02:00
a44d232dea
remove unused cfg/sea/*.py
...
Change-Id: Ide289a30f558386d08ce4cdeb439f7438c072231
2023-06-20 11:07:23 +02:00
32b1d6412d
camea filter addon
...
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
2023-06-20 11:03:37 +02:00
87830a1473
branch develop: recent changes from branch wip
...
Change-Id: I2e1173423f2aa164a8a7158921b354c2aff1ab2c
2023-06-20 10:59:18 +02:00
fcca3801a4
branch develop: cfgfiles cfg/main for branch wip
...
Change-Id: Iece67aedc45300b920378a83cfebf5f617c1bad3
2023-06-20 10:55:12 +02:00
00b57e3d2c
GUI bugfix: use isChecked instead of checkState in BoolInput
...
Change-Id: I68153543d8f3424a70da5b3999e68f3e91edb2dc
2023-06-15 10:23:07 +02:00
720d010c47
frappy_psi.thermofisher improvements
...
- merge Loop with Sensor
- make convergence work
Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-06-05 09:52:18 +02:00
9e52665b88
frappy_psi.convergence: improvments
...
- merge_status
- empty string instead of 'approaching'
- dif <= tol
Change-Id: I6f10875f7ef5d2109c13d7448ede114b8e30d86e
2023-06-05 09:52:18 +02:00
a529cb9ab1
frappy.client: missing exception method in dummy logger
...
Change-Id: Ie3a574c3060f2ac6833ff44e8074a19db6ea2f0b
2023-06-05 09:52:18 +02:00
33fb90af05
fixed autorange, vmode, amp, irange, freq
...
Change-Id: Idae23ad1b5716375484acf0410843141e2e45d24
2023-06-01 17:03:02 +02:00
da122ad961
edited lockin (SR)
...
Change-Id: I66d95144d61c62a2396933c2f9a7ce6e05917fe4
2023-05-31 17:25:59 +02:00
11d1ad546f
up to date with mlz
...
Change-Id: I205ccc9847771ebe5622a45792a4dbe8d8e02b82
2023-05-31 14:29:25 +02:00
37d28c9f35
update 2023-05-30 from gitmlz
...
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
2023-05-31 14:17:21 +02:00
dc0cc590ed
Merge branch 'wip' into develop
...
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
2023-05-31 14:06:05 +02:00
0771cb6899
working on lockin (SR)
...
Change-Id: Ia8dc71bf1029feaa66614ade0f8e9e99358f142e
2023-05-31 13:39:09 +02:00
564620e9e3
Test for lockin driver
...
Change-Id: I9db745088efdef182154b71e019a0f6f83644278
2023-05-31 13:39:09 +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
0cbaffd4b6
log.exception instead of log.error in callbacks
...
+ inhibit timestamps in future
Change-Id: Idef463558bf24e891573179474ffbebd4e81468f
2023-05-25 16:16:30 +02:00
1de5455ef6
add haakeuro
2023-05-25 09:56:25 +02:00
e1b30bf37e
merge with wip branch
2023-05-17 17:00:06 +02:00
db94def694
newest version of okasanas drivers
2023-05-17 16:56:49 +02:00
439c9d34c1
add test cfg for lockin
...
Change-Id: I7985202df5848b30bdf55f62453321932422ab01
2023-05-17 16:04:09 +02:00
ac90999bdd
add Thermofisher to doc
...
Change-Id: I90c3b8d07b20d0f7b90db9d30e9f3b835fe75937
2023-05-17 16:03:55 +02:00
85dd905cfd
add SR lockin
...
Change-Id: I4807ead7ceefcf0e266f7d215ef2898d54da9f53
2023-05-17 16:03:18 +02:00
04b9bed7c9
thermofisher updates
...
Change-Id: I6e7103e87cb3c1e69ef4d0e16d06e3d0fc3729ea
2023-05-17 16:02:41 +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
df4a37085a
frappy-cli: fix init(*...)
...
Change-Id: Iba8106a779ac399e6d72d247ea93e6c1e8cdbf94
2023-05-15 11:12:31 +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
fa9525fd4c
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-05-11 10:42:38 +02:00
087036922a
move more code from bin/frappy-cli to frappy/client/interactive.py
2023-05-11 10:42:10 +02:00
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
3099c813d1
add unit=s to pollinterval
...
Change-Id: I6a28fecd4b0d650042f2f031a1b64b801fc2885e
2023-05-10 14:32:11 +02:00
8039351395
mercury, ips, sea, triton, convergence
...
after gerrit
Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
2023-05-09 14:57:34 +02:00
750b5a7794
add empty description to Mod() for Sea classes
...
Change-Id: I3890782b4e08291f73db0bfc4671c6cbc14f05d6
2023-05-09 08:19:03 +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
74729872a8
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-05-05 13:25:10 +02:00
6b78e69dbe
add HasOffset feature
...
+ remove all other unused features
Change-Id: Idff48bdabf51e7fa23547eac761f11320c41861c
2023-05-05 13:23:14 +02:00
3b95013b69
improve and fix errors with parameter limits
...
- in order to work properly, readonly=True in limit parameters
has to be set before creating the write_* method
- more explicit: Use e.g. target_max=Limit()
- fix an error in the loop over the base classes when creating
the check_* method
- more concise error message when a limit is violated
+ fix an error in playground when using persistent parameters
Change-Id: Ibd557b55d6c0d9a2612cda4460b16e3c70e1bc9e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31017
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:21:37 +02:00
85166344d2
improve interactive client
...
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace
Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:20:54 +02:00
ca6b7a65c0
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-05 13:20:38 +02:00
f528cc4808
fixes on HasConvergence and HasOutputModule
...
- HasConvergence must inherit from HasStates
- control_active should have a default
Change-Id: Ic8b430003fdb746bf76782b74fa04e43c700c2e2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31023
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:18:51 +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
5bc0b94c6d
fix mb11 slot for updated mercury driver
2023-05-04 15:25:05 +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
31be98c62e
MB11: increase persistent_limit to 11.1
...
Change-Id: I6849877212a8fc2ac16ef80d727581ae7f6c5e94
2023-05-02 16:49:35 +02:00
94070121c7
converted smamor
2023-05-02 16:43:09 +02:00
1961f91567
add switching_sensor
2023-05-02 16:39:34 +02:00
e38139089f
add hvolt_long and varioxstick (zebra)
2023-05-02 16:38:27 +02:00
e2c51b3dd1
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-02 16:35:50 +02:00
b77c222b72
add setsamp to ma02.config.json
2023-05-02 16:34:23 +02:00
b55af7b20b
add ma7two, oventwo and ovenstick (sans)
2023-05-02 16:32:04 +02:00
72add69b65
add rt and sch (from hrpt)
2023-05-02 16:19:07 +02:00
1a44c2d513
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-02 16:09:16 +02:00
0fb10a0a10
converted cfg files from camea
2023-05-02 16:07:38 +02:00
748ea1400a
improve interactive client
...
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace
Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:54:32 +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
6c02f37bbb
issues with StructOf
...
- depending whether client or server side, handling of optional is different
- fix issues when struct is used as keyworded command arguments
Change-Id: I72b347b1a96ee3bce1f67dace4862c313c12c7a9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30972
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:52:51 +02:00
d6d564f4aa
a playground for debugging drivers
...
playground for trying out drivers by calling methods read_*
and write_* directly without starting a real SECoP server
Change-Id: Ia7d2366920d29794a4eda5d7bfb2b62d4930eb65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30944
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:52:19 +02:00
da15df076a
fetched mlz version
...
- before some chamges in the gerrit pipline
Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
2023-05-02 15:25:11 +02:00
9fc6b6c0fd
add ill3 and ori1 stick
2023-05-02 09:31:09 +02:00
1171245704
add playground
...
+ fix SR_7270 communicator
Change-Id: If9604f9a6fe59ca3de3bbdbecf1b5053fce0573e
2023-04-26 13:54:53 +02:00
ab1fdbae16
draft versions of lock-in and signal generator
...
Change-Id: Icf4e3968efc3028af0de699a68a98a81e04ac9b6
2023-04-26 11:33:49 +02:00
2d628e151c
finished thermofisher
...
but: convergence does not work yet properly
Change-Id: I834f8368730c347ba9f08a03eceae1a60fc66f90
2023-04-26 10:23:48 +02:00
329c8d999a
cosemtic adaption of interactive.py
...
Change-Id: Ie8697e06a2f70e40a8b451cb42e8d0fb12a0b40f
2023-04-21 16:18:10 +02:00
af920aafdf
update interactive client
...
Change-Id: Iacc521807969b23779f1172d09bfc164a0a66a3b
2023-04-21 16:17:31 +02:00
98162a59b9
add frappy-cli
...
Change-Id: I2622212e178ceede7cc7285564a7a09929fafc5c
2023-04-21 16:17:31 +02:00
64b4cba67c
fix error from manual %-format conversion
...
frappy_psi.ppms (line 263) was not correctly converted probably due
to the fact, that dict access with f-strings gets quite ugly.
As it seems we want to get rid of %-format, use str.format_map here.
Change-Id: Idf5b700554aa7a02a6647dc4672bf4a3856f92a5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30933
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:31 +02:00
d99f2dfbc3
Add __format__ to EnumMember
...
Make the format specifier 'd' able to be used when formatting them
in f-strings as an alternative to an int()-cast.
Change-Id: I4083aa0f4b0d8d10e3e11a29591cfbf5e5aca03d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30902
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 >
2023-04-21 16:17:31 +02:00
e673dfe92b
[deb] Release v0.17.10
2023-04-21 16:17:30 +02:00
d18e368ab9
make entangle mapping a dict
...
Change-Id: I38d863a907469674001f0721140f88c17b53635b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30911
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 >
2023-04-21 16:17:30 +02:00
a334cc4f0a
Manually convert most remaining format statements
...
%d accepts floats and other things, so manual fixes are needed after
conversion.
After flynt -ll 2000 --aggressive, each was manually checked if the
casts with int() are needed.
Two statements are still missing in ls370res
Change-Id: I2651ddbe60695aa19582882a97d0f71bcb05c1ef
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30901
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
42c5e97122
Rebuild NodeWidget when the description changes
...
+ add descriptionChanged signal
* track detached of TabWidgetStorage correctly
* build new NodeWidget when the nodes description changes. the old one
is replaced
Change-Id: I61e60c61b7c2c975819730cb98562657a66f16af
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30910
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 >
2023-04-21 16:17:30 +02:00
f069b31d5a
[WIP] gui: add specific input widgets
...
+ add bool, enum and generic input widgets
Change-Id: If6962ed6f2c96a319d4ed8c8ee5fb8c03f6e7f82
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30723
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
47000f7a9f
move unit into display label
...
TODO: decide if this is preferable to a dedicated label
Change-Id: I707fad5ab85bf2de53f82bc638a9fe20eb26f14e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30786
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
6f95c0d825
Convert formatting automatically to f-strings
...
Automatically convert formatting with the following call:
flynt -ll 2000 -v frappy*
Result: 303/381 auto-converted.
Failing conversions will be looked at manually in a follow-up commit.
Change-Id: Icd996b27221202faccc15af78e0380cf52ee37f2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30900
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
a9d479ba0a
Change leftover %-logging calls to lazy
...
Change-Id: I0bee8d02ac364ab93f77919cae78afa386b85c85
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30899
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
9329d2b0f4
[deb] Release v0.17.9
2023-04-21 16:17:30 +02:00
4f69899fbe
interactive client: avoid messing up the input line
...
- trigger a redraw of the input line when asynchronous log
messages arrive
+ do not print traceback on 'remote' errors
+ persistent readline history
Change-Id: If85fd064c1c09c44e0cb0ebccbfc1b6411ad5aac
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30793
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
2dad4b4ee1
[deb] Release v0.17.8
2023-04-21 16:17:30 +02:00
5174321b6a
Debian: Fix typo
...
Change-Id: Iba218600bd60ad663869cee7758d6d4ac1387908
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30864
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de >
2023-04-21 16:17:30 +02:00
32edc4c049
[deb] Release v0.17.7
2023-04-21 16:17:30 +02:00
d986134781
Debian: add pyqtgraph dependency
...
The pyqtgraph version should be >= 0.11.1 (tested on Debian 11), so the
buster installation won't run without manual interaction: Installation
of pyqtgraph via pip
Fixes : #4711
Change-Id: If785da5578ac7f3812d8d49bc36d055cde4a37f9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30859
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de >
2023-04-21 16:17:30 +02:00
bd4330f9fd
[deb] Release v0.17.6
2023-04-21 16:17:30 +02:00
f260bd25b1
Fix debian GUI package dependency
...
The current python packages for Qt5 are called 'python3-pyqt5*'
Change-Id: I36bba2be50eb8769b01eeaf1202b32d3c849fc56
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30854
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
d0af831b1f
improve error messages
...
- treat validation errors of the result of write_ and read_ messages
properly
- add info about the called read_* and write_ methods to the error
message, in case the error is not raised in the outmost method
- as subsequent errors in poll functions are logged only once, log an
info when a poll function succeeds again
- remove DiscouragedConversion error
Change-Id: Ib66e001cc95de8225751a1464a92594c369ceb3f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30788
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
df8bc1c203
cli: add argparse and inlcudes before repl
...
+ add argparse to cli
+ add option for files that are executed after connection to the modules
but before repl starts
+ add option to skip interactive mode after executing files
Change-Id: I8f01db84b2c91d4bf1a7b397e8fa1bf0c87ddf0d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30823
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Tested-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
c101af99d3
add optional validation to ValueType
...
* add optional parameter for ValueType: validator
used for checking, if a value meets a criteria (e.g. is dict)
+ InternalParameter, which is not exported and can hold any python value
Change-Id: If39a7a4a8019f2aa1a930e42cbef4fca59163b78
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30787
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
7baacb0f9e
add copyright headers where missing
...
Change-Id: Ie68ed439d084b4b79d7db81b58360967f5726d7c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30768
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
155efb06bf
gui: logwindow improvements
...
* make state consistent with menu action
* colorize
* add time to log message
Change-Id: I0c0800ddb1843b826a6adacf4e4b18d52598acf2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30759
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 >
2023-04-21 16:17:30 +02:00
2f730ab444
gui: add console history
...
+ add HistorySerializer to merge histories in correct order
* move console to own file
* promote msgLineEdit to class based on NICOS-HistoryLineEdit
Change-Id: I853d49a70640f38275c8762ab345003db5ec5592
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30753
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 >
2023-04-21 16:17:30 +02:00
41f3a2ecd4
gui: switch group button order, change text
...
* change order of name and toolbutton
* change text on click
Change-Id: I6efba544d0ba63fd8065483a566643372892cc00
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30750
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
10d2d16453
gui: full module description only in detailed mode
...
* take only the first line of the description, this makes the normal
view more condensed if it is formatted like a git commit message or
similar
Change-Id: I268dce0aa09d3ad5133815fe33577532bf0a2e96
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30749
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
087a5ef476
gui: show parameter properties again
...
* parameter properties shown with own button
* for now as a popup window
Change-Id: If3b51eb66a759c207591f1341126557f2c6e4a3d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30748
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
67bbe9d9a5
[deb] Release v0.17.5
2023-04-21 16:17:30 +02:00
0b501ba444
Fix generator
...
Change-Id: Ic332e9c130b56e446787af87718d4028f2aac714
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30746
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
981513df10
[deb] Release v0.17.4
2023-04-21 16:17:30 +02:00
95e5102137
Fix entangle integration bugs
...
found during ccr-box adaption
* missing param description DigitalOutput
* missing Writable baseclass in DigitalOutput
* rework ccr config file
Change-Id: Ie40f875caacd374b02e6f6175b5fb003619c5f4e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30743
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
d498fa9230
[deb] Release v0.17.3
2023-04-21 16:17:30 +02:00
eff8ac8c62
[deb] Release v0.17.2
2023-04-21 16:17:30 +02:00
39f0180f40
format unit properly in the case of nested arrays
...
The unit is shown at the end of nested arrays.
Change-Id: I235bc40e61161e09a7b00cd1e186d8d8c1769d89
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30734
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
dd6ee398f2
fix issues when closing tabs
...
- catch error on AsynTcp.shutdown (when already disconnected)
- avoid opening duplicate tabs
- shorten try except in mainWindow._handleTabClose to the minimum
+ fix an issue with frappy.client.CacheItem.formatted
Change-Id: Ice4086373a89a969f02e08ec90a173edbd5b0585
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30730
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
c3796aa6eb
gui: more greeter interactions
...
+ double click item to open node
+ Enter key while recent nodes are focused opens selected
Change-Id: I397f743faec70e623b5ef9a86d61625f8db7e933
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30736
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 >
2023-04-21 16:17:30 +02:00
4cf54dcce8
Add SECoP link to readme
...
Change-Id: I5990b59e26060f9c9a2457f455537a0af28e28bb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30735
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:17:30 +02:00
79277e86f1
fix generalConfig defaults
...
bin/frappy-server:
- the default for omit_unchanged_within must not be overriden
+ remove no longer used disable_value_range_check
Change-Id: I5c0620e44dc7df3ae2ca48f7ab6371189acae489
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30727
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
361f9ac4fc
remove UNKNOWN, UNSTABLE and DISABLED from Readable.status
...
- re-add them where needed (epics, entangle ...)
Change-Id: I2b8af9f5f86285f081d5418211f6940e80a1dbd7
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30718
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 >
2023-04-21 16:17:30 +02:00
11a3bed8b8
improve frappy.errors
...
- include all secop errors from spec
- add doc strings
- make conversion to and from error report nicer
- move all error classes to frappy.errors
- rename errors clashing with built-in errors
Change-Id: I4d882173b020cd4baf862c5891375b691e67e24a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30721
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
5db84b3fa1
simplify status type declaration
...
- StatusType: simpler inheritance (inherit from module instead of Enum)
- StatusType: more robust for standard codes, give names only
- <Module>.Status is automatically extended
- Enum: accept duplicates with same name and value
Change-Id: Iad1dacf14c31fe6f4ae48e7560b29e49838e4f23
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30716
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 >
2023-04-21 16:17:30 +02:00
dccd329435
enhanced parameter range checks
...
- check for <param>_min and <param>_max
- customized checks with check_<param> method
the inherited customized check functions are all called in
a sequence, with the possibilty to return True to quit earlier,
no need to use super calls here
Change-Id: I903081abbbad2586c1e8237e303abaa3683ac419
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30632
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
0d265b9752
make return value 'Done' unneccessary
...
'Done' was introduced in order to suppress unneccessary
duplicate updates. However, since super calls on access methods are
allowed, it is not nice when such a method returns Done, as this
is not automagically replaced by the current parameter value.
As a consequence:
- using Done is discouraged, but not (yet) removed in all code
- the 'omit_unchanged_within' property is moved from Module to an
internal Parameter property 'update_unchanged'
- its default is moved from a SEC node property to generalConfig
- the 'update_unchanged' parameter property may be set to
'never' for parameters where duplicate updates make no sense
- this property might be set to 'always', for measurements, where
even unchanged values taken from HW should be transmitted
Change-Id: I2847c983ca09c2c4098e402edd08d0c96c3913f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30672
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:17:30 +02:00
9cab6670b9
check configured names for spaces
...
reject equipment_ids and module names which contain spaces
Change-Id: I0ffe8fee13122ddfff6715863d0a82f72b5cb9f6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30711
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:16:40 +02:00
8c6f1a21ab
gui: terminate connection on tab close
...
+ add method to explicitly terminate connection on qsecnode
* disconnect explicitly when closing tabs
Change-Id: I00af5fb296e1499b88eafc033f62fdcc1131a145
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30677
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:16:40 +02:00
a1271b7268
fix README typo
...
Change-Id: I545835243959c9feb6781f3ed400bff53d0eb428
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30705
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:16:40 +02:00
9bf187758b
central point for status codes
...
Put status code definitions into frappy.datatypes.StatusType.
frappy.datatypes is anyway imported in servers and clients,
so this is a better place than frappy.modules.
Change-Id: I81dfc8a066f598fbd20854ed1a13b937b7facc8c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30703
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:16:40 +02:00
349c510555
gui: support proper formatting of values
...
- use Datatype.format_value to convert all values
- frappy.client.ProxyClient: use CacheItem instead of 3-tuple
- CacheItem has built in formatting
- adapt gui to use it instead of stopgap
As it is now easy to convert to string including values, it may
be better to move the unit in the modulewidget into the value field.
This would simplyfy the code.
Change-Id: I5c06da4a24706fcbc83ebcbf8c0ea6a8eb6d7890
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30680
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:16:40 +02:00
31b1a916f5
fix importing AsynCon without serial
...
importing HasIO without serial being installed fails, as the import
guard sets Serial to None, which is then called for AsyncSerials
SETTINGS attribute
Change-Id: I94a9eb5c2ff8de1a1b31f31700358d5d2226eadd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30700
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:16:40 +02:00
9755040ac2
demo: fixup Switch class
...
Target and value are not emitting an update event upon changing target.
Change-Id: Ic01d17fd8529dc0b0a720fbc79d98c7a61fc572b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30645
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:16:40 +02:00
c0704b3d4f
split BadValue into WrongType and RangeError
...
in order to match SECoP specification
fixes #4668
Change-Id: Ica73a8171536ccc324cf8db915347a6263c2d736
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30625
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-04-21 16:16:40 +02:00
58ff438f46
handle connection close more gracefully
...
Change-Id: Iea12e95e88fa3638f91edc2e99abb5ece3f75b4d
fixes : #4705
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30685
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2023-04-21 16:15:20 +02:00
98ab5a5785
gui: Logo in greeter
...
+ add SECoP logo resources (3 dark text, 1 light text)
+ Add logo to greeter
TODO: when there is a frappy-logo, replace this
Change-Id: I37eb8946d291b2f5dde0b5000251a4ac363fb01f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30596
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
58f7ef6de4
gui: make module details button checkable
...
Change-Id: I22e5591e87e84a86ecbaf47d86d5885cf0a569be
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30676
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 >
2023-04-21 16:15:20 +02:00
431a1c20ab
isort: add firstparty
...
Change-Id: I38d2ee3bf617accc97069167c408b1cd1b9ef6b1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30675
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:15:20 +02:00
2e698af78c
Jenkinsfile: isort does not fail the build
...
Change-Id: Ide31346f35ecef3030f306698cfe4586010df020
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30674
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:15:20 +02:00
5c2b4c6491
Fix doubled module info
...
Change-Id: Ic406471a28f0c891323b990760ffd721ed419e12
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30667
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
80b1932f39
treat returning None from write_<param> properly
...
as intended originally, returning None should be the same
as returning the new value from the argument
Change-Id: I5596d2b6f6f525efd4dc410bbe22dad6f1fb2017
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30659
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:15:20 +02:00
644bfa85f7
Short background Color animation on scroll
...
When the tree selection changes, trigger a short animation of the
background color of the name-label of the selected module/parameter
Change-Id: Ia56619a7e73458a5ac63ef821b5ac7ab5f7451df
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30651
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2023-04-21 16:15:20 +02:00
bd06abc060
gui: always show scrollbar in nodewidget
...
To avoid content jumping around when expanding.
Change-Id: I81a80f2ed11057bab2d4f0c1a21f9f29c4053c36
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30648
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: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:15:20 +02:00
efad0e2079
gui: cleanup code in modulewidget
...
- line length
- spacing style
- copyright header
Change-Id: Ib402baf271868e82010e9acdfad4087164d91714
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30647
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: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:15:20 +02:00
c3bfc0a930
gui: better display of protocol version
...
Change-Id: I987aa7bf4b0cb1395425590655739fd4b28bd282
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30646
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
2eef2f1d7f
Remove Modulectrl Widget
...
Change-Id: I172227f01c8de494477050414e8cdd02bebafdbc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30639
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
d8621bdc2c
Scroll Module area instead of replacing widgets
...
Change-Id: Id06eaabee294e032a71e7b28255a9b818763737e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30638
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
23c9aa6038
Extend Node and Module widgets
...
- put nodeinfo elements into ui file
- add per-module detailed view
- add first version of grouping (cleanup in a follow-up commit)
Change-Id: If35bc4a8f4ed0a313e97f88797e70186d7c0d9bc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30631
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
0464d60f68
Merge resource files
...
- move config editor files into resources
- merge both qrc files into one
Change-Id: I3089b0e1c7784683964d3e0b6e87c8a5cbd62ad2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30593
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
d4b80eabd6
[Needs Feedback] Add PyQt6. Remove PyQt4
...
- fully qualify enum values for Qt6
- add resource file per Qt version
- TabWidget: use QPointF instead of QPoint for constructing mouse event
Change-Id: I07da61c36c4228a60f6b5b9dacbead27c0a2409d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30585
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 >
2023-04-21 16:15:20 +02:00
952cbe76a5
refresh logging when reconnected while watching
...
when a connection is reconnected, send 'logging' has to
be resent when watching
Change-Id: I13bb0075811151d93bd20f390b4c0745b9ad5418
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30604
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:15:20 +02:00
746df2eb94
improve online help of frappy-cli
...
- help text shown exactly once (even with no or more arguments)
- automatically generated client object names
+ stay in interactive mode even when not all clients succeded
Change-Id: Iefcac66df92f47363e43bc9b97bb2082f153e5df
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30583
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 >
2023-04-21 16:15:20 +02:00
494960a2ac
Always make a greeter tab
...
Change-Id: If6a8cf55d29508645e4a731277ad341de23ca37d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30587
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 >
2023-04-21 16:15:20 +02:00
0382313fc7
gui: better label for param set button
...
Change-Id: Ied1eb2851b755fa63289dcc19ba8b2aff803f13e
2023-04-21 16:15:20 +02:00
66faf89d7f
gui: remove unused ui file
...
Change-Id: I2b73cb7e65d12f5b053274e50d2fcf5f0b01c6d0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30581
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-04-21 16:15:20 +02:00
79da402ceb
AsynConn.uri: better handling for missing scheme
...
- check roughly for hostname being a valid address
- allow missing 'tcp' scheme even with missing port number
Change-Id: Ia3ce4cb7b8d2a4b339421eafe21f06fba6d938e6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30582
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-04-21 16:15:20 +02:00
b0b85a2711
Make input field more distinct
...
* different color for value fields
* placeholder text in input fields
Change-Id: Ibb94eb09ab7bfd7c2807f27226b7e2825ac3ea5d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30579
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-04-21 16:15:20 +02:00
5fb1e649ab
Driver for ThermoFisher A 10
...
Change-Id: Ic19ae444c3b4242f3bb1fe83852d4521326d0b9d
2023-04-13 15:14:44 +02:00
7a3cfe9836
fix %g in the write_target
...
Change-Id: I3c15ed44848c792320dd146d17d4bb52f30f49f0
2023-03-08 14:57:22 +01:00
e12f2bacb1
fix read_setpoint
...
Change-Id: I8c6449979aca294af13c350b7632190121bc4230
2023-03-08 14:52:16 +01:00
d6c641e67b
fix set/get_par
...
Change-Id: I9790a667bc2e89baf2be9e35edb7473cdfc5dd31
2023-03-08 14:49:56 +01:00
ec15a35977
lakeshore ramp
...
Change-Id: I323c2b88e554bc2dc9c3f1af2b23f99aa082489f
2023-03-08 14:37:56 +01:00
05415e79b1
qnw: WARN status when control is off
...
Change-Id: Ic91607658b4c0f3a622ad7307aa55d927c82914b
2023-03-06 14:05:01 +01:00
908f2d4c23
fix minor issues in ppmssim and k2601b
...
merging changes in gitpsi and gitmlz branch
Change-Id: I4996da637ad62c5bd76596ea95aee1decaaccaf2
2023-03-06 08:24:16 +01:00
cdd6d7f1a2
improved features
...
- remove legacy feature proposals
- add Feature.featureName (in case not matching ptyhon class name)
Change-Id: I7a09fc5e24067b2fde5d2c04523bc5d2172e714b
2023-03-06 08:24:16 +01:00
8831e7142f
Remove unneeded constants
...
Change-Id: I1bfb213bb6c58af311d4f1af7af18abbdb82c269
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30575
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:16 +01:00
e5c99c36e7
Fix Node adding logic
...
* Unify _addNode calls
* introduce addNode for error catching
* set parent for Nodewidget only after successful creation (otherwise
this results in Bug #4694
Change-Id: I82a5d867b45e766cd7dd33e7144e57a9f66a73b3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30572
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:16 +01:00
bb0619f212
gui: isort
...
Change-Id: Ic1c1d54a9577c1774024aefd5464b6e4b8e1fe07
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30570
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
0e5f62d849
gui: move QSECNode to separate module
...
Change-Id: Iaba98c6c74adec7c3de952cc703430c5756dfbe4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30569
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
3aaa12eee1
gui: add about dialog, remove "about Qt" menu entry
...
Change-Id: I483cc8cbe67cff6d0e14ff9ce198cc50bebb7cf8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30567
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
dbf4ad373e
readme: fix make call
...
Change-Id: I58f31d53a2a4c67680c848f9e81068daabfa6cd4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30568
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
595c32783c
Add reconnect Action
...
* add reconnect method to QSECNode
* Rename File Menu to Node
* Add Button to 'Node' Menu
Fixes : #4687
Change-Id: I04ee55ddbc13253255f0099a9f4d2f8d4d0da77c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30566
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
b48b965070
make doc should not fail when version is not available
...
Fixes : #4665
Change-Id: Ief312e86b64ec1290d3410e1374ad1a71b5a3e4e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30536
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
2cf073e7d8
installer: add config for frappy gui exe
...
Change-Id: I1abc325f685f8e95fac281b419be3defcc1e4485
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30508
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
ef1664e1a2
cfg editor: fixes
...
Change-Id: I1ea9f96f6c39c25ff8d4c51163aabccc5698dace
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30507
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
05cf4a791a
demo lakeshore with simulation
...
- example for lakeshore tutorial
- lakeshore simulator (merge with frappy_psils370sim)
- rename stringio-server to sim-server
Change-Id: I33a9c75ea268349573f8a8387910921e19f242eb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30516
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
c8f30582a5
default settings on the IO class
...
allow to define default settings on the IO class:
- a default 'port' may be given for tcp
- defaults like 'baudrate' or 'parity' might be given
for serial connections
this avoids explicit settings in the config file in case
the settings can not be changed or have a typical value
other than the defaults in serial.Serial
Change-Id: I990f47d63e785f8cc48c4af197944a8eebe91fb4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30555
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
0acb80380a
fix ppms with proxy
...
- proxy: remote parameter status should overddide datatype from
ProxyModule.status
- ppms: create PpmsDrivable instead of importing from
(PpmsBase, Drivable). Order matters for status parameter!
- update cfg files
Change-Id: If8fc263cffb903d8b3c1a93a089dcac3597d13a0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30512
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
b5205d7c7a
better guess for cfg file location
...
check for existence of repodir+'/cfg' instead of repodir+'/.git'
fixes #4692
Change-Id: Ida841cd31eba851305bcfc0d96019710340c3140
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30510
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
819026659a
Fix forge link in README
...
Change-Id: Ie428f1814edc2685d03590da4e0635d0b100bbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30538
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
09f6149822
version.py: sync with other projects
...
Change-Id: I0e8b1502a9d1e8efa3ee1e0798ec5a85bf9d0f35
2023-03-06 08:24:15 +01:00
0ce5a495f0
do not reuse address on Windows
...
socketserver.ThreadingTCPServer.allow_reuse_address must be False on
Windows systems, else several servers might be started on the same
port, and unspecified behaviour will happen
Fixes : #4695
Change-Id: Ic9f193e23854f9cd3413ab6e664ca8029a7c9c76
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30523
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
a66f2ac21b
Remove auto-connect to 10767 on startup
...
* not necessary with greeter
* Port is default in greeter text field
Change-Id: If89cb72ec6af20fd4d83488af85b942c5f54b105
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30531
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
244d84aa56
Add recent SECNodes to Drop down menu
...
Fixes : #4686
Change-Id: I864e8dd407b23c8af0f0633d3be477e222df6c40
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30525
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
f1ea85bfa7
Add greeter tab to UI
...
* adds a tab on startup that shows last connected secnodes
* last nodes saved with qsettings
Change-Id: I2b663a408dc46bd0a0135e723b55d5ef3661bec8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30524
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
4c577cf83d
allow super calls on read_/write_ methods
...
instead of wrapping the access methods on the class directly,
create a wrapper class with the wrapped methods.
Change-Id: I93f3985bd06d6956b42a6690c087fb125e460ef9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30448
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-03-06 08:24:15 +01:00
ca4297e3a6
add pyqtgraph to gui dependencies
...
Change-Id: Ic75d395e683c4c4e92162a287ef9beeb1c68df53
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30509
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
31706093fb
cfg path quick fix for hands-on session
...
Change-Id: If79f76ed17dce6a5587deaae2eae4eda77546306
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30503
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2023-03-06 08:24:15 +01:00
f4fac1f3dd
Fix Simulation and Proxy
...
Combination of changes 30188 and 30194 leads to simulation and proxy
still reading 'default' instead of 'value'
Change-Id: I176a42f534a4eb04916b57bb3b54e880a2531ed3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30502
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-03-06 08:24:15 +01:00
c9500bcd96
[deb] Release v0.17.1
2023-03-06 08:24:15 +01:00
65c5277a79
gui: make plot windows children of the node, so they close automatically
...
Change-Id: I025bff02bc566be8bbaa8d90bf0035d1e2bf2a69
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30494
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
e0132ed201
gui: clear tree selection by clicking into empty space
...
Change-Id: Ib065feeffa8636ee0b3160d7612f069057ef6b0e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30492
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
e0090a5918
gui: as a stopgap measure, apply %g format to floats
...
Needs to be properly fixed by sharing the code to format
parameter values everywhere.
Change-Id: I766e4d2cb644153f99f9f40ce0414aa314b47307
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30491
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
ee9f8536b2
gui console: better formatting of input/output
...
Change-Id: I2ffb3712bb4ef5dcdfbcae869e4971bdc7a116ad
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30490
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
a1141c87c9
fix links in doc/introduction
...
Change-Id: I9f613c77835472c79be2850265126686cb57e8b9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30493
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-03-06 08:24:15 +01:00
b75d89ad16
gui: make spacing more consistent
...
Change-Id: I5bb44c440b33cb0b5de0f5e2457c9226afe74a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30489
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
af32fd308c
cfg: repair demo cfg after conversion
...
Change-Id: I00b4e92d8e10842e9b2ae1ae904402473e77107f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30488
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
355eaeb864
config: demo config fixes
...
Change-Id: I380e101065179bf0d784bacfe6b79731b40af4c5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30487
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
a2458005f1
gitignore: ignore demo PID file
...
Change-Id: Iab6bd32c51772f5bcf256802c9bb7082be5e7873
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30486
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-03-06 08:24:15 +01:00
1004512caf
[deb] Release v0.17.0
2023-03-06 08:24:15 +01:00
9f54d89efa
Rework GUI.
...
Work-in-progress state of the new gui.
Change-Id: Ib5e9ad2178b372fbd2914077096a9c73f025ecb7
2023-03-06 08:24:15 +01:00
72f9f242d7
doc: fix trailing comma in authors
...
Change-Id: Ie611a3258a5b1acbdcbdfa55aad5198c4613f647
2023-03-06 08:24:15 +01:00
4857ebf043
ci: remove duplicate variable
...
Change-Id: I839ac4d9eda36082ba24c7c06df234a78798be2c
2023-03-06 08:24:15 +01:00
25ff6018c4
[deb] Release v0.16.1
2023-03-06 08:24:15 +01:00
b3fbf3b107
[deb] Release v0.16.4
2023-03-06 08:24:15 +01:00
8651a5fb83
[deb] Release v0.16.3
2023-03-06 08:24:15 +01:00
231f5942f8
[deb] Release v0.16.2
2023-03-06 08:24:15 +01:00
1d893974cb
gui: move icon resources for the cfg editor to its subdirectory
...
Change-Id: Iebda39c73d9886701a58fe58b91ef54b70a4fd73
2023-03-06 08:24:15 +01:00
6b32c4bb81
[deb] Release v0.16.1
2023-03-06 08:24:15 +01:00
9b801e9487
add frappy-cli to package
...
Change-Id: I8697f05517935470a7c867ebddd63f5d28be21c3
2023-03-06 08:24:15 +01:00
23b1f59320
[deb] Release v0.16.0
2023-03-06 08:24:15 +01:00
3a2a90e712
README: add link to doc on forge.frm2.tum.de
...
Change-Id: I4a183202590a7e73ee1a905538c35af175f6c82d
2023-03-06 08:24:15 +01:00
ad7ff7f7f3
do proper value import on the client side
...
json values were not converted properly, resulting in integers
instead of enums at the client side
+ add log.debug in rx thread
Change-Id: Ifc3c3b28540eb6a516d77387a3f83711f34b7480
2023-03-06 08:24:15 +01:00
8799710b38
Convert example configs to python
...
Fixes : #4627
Change-Id: I1049af9fa2f3f9ec06e55811dc9ecfa5f359c805
2023-03-06 08:24:15 +01:00
e1d5170a90
T controller tutorial and improve documentation
...
add tutorial for Berlin hands-on workshop
+ improve the documentation (hints for structure welcome)
+ remove 'optional' parameter property
(is not yet used - should not appear in doc)
+ added test property in frappy_demo.cryo alters Parameter class
('test' property appears in Parameter doc)
Change-Id: I3ea08f955a92f72451fd23a5ff00d1185c7fb00e
2023-03-06 08:24:15 +01:00
a39db9a35d
Change Readme title
...
Change-Id: Id8b07e76cb5748aa595fb484d78ffcc43f9cdddf
2023-03-06 08:24:15 +01:00
5c874483a9
Add initial README
...
Change-Id: I314b6bf527ba6bb7011804a3768e7785ed4046e3
2023-03-06 08:24:15 +01:00
65480cd773
HasStates: fix status code inheritance
...
use mro for status code inheritance
- as a consequence, the decorator class 'StatusCode' is now a
decorator function 'status_code'. snake case is anyway more
common for decorators.
- adapt tests
+ fix an error message
Change-Id: Ib409b963c51e0fe807397ff1d73d77d0147b8580
2023-03-06 08:24:15 +01:00
7d59345f43
HasControlledBy and HasOutputModule mixins
...
for supporting coupled modules (output - input case)
Change-Id: I58488faa0d52b3b984a3dc70ff44ee4a9a218d7a
2023-03-06 08:24:15 +01:00
bc553f889c
Implement ramping qnw
...
Change-Id: I9d7fab73194a0a8be3a230cc7ca99066d2553fce
2023-03-02 17:01:43 +01:00
cae225df41
create qnw driver
...
Change-Id: I7b466caf91b7a2a177fa94ac84cdfc315475f959
2023-03-01 17:49:15 +01:00
3a52f9d31c
fixes in lakeshore alarm
...
Change-Id: Ibbcbe94d9a64d1c074025183e1310506a2cb00f4
2023-03-01 17:49:15 +01:00
4ebb15ca6c
add lakeshore demo for hands-on workshop
...
- a simple LakeShore model 336 driver
a tutorial follows
Change-Id: I291a615efa5bd58a0dd908949210086d2f82c2ca
2023-02-20 12:52:05 +01:00
240c4f027b
interactive client: improve watch function
...
- watch is now a command, not a module method
- finish watching with ctrl-C
- watching an io module logs communication
- add bin/frappy-cli to start interactive client
+ remove sorted function from StructOf.format_value
Change-Id: I7dd707473e4534f2d39c5d6afc533c2d872380f8
2023-02-20 12:51:55 +01:00
f7e24f13bb
raise ProtcolError when specifier is missing
...
- fixed this for 'read', 'change' and 'do' message
+ fix an error in frappy.client.SecopClient closing the connection
when the identifier is None
fixes : #4672
Change-Id: Iaba0f9ed86b6eb6ef7588403ba640ded552dded6
2023-02-20 12:51:22 +01:00
c3d8068e02
adapt tutorial to new config file format
...
Change-Id: Iafd8a2dbed8cd1283ce97b6559138c7bc02714c7
2023-02-20 12:51:11 +01:00
084e890645
do not throw ZeroDivisonError when pollinterval is 0
...
fast_interval might be 0, indicating to poll as fast as possible
- this should not throw a zero division error
Change-Id: I26e18f5a656c943b906c6ffff65361e1fcf16d50
2023-02-20 12:50:38 +01:00
edd3437682
improve persistent parameters
...
A value given in config overrides values read from the persistent data file.
To let the loaded parameter have precedence, configure a default only.
The write_<param> method of a persistent parameter is now always called
on startup.
- add tests for persistent behaviour
+ simplify Modules.writeInitParams: remove started_callback argument
Change-Id: I08b49de52e9d9a2ed0918018eb2fe538141a4f5e
2023-02-20 12:50:19 +01:00
c2728c8340
Add .desktop file
...
Fixes : #4632
Change-Id: Ie0f07049462ed6664cca4062bced09c15bdd5a56
2023-02-20 12:50:08 +01:00
725820fafd
fix copy method of Attached
...
a copy of 'Attached' must also copy the basecls
Change-Id: Ia80cc458b241cb1f224f4c24f0241ed1d4ec1060
2023-02-20 12:49:53 +01:00
9f653b4e6f
update interactive client
...
Change-Id: Iacc521807969b23779f1172d09bfc164a0a66a3b
2023-02-02 17:35:39 +01:00
ae7d3514a1
update interactive frappy client
...
Change-Id: Icf0ce4c7e2f99ac65e2b47e8fa1efb497322922a
2023-02-02 17:33:53 +01:00
6b9d4a8140
.
...
Change-Id: I45df6909814299a26eefdb25c63b827741872d82
2023-02-02 17:31:24 +01:00
af295b12b0
fixed write_alarm
...
Change-Id: I1c155a63c7340aa1292bc1e530cedfcc72d5ffed
2023-02-02 17:25:34 +01:00
69dd011260
Added alarms
...
Change-Id: Idd06278e44e01522ddf904b56a452ce8c704b5a6
2023-02-02 17:22:08 +01:00
d62076128a
add comma between command and arguments
...
Change-Id: Ibc3a9072140842d521ebb4840eecb180e69b134e
2023-01-31 09:42:45 +01:00
38ae301cda
add frappy-cli
...
Change-Id: I2622212e178ceede7cc7285564a7a09929fafc5c
2023-01-30 17:16:08 +01:00
2ee9ea65da
fix SETP?
...
Change-Id: I337adece10204ca67dcf720e4de36085b80601ba
2023-01-30 17:13:52 +01:00
0dfaa79f77
fix set_par/get_par calls
...
Change-Id: Iff6b244ca381849333646853b4c0bb8a347bbb3b
2023-01-30 17:09:46 +01:00
866fe73f2e
fix CDISP
...
Change-Id: I09010a1997799bed04f25a7a3eb0157f7af5ad8b
2023-01-30 17:04:28 +01:00
f5c96214b0
Merge branch 'develop' of gitlab.psi.ch:samenv/frappy into develop
2023-01-30 16:57:29 +01:00
4d28abe141
fix issue with old reading
...
- old reading shoould be ignored
- fix channels for CTI7
2023-01-30 16:56:31 +01:00
c75d7f17f7
The PID parameters were added.
...
Change-Id: I67a7db66ca13b60d35cb4041bbd35c6c4729416c
2023-01-30 16:52:06 +01:00
a384664639
first version of lakeshore 340 driver
...
Change-Id: Ie9a68be61e142802b2e71420b87623b7a4b4f645
2023-01-24 18:13:34 +01:00
ee708f7b02
fix typo in frappy_psi.mixins
...
Change-Id: Ifccb6278bbfc221882067a2ae8c72d0163e5f351
2023-01-24 18:12:25 +01:00
edc942cb24
introduce frappy_psi.mixins
...
containing for now: HasControlledBy, HasOutputModule
Change-Id: I27e3a81d6e985c74440eb9ea6d224272bac4fb7d
2023-01-24 15:33:27 +01:00
b19a8c2e5c
converter for creating python config files
...
+ testmode in server returns errors
+ fix in (old) statemachine
Change-Id: Icdfd6c3d8f70e717fecd61e8a54adad326be6000
2023-01-23 18:00:56 +01:00
68b45978a7
ppms.cfg: add target=0 in mf
...
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
2023-01-23 18:00:20 +01:00
7d4dfdebbd
fix bug in k2601b
...
convert returned float (which is integer) to int
Change-Id: I8363f4d5188f2b1be89f1383da20c76522286424
2023-01-23 18:00:20 +01:00
6c325460f7
make doc when .git is not there
...
accept failure of secop.version.get_version()
Change-Id: Ia689bd4f56b848bc354c0d68826a3174f0746a97
2023-01-23 18:00:20 +01:00
c70b61e4e5
relax identification check
...
accept *,SECoP,*
Change-Id: Ieb56e9c57fc5eb18e025fbc2f1d17a9d6e3f0a97
2023-01-23 18:00:20 +01:00
589b857039
add driver for LakeShore 372
...
- including channelswitcher
2022-12-21 11:05:15 +01:00
ad4a6d2e09
improved cyoltd (flame magnet)
...
- use a statemachine
- do more control in frappy, switching from persistent to driven
internally
- a lot of fixes
2022-12-21 11:00:19 +01:00
766f15beee
improvements in magfield
...
- use HasTargetLimits instead of HasLimits
- move ramp_tmo parameter to SompleMagfield
- add last_target method
- fix progress check in SimpleMagfield.ramp_to_target
- better mechanism for setting to persistent mode after restart
- fix switching mode
- fix on_error
- fix condition for shortcut start_field_change -> check_switch_off
- remove direct status updates
- move check for manual switch heater operations to ips_mercury
2022-12-21 10:57:41 +01:00
79b8cd7b2d
fix inheritance of status codes attached to state functions
2022-12-21 10:38:11 +01:00
bd0f3a0b07
fixe in triton and mercury
2022-12-19 16:13:06 +01:00
c4f9f2ef4b
rename action to dil_action
2022-12-19 16:12:06 +01:00
0820d537c3
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-12-19 16:09:40 +01:00
1a6aa893e4
move persistent_field parameter from magnet.py to ips_magnet.py
...
'persistent_field' is in principle the same as 'value'.
however, on IPS it might be different, at least it is a seperate
HW parameter
2022-12-19 16:03:44 +01:00
b10c722ff6
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-12-19 15:13:20 +01:00
b7a1f17e5e
fix new statemachine with ips magfield
...
+ add on_error, on_restart etc. to states.py
+ add n_retry argument to mercury change/multichange
2022-12-19 15:12:00 +01:00
a0d14c30be
attocube: more robust moving
...
- try up to 10 times when end of travel or no more progress
- issue WARN instead of ERROR when moving did not work
2022-12-02 10:37:45 +01:00
e668b6a439
attocube: add offset and change to HasTargetLimits
2022-12-02 09:12:51 +01:00
3483c3374d
allow pollinterval = 0
2022-12-02 09:10:07 +01:00
d71a512454
new features HasTargetLimits and HasSimpleOffset
...
according to standard
2022-12-02 09:07:20 +01:00
b1608c4d7f
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-12-02 09:00:12 +01:00
e4c1f35e4a
add attocube
2022-12-02 08:54:26 +01:00
3ab7eb99ab
add flamemag / flamedil config
2022-11-30 14:14:47 +01:00
ef9d89993c
new specs of HasOffset and target_limits
2022-11-30 14:14:06 +01:00
9887ba0721
improve Attached
...
- allow a default value
- make copy method work properly
2022-11-30 14:11:05 +01:00
397ca350f8
add FLAMP furnace
2022-11-24 07:56:09 +01:00
99220400f1
add FS furnace
2022-11-24 07:55:36 +01:00
4e8636a620
heliox: make temperatures seperate modules
2022-11-24 07:50:24 +01:00
f14bd553a8
disable closed loop on MA10 rotator
2022-11-24 07:49:36 +01:00
2845a82236
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-11-23 22:41:49 +01:00
4f5cc3059e
add FT furnace
2022-11-23 22:41:23 +01:00
d845fedc03
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-11-21 14:38:40 +01:00
1b2e364f70
magfield adapted to new state machine
2022-11-21 14:37:53 +01:00
4405b2b02c
new state machine, HasStates mixin
2022-11-21 14:13:52 +01:00
49b9bfa11d
improvements for triton
...
- set cooldown channel befor setting action
- improve max heater setting
2022-11-15 16:57:52 +01:00
df428f4c0c
check readback and try up to 3 times when it does not match
2022-11-15 16:57:00 +01:00
0c93ca8c75
add comment "do not use mb11stick"
2022-10-18 16:41:04 +02:00
971c1dcfee
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-10-04 15:13:23 +02:00
498dbd4179
sea.py: fix status datatype
...
sea status is a string (not a tuple) and needs therefore
special treatment.
interestingly this bug did not yet appear ...
2022-10-04 15:11:57 +02:00
00b0a54f12
ramp unit must be $/min
2022-09-22 17:12:54 +02:00
48076edd99
improve magfield and ips_mercury
2022-09-22 17:12:30 +02:00
485e81bfb0
[deb] Release v0.13.1
...
Change-Id: Ib038475d75de7b2976bc463423c2493eb531c02a
2022-09-21 16:19:34 +02:00
0df50bb0f9
secop_mlz: minor rework entangle client
...
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2022-09-21 16:17:01 +02:00
de5f17695c
make startup faster in case of errors
...
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.
Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
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 >
2022-09-21 16:16:48 +02:00
e4aa2149f7
phytron: fix warning on repeated comm. error
...
log only a warning when several retries ware successful
Change-Id: I2f1dfba920b0841914da82229820bcdd4b97c6e9
2022-09-21 11:35:42 +02:00
9f656546df
fix undefined status in softcal
2022-09-20 12:07:11 +02:00
5affb9f31b
fix bug in persistent.py
...
- use dirname instead of basename
2022-09-20 12:07:11 +02:00
5e3bf96df1
rework of uniax
...
- try to deal with anomaly at 17 N
- reduce pid on overshoot
- use new statemachine
2022-09-20 12:07:11 +02:00
07995e2235
fix bug when restarting statemachine
...
fixed bad if clause
+ better debug message on restart/stop
2022-09-20 12:07:10 +02:00
54f091d0fe
disable encoder for ma6 stick motor
2022-09-19 11:38:33 +02:00
14a71427fa
jtccr: fix rel_paths
2022-09-19 11:37:56 +02:00
486be9604e
[WIP] uniax: removed do_ prefix
...
Change-Id: I98d56a8ece681515de8f05767c67686715212c09
2022-09-16 14:57:58 +02:00
a8f1495bc8
[WIP] uniax after changing to StateMachine
...
Change-Id: I0173f8c8eaaeb2526477d05803a615673297667d
2022-09-16 14:53:42 +02:00
3ab9821860
improve formatting of values
...
Change-Id: I4a9290e85ee2071a3f2cfe0d00bc7dc4dcb4caed
2022-09-16 08:06:45 +02:00
0b9e227669
state after discussion with users
...
- cirterium for "no substantial forece change" must be improved
2022-09-16 08:16:15 +02:00
befba09acc
fix main value unit
...
Change-Id: I27186e66bf065e015680a6925c5428714444c25e
2022-09-14 14:54:48 +02:00
554f265eb8
fix main value unit
...
Change-Id: I30c6107fae31b5087bac75d66db6be8dee78a757
2022-09-14 14:53:59 +02:00
4287ec6477
apply main unit also in structured types
...
Change-Id: I5a3efb167f2b460b847d8e7ac75a21848976b5f8
2022-09-14 14:50:39 +02:00
aad1c33742
improvements on interactive client
...
- add selective logging
- fix handling of exceptions
Change-Id: I7e2c2d4ed12302874c3bb2cc7bd707aa8e487341
2022-09-14 13:59:51 +02:00
b0315e133b
rework switch timing
...
- specific things in ips_mercury.py
- general things in magfield.py
Change-Id: I7c2bae815b9a80a17803b44b8941ef3dea3adb60
2022-09-14 13:58:12 +02:00
c3f55435da
add reading of slave currents and voltages
...
with fast polling
2022-09-14 10:59:55 +02:00
12cb0cdade
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-09-12 15:16:57 +02:00
7ed7dd7493
add combined mb11 / mb11 stick
2022-09-12 15:16:26 +02:00
031b30a4aa
heater slots H2 and H3 are exchanged!
2022-09-12 15:15:24 +02:00
3597adf869
fix code for current framwork version
...
- remove _iodev, use HasIo instead of HasIodev
- add earlyInit super call
2022-09-08 14:57:06 +02:00
8bfe969a95
HasIO: attached io must not be mandatory
...
as an uri might be given instead.
2022-09-08 14:55:36 +02:00
5a78a5b258
fix wrong name (uniax.cfg)
...
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
2022-09-08 09:26:01 +02:00
298f94e4d5
update code (remove underscore from attached modules)
...
Change-Id: I10bd6bec8f5e9459219f3186fd696e053a264604
2022-09-08 09:22:32 +02:00
0fec736886
update code in several drivers
...
- remove poll arguments
- change from HasIodev to HasIO
Change-Id: I2668f1068c17a50d9aff43b1bb3e4fb03c8d840e
2022-09-08 09:13:03 +02:00
38b3a192ab
fix move_limit in cfg
...
Change-Id: Iea99a39155e6172bcc265c350431a438d20f2fc3
2022-09-08 08:31:38 +02:00
4959619d56
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-09-08 08:27:43 +02:00
6caf4fc993
uniax stick
2022-09-08 08:27:17 +02:00
95eb4e969a
change safe current to 0.3, set offset to 15
2022-09-07 13:14:51 +02:00
ada4c43ebf
change max force to 190 N
2022-09-07 13:14:51 +02:00
9a40d27354
fix bug in ls340res
...
return value must be converted to float
2022-09-07 13:14:51 +02:00
6929422b94
fox update of param2path dict
...
Change-Id: Ie8de3d7f549ba29954058f3d516d1c3965932aa0
2022-08-24 17:02:21 +02:00
2cd66c2e08
sea: allow multiple parameters being updated with one hdb path
2022-08-24 16:57:27 +02:00
268ebbe00e
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-08-23 17:21:21 +02:00
ea960f2250
fix ln2fill enum
2022-08-23 17:21:01 +02:00
9673f7b242
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-08-22 15:56:48 +02:00
292d028fe6
add ill5 p sample stick
2022-08-22 15:55:58 +02:00
aa0c0421c3
add Be-Filter addon for boa
2022-08-19 12:43:36 +02:00
db43a77614
remove some log.debug statements
...
in order to sync with frappy@mlz
Change-Id: Iab89cb313fb6969c91663b8ebc56bdcb96ed2dd1
2022-08-16 17:17:54 +02:00
21bcc7ce98
an enum with value 0 should be interpreted as False
...
for example: bool(Enum(off=0, on=1)('off')) is False
Change-Id: Ieb200b4ecf0eed50b657ecc00f73a69810ad828f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28586
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 >
2022-08-16 17:16:02 +02:00
7b9c099321
default unit to UTF8
...
Change-Id: Ic958346beb1a3b164c8d7b2826d59cf7e3991e15
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28946
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2022-08-16 17:14:50 +02:00
33a7c56fa2
allow to convert numpy arrays to ArrayOf
...
accept all sequences instead of just tuple / list
+ change Module.announceUpdate to convert value before
comparing with previous one (comparing will not work with numpy arrays)
Change-Id: I5eceef4297607107e2dde688af2833d3651a8775
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28525
Tested-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-08-16 17:14:38 +02:00
ab2fe6200a
reintroduced individual init of generalConfig.defaults
...
revert basically the former change
"init generalConfig.defaults only in secop-server"
The problem of import order when setting generalConfig.defaults
has to be solved by not overriding already existing keys when
setting the default.
Change-Id: I82121e346607dd74146279c4241e13ab63c14096
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28011
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 >
2022-08-16 17:11:56 +02:00
d5d04dc82f
add simple interactive python client
...
- SECoP modules are accessible as objects in the main python module
- parameters are accessed as attributes of these objects
- __repr__ is used for listing all parameters
- __call__ is used for 'change target and wait until no more busy'
typically used from a python interpreter or in a jupyter notebook
Change-Id: Idb55684eeff6d1262e5d1517a3ff934f1c1bf208
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28980
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-08-16 17:08:18 +02:00
f23e42de1f
fix bugs with persistent_limit parameter
...
take into account that reading the switch heater might be delayed
2022-08-16 16:54:30 +02:00
2f6954c4f3
magfield: add persistent_limit parameter
...
- use update_switch_heater instead of write_switch_heater
for detecting switch time
- switch_time split into switch_on_time/switch_off_time
Change-Id: Id90a8b2c2520e24f3ee4a34aee25d41210e5d6d4
2022-08-16 10:05:01 +02:00
b81fc7b122
remove tm from ill5.cfg
...
only one SeaDrivable per sea drivable allowed!
2022-08-15 16:22:02 +02:00
704bba292a
add mb11 stick
2022-08-12 15:13:07 +02:00
f1e642b1b0
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-08-12 15:12:23 +02:00
8e3cdc80e4
improvements in magfiels/ips_mercury
...
- read voltage
- fix a bug with ._init name conflict
2022-08-12 15:10:23 +02:00
3496e391f6
check for last_target in conditions for redo
2022-08-02 11:19:30 +02:00
bb40a0820c
use flag instead tolerance for redo check
...
when target is changed, a flag is set, and
this is used to jump back in the sequence to the right step
for redoing
2022-07-29 15:12:44 +02:00
8f739b11dc
ILL1 .cfg created and ILL1stick
2022-07-06 16:14:16 +02:00
7ef386424c
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-07-06 11:24:56 +02:00
53b3dd2fad
fix stick motor port number on ma02-ts
2022-07-06 11:24:27 +02:00
6554e5de47
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-07-05 11:02:15 +02:00
60ec1edb32
fix He-fill enum
2022-07-05 11:00:35 +02:00
131082313d
added stick-motor addon
2022-07-05 10:57:43 +02:00
f12b0b3da0
add ill5 gas pressure stick
...
not yet tested
2022-07-04 14:23:51 +02:00
5ecd9557a3
add lev to ill5 cfg
2022-07-04 14:23:08 +02:00
3769ddca75
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-06-29 11:51:01 +02:00
a4dec7b832
fix ill5 cfg
2022-06-29 11:49:51 +02:00
390af7eff7
improve general config
...
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file
Change-Id: Ifb00dae482dd366bd4b7951c76164af91cad9fc2
2022-06-29 11:42:33 +02:00
f495313018
dil2/3/4: added more temperatures, added dil3
2022-06-28 08:22:13 +02:00
18ded2159c
changed mf from Readable to Drivable
2022-06-28 08:09:00 +02:00
760fc9eb40
added jtccr sea cfg
2022-06-27 11:06:45 +02:00
5d348eb7b1
fix ma6 stick motor port
2022-06-27 11:06:00 +02:00
86767e2fa1
add still and sorb heaters to dil5
2022-06-21 15:32:15 +02:00
8a995aafed
fix issue with non matching persistent field
2022-06-21 15:31:44 +02:00
7379ea91e5
fix issue sending numbers in exp. format
...
numbers must be fixed point, with maximum 8 digits
2022-06-21 15:30:20 +02:00
cf42119f85
fix handling of persistent_field parameter
...
'persistent_field' parameter should be updated as long as the
switch is turning off
Change-Id: I76b592077ceb0a2a20beb8e6390487c620764650
2022-06-17 08:24:38 +02:00
80d9a790ec
fixed proper parameter inheritance
2022-06-15 16:02:38 +02:00
5951312d40
fixes to make pylint happy
...
Change-Id: I95baf4e585603a640d4ec71076a4d509082775ed
2022-06-14 15:24:42 +02:00
778ac17172
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-14 15:08:35 +02:00
dfbc1c757a
fixes in mercury an triton
...
- Valve is now a drivable, as it will check success, and retry,
which might take around 1 second
+ some more
2022-06-14 15:07:17 +02:00
54b58f2188
step_size instead of speed_factor
...
no longer need to pre configure a speed_factor,
the proper units of speed and accel are taken from
the hardware
2022-06-14 15:03:53 +02:00
f855b9db40
fixes in convergence and statemachine
...
- set spent_inside to 0 on set_target
- additional debug log messages in statemachine
2022-06-14 14:07:24 +02:00
6fd365197a
sea driver: no events for unexported params
...
Change-Id: Ia4b5f5f742d0240010218ee24dc147bb535c7c64
2022-06-13 14:09:13 +02:00
8b2abf7044
fix iodev to io in ill4stick.cfg
2022-06-10 14:31:44 +02:00
182a8c7e49
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-10 13:22:04 +02:00
6da1a89459
add dil4/variox, fix ma10 in cfg
2022-06-10 13:21:20 +02:00
f1d5e82bb4
remove unneccessary fiels in cfg/sea
2022-06-10 13:20:12 +02:00
e6fdd79df4
start SEA server if not running
...
before connecting to SEA
Change-Id: I75c02f25e023e0e1769810a180430efd48b9c550
2022-06-08 16:28:39 +02:00
a35231f5bd
fixes in mb11/dil5
...
- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber
Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de
2022-06-07 14:26:30 +02:00
9c7b6aeb94
various fixes on mb11/dil5
2022-06-07 11:45:25 +02:00
68e2e06905
fixes in convergence, mercury, phytron, triton
2022-06-01 09:21:47 +02:00
3563a0db16
fix ill4
2022-05-31 16:44:53 +02:00
4cb0031302
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-05-30 12:10:51 +02:00
4bfb76ca82
IPS mercury
...
+ mb11, dil5, dil2, variox configs
2022-05-30 12:09:57 +02:00
3e6f1bebf7
added features
2022-05-30 12:07:33 +02:00
efca358c72
add adq_mr and iqplot
2022-05-23 15:30:23 -04:00
319f3b4649
upgrade upltrasound to newer version of frappy
2022-05-23 15:25:41 -04:00
7fc030191d
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-05-19 18:10:14 +02:00
3959da6847
stick rotatation is either om or stickrot
2022-05-19 18:10:02 +02:00
39171fe06e
add limits to phytron
...
Change-Id: I431374efab7a858db6a652f78533b13b12ba6d57
2022-05-19 18:05:52 +02:00
0972e8c7e8
add sign to phytron motor
...
+ fixes in ma10 config
2022-05-19 17:58:54 +02:00
7b9d2d1701
allow quiet SEA requests
...
SECoP read -> SEA hval should be quiet on the log file
Change-Id: Ie020b02ef62e5792ca60e08fe72b420a6377efee
2022-05-16 17:04:47 +02:00
f276b973f5
add variox
2022-05-16 15:28:30 +02:00
8739ef04d7
add ori3
2022-05-12 16:39:28 +02:00
aea73d976c
add ori6
2022-05-12 16:23:58 +02:00
4c98a4c706
add sticks and cfg
...
ma02, ma10, ma11, mbe
2022-05-12 16:16:26 +02:00
62146aa477
add heliox stick
2022-05-05 10:31:50 +02:00
2bdfcf10a3
fix triton
...
tested at warm kelvinox triton system
Change-Id: I1c8064c78846db5b077363be3a8ecff5e2766ddb
2022-05-03 16:49:27 +02:00
f9db90d89b
update secop_psi/sea.py
...
fixes after serveral changes in frappy
2022-04-29 16:30:19 +02:00
1ded96abba
fix keithley 2601b after tests
...
- add missing super call in initModule
- change mode before writing levels
- fix MEASURE_DCVOLTS instead of MEASURE_VOLTS
Change-Id: Id93187e082db9868f443d4ef8cbdc85acd11be2b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28256
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 >
2022-04-29 14:03:04 +02:00
cb170bd73b
allow a configfile path as single argument to secop-server
...
when a full path is given as single argument to secop-server,
the server name has to be sanitized
Change-Id: I1d11f076157548e90877f380f0cab3a6a3f96784
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28232
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-29 14:03:04 +02:00
a379805e43
add 'ts' to the ppms simulation
...
+ convert from CRLF to LF
Change-Id: I46fab0c970ccc5e7e704a5dc0ab2cfd51213cd31
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28233
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2022-04-29 14:03:04 +02:00
9ff8c3ba54
add ma10, add stick motors
2022-04-29 11:08:04 +02:00
1d7351ba4f
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-04-29 08:47:39 +02:00
3ac8876b37
cti5, cti7, ma10
...
+ fix .gitignore
2022-04-29 08:47:11 +02:00
9fa5aba052
add dom motor to MA7
...
Change-Id: I32b9ec469e030da90519b0a9e3d38b881e94d59f
2022-04-28 17:21:46 +02:00
bc13a912b4
change descr of ccr3 (ZEBRA)
2022-04-28 16:32:38 +02:00
33ba9ca946
add ccr3
...
+ add missing ma6.config.json
2022-04-28 16:31:20 +02:00
7d43f1cd58
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-04-28 13:43:46 +02:00
21a3865c5d
general ini files for main, stick and addons
2022-04-28 13:43:09 +02:00
f1a639bc3c
add secop_psi/triton.py
...
triton dil support
Change-Id: Ifbb0d382adec29b031a1e99c68515f7bb23ead45
2022-04-28 12:56:42 +02:00
98cdbafa7a
fix mercury
...
secop_psi/mercury.py was not merged properly
Change-Id: I638fac70b278aa1ffb1378ad0f97b375a7e40869
2022-04-26 08:51:58 +02:00
6752997048
replace 'iodev' by 'io' in cfg files
2022-04-22 16:45:12 +02:00
026ab3f4b2
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-04-22 16:36:03 +02:00
20ad159722
support for OI mercury series
...
- temperature (incl. heater)
- pressure (incl. control via valve motor)
- LHe and LN2 levels
not yet included: magnet power supply
Change-Id: Id4ee8f9b7ebfa6284e519ba485217f9a19d70d59
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28028
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-22 16:35:24 +02:00
7316632fa6
improve poller error handling
...
- repeated errors on poller are only once logged (per poll
function / read_* method)
- during exception handling, silent=True on a SECoP error indicates
that the error is already logged
+ fix the name of HardwareError
+ add test for consistency of SECoPErrors
+ catch socket.timeout in AsynTcp
Change-Id: I9df6c775cc19553b22a4d6e39591092adf7ff9a1
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2022-04-22 16:35:24 +02:00
2159753398
avoid deadlock in proxy
...
in secop.proxy the callers modules method announceUpdate is
called from an other thread while the accessLock is locked,
creating a deadlock. solve this by creating an other lock
'updateLock' for the update.
+ add status parameter even to non-Readable proxy modules,
in order to indicate a failed connection
+ fix an error in secop_psi/softcal.py
Change-Id: Iae7c6d5a74001150a47aa9dc99209c15d972cd5e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28130
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 >
2022-04-22 16:35:24 +02:00
8cb3ba7dfc
fix error in secop.logging
...
Implement LogfileHandler.getChild. This is needed to inherit
the configured level from the parent handler.
+ remove redundant assignmet of logfile_handler.max_days
Change-Id: I7277c28221bbb6108d75f2437634e9db9bf6761e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28140
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 >
2022-04-22 16:35:24 +02:00
b1a24b253a
improved trinamic driver
...
- safe_current: current limit for unlimited move
- move_limit: max. angle to move with high current > safe_current
- direct axis parameter access is not exported by default
- support for home switch
- allow use without encoder
- automatic reset for motors in a configuration, where the motor
current is deliberatly low for a limited torque
- improved error message on driving failures
Change-Id: I25f8516905a2c4c3cda09d091d5a43004ec6dc6f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28029
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 >
2022-04-22 16:35:24 +02:00
5a553dbdeb
motor valve using trinamic motor
...
This valve needs 8 turns to open. As the encoder forgets
the number if turns on power cycle, a home switch is
mounte, which engages during the last turn when closing.
The final close position is determined by closing the valve
with a defined motor current/torque.
+ fix an issue in StateMachine.start: the first cycle
must be called after the new state is assigned
Change-Id: I34cd05d10d97b043f9e3126310943b74ee727382
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28030
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 >
2022-04-22 16:35:24 +02:00
e9f687e6dd
update phytron driver
...
+ fixes in secop_psi/sea.py (iodev)
2022-04-22 16:25:14 +02:00
1ac2f8557c
fixes in sch5
2022-04-20 15:53:15 +02:00
774f33122a
fixes in secop_psi/sea.py
...
is_running parameter
2022-04-20 15:52:43 +02:00
1da7657483
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-04-20 14:52:17 +02:00
ac3bf5b122
add cryosim and magsim cfg
...
Change-Id: I5ad510c2119ec08cbef234b6565dda69aa370436
2022-04-13 10:46:57 +02:00
f6f2dd189b
use a common poller thread for modules sharing io
...
When several poller threads are using the same io, the resposivity
of client requests is reduced, as every thread first finishes
its pending communication requests, before it is the turn of the
request thread. This is solved by using one common poller thread
for all modules sharing the same communicator.
+ fix an issue with overriding a property with a parameter, as
this is the case for pollperiod (cfg was applied to property
instead of overriding parameter)
+ separate setFastPoll arguments into flag and fast interval
+ fix missing announceUpdate call when read function fails
+ fix mechanism for triggering polls after an io connection
reconnected again.
Change-Id: I1115a61fae3de80d18416e61f40b52a0eebb637c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28021
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
d5924567da
fix statemachine
...
- fix: calling state.start(<new state>) on restart must ensure
that the function <new state> is called before state.start()
returns.
- modify slighly behaviour of cleanup function
Change-Id: I483a3aefa6af4712b3cf13f62c86d4c06edd1d8d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28020
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 >
2022-04-08 15:36:23 +02:00
9152ea1d26
reintroduced individual init of generalConfig.defaults
...
revert basically the former change
"init generalConfig.defaults only in secop-server"
The problem of import order when setting generalConfig.defaults
has to be solved by not overriding already existing keys when
setting the default.
Change-Id: I82121e346607dd74146279c4241e13ab63c14096
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28011
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 >
2022-04-08 15:36:23 +02:00
a124adab97
avoid race conditions in read_*/write_* methods
...
using one RLock per Module
+ init generalConfig for all tests
Change-Id: I88db6cacdb4aaac2ecd56644ccd6a3e5fd2d1cf2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28005
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
2e21bcdd0a
HasConvergence mixin
...
the HasConvergence mixin runs a state machine to determine
when the value has reached target from parameters 'tolerance',
'settling_time' or detects convergence failure depending on
the parameter 'timeout'.
Change-Id: Iccc3d43bcf5ab54ae02ce3a81423c2decc1b392d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27967
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
526a182ed7
init generalConfig.defaults only in secop-server
...
generalConfig.defaults must not be set on import, as this
depends on import order
Change-Id: I00395b40b4281ddc044c196713f6512068011380
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27985
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 >
2022-04-08 15:36:23 +02:00
b1ddc01fbb
merge until "support write_ method on readonly param and more"
...
from gerrit
Change-Id: I8d2ad2a381d3a37947d8afc5e17be0428d94df36
2022-03-21 14:00:12 +01:00
7c9296fe2e
even more merges from gerrit
...
Change-Id: I4cfddc8fd4157ceae353789f2f60d834ec05974e
2022-03-08 10:54:04 +01:00
34b93adef0
more merges from gerrit
...
Change-Id: I13441cd8889dd39f74a2dd1a85e75a1b76bb93c8
2022-03-08 10:52:14 +01:00
10018b8cad
some more merges from gerrit
...
- removed files
- modified drivers
- fixed READE.md
Change-Id: I47ae486df4dde3d60cc5e0e328194718dd396d87
2022-03-08 08:54:47 +01:00
57e0a2cc72
add statemachine
...
Change-Id: Icd35d284329a854a9757cb1963a70662b15fb6bb
2022-03-08 08:37:26 +01:00
a2bfe878b6
add handlers
...
Change-Id: Ia0604ea9e4fd7a226cf6eccb326df003f88cc4b0
2022-03-08 08:36:40 +01:00
9320541754
result from merge with gerrit
...
drivers in secop_psi
Change-Id: I7fd8312b11f365b423e66b2417b9e54ec6558a11
2022-03-08 08:35:41 +01:00
bd246c5ca7
result from merge with gerrit
...
secop subdir only
Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1
2022-03-07 17:49:08 +01:00
dee3514065
Makefile: fix docker image
...
Change-Id: I90a3fe36abbea0501c7e7e27fa33e90bfd4f116d
2022-03-07 11:21:28 +01:00
93c8866f37
fixed README.md
...
Change-Id: I24445416d1195aed50a153f6462b2a168e1be1c4
2022-02-02 11:40:30 +01:00
acb3bdad6a
varios fixes at psi repo, as of 2022-02-01
...
Change-Id: I8cdc849126d52ef0f2f27a0faf661830aac6f874
2022-02-02 09:57:30 +01:00
5e3fb10884
trinamic (psi repo!) as of 2022-02-01
...
Change-Id: I87b94ff0fa7a56abc6eae65fa76539a0c6a8f396
2022-02-02 09:56:44 +01:00
3b25251e10
ppms fixes (psi repo!) as of 2022-02-01
...
Change-Id: I96c81a0772baf5e6038d27d3a40e1163c4669289
2022-02-02 09:56:08 +01:00
903e17a6e5
mercury, as of 2022-02-01
...
Change-Id: Ifdbb2afc827b894874edaec50e82b645023beda9
2022-02-02 09:55:43 +01:00
9109170752
logging as of 2022-02-01
...
Change-Id: I63c681bea9553cd822b214075b163ca6c42fe0cc
2022-02-02 09:54:54 +01:00
05d0cfb193
history, as of 2022-02-01
...
Change-Id: I725a57546df8f7c9e5ffe04eb98872f2a609efe4
2022-02-02 09:52:01 +01:00
8253fe471b
check for missing supercalls to module init methods
...
Change-Id: I8b7fe5cdd2883fd45532a3e8ac2d7b32945b36a3
2021-12-21 09:46:50 +01:00
245f4f48bf
all members optional be default in struct
...
this apllies only to the argument in frappy - in the case
of all members optional, they are put into the description,
not honouring issue 69
Change-Id: I8e9e4d9ef6bd5b9bb2748f3c6116b7094cd9e927
2021-12-21 09:21:00 +01:00
c523e8f84e
[WIP] work on history writer
...
Change-Id: If8c42091c734fb8c7b386c06429f1b21a7e169ec
2021-12-03 16:50:34 +01:00
6e73420d0f
add doc strings to commands missing them
...
Change-Id: Ib0320cc4653ff695a7ee2bad3486eeec5309d3b1
2021-12-03 16:49:48 +01:00
483d4c9d6f
add doc string to Persistent.factory_reset
...
this is mandatory for a Command !
2021-12-03 16:26:07 +01:00
77acda840a
fix tests from mlz repo
...
- fix omit_unchanged
- names too short
+ other pylint complains
Change-Id: I3c277b461fad1a5fdf8e76ff1cc42b8742d1de16
Change-Id: I58fb64f91bcc2efef20df68f5c63a64315413286
2021-11-12 17:16:59 +01:00
1eecc93f71
fix feature for removing commands
...
from a bug introduced in the 'fix parameter inheritance' change
Change-Id: I757c354130077d8838aac864b21b4f81caa9bccf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27096
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 >
2021-11-12 17:09:29 +01:00
1d9e07edb4
add more tests and fixes for command inheritance
...
- fix CommandType.__repr__
- secop/modules.py: command properties are allowed to be configured:
- section 2: remove comment and rename
- section 3: all accessible properties should be checked
- command description should be inherited also when taken from docstring
- move test for command inheritance to test_modules.py
- added tests to check for valid properties of commands
Change-Id: I5fd04e03be1faec5e54fed9735620bc5dc0f89c0
2021-11-12 17:07:11 +01:00
9058ef054b
various small changes
...
- set default target unit to '$'
- shorten too verbose error message on client
- add shutdown method to server and dispatcher
Change-Id: Ib3a8b26bc31e988e45a3ff2efd734168d723d794
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27095
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 >
2021-11-12 17:00:17 +01:00
a7b741eaa4
updates from mlz repo
...
- asynconn: raise * from *
- asynconn: correct handling for timeout in AsynSerial
- add new py35compat
- target unit $
Change-Id: I052185ad3ebb3e3d1e3374f7ece9c7df06223951
2021-11-10 14:37:57 +01:00
41ce909172
update to changes from mlz repo
...
- bug fixes in error.py
- add from * to raise statements
- fix py35 compatibility
- finalize omit_unchanged_within feature
- fix follwup bug (missing Param.override) in proxy.py
Change-Id: I621c01a0d5e1ec6696fb06f39666f3316fb53649
2021-11-10 13:44:14 +01:00
7690481938
secop_psi.softcal: default path for calib
...
Change-Id: I5ad2159587f13e1a0bcb75764397d4c784ed1c87
2021-11-08 14:24:09 +01:00
3d9e9c59d6
fixes in sea
...
- call explicitely __set_name__ on produced parameters
- as Parameters.override has changed, do not use it
2021-11-04 12:56:42 +01:00
7d2eacfe5c
fixes in sim_uniax
2021-11-04 13:01:40 +01:00
ccf38f87d9
remove do_now argument for next_action
2021-11-04 12:58:33 +01:00
b6cadf4a69
add ill4
...
+ fixes in focus-be-filter
2021-11-04 07:51:37 +01:00
1c1911f8a8
adapt uniax simulation to newest uniax version
...
Change-Id: Iad13306edf007ecfa4aebafdfb0bd38fa6be9c6a
2021-10-27 16:35:54 +02:00
99ebb9d110
closed loop force control
2021-10-27 16:36:44 +02:00
e47d07f706
fix set_zero
...
and cosmetic changes
2021-10-27 16:35:57 +02:00
5f034a40f8
new version using actions state machine
...
Change-Id: I3de3ee8077aa11b66a0b15232d8f9313c2ab0226
2021-10-08 13:26:23 +02:00
57082e276f
uniax, version 7.10.2021
...
- driving with a generator
- 3 phases
1) find active range (low current, far movement until force over hysteresis)
2) release force until well below target
3) adjusting using pid_p. (this is in fact an integral factor)
2021-10-08 08:53:22 +02:00
2c6b42f2aa
merged after getting from uniax
...
Change-Id: I1049ac1a22fd3013c360dba4eda9e53784ac36a5
2021-10-06 14:26:05 +02:00
762913012b
uniax.Uniax: fixed tolerance
...
Change-Id: I201c54715ef7f70a164f0f72116c5a8e737c128f
2021-10-06 14:19:20 +02:00
f491e53f8a
fix uniax cfg typo
2021-10-06 14:12:56 +02:00
92a812f92f
update uniax.cfg for current box
2021-10-06 14:11:40 +02:00
c0fbbdb419
remove whitespace
...
Change-Id: Ibe7acffe1dcdcd4932fa4275d14e8b9b87573537
2021-10-06 14:02:55 +02:00
29226a1062
uniax: added force control as seperate module
...
Change-Id: I8b14fc90f5885834e342f6bc5e5dd0ea711b27ea
2021-10-06 13:33:34 +02:00
70b9c88f82
revert signature of Accessibles.copy() method
...
no more kwds arguments, method 'merge' should be used
Change-Id: I7028d9df8b69c018dcdc0c55d3ae0f71e24ee15b
2021-10-06 13:31:21 +02:00
0d3df7be92
sameside approaching
...
Change-Id: I8b73d0ae0475bc727b49edd6f245c2204c51695b
2021-10-06 09:08:29 +02:00
5b7f4604ad
more precise wording, typos
...
Change-Id: I6ca052fa512b5864b1ce29a22808a432c6f527db
2021-10-06 09:07:55 +02:00
09056ea87e
set unit together with datatype
...
Change-Id: I412471880e71792160ee56a79375dc62dd4aaafc
2021-10-06 09:07:09 +02:00
21dfcbd290
allow interval in SimDrivable to be customized
...
Change-Id: Id59d263e5f54fda9388dcdaa34a3ce83b6d4a339
2021-10-06 08:46:04 +02:00
84e55d9c8d
move markdown from requirements.txt to requirements-dev.txt
...
Change-Id: I07d700c7ac30900e4166611d0b17f80dff8d6f83
2021-10-06 08:41:53 +02:00
cbb005d942
show traceback of first error instead of last one
...
Change-Id: Iee418dcfb1d81a16112eed57b03c86242c2128b4
2021-10-06 08:34:56 +02:00
929f55055e
fix property inheritance
...
Change-Id: If01b98fc38c730e73799b43c78838afee6cf6058
2021-10-06 08:33:52 +02:00
e38cd11bfe
fix parameter inheritance using MRO
...
+ no update on unhchanged values within 1 sec
Change-Id: I3e3d50bb5541e8d4da2badc3133d243dd0a3b892
2021-10-06 08:32:47 +02:00
544e42033d
fix merge errors
2021-09-21 16:58:29 +02:00
8bbf65f6e8
Merge branch 'uniax' into wip
...
Conflicts:
cfg/uniax.cfg
secop/core.py
secop_psi/trinamic.py
2021-09-21 16:52:15 +02:00
e98f81a7c9
reduce communication traffic
...
- expermental change: no updates of unchanged values within 1 sec
- reduce fast_pollfactor in trinamic
- improve stop behaviour of dpm.DPM
2021-09-21 16:40:54 +02:00
8f1375aa31
added/modified new drivers
...
mercury, phytron, cryotel
Change-Id: I2288dd39ec4eb3dd2a11ecd5acb4ca7fd704e017
2021-08-09 15:42:36 +02:00
584a293643
fix secop.io imports
...
Change-Id: I8abe4836312cdd2d17847ca0a117dceebaaac235
2021-07-27 09:19:28 +02:00
73e06c590b
add Phytron driver
...
+ updates of cfg files
Change-Id: Ief24ee681423e18cae0fca29fe41419018d394dd
2021-07-27 08:16:36 +02:00
4f6cb8755e
additional fixes in secop.io
...
Change-Id: Ifdda637183de2b878317c477215f5874d088a668
2021-07-27 08:14:01 +02:00
a037accbb8
backport fixes from MLZ repo
...
- unification of secop.stringio/bytesio to secop.io
- persistent parameters
Change-Id: I76307cccc5191ac8cbb5cfec6fb7450fcf6945f1
2021-07-27 08:11:51 +02:00
2ff3a17427
fix simulation
...
Change-Id: Iaa05d3a7a78b6000ab3c372074bf4053dd74aadb
2021-07-06 16:25:35 +02:00
495709b670
allow partial describe
...
in addition to the SECoP standard
Change-Id: If756e8d9d6a67d3194abc0fe2436cf7124713536
2021-07-06 16:24:44 +02:00
d9cc85c1df
fix issues raising pylint warnings
...
+ small bug fixes
Change-Id: Ib63bf13ad06446d3ec3b8cd0b16f9426cef9e3f4
2021-07-06 16:23:06 +02:00
b30bd308a9
fixes for uniax device
2021-06-11 16:45:45 +02:00
039ece9549
allow to remove accessibles
...
removing an inherited command or parameter can now be indicated
with an attribute set to None
Change-Id: I9645c58e2589c878b62dcebe7a80f479a2b65339
2021-06-08 16:17:23 +02:00
6c4bb78f97
minor fixes
...
Change-Id: I41aa50b1742fb0e24ff5a34d6d9ba98a6b4c4905
2021-06-08 15:32:12 +02:00
b226f2c7c0
trinamic and persistent
...
- remove methods from Modules existing in secop.persistent
- do reset on start when encoder matched and motor was power cycled
2021-06-08 15:32:12 +02:00
3687ed85e5
first tries with uniax stick
...
Change-Id: I70da38aff091f7fc64f409485db335cde07163c9
2021-06-08 15:32:12 +02:00
7ff88cf819
fix issues with sea is_running
2021-06-08 14:59:45 +02:00
25b8780b11
persistent module fixed
2021-06-08 14:59:20 +02:00
246ab99e12
experimental persistent mixin
...
- still contains changes in mouduls/params ...
2021-06-08 14:59:20 +02:00
229604439b
remove debug print statement
2021-06-08 14:59:20 +02:00
114af36ac6
first tries with uniax stick
2021-06-08 14:59:20 +02:00
ca6aebd290
added trinamic.cfg
2021-06-08 14:58:20 +02:00
49ad153605
trinamic driver and bytesio module
...
Change-Id: Id634e7514fecab6fd6bc3edf81e25ad41c2bb12f
2021-06-08 14:58:19 +02:00
c6157049d7
fix issue with a module based on a SEA subobject
...
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
2021-06-08 14:58:19 +02:00
3977fad3f3
correct to readonly=False for target parameter
2021-06-08 11:59:02 +02:00
eaac83e4d5
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2021-06-08 11:07:31 +02:00
1619e042e9
added fftf furnace and smamor
2021-06-08 11:06:39 +02:00
8d6ba91a5e
changes defaults in ls370sim
...
Change-Id: I6388358c42a4b115fc5aec4df0d4588457140744
2021-06-04 12:26:58 +02:00
21c49df1a2
fixes on secop gui
...
- do not display a dialog when a command returns None
- apply fmtstr, if available
Change-Id: I74da3e86e4eae9000608581e0a0f6e8c72cef715
2021-06-04 12:26:34 +02:00
a771259ecf
more fixes to SeaWritable
...
+ fix mbe.cfg
2021-05-20 17:57:41 +02:00
c779d49548
fix: handle non Readable SeaModules correctly
2021-05-19 18:10:48 +02:00
5f65b6b4ce
handle non Readable SeaModules correctly
...
Change-Id: I5fa0a52926af3bb386c18de49fef9b1caba92e79
2021-05-19 17:54:36 +02:00
70c3f5f37f
created SeaConfigCreator
...
running frappy with 'seadesc' cfg does the same as previously
starting 'sea' cfg and performing seaconn:_describe automatically
create mbe.cfg
2021-05-19 17:41:18 +02:00
3e599a24d7
fixed sea.cfg to be general
2021-04-29 10:58:15 +02:00
e638661edc
if sea cfg not found, take from FRAPPY_SEA_DIR
2021-04-29 10:55:52 +02:00
772f45a241
add cfg/deleop directory
...
Change-Id: Ia9f15af8bb68a8306a9d966ef2b217d587f0ab28
2021-04-28 16:37:30 +02:00
e589ed1063
treat raised error message in modules.py correctly when arg is not a list
...
Change-Id: I4082a65849c71b3f212f2c8c345a6881f972d107
2021-04-28 12:01:34 +02:00
1a616ecab1
fixed doule entry tcoil1 in ma7.cfg
...
Change-Id: I547e7dcb6cca72004dd3ea8e56a0601e7bf8771a
2021-04-28 09:29:18 +02:00
61aeafdfb6
added cfg files for SINQ Frappy
...
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
2021-04-27 17:54:20 +02:00
c89c982c42
improve comments (poller.py)
2021-04-27 17:15:28 +02:00
acbb17f367
updated README.md
...
the procedure may still need to be discussed
Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4
2021-04-27 17:00:06 +02:00
4bda112bb7
pollOneParam has no return value (avoid pylint complaint)
...
Change-Id: Iab75c970e106617ffd4e612d358da491312ca54b
2021-04-27 16:51:37 +02:00
8029443f1b
fix issue with a module based on a SEA subobject
...
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
2021-04-27 16:07:49 +02:00
57e9367e40
improve more errors during startup
...
errors from a module a combined with a header and intended
details
Change-Id: I4be7bc2f8455fb0e3c9346f3bb23ac88e7589604
2021-04-27 16:04:24 +02:00
de7a91d727
fix poller issue with dynamic interval
...
calculating next due must also be done when current poll was not due
Change-Id: I18d9cbc61aa6ca66f3fc2dc4cdfa1fce29a87705
2021-04-27 16:04:15 +02:00
078ac7c600
fix 'ts' value
2021-04-26 16:04:33 +02:00
8b2c5f6144
fix issues with sea is_running
2021-04-26 11:56:48 +02:00
99eb600d90
fix handling of unknown sea messages
2021-04-23 09:21:47 +02:00
48d5fe5ea2
forward config description with describe method
2021-04-12 14:47:29 +02:00
331dc544ad
use different names for seaconn in different frappy services
2021-04-09 11:46:24 +02:00
a5cc98d0b0
various improvements on the sea client
2021-04-08 10:22:53 +02:00
d3fc01689f
improve more handling of errors when starting server
...
+ add shutdown method to server (and dispatcher)
2021-04-08 10:21:44 +02:00
dec286460d
starting TcpServer in case of Address already in use
...
try several times, in case this is a restart. It seems that
allow_reuse_address = True is not always enough
2021-04-08 10:19:03 +02:00
d768d84ea1
check if configured item is available before setting
...
if neither a property nor a parameter exists for a given
configured item, just an attribute was created
2021-04-08 10:16:24 +02:00
4d8390c1fe
better error message when validating int
2021-04-08 10:15:42 +02:00
6ec8348355
Merge branch 'wip' of git.psi.ch:sinqdev/frappy into wip
2021-04-08 10:14:41 +02:00
10dad6da47
client: change online state before callback
...
the client in NICOS is referring to the online state within the
callback.
+ better error handling
2021-04-08 10:11:04 +02:00
185bf7bc88
improved softcal
...
+ removed debug code from ls370
2021-03-18 14:01:28 +01:00
499ae69f29
improved k2601b
...
- read back mode
- mode has now 4 values
Change-Id: I0576c73b225cb16e7f890a9479d3b002c52b71ba
2021-03-18 13:56:57 +01:00
4d7e5d3cdc
remove debug print statements
...
Change-Id: I51dc66b9cecb0f5e84bef36d1b4a541ddefcfbc2
2021-03-18 13:41:49 +01:00
48230334af
fix inheritance problem with mixin
...
- a mixin should not inherit from module then it has Parameters
- Parameters in mixins must be complete, not just overrides
- check precedence of read_<param> or handler
Change-Id: I72d9355a1982770d1a99d9552a20330103c97edb
2021-03-18 13:32:54 +01:00
6538500881
more fixes for sea
...
Change-Id: I195bcdbe5f6b274e65dd431ed13a123c74a8d5bf
2021-03-11 15:57:04 +01:00
bcf57f53c3
fix access to sea config dir
...
- removed unused property json_path
- do not take the first directory in config path, but the first
directory with a sea subdirectory
Change-Id: I4f0d72936ca616134c38568d88c57a33a3397ec6
2021-03-11 15:53:57 +01:00
fb01f81cb6
fix user friendly reporting of config errors
...
Change-Id: I42ec1ad2e18a0363fb7317c86743ff2f6665f049
2021-03-11 15:33:21 +01:00
3b03e578bb
user friendly reporting of config errors
...
Config errors are collected first, and raised after processing
all modules. This is more user friendly.
+ remove redundant check for predefined accessibles in modules.py
+ fixed error handling for exporting parameters in params.py
+ fixed handling of bare attributes overwriting properties
Change-Id: I894bda291ab85ccec3d771c4903393c808af0a2a
2021-03-08 10:47:22 +01:00
804581546d
user friendly reporting of config errors
...
Config errors are collected first, and raised after processing
all modules. This is more user friendly.
+ remove redundant check for predefined accessibles in modules.py
+ fixed error handling for exporting parameters in params.py
+ fixed handling of bare attributes overwriting properties
Change-Id: I894bda291ab85ccec3d771c4903393c808af0a2a
2021-03-08 10:33:20 +01:00
1ca35cf8e9
improved softcal
...
- better error handling
- bug fix
Change-Id: I43bdd4aa35723f43f9e4baf2723af812f04689d3
Change-Id: I5990c75a7a8153e95abee9548475783ee893bd08
2021-03-08 10:25:39 +01:00
adc9a6da71
fixed bugs from syntax migration
...
- a new wrapper for a read function is not only to be created when
the a new read method is in the class dict, but also when
it is inherited, but not yet wrapped
- a handler must not be ignored, when a write method is inherited
- a proxy class must not call checkProperties
+ remove trailing spaces in tutorial_helevel.rst
Change-Id: I16024c14232ea200db91a1bc07ec23326219ab68
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25093
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-03-08 10:22:58 +01:00
7f22a270e6
make softcal more tolerant reading .340 files
...
accept tab instead of space in 'Data Format' header keyword
Change-Id: I77e5500da5eaed6fd1097723533bc86207fa73d8
2021-03-08 10:21:23 +01:00
7d133bacfe
update checklist for git branch sync in README.md
...
Change-Id: I788fba8cd748be090f82442ad20c839f206e5e3c
2021-03-03 14:47:47 +01:00
1760881f56
fixed bugs from syntax migration
...
- a new wrapper for a read function is not only to be created when
the a new read function is in the class dict, but also when
it inherited, but not yet wrapped
- a proxy class must not call checkProperties
2021-03-03 14:40:36 +01:00
04692bd1aa
added README.md
...
this should be the only file not matching mlz branch
now in sync with 316cf9738db29920a99e29813513ed1da048994a
'added README.md'
Change-Id: I826fd8c782f95fde3f8f4ef15b15b8b8f99d9973
2021-03-03 11:04:15 +01:00
ffafd7344c
removed obsolete files from merge
...
Change-Id: I98c6d06a680ef6885f38d4b3e6b3f51aa7ebd022
2021-03-03 10:19:59 +01:00
b1bf5e866d
improve tutorial_helevel
...
- fix indent of query method
- add remark about the CCU4 cid command
2021-03-03 10:17:05 +01:00
e4748ef9c9
do not export pollintervals in ppms driver
2021-03-03 10:16:52 +01:00
b4bb172ada
Merge branch 'wip'
...
Change-Id: I3ba389775ce9b02269ca9c20a42ec1bddf6c5d21
2021-03-03 09:46:20 +01:00
4fd9c17bcb
move historywriter to secop_psi
...
as historywriter currently could be used at psi only
secop_psi is a better place for it
+ add comment about a general config file
Change-Id: I9b0e74d3da83ac485bd4bcc13475695c3140822c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25077
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 >
2021-03-03 09:06:14 +01:00
76c6ebe92c
fixed errors during migration
...
- reference.rst did still contain do_<something>
- trailing commas in secop_demo/cryo.py
Change-Id: I5bb8bd310576366c8cfe406f0ec770fa40bcab5b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25079
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 >
2021-03-03 09:06:01 +01:00
12b0549cc0
merged master with work
...
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
2021-03-03 09:00:45 +01:00
3aa99e2268
fix doc main index and tutorial index
...
Change-Id: Ibf0ca53e8e1c2ca7da6bb8a0a357f860e6744c8d
2021-03-01 14:51:26 +01:00
72eaeac698
fixed errors during migration
...
- reference.rst did still contain do_<something>
- traling commas in secop_demo/cryo.py
Change-Id: I5bb8bd310576366c8cfe406f0ec770fa40bcab5b
2021-03-01 14:36:58 +01:00
d3831b3974
fix doc and REAMDE
...
Change-Id: I2e022e29e52511ca1a7f529d6d1bae44a995a073
2021-03-01 14:31:02 +01:00
f861701fc2
update FG and SR drivers
...
these drivers should now include the last changes before
the syntax change. To be tested ...
2021-03-01 11:24:30 +01:00
452eb00417
again README
...
Change-Id: Ie1410448532253e85106d3d6c03ca7cd61db4bf5
2021-02-26 17:49:13 +01:00
52472acae9
impoved sync startegy (README)
...
Change-Id: I62da19c17d269e507833941d3f53c2aefd2a9a17
2021-02-26 17:46:55 +01:00
fee7c4904b
added hook for optional history writer
...
- activated with envrionment variable FRAPPY_HISTORY
- using the (currently) private package 'frappyhistory'
Change-Id: I8f747b29d8311af677ed77268a4c38c8d71b08c2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25064
Tested-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-02-26 17:27:13 +01:00
3141e22894
lookup cfg files in a list of directories
...
environment variable SECOP_CONFDIR may be a ':' separated
list of directories to lookup for cfg files
Change-Id: I058be6a270d3a3f6cd8ca45fdd4ab68c80fa5c23
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25063
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 >
2021-02-26 17:27:13 +01:00
fbccd0f9b7
remove obsolete code
...
- basic_validators is not needed any more since the implementation
of datatypes.Stub
- client/baseclient.y is replaced by client/__init__.py both for
the gui client and NICOS SECoP client
- lib/parsing.py used by baseclient only
Change-Id: I15b6ac880017000e155b8f6b7e2456e1bbf56dab
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25058
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 >
2021-02-26 17:27:13 +01:00
9071a5bcf7
fix inheritance order
...
+ hide pollperiod on PPMS Modules
Change-Id: I77ad5502884360bf6babfd226de0675ee06a6196
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25054
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 >
2021-02-26 17:27:13 +01:00
1588703f99
try to follow PEP8
...
- fixed most important code after checking with flake8
- ignored code which has to be reworked or removed
+ mark unused code with 'TODO: remove ...'
Change-Id: Ic45e541049e391e2853d29cd64bb0963bd9a2125
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25053
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2021-02-26 17:27:13 +01:00
fe041bac0a
after running isort
...
Change-Id: I6d7dbb8dee9480fc9242529089a1b40f17f068e7
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25052
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-02-26 17:27:13 +01:00
07b758c3dd
removed old style syntax
...
- removed secop/metaclass.py
- moved code from ModuleMeta to modules.HasAccessibles.__init_subclass__
- reworked properties:
assignment obj.property = value now always allowed
- reworked Parameters and Command to be true descriptors
- Command must now be solely used as decorator
- renamed 'usercommand' to 'Command'
- command methods no longer start with 'do_'
- reworked mechanism to determine accessible order:
the attribute paramOrder, if given, determines order of accessibles
+ fixed some issues makeing the IDE more happy
+ simplified code for StatusType and added a test for it
Change-Id: I8045cf38ee6f4d4862428272df0b12a7c8abaca7
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25049
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 >
2021-02-26 17:27:13 +01:00
f9a2152883
enhance documentation
...
- flatten hierarchy (some links do not work when using folders)
- add a tutorial for programming a simple driver
- clean description using inspect.cleandoc
+ fix a bug with 'unit' pseudo property in a Parameter used as override
Change-Id: I31ddba5d516d1ee5e785e28fbd79fca44ed23f5e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25000
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-02-26 17:27:13 +01:00
25891f296d
new syntax for parameter/commands/properties
...
New Syntax:
- define properties and parameters as class attributes directly
instead of items in class attribute dicts
- define commands with decorator @usercommand(...)
- old syntax is still supported for now
still to do (with decreasing priority):
- turn parameters into descriptors (vs. creating getters/setters)
- migrate all existing code to new syntax
- get rid of or reduce code in metaclasses using __set_name__ and
__init_subclass__ instead, including a fix for allowing py < 3.6
Change-Id: Id47e0f89c506f50c40fa518b01822c6e5bbf4e98
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24991
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 >
2021-02-26 17:27:13 +01:00
0d1c7ba76f
make arguments of Parameter and Override consistent
...
- allow (description and) datatype being positional args in Override
- disallow ctr and unit being a positional arg in Parameter
- disallow reorder being a positional arg in Override
Change-Id: Ic5711d091af11d5843943b0b2b31567127f8ed8c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24934
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 >
2021-02-26 17:27:13 +01:00
9afcc49430
improve softcal
...
- bugfix: stop searching for file on the first match
- allow to ignore the sign on input by abs (bool) parameter
Change-Id: I0e5544d7645f124d4c4ac720174b0f5bde7e71a6
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24928
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-02-26 17:27:13 +01:00
7895470301
main module of LS370 is now drivable
...
The main value of main module is the selected channel, it is 0
when pausing during scanning, and the status is busy.
+ cosmetics to make IDE more happy
Change-Id: I11d8f08ea67d25fb00f7492080b4a55efc124bfb
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24927
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 >
2021-02-26 17:27:13 +01:00
9df43bb940
make order of accessibles work again
...
- when applying overrides with reorder=True, take ctr from Override,
else copy from the cloned Accesible. This did not work properly
- reworked:
- replaced CountedObj class by object_counter
- accessibles created by a copy or by applying Overrides
do not need fresh counted values
- adjusted tests
Change-Id: Id2fcf1ab1295aa1ea80ea81ae8cd02d36f86e969
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24926
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 >
2021-02-26 17:27:13 +01:00
ab558b3390
fixed README
2021-02-26 17:05:44 +01:00
fad330b71d
fixed README
...
added a plan, how to keep mlz and local git in sync
2021-02-26 17:02:26 +01:00
3cc8db881e
fixed ls370 issue when dwell time is too short
2021-02-26 16:13:22 +01:00
fa71b8ee25
added hook for optional history writer
...
- activated with envrionment variable FRAPPY_HISTORY
- using the (currently) private package 'frappyhistory'
Change-Id: I8f747b29d8311af677ed77268a4c38c8d71b08c2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25064
Tested-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-02-26 15:29:44 +01:00
dbc6f17e5e
lookup cfg files in a list of directories
...
environment variable SECOP_CONFDIR may be a ':' separated
list of directories to lookup for cfg files
Change-Id: I058be6a270d3a3f6cd8ca45fdd4ab68c80fa5c23
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25063
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 >
2021-02-26 15:29:44 +01:00
0c23ee46a1
remove obsolete code
...
- basic_validators is not needed any more since the implementation
of datatypes.Stub
- client/baseclient.y is replaced by client/__init__.py both for
the gui client and NICOS SECoP client
- lib/parsing.py used by baseclient only
Change-Id: I15b6ac880017000e155b8f6b7e2456e1bbf56dab
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25058
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 >
2021-02-26 15:29:44 +01:00
d6cf1f7629
added ccu4 and mercury drivers
...
Change-Id: I566016e9972a33b94eff5025523206e9806c4b5c
2021-02-26 15:17:58 +01:00
41baf5805f
migrated secop_psi drivers to new syntax
...
- includes all changes up to 'fix inheritance order' from git_mlz
6a32ecf342
Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283
2021-02-25 14:01:54 +01:00
bc5edec06f
enhance documentation
...
- flatten hierarchy (some links do not work when using folders)
+ fix a bug with the redorder flag in Override
+ allow removal of parameters
+ clean description using inspect.cleandoc
Change-Id: I3dde4f4cb29c46e8a21014f1fad7aa3ad610a1bf
2021-01-25 15:12:47 +01:00
e411ded55b
worked on tutorial
...
Change-Id: I630e7379e35cc0146d58f9abe10cb19283191ca8
2021-01-21 08:42:43 +01:00
ad9defab0f
changed doc html layout to alabaster
...
- make page width 100% of the window
- decrease code font size (seems to big compared to other text)
Change-Id: Id36dffea22163dcbd77303b0aab8c852371ef017
2021-01-21 08:41:17 +01:00
fbb0d10c55
fixed worst bugs in FG Lecryo driver
...
Change-Id: Iab6b7e0f0838a42f1a4f4b484745cc7dd7089c6b
2021-01-21 08:40:16 +01:00
bc33933a1a
update doc
...
- add properties, parameters and commands to the doc string autoatically
- change names to "Frappy"
- started tutorial
- changed doc structure slightly
Change-Id: I87bef91384d138c738d12ddcf3a1de7f758a0973
2021-01-19 17:20:53 +01:00
2d310bc612
TupleOf and StructOf create multiple curves
...
the components of TupleOf and StructOf are storead as separate
curves in history
Change-Id: I42ebf84653408de7148796763a4d4ea9dd309696
2021-01-12 15:41:06 +01:00
e0f9b4a858
add history writer
...
Change-Id: I2d577dcf0c543c26680d157be959b0a608ace759
2020-12-10 17:04:41 +01:00
16834f8802
fix a bug softcal
...
- stop searching for files on the first match
2020-12-04 13:33:54 +01:00
d9650d7fc7
improve drivers for PPMS auxiliary equipment
2020-12-04 13:33:08 +01:00
569c0a3399
make arguments of Parameter and Override consistent
...
- allow description _and_ datatype being positional args
- disallow ctr, unit, reorder being positional
2020-12-04 13:28:04 +01:00
cab2bb85ba
[wip] next version of FG
2020-11-10 11:55:09 +01:00
2fb05b37f8
[WIP] driver for FG_Lecroy_3000
...
not yet working
2020-11-10 08:09:39 +01:00
ad2a79c312
SR_7270: autorange is an enum
...
- autorange may be off, soft or hard
2020-11-10 08:00:33 +01:00
82b4af4faa
main module of LS370 is now drivable
...
- the main value is the channel
- it is busy when pausing during scanning
+ allow softcal to ignore the sign
2020-11-10 07:57:48 +01:00
ad07ecdd69
fix typos in secop/modules.py doc
...
Change-Id: Idfbb85603b5efd0884ae9356dd96136c9c32ada1
2020-10-28 10:09:17 +01:00
cf24bbc3c3
improved doc on softcal and Module.registerCallback
...
Change-Id: I12b1f7a2d29435d989fb9953f72bea181e6cb4f7
2020-10-28 09:59:40 +01:00
29c66fa19a
describe branches in README.md
...
Change-Id: I5bec3d9177a14d618b982f9301a7f06a71a4a72e
2020-10-28 08:49:35 +01:00
25a887dcab
fix initwrite behaviour
...
with handlers, a parameter from the cfg file which is not the
first of parameters with the same handler were not written.
fix: write_<param> method is called for all parameters in
<module>.writeDict even if there is no poll entry.
with this fix, when a parameter has the property initwrite=True,
the write_<param> method is called even when <param>
is not polled and even when <module>.pollerClass is None
Change-Id: I9b397deb5b20709fc4fa7c860c85b251a204c7f6
2020-10-28 08:35:01 +01:00
36ffb0a31f
Merge branch 'mlz' into wip
...
Change-Id: I9dab1c32c4f0579f7f54bb68c60f7a8b14866652
2020-10-28 08:01:44 +01:00
b544d2af98
Merge branch 'master' into wip
2020-10-28 07:55:17 +01:00
5db1acb07c
improvements on SR_7270 driver
2020-10-20 14:38:45 +02:00
880327c544
main ls370 module is now drivable
...
the value is the current channel, when the target (=channel) is changed,
the value changes to 0, until the switching has finished, including pause time
2020-10-20 14:17:24 +02:00
4f1883ba27
fix initwrite behaviour
...
with handlers, a parameter from the cfg file which is not the
first of parameters with the same handler were not written.
fix: write_<param> method is called for all parameters in
<module>.writeDict even if there is no poll entry.
with this fix, when a parameter has the property initwrite=True,
the write_<param> method is called even when <param>
is not polled and even when <module>.pollerClass is None
Change-Id: I9b397deb5b20709fc4fa7c860c85b251a204c7f6
2020-09-25 13:28:12 +02:00
3043200012
fix initwrite behaviour
...
with handlers, a parameter from the cfg file which is not the
first of parameters with the same handler were not written.
fix: write_<param> method is called for all parameters in
<module>.writeDict even if there is no poll entry.
with this fix, when a parameter has the property initwrite=True,
the write_<param> method is called even when <param>
is not polled and even when <module>.pollerClass is None
Change-Id: I9b397deb5b20709fc4fa7c860c85b251a204c7f6
2020-09-25 12:05:16 +02:00
1b4865c608
Revert "support name mangling for parameter/command names"
...
This reverts commit 99bdafdd0c
.
2020-09-25 11:30:23 +02:00
f7576cf541
fix initwrite behaviour
...
with handlers, a parameter from the cfg file which is not the
first of parameters with the same handler were not written.
fix: write_<param> method is called for all parameters in
<module>.writeDict even if there is no poll entry.
with this fix, the write_<method> is called even when a parameter
is not polled.
2020-09-25 11:19:17 +02:00
587b170f6a
update SR_7270
2020-09-10 15:47:04 +02:00
1c42859466
newset version of senis
2020-09-10 10:43:34 +02:00
1f832388d7
Merge branch 'wip' of git.psi.ch:sinqdev/frappy into wip
2020-09-08 13:37:01 +02:00
5f9344109d
improve sea client
2020-09-08 13:36:11 +02:00
99bdafdd0c
support name mangling for parameter/command names
2020-09-08 13:33:13 +02:00
ab21bb5e3f
add timestamp to error reply
2020-09-08 13:32:18 +02:00
99e32065b1
simplyfy some error messages
2020-09-08 13:31:38 +02:00
c1ffc160a2
configurable search path for cfg files
2020-09-08 12:13:17 +02:00
89bf080dab
fix typo
...
Change-Id: I578668ab179b9d95bb16a0103bb96c5f4a937133
2020-08-13 11:37:18 +02:00
047f3a7606
add a lot of current stuff
...
this is not (yet) in the frm2 repo
Change-Id: Ia5b2996803c3dbb15b85ab1bc3a24717ac6297fb
2020-08-13 11:33:14 +02:00
7f7c1a85ab
improvements on PPMS and LS370
...
- PPMS: improved machanism for 10 K waiting
- LS370: fixed an issue with auto range
+ LS370: show test for all status bits
Change-Id: Ia6454141917893f0e5c6c4351df3a864942bb629
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23495
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2020-08-13 11:33:14 +02:00
5aff4b9dab
README: add a short description
2020-07-30 08:46:09 +02:00
2bd30c4423
test adding README
2020-07-30 08:42:44 +02:00
0641968715
add a lot of current stuff
...
this is not (yet) in the frm2 repo
Change-Id: Ia5b2996803c3dbb15b85ab1bc3a24717ac6297fb
2020-07-29 14:57:50 +02:00
d9a2045fca
more flexible end_of_line in stringio
...
in the previous version, it was not possible to give a ASCII nul
character as end_of_line, because StringType refuses this
- end_of_line might be given as bytes, str or int
- end_of_line might be given as tuple (eol_read, eol_write)
Change-Id: I8b7942320ad3ffe162cdf3a673e113a66a84fb93
2020-07-23 16:12:14 +02:00
ab00c45db0
improvements on PPMS and LS370
...
- improved machanism for 10 K waiting
- fixed an issue with auto range
Change-Id: Ia6454141917893f0e5c6c4351df3a864942bb629
2020-07-07 15:08:28 +02:00