linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
528 Commits 23 Branches 1 Tag
8029443f1bc0608ff3536f65eada4f40fc8564a5
Commit Graph
76 Commits
Author SHA1 Message Date
zolliker 078ac7c600 fix 'ts' value 2021-04-26 16:04:33 +02:00
zolliker 8b2c5f6144 fix issues with sea is_running 2021-04-26 11:56:48 +02:00
zolliker 99eb600d90 fix handling of unknown sea messages 2021-04-23 09:21:47 +02:00
l_samenv 48d5fe5ea2 forward config description with describe method 2021-04-12 14:47:29 +02:00
l_samenv 331dc544ad use different names for seaconn in different frappy services 2021-04-09 11:46:24 +02:00
l_samenv a5cc98d0b0 various improvements on the sea client 2021-04-08 10:22:53 +02:00
l_samenv 185bf7bc88 improved softcal 
+ removed debug code from ls370
 2021-03-18 14:01:28 +01:00
zolliker 499ae69f29 improved k2601b 
- read back mode
- mode has now 4 values

Change-Id: I0576c73b225cb16e7f890a9479d3b002c52b71ba
 2021-03-18 13:56:57 +01:00
zolliker 4d7e5d3cdc remove debug print statements 
Change-Id: I51dc66b9cecb0f5e84bef36d1b4a541ddefcfbc2
 2021-03-18 13:41:49 +01:00
zolliker 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
zolliker 6538500881 more fixes for sea 
Change-Id: I195bcdbe5f6b274e65dd431ed13a123c74a8d5bf
 2021-03-11 15:57:04 +01:00
zolliker 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
zolliker 1ca35cf8e9 improved softcal 
- better error handling
- bug fix
Change-Id: I43bdd4aa35723f43f9e4baf2723af812f04689d3

Change-Id: I5990c75a7a8153e95abee9548475783ee893bd08
 2021-03-08 10:25:39 +01:00
zolliker 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
l_samenvandzolliker e4748ef9c9 do not export pollintervals in ppms driver 2021-03-03 10:16:52 +01:00
zolliker b4bb172ada Merge branch 'wip' 
Change-Id: I3ba389775ce9b02269ca9c20a42ec1bddf6c5d21
 2021-03-03 09:46:20 +01:00
zolliker 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
zolliker 12b0549cc0 merged master with work 
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
 2021-03-03 09:00:45 +01:00
l_samenv 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
zolliker 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
zolliker 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
zolliker 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
zolliker 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
zolliker 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
zolliker 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
l_samenv 3cc8db881e fixed ls370 issue when dwell time is too short 2021-02-26 16:13:22 +01:00
zolliker d6cf1f7629 added ccu4 and mercury drivers 
Change-Id: I566016e9972a33b94eff5025523206e9806c4b5c
 2021-02-26 15:17:58 +01:00
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
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
zolliker fbb0d10c55 fixed worst bugs in FG Lecryo driver 
Change-Id: Iab6b7e0f0838a42f1a4f4b484745cc7dd7089c6b
 2021-01-21 08:40:16 +01:00
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
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
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
zolliker cf24bbc3c3 improved doc on softcal and Module.registerCallback 
Change-Id: I12b1f7a2d29435d989fb9953f72bea181e6cb4f7
 2020-10-28 09:59:40 +01:00
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
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
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
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
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
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
zolliker 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