5458911b67
Adapt sim_* cfg's to current syntax
...
+ make 'limit' usable as type in cfg files
+ minor fixes
Change-Id: Ib94b2645c7a0d978d64d4c86c4415d4b5b0d485f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21485
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-10-31 13:59:56 +01:00
e19f7a8c25
minor fixups
...
Change-Id: I038a962a128c12b81bad6d228e3c1a086c7db719
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21480
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
2019-10-29 16:29:41 +01:00
1768aaefaa
change interfaces_class to interface_classes
...
according to the newset SECoP syntax
accept both namings on the client side
Change-Id: I23abfa163d189044d997b715c912359158c16e42
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21478
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-10-29 16:28:00 +01:00
98f87f1306
make baseclient work without mlzlog
...
The used logger can now be configured from caller. This allows
for example to use NicosLogger when imported from NICOS.
+ fix a problem when connections was lost
Change-Id: I8496ba11ad467749493751b49c4e36dd739892ab
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21477
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2019-10-29 14:28:15 +01:00
c1164568ae
further fixes of py3 issues
...
complaints by pylint are mainly related to
- remove object from base list in class definitions
- unnecessary else/elif after return/raise
Change-Id: I13d15449149cc8bba0562338d0c9c42e97163bdf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21325
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2019-09-26 14:15:48 +02:00
70a9c42a7a
Remove py2 support
...
Change-Id: Ieeaeb3b8efcae004e94aea6c1d2703c9782a8650
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21320
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-09-26 10:32:01 +02:00
8631fd47a1
change datatype property to datainfo
...
- according to SECoP v1.0
- internally the name 'datatype' is kept
Change-Id: I0298a45f2db529ced3a07e2e9b344c91cfb7bb88
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21300
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2019-09-24 16:20:19 +02:00
d187b3240b
rename host argument to client
...
from connectto to host
Change-Id: I4835148b9b7e4675ba70e588998eadc0889735c2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21289
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-09-24 09:31:19 +02:00
7c620901c9
handle SEC node connection properly in client
...
baseclient.py:
- select was not used properly, creating a busy loop
- added stop function in TCPConnection
mainwindow.py:
- fixed behaviour when a connection is broken:
a message is shown, and the node is removed from the tree
Change-Id: I7223dfd9ea027681aff089f2fa16e134a16a7b84
Reviewed-on: https://forge.frm2.tum.de/review/20922
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-07-24 10:47:32 +02:00
94959f2e9b
rework message syntax to conform to latest decisions
...
needs a bigger rework, since READREPLY and EVENTREPLY are now different....
Also the format of the error-reply got changed :(
Change-Id: I1760743238227730ee49aaf92b54e0ff5f25423b
Reviewed-on: https://forge.frm2.tum.de/review/20246
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-03-28 13:38:18 +01:00
99f757bf78
fixup: rename *subtype* in client code as well
...
Change-Id: I97cc836b2eaa508935113c225de593bbb9ad8821
Reviewed-on: https://forge.frm2.tum.de/review/20245
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2019-03-27 15:40:49 +01:00
8efd1df92c
fix isort
...
Change-Id: I5486e1f9b3143c6bb0804c49c7ca21adb9b84de1
Reviewed-on: https://forge.frm2.tum.de/review/19524
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-12-04 10:18:55 +01:00
29a5b5c49e
big rework to comply to current spec
...
- adapt to release(v2018-11-07)
- remove duplicate errors.py
- adapt tests
Change-Id: I383bb571f9808c72b37c12fbe55042011c4c0084
Reviewed-on: https://forge.frm2.tum.de/review/19397
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-12-04 10:18:40 +01:00
fb1939d5c8
merge 'parameters' and 'commands' to 'accessibles'
...
- for now, the definition also accepts the old syntax
(to be changed later)
- Commands have datatype CommandType
- do not need keyword for the decription parameter of Override
- issue a Warning when a Parameter is overwritten without Overrride
(this should be turned into an error message)
-
Change-Id: Ib2c0f520abb5b4d7e6aed4d77a0d2b8bc470a85a
Reviewed-on: https://forge.frm2.tum.de/review/18251
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2018-06-25 17:26:01 +02:00
574a66c65b
rework EnumType to use better Enum's
...
unfortunately IntEnum can't be bent like we would need it (extensible).
So we had to write our own....
The members of the Enum still behave like ints, but also have
.name and .value attributes, should they be needed.
needed adoptions to correctly use (and test) the EnumType are included.
Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59
Reviewed-on: https://forge.frm2.tum.de/review/17843
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-06-07 17:57:46 +02:00
153b4d79f7
fix equipment_id handling
...
Change-Id: Ibeba9f0771dca8e7f9754f8b6431535885d654a0
Reviewed-on: https://forge.frm2.tum.de/review/17857
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-04-26 16:32:51 +02:00
3b802e67c8
improve Py2/3 compat
...
Change-Id: I1dfdcb88a492401851d5157c734cd708496bf004
Reviewed-on: https://forge.frm2.tum.de/review/17734
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-04-17 17:34:24 +02:00
66503e8975
Add value parser + use it for the gui
...
replaces eval which is used so far
Change-Id: Ie5ff8c82175786e233d52bc0faac4e72e3bc27e9
Reviewed-on: https://forge.frm2.tum.de/review/17271
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-02-08 09:54:04 +01:00
8e7908f9b7
replace last references to device by module
...
Change-Id: I2b7099715c356054aad21895f11b13547f104a88
Reviewed-on: https://forge.frm2.tum.de/review/17126
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-01-22 18:24:18 +01:00
79d91d1f23
fix a connection timeout bug
...
When connecting to a fast reacting server, if may be possible that
the "_communicate" function sends it command earlier than the question
for the SECoP version inside the "_inner_run" function. A new variable
showing the connection status forces to wait inside "_communicate".
Change-Id: Id521bbd53fea9e2e980b9c11b849d36cfdeb1ec2
Signed-off-by: Lutz Rossa <rossa@helmholtz-berlin.de >
Reviewed-on: https://forge.frm2.tum.de/review/17006
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2018-01-22 15:42:04 +01:00
8220067795
Fix gui (leftover from extending datatypes)
...
Change-Id: Id12d37d9381f622c3cc1bba2c388784169690b85
Reviewed-on: https://forge.frm2.tum.de/review/16916
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2017-12-15 15:15:02 +01:00
3c3eaa166b
provide an mean to use commands in the gui
...
Change-Id: Ia6a3fa03b50496abcab47026637a8f292c761d0c
2017-09-13 17:09:41 +02:00
96ac437fd3
fix transport and display of node-properties
...
Change-Id: I35a3021768e386a5ce922c8e24128d0bc3a039be
2017-09-12 16:10:22 +02:00
ba59448442
fixups
...
Change-Id: If1377ef41f8d500ccab0e2a0979343b4c090c036
2017-09-11 17:50:20 +02:00
357056d478
fixups
...
Change-Id: I72abe9b4c2deb08e58ce69786f853ccc4b385a5d
2017-09-11 15:22:33 +02:00
dc891466cb
fix formatting of timestamps
...
Change-Id: I92e714833f333b13257e8e54561aa18716d89ecb
2017-09-07 16:37:48 +02:00
123d0fb504
[GUI]: create buttons for commands
...
very basic!
Change-Id: Iee528a307be41e2da1f6f54d8442b7d24634bebe
2017-09-07 15:03:36 +02:00
2bb96bea70
provide setup for MLZ_Amagnet to be used @PSI soon
...
Also implement lots of fixes and improvements.
fixes : #3381
Change-Id: Ibe6664da00756ae5813b90f190295045808b2ff0
2017-07-27 11:21:05 +02:00
29ee07c5b3
several improvements and bugfixes
...
+ rework GUI
- include a combobox for selection of visibility
- include a checkbox wether validation should be done in the client
- remove unused lineEdit
+ improve datatypes
+ improve tests for new descriptive data
+ metaclasse: fix overlooked read_* or write_* func's
+ improve polling
+ Introduce new ErrorClasses
+ dispatcher: use new features of datatypes + PARAMS
+ improve lib
+ autopep8
+ first working version of MLZ_entangle integration
+ split specific stuff into it's own package (MLZ,demo,ess)
Change-Id: I8ac3ce871b28f44afecbba6332ca741095426712
2017-07-19 11:03:29 +02:00
8a63a6c63f
Switch descriptive data to new format
...
Change-Id: Ic8afe976564824d14394ed6a1b4b36df226648df
2017-07-10 18:11:14 +02:00
bc3253a01a
replace validators with datatypes
...
Change-Id: I446c4e14e24afa3f65e79c8b6e07eec3271532b0
2017-07-03 18:13:09 +02:00
f984129986
GUI: show grouping of parameters
...
still todo: grouping of modules
Change-Id: I67e8582004f16061dda96e455f424f5a12e6a163
2017-05-24 17:15:22 +02:00
462b6a0a7e
autopep8
...
Change-Id: I4e40e0ef8e80999832846eac3a415fdd767c6d98
2017-05-24 17:15:20 +02:00
c0fd2e9907
Use mlzlog for better logging
...
Change-Id: Ic82ca0d7b43a906cb9c7d3f1350287e7082afc45
2017-05-16 18:17:43 +02:00
6ec30e38e8
polishing for a demo
...
+ adopting additional requests
Change-Id: If5ca29b5d247f1bc429ca101b0081b1d14f6e6f1
2017-01-26 10:13:12 +01:00
d5e935788f
Bug hunting and polishing
...
Change-Id: I0f05730dd4e01e926ab0c4870c27ed5754f3ccfd
2017-01-23 17:48:50 +01:00
8e3d0da5dd
Polishing
...
- unify (encoded) Errormessages. They now always contain the offeding request.
- adopt keywords to current spec
- fixed formatting of timestamp in WriteReply
- minor bugfixing + polishing
Change-Id: I0ab8836756551399643bdce3d062eedd345509f1
2017-01-20 10:51:19 +01:00
d442da0789
Stub debug client gui.
...
Change-Id: Ib422c66bc36245e1fc3c450765d7555da5c8dda0
2017-01-19 10:04:16 +01:00
68f73b5aa1
Fix some bugs.
...
- Commandreplies format their timestamp like events
Change-Id: I388b9f26bb8b0234d9209b05732e98f9ce1d01c7
2016-12-21 17:00:22 +01:00
78bb3b5f96
Pep8 improvements + cleanup
...
Change-Id: I9052e703b58e93b639c027521b47f693ae853f6e
2016-12-16 14:21:42 +01:00
7320ac1538
Provide basic client Object
...
also improve the describing data and core params
Change-Id: I645444f2a618fdfd40a729e1007c58def24d5ffb
2016-12-15 14:24:25 +01:00
