linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,215 Commits 20 Branches 1 Tag
c9ccaa484a098bf9b820a4fb59e33fc7cf26dcdd
Commit Graph

1215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
21dfcbd290 allow interval in SimDrivable to be customized 
Change-Id: Id59d263e5f54fda9388dcdaa34a3ce83b6d4a339
 2021-10-06 08:46:04 +02:00
Markus Zolliker
84e55d9c8d move markdown from requirements.txt to requirements-dev.txt 
Change-Id: I07d700c7ac30900e4166611d0b17f80dff8d6f83
 2021-10-06 08:41:53 +02:00
Markus Zolliker
cbb005d942 show traceback of first error instead of last one 
Change-Id: Iee418dcfb1d81a16112eed57b03c86242c2128b4
 2021-10-06 08:34:56 +02:00
Markus Zolliker
929f55055e fix property inheritance 
Change-Id: If01b98fc38c730e73799b43c78838afee6cf6058
 2021-10-06 08:33:52 +02:00
Markus Zolliker
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
Markus Zolliker
544e42033d fix merge errors 2021-09-21 16:58:29 +02:00
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
8f1375aa31 added/modified new drivers 
mercury, phytron, cryotel

Change-Id: I2288dd39ec4eb3dd2a11ecd5acb4ca7fd704e017
 2021-08-09 15:42:36 +02:00
Markus Zolliker
584a293643 fix secop.io imports 
Change-Id: I8abe4836312cdd2d17847ca0a117dceebaaac235
 2021-07-27 09:19:28 +02:00
Markus Zolliker
73e06c590b add Phytron driver 
+ updates of cfg files

Change-Id: Ief24ee681423e18cae0fca29fe41419018d394dd
 2021-07-27 08:16:36 +02:00
Markus Zolliker
4f6cb8755e additional fixes in secop.io 
Change-Id: Ifdda637183de2b878317c477215f5874d088a668
 2021-07-27 08:14:01 +02:00
Markus Zolliker
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
Markus Zolliker
3140d454ae fix Parameter/Command copy method 
in case the Parameter/Command is subclassed

Change-Id: Ib34fc78e72cd04e743e35ef7ccd40b2eae03b614
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26450
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-07-27 08:06:20 +02:00
Markus Zolliker
7bd166a8a1 persistent params / trinamic motor 
for the trinamic motor we need persistent parameters

Change-Id: Id509b87f8368ea5ba1aca71951f79433b0b4b79f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26405
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-07-27 07:57:49 +02:00
Markus Zolliker
f3978385b4 GUI fixes 
- do not show command result dialog when result is None
- apply fmtstr, if available

+ fix io import in secop.core
+ change old style <basecls>.__init__(self, ...) calls to super().__init__(...)

Change-Id: I599d5d8e8ff430ea9454a0858d703290e87454fc
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26397
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-07-16 14:50:00 +02:00
Markus Zolliker
bc6a99e11b introduce BytesIO 
rename secop.stringio to secop.io, which includes now
also BytesIO and the common base class IOBase

+ a small fix in error handling

Change-Id: I8e305e2c164f4ed131f4b36ef45edd8bd222336d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26393
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-07-15 15:54:51 +02:00
Markus Zolliker
2ff3a17427 fix simulation 
Change-Id: Iaa05d3a7a78b6000ab3c372074bf4053dd74aadb
 2021-07-06 16:25:35 +02:00
Markus Zolliker
495709b670 allow partial describe 
in addition to the SECoP standard

Change-Id: If756e8d9d6a67d3194abc0fe2436cf7124713536
 2021-07-06 16:24:44 +02:00
Markus Zolliker
d9cc85c1df fix issues raising pylint warnings 
+ small bug fixes

Change-Id: Ib63bf13ad06446d3ec3b8cd0b16f9426cef9e3f4
 2021-07-06 16:23:06 +02:00
Markus Zolliker
6b610f1e25 remove irrelevant comments 
+ improve error message 'can not convert %r to float'
Change-Id: Idf534a4105086463fd238d7c91317424a809d7ba

Change-Id: I09260dda8deff1e6ee0af2fa38a42a09884a2061
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26345
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-07-06 16:13:33 +02:00
Markus Zolliker
9a60de9c1c various fixes 
- nodestatechange callback must appear after the online attribute
  is changed
- IntRange: move range validation outside of try except
- fixes on some error names
- well defined error message 'no such class' in secop.lib.get_class
- try again 4 times when starting Tcp Server on EADDRINUSE
- fix error handling

Change-Id: I4eee9b79ea8173936b9f5193b87e006ac8fca827
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26171
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-06-14 09:03:41 +02:00
Markus Zolliker
b30bd308a9 fixes for uniax device 2021-06-11 16:45:45 +02:00
Markus Zolliker
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
Markus Zolliker
6c4bb78f97 minor fixes 
Change-Id: I41aa50b1742fb0e24ff5a34d6d9ba98a6b4c4905
 2021-06-08 15:32:12 +02:00
Markus Zolliker
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
Markus Zolliker
3687ed85e5 first tries with uniax stick 
Change-Id: I70da38aff091f7fc64f409485db335cde07163c9
 2021-06-08 15:32:12 +02:00
SANS
7ff88cf819 fix issues with sea is_running 2021-06-08 14:59:45 +02:00
Markus Zolliker
25b8780b11 persistent module fixed 2021-06-08 14:59:20 +02:00
Markus Zolliker
246ab99e12 experimental persistent mixin 
- still contains changes in mouduls/params ...
 2021-06-08 14:59:20 +02:00
Markus Zolliker
229604439b remove debug print statement 2021-06-08 14:59:20 +02:00
Markus Zolliker
114af36ac6 first tries with uniax stick 2021-06-08 14:59:20 +02:00
Markus Zolliker
ca6aebd290 added trinamic.cfg 2021-06-08 14:58:20 +02:00
Markus Zolliker
49ad153605 trinamic driver and bytesio module 
Change-Id: Id634e7514fecab6fd6bc3edf81e25ad41c2bb12f
 2021-06-08 14:58:19 +02:00
Markus Zolliker
c6157049d7 fix issue with a module based on a SEA subobject 
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
 2021-06-08 14:58:19 +02:00
amor
3977fad3f3 correct to readonly=False for target parameter 2021-06-08 11:59:02 +02:00
amor
eaac83e4d5 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2021-06-08 11:07:31 +02:00
amor
1619e042e9 added fftf furnace and smamor 2021-06-08 11:06:39 +02:00
Markus Zolliker
8d6ba91a5e changes defaults in ls370sim 
Change-Id: I6388358c42a4b115fc5aec4df0d4588457140744
 2021-06-04 12:26:58 +02:00
Markus Zolliker
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
Georg Brandl
026e657799 Makefile: fix docker image 
Change-Id: I90a3fe36abbea0501c7e7e27fa33e90bfd4f116d
 2021-05-29 14:46:25 +02:00
amor
a771259ecf more fixes to SeaWritable 
+ fix mbe.cfg
 2021-05-20 17:57:41 +02:00
amor
c779d49548 fix: handle non Readable SeaModules correctly 2021-05-19 18:10:48 +02:00
Markus Zolliker
5f65b6b4ce handle non Readable SeaModules correctly 
Change-Id: I5fa0a52926af3bb386c18de49fef9b1caba92e79
 2021-05-19 17:54:36 +02:00
amor
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
Jenkins system
35f08bf4ad [deb] Release v0.12.2 2021-05-18 10:29:17 +02:00
Enrico Faulhaber
76ae75a926 secop_mlz: small fixes 
- wrong unit for 'ramp'
- disable Setposition for TemperatureController
- write_target should return the new target
- AnalogInput should not crash initialisation if reading the unit fails
- convert super(...) calls to py3 style super()
- use proper exception chaining
- NamedDigital*put: mapping may already be a dict.

Change-Id: I03ce5f29581dcb3b33466771e7a8b8dd4b1e2bdb
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25960
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>
 2021-05-18 10:27:54 +02:00
Markus Zolliker
27ac70b1da allow to remove accessibles 
removing an inherited command or parameter can now be indicated
with an attribute set to None

Change-Id: I7582434013856190b346e381d2e634509896ccb3
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25963
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2021-05-18 10:27:37 +02:00
Markus Zolliker
a343b07f1d treat specifier of describe message 
for debugging purposes, getting the description of a module
or even a parameter is usefull

therefore the following will work

describe <module>
describe <module>:<param>

Change-Id: Ie262ae12c23d1c151cdc01830ad4f8fd5ec3c5f1
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25962
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-05-17 17:36:47 +02:00
Markus Zolliker
09411f36f3 fix issue with new syntax in simulation 
for creating extra parameters a subclass of SimBase is created,
in order to treat parameters and read_/write_ methods properly.

Change-Id: I9061b9afb0f8922b36b8f9448c45bb3aadb8f515
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25961
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-05-17 17:36:28 +02:00