linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,247 Commits 18 Branches 1 Tag
ec2bc57ade4609a40a2fd7c5f2bc9cdbab839fed
Commit Graph

1247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jenkins system
b0f0a48e51 [deb] Release v0.12.1 2021-05-04 09:42:53 +02:00
Enrico Faulhaber
e4261ecfe1 remove secop-console from debian *.install file 
Change-Id: I9ba8bd37b9460db83512a35bc2e98b63a4df9687
 2021-05-04 09:41:12 +02:00
Jenkins system
598dd07888 [deb] Release v0.12.0 2021-05-04 08:49:58 +02:00
Bjoern Pedersen
f2b330a3f0 Correct checks enum 
Change-Id: Ibe23825bfdfcac15262987383407e18ead4cf880
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25840
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2021-04-30 08:08:22 +02:00
Bjoern Pedersen
a85201ad7d Another Jenkisfile error 
Change-Id: I313f1471aad166c794374c7d381c1b66a4395b4d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25839
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2021-04-30 07:59:02 +02:00
Bjoern Pedersen
2cf6e167a8 No pull for images, they are recreated in the job 
Change-Id: I4ac389873310a411ea33ed6c06af8ec8f752dfd6
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25838
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2021-04-30 07:54:43 +02:00
Bjoern Pedersen
ffc2c495fb Fixes to Jenkinsfile 
Change-Id: Id75b49fd8c38ef90a0869ba6845a36f338a239b5
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25837
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2021-04-30 07:52:14 +02:00
Bjoern Pedersen
7ea4e3955a Jenkisfile: verification 
Change-Id: I58829f1672c95bb76c765aa1ce86d808f9e50dfd
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25836
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2021-04-30 07:49:28 +02:00
SANS
3e599a24d7 fixed sea.cfg to be general 2021-04-29 10:58:15 +02:00
SANS
e638661edc if sea cfg not found, take from FRAPPY_SEA_DIR 2021-04-29 10:55:52 +02:00
Markus Zolliker
772f45a241 add cfg/deleop directory 
Change-Id: Ia9f15af8bb68a8306a9d966ef2b217d587f0ab28
 2021-04-28 16:37:30 +02:00
Markus Zolliker
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
Markus Zolliker
1a616ecab1 fixed doule entry tcoil1 in ma7.cfg 
Change-Id: I547e7dcb6cca72004dd3ea8e56a0601e7bf8771a
 2021-04-28 09:29:18 +02:00
Markus Zolliker
cc1632e07d 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
+ fixed race condition in writeInitParams

Change-Id: I894bda291ab85ccec3d771c4903393c808af0a2a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25128
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-04-27 18:20:53 +02:00
Markus Zolliker
61aeafdfb6 added cfg files for SINQ Frappy 
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
 2021-04-27 17:54:20 +02:00
l_samenv
c89c982c42 improve comments (poller.py) 2021-04-27 17:15:28 +02:00
Markus Zolliker
acbb17f367 updated README.md 
the procedure may still need to be discussed

Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4
 2021-04-27 17:00:06 +02:00
Markus Zolliker
4bda112bb7 pollOneParam has no return value (avoid pylint complaint) 
Change-Id: Iab75c970e106617ffd4e612d358da491312ca54b
 2021-04-27 16:51:37 +02:00