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

659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Krüger
b49dcf0fa8 UI: Add connection from exit button to close the window 
Change-Id: I168b06efa8ae95b09a9be408a25c510f90937c4c
Reviewed-on: https://forge.frm2.tum.de/review/17714
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:47:06 +02:00
Enrico Faulhaber
e830666315 Support PyQt5 (fallback to PyQt4) 
Change-Id: I7fa1add00d677e626fee5cd1071dee54d0bf8565
Reviewed-on: https://forge.frm2.tum.de/review/17666
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-11 12:43:04 +02:00
Enrico Faulhaber
40e75aefcc minor adoptions 
Change-Id: I8ee3968b46609ffb22f3618b61f6d15f0e5188c1
Reviewed-on: https://forge.frm2.tum.de/review/17281
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 15:36:45 +01:00
Enrico Faulhaber
d0620964fd fix unbound unit access 
Change-Id: I6dfb1a1c3c08fda54283ebbd1c862d99281b4c1e
Reviewed-on: https://forge.frm2.tum.de/review/17280
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:53:42 +01:00
Enrico Faulhaber
8117b26363 GUI: Saveguard against missing mandatory parameter status 
Change-Id: I04fa866474a8f2205c1e77f19d3eef4cd100ccf0
Reviewed-on: https://forge.frm2.tum.de/review/17279
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:50:39 +01:00
Enrico Faulhaber
b8abcfaf85 remember Widgets for modulectrl and paramctl 
to not recreate them when another module/param got selected

Change-Id: Ic81bd8e3105f666d3a03dffb3de4e15603d99c39
Reviewed-on: https://forge.frm2.tum.de/review/17276
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:13:23 +01:00
Enrico Faulhaber
99f763647f Avoid race condition upon gui start with autoconnect 
Change-Id: I9f886dd858d50584403da5adf0c995e73fe67267
Reviewed-on: https://forge.frm2.tum.de/review/17277
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:05:12 +01:00
Enrico Faulhaber
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
Enrico Faulhaber
c146f477aa secop/errors: add comments 
Change-Id: If03094acd29a8fd437ad9b82a8b332cc5ad8366b
Reviewed-on: https://forge.frm2.tum.de/review/17270
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:38:55 +01:00
Enrico Faulhaber
b9324876b3 Makefile: allow specifying only a subset of the tests to run 
Change-Id: I4502789e7bad322372f915051320d1d0d8b25fb3
Reviewed-on: https://forge.frm2.tum.de/review/17269
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
 2018-02-08 09:38:51 +01:00
Enrico Faulhaber
3ae82fb352 fix regression from renaming device to module 
Change-Id: I05c6c1d5bef2d6e4bce6a6130793bf8a8ed9bd6c
Reviewed-on: https://forge.frm2.tum.de/review/17272
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:38:41 +01:00
Enrico Faulhaber
09df63fdec Remove old demo code (no longer used) 
Change-Id: I6976a28b57258cc451bac410767fd3acf2fb8d49
Reviewed-on: https://forge.frm2.tum.de/review/17267
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:37:54 +01:00
Enrico Faulhaber
5621b17ee4 More simulation cfg's 
Change-Id: I57c0d85513e673cf070870708a7a3f75e90ebeda
Reviewed-on: https://forge.frm2.tum.de/review/17157
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-07 13:57:51 +01:00
Enrico Faulhaber
1c03b3c7f6 minor fixes 
Change-Id: Ic8ce37f62071bc928ea10a669da3ac7e43986f47
Reviewed-on: https://forge.frm2.tum.de/review/17156
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-23 15:21:18 +01:00
Enrico Faulhaber
62c2434f0f fix exceptions 
Change-Id: I09f33386d5ae1499f157f3ffb7aa3b08b65e27db
Reviewed-on: https://forge.frm2.tum.de/review/17127
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:27:40 +01:00
Enrico Faulhaber
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
Enrico Faulhaber
8538659b22 fix PARAMS handling + initialisation for simulation 
Change-Id: I1be9814b33884034301da0d8f3984011dfcf53b9
Reviewed-on: https://forge.frm2.tum.de/review/17128
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:03:32 +01:00
Enrico Faulhaber
41eb7e6508 Provide mlz_ccr12 simulation mockup cfg 
Change-Id: Ia473023dba6004a9148678c2af4dec9df9516054
Reviewed-on: https://forge.frm2.tum.de/review/17129
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:03:26 +01:00
Lutz Rossa
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
Enrico Faulhaber
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
Enrico Faulhaber
b0c3ac01d4 Provide a mean for simulation dummy devices 
create the correct descriptive data.
Main use case is for unit-tests and testing custom configs.

Change-Id: I3077f80cb9fdbf2443ee9da796c3749707fd2b55
Reviewed-on: https://forge.frm2.tum.de/review/16806
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 15:00:04 +01:00
Enrico Faulhaber
8c26ecf5cf extend datatypes 
also make interface more explicit

Change-Id: Ib104e2c050d3e98e9d434d502951e33619784e2e
missing: test cases for *.from_string(input) methods
Reviewed-on: https://forge.frm2.tum.de/review/16893
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 14:08:42 +01:00
Frank Wutzler
3e9733d8f3 describe SECoP motivation discussed in meeting 2017-11-27 
Change-Id: Ib82b9ac195dccb29ce5c314e67840bcdd02e0515
Signed-off-by: Frank Wutzler <frank.wutzler@helmholtz-berlin.de>
Reviewed-on: https://forge.frm2.tum.de/review/16892
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 13:57:00 +01:00
Enrico Faulhaber
fd0f0ea961 playground: give sequencermixin a loopcounter (per step) 
Change-Id: Ibb300d426aa0a8191a08f4b1599965ca06731a02
Reviewed-on: https://forge.frm2.tum.de/review/16894
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 13:56:24 +01:00
Enrico Faulhaber
69e77749fb fix typo and include comment from Niklas 
Change-Id: I12656269a399d8e0602304187a833d0781906084
Reviewed-on: https://forge.frm2.tum.de/review/16848
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-05 10:01:00 +01:00
Enrico Faulhaber
97d0d33049 add info about Meeting @PSI 
Change-Id: I45231cd0fc35925d668615aed724b5c3d37629a3
Signed-off-by: Lutz Rossa <rossa@helmholtz-berlin.de>
Reviewed-on: https://forge.frm2.tum.de/review/16789
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Anders Pettersson <anders.pettersson@esss.se >
 2017-12-04 13:57:39 +01:00
Enrico Faulhaber
4b02a4c82e fix amagnet 
Change-Id: I6f1dedd5dfdd10cc828e27ea22440c35a25c2b9d
Reviewed-on: https://forge.frm2.tum.de/review/16790
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>
 2017-11-30 10:55:34 +01:00
Markus Zolliker
4cf4ecb507 - fixed documentation hierarchy 
Change-Id: Ic61b10c393b1d5fa12d194a804c19f23a570c792
Reviewed-on: https://forge.frm2.tum.de/review/16708
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2017-11-15 11:48:47 +01:00
Markus Zolliker
8663501150 revision of SECoP documentation 
- created secop_v2017-09-14.rst, based on the GoogleDocs
  SECoP Preliminary V2016-11-30 (rc 2)
- this Document is supposed to contain the full SECoP standard
- created SECoP issues
- moved everything else to "outdated" (kept for reference)

Change-Id: I87d69d1846fc4ed55f1c78b22fd4650d8550152b
Reviewed-on: https://forge.frm2.tum.de/review/16573
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
 2017-11-03 08:46:20 +01:00
JenkinsCodeReview
622bc8b3d3 [deb] Release v0.4.4 2017-09-24 22:25:02 +02:00
Enrico Faulhaber
11e836952a amagnet: fix switching sequence 
Change-Id: I7fcf5ad164997f8562849b0f422a2e2a87deca07
Reviewed-on: https://forge.frm2.tum.de/review/16328
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-24 22:28:39 +02:00
JenkinsCodeReview
a775941447 [deb] Release v0.4.3 2017-09-22 17:29:46 +02:00
Enrico Faulhaber
ab5beeeae6 wait for tango 
Change-Id: Ie316eb0fbd954c40ccef1dab0f60916a78340994
Reviewed-on: https://forge.frm2.tum.de/review/16327
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-22 17:34:28 +02:00
JenkinsCodeReview
9d2897c4c5 [deb] Release v0.4.2 2017-09-22 16:38:00 +02:00
Enrico Faulhaber
2ba0a5be9b MLZ_entangle: use generous timings for initial device connect 
Change-Id: I154df78deea1879a44444b48c2d7f8328478860a
Reviewed-on: https://forge.frm2.tum.de/review/16326
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-22 16:41:52 +02:00
JenkinsCodeReview
e6958ab2bd [deb] Release v0.4.1 2017-09-22 13:25:29 +02:00
Enrico Faulhaber
c627caf0d1 fix init script 
Change-Id: I0bc2e95bf87eaba02b5d502719354e439042de1e
Reviewed-on: https://forge.frm2.tum.de/review/16323
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-22 13:29:00 +02:00
JenkinsCodeReview
a71c9b7c81 [deb] Release v0.4.0 2017-09-22 10:33:05 +02:00
Enrico Faulhaber
16e69e7778 fix entangle integration 
StringIO::multicommunicate can now only handle up to 100 messages.
Should be sufficient.

Change-Id: Id3ccdf03143b80a37aa0ef0b87c47090ef802a42
Reviewed-on: https://forge.frm2.tum.de/review/16288
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-19 18:30:21 +02:00
Enrico Faulhaber
eeac276601 Remove obsolete protocol implementations 
Change-Id: I9342ff3d00666238b6412b41a3785dadd96a7778
Reviewed-on: https://forge.frm2.tum.de/review/16273
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-18 15:14:04 +02:00
JenkinsCodeReview
38c6729c84 [deb] Release v0.3.0 2017-09-18 14:18:37 +02:00
Enrico Faulhaber
3d3558ccd8 make StringType default maximum size = 255 Bytes 
Change-Id: I0c26fc24ad99ff4185ff5a0b9b8ada9a10817b8b
Reviewed-on: https://forge.frm2.tum.de/review/16269
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-18 14:15:25 +02:00
Enrico Faulhaber
0c63522eab fix tests 
Change-Id: I53e9143121a6d01dbd1733f6fcd71fe1a9a9e3e3
Reviewed-on: https://forge.frm2.tum.de/review/16260
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-18 13:58:08 +02:00
Enrico Faulhaber
ee5f749aad Merge "tmp: test gerrit pylint." 2017-09-14 12:26:13 +02:00
Alexander Lenz
47cafc5b1b tmp: test gerrit pylint. 
Change-Id: I278668dc8844566e9d76fdf51de061285a549cc3
 2017-09-14 12:10:24 +02:00
Enrico Faulhaber
4bfd0c5ac2 Improve pylintrc. 
Change-Id: I7115927a829a6dbdde32b26a08fa8f78b43dbf27
 2017-09-14 11:22:24 +02:00
Alexander Lenz
4717322400 Add pylintrc. 
Change-Id: I151c14607aaa9d6255db41cc30a4422989f1509e
 2017-09-13 18:54:41 +02:00
Alexander Lenz
88a2230fb7 Makefile: add convenience targets. 
Change-Id: I3e8fcb6d7db87c6b85dc03b801103f41e199c11c
 2017-09-13 18:45:35 +02:00
Enrico Faulhaber
0aa542f07c Merge "provide an mean to use commands in the gui" 2017-09-13 17:10:37 +02:00
Enrico Faulhaber
3c3eaa166b provide an mean to use commands in the gui 
Change-Id: Ia6a3fa03b50496abcab47026637a8f292c761d0c
 2017-09-13 17:09:41 +02:00