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
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
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
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
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
b30bd308a9
fixes for uniax device
2021-06-11 16:45:45 +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
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
8d6ba91a5e
changes defaults in ls370sim
...
Change-Id: I6388358c42a4b115fc5aec4df0d4588457140744
2021-06-04 12:26:58 +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
e638661edc
if sea cfg not found, take from FRAPPY_SEA_DIR
2021-04-29 10:55:52 +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
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
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
1ca35cf8e9
improved softcal
...
- better error handling
- bug fix
Change-Id: I43bdd4aa35723f43f9e4baf2723af812f04689d3
Change-Id: I5990c75a7a8153e95abee9548475783ee893bd08
2021-03-08 10:25:39 +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
l_samenv
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
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
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
