linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
969 Commits 18 Branches 1 Tag
397ec2efbddd3f2da63a90fb9fcc6eaeb93a320c
Commit Graph

969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
d6cf1f7629 added ccu4 and mercury drivers 
Change-Id: I566016e9972a33b94eff5025523206e9806c4b5c
 2021-02-26 15:17:58 +01:00
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
e411ded55b worked on tutorial 
Change-Id: I630e7379e35cc0146d58f9abe10cb19283191ca8
 2021-01-21 08:42:43 +01:00
Markus Zolliker
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
Markus Zolliker
fbb0d10c55 fixed worst bugs in FG Lecryo driver 
Change-Id: Iab6b7e0f0838a42f1a4f4b484745cc7dd7089c6b
 2021-01-21 08:40:16 +01:00
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
e0f9b4a858 add history writer 
Change-Id: I2d577dcf0c543c26680d157be959b0a608ace759
 2020-12-10 17:04:41 +01:00
l_samenv
16834f8802 fix a bug softcal 
- stop searching for files on the first match
 2020-12-04 13:33:54 +01:00
l_samenv
d9650d7fc7 improve drivers for PPMS auxiliary equipment 2020-12-04 13:33:08 +01:00
l_samenv
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
local SE user
cab2bb85ba [wip] next version of FG 2020-11-10 11:55:09 +01:00
l_samenv
2fb05b37f8 [WIP] driver for FG_Lecroy_3000 
not yet working
 2020-11-10 08:09:39 +01:00
l_samenv
ad2a79c312 SR_7270: autorange is an enum 
- autorange may be off, soft or hard
 2020-11-10 08:00:33 +01:00
l_samenv
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
Markus Zolliker
ad07ecdd69 fix typos in secop/modules.py doc 
Change-Id: Idfbb85603b5efd0884ae9356dd96136c9c32ada1
 2020-10-28 10:09:17 +01:00
Markus Zolliker
cf24bbc3c3 improved doc on softcal and Module.registerCallback 
Change-Id: I12b1f7a2d29435d989fb9953f72bea181e6cb4f7
 2020-10-28 09:59:40 +01:00
Markus Zolliker
29c66fa19a describe branches in README.md 
Change-Id: I5bec3d9177a14d618b982f9301a7f06a71a4a72e
 2020-10-28 08:49:35 +01:00
Markus Zolliker
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
Markus Zolliker
36ffb0a31f Merge branch 'mlz' into wip 
Change-Id: I9dab1c32c4f0579f7f54bb68c60f7a8b14866652
 2020-10-28 08:01:44 +01:00
Markus Zolliker
b544d2af98 Merge branch 'master' into wip 2020-10-28 07:55:17 +01:00
l_samenv
5db1acb07c improvements on SR_7270 driver 2020-10-20 14:38:45 +02:00
l_samenv
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
Markus Zolliker
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
Markus Zolliker
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
l_samenv
1b4865c608 Revert "support name mangling for parameter/command names" 
This reverts commit 99bdafdd0c.
 2020-09-25 11:30:23 +02:00
l_samenv
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
l_samenv
587b170f6a update SR_7270 2020-09-10 15:47:04 +02:00
l_samenv
1c42859466 newset version of senis 2020-09-10 10:43:34 +02:00
l_samenv
1f832388d7 Merge branch 'wip' of git.psi.ch:sinqdev/frappy into wip 2020-09-08 13:37:01 +02:00
l_samenv
5f9344109d improve sea client 2020-09-08 13:36:11 +02:00
l_samenv
99bdafdd0c support name mangling for parameter/command names 2020-09-08 13:33:13 +02:00
l_samenv
ab21bb5e3f add timestamp to error reply 2020-09-08 13:32:18 +02:00
l_samenv
99e32065b1 simplyfy some error messages 2020-09-08 13:31:38 +02:00
l_samenv
c1ffc160a2 configurable search path for cfg files 2020-09-08 12:13:17 +02:00
Markus Zolliker
89bf080dab fix typo 
Change-Id: I578668ab179b9d95bb16a0103bb96c5f4a937133
 2020-08-13 11:37:18 +02:00
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
7af4d572ab Param(..., initwrite=True) works only with poll=True 
check this when creating a Parameter

Change-Id: I5d45f25fd67682de45b51c842323e9582f69e6e3
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23547
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>
 2020-08-12 16:47:03 +02:00
Markus Zolliker
2eb0aeba0d add readbytes method to AsynConn 
+ flush_recv now also clears _rxbuffer

Change-Id: I33c7ea1a9a1d8b663e5cd3bd81cf7ad43448e0fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23548
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>
 2020-08-12 16:46:48 +02:00
l_samenv
5aff4b9dab README: add a short description 2020-07-30 08:46:09 +02:00
l_samenv
2bd30c4423 test adding README 2020-07-30 08:42:44 +02:00
Markus Zolliker
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
Markus Zolliker
aa4c8f1f04 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-07-29 13:50:21 +02:00
Markus Zolliker
a520e6e1e4 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
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23496
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>
 2020-07-28 14:53:06 +02:00
Markus Zolliker
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